diff --git a/apitools/org.eclipse.pde.api.tools.ui/icons/full/elcl16/compare_apis.svg b/apitools/org.eclipse.pde.api.tools.ui/icons/full/elcl16/compare_apis.svg
index 1931f76bc90..6be73230f2a 100644
--- a/apitools/org.eclipse.pde.api.tools.ui/icons/full/elcl16/compare_apis.svg
+++ b/apitools/org.eclipse.pde.api.tools.ui/icons/full/elcl16/compare_apis.svg
@@ -2,24 +2,19 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.92.3 (2405546, 2018-03-11)"
-   sodipodi:docname="compare_apis.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4817">
       <stop
          style="stop-color:#7695b8;stop-opacity:1"
@@ -31,22 +26,6 @@
          id="stop4821" />
     </linearGradient>
     <linearGradient
-       id="linearGradient4805">
-      <stop
-         style="stop-color:#4b82b6;stop-opacity:1"
-         offset="0"
-         id="stop4807" />
-      <stop
-         id="stop4815"
-         offset="0.79358917"
-         style="stop-color:#9ab7d5;stop-opacity:1" />
-      <stop
-         style="stop-color:#a2bcd8;stop-opacity:1"
-         offset="1"
-         id="stop4809" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4817"
        id="linearGradient4823"
        x1="11.436646"
@@ -54,21 +33,6 @@
        x2="14.526019"
        y2="15.130951"
        gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient3827">
-      <stop
-         id="stop3829"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0.60149658"
-         id="stop3835" />
-      <stop
-         id="stop3831"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
     <linearGradient
        id="linearGradient10798-1-9-3-7-6-8-9-0-9-1">
       <stop
@@ -85,7 +49,6 @@
          style="stop-color:#91c168;stop-opacity:1;" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10798-1-9-3-7-6-8-9-0-9-1-7"
        id="linearGradient3929-5-9"
        gradientUnits="userSpaceOnUse"
@@ -109,240 +72,6 @@
          offset="1"
          style="stop-color:#9283c3;stop-opacity:1" />
     </linearGradient>
-    <linearGradient
-       id="linearGradient7540-2-3-8-7">
-      <stop
-         id="stop7542-8-7-5-3"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.502" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0.47623286"
-         id="stop7544-8-2-0-5" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0"
-         offset="0.5"
-         id="stop7546-1-7-9-5" />
-      <stop
-         id="stop7548-98-9-2-4"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient7272-66-4-5-5-5-8">
-      <stop
-         style="stop-color:#8f6c10;stop-opacity:1"
-         offset="0"
-         id="stop7274-6-0-1-7-4-7" />
-      <stop
-         style="stop-color:#c9a645;stop-opacity:1"
-         offset="1"
-         id="stop7276-66-6-3-9-1-4" />
-    </linearGradient>
-    <linearGradient
-       y2="1030.3411"
-       x2="-10.159802"
-       y1="1030.3411"
-       x1="-22.453552"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient10540"
-       xlink:href="#linearGradient7540-2-3-8-7"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="1030.3411"
-       x2="-10.159802"
-       y1="1030.3411"
-       x1="-22.453552"
-       gradientTransform="matrix(0,1,-1,0,1014.0344,1046.6478)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient10542"
-       xlink:href="#linearGradient7540-2-3-8-7"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="1023.2569"
-       x2="-15.945988"
-       y1="1037.4661"
-       x1="-15.945988"
-       gradientTransform="matrix(0.95585117,0,0,0.95585117,-0.71992063,45.488394)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient10544"
-       xlink:href="#linearGradient7272-66-4-5-5-5-8"
-       inkscape:collect="always" />
-    <mask
-       id="mask10620"
-       maskUnits="userSpaceOnUse">
-      <path
-         transform="matrix(0.55482947,0,0,0.55482947,-206.96039,787.08655)"
-         d="m 398.75,468.23718 a 10.625,10.625 0 1 1 -21.25,0 10.625,10.625 0 1 1 21.25,0 z"
-         sodipodi:ry="10.625"
-         sodipodi:rx="10.625"
-         sodipodi:cy="468.23718"
-         sodipodi:cx="388.125"
-         id="path10622"
-         style="font-size:13.58917427px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:2.16621375;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline;font-family:Sans"
-         sodipodi:type="arc" />
-    </mask>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5068-6-9-4-9"
-       id="linearGradient6323-7-1-1"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-15.015625,1046.6356)"
-       x1="10"
-       y1="5"
-       x2="10.007812"
-       y2="6.9843998" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient5068-6-9-4-9">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop5070-8-0-4-9" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop5072-3-6-1-7" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5068-6-9-4-9"
-       id="linearGradient5084-3-3-2-6"
-       x1="12"
-       y1="1043.3622"
-       x2="12"
-       y2="1045.3466"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-15.015625,10.2734)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5068-6-9-4-9"
-       id="linearGradient5086-8-0-8-5"
-       x1="13"
-       y1="1043.3622"
-       x2="15.007812"
-       y2="1043.3466"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-15.015625,10.2734)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5068-6-9-4-9"
-       id="linearGradient5082-1-0-8-1"
-       x1="12"
-       y1="1042.3622"
-       x2="10.007812"
-       y2="1042.3622"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-15.015625,10.2734)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5068-6-9-4-9"
-       id="linearGradient5078-8-2-1-4"
-       x1="10"
-       y1="1041.3622"
-       x2="8.0078125"
-       y2="1041.3466"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-15.015625,10.2734)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5068-6-9-4-9"
-       id="linearGradient5076-5-2-9-8"
-       x1="10"
-       y1="1040.3622"
-       x2="10.007812"
-       y2="1038.3466"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-15.015625,10.2734)" />
-    <linearGradient
-       y2="1038.3466"
-       x2="10.007812"
-       y1="1038.3622"
-       x1="12"
-       gradientTransform="translate(-15.015625,10.2734)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3500-5"
-       xlink:href="#linearGradient5068-6-9-4-9"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5068-6-9-4-9"
-       id="linearGradient5088-1-4-8-6"
-       x1="14"
-       y1="1041.3622"
-       x2="14"
-       y2="1043.3466"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-15.015625,10.2734)" />
-    <radialGradient
-       r="3.4803574"
-       fy="-738.83777"
-       fx="-757.20496"
-       cy="-738.83777"
-       cx="-757.20496"
-       gradientTransform="matrix(1.8508179,-8.813921e-6,8.4531434e-6,1.7750589,644.24981,572.63612)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient3091-1-9-6-4-6"
-       xlink:href="#linearGradient4528-9-5-7-9-7-3"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient4528-9-5-7-9-7-3">
-      <stop
-         id="stop4530-0-5-0-5-8-4"
-         offset="0"
-         style="stop-color:#e0c576;stop-opacity:1;" />
-      <stop
-         id="stop4532-7-9-3-3-6-1"
-         offset="1"
-         style="stop-color:#9e7916;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       y2="7.549418"
-       x2="0.9375"
-       y1="4.8437853"
-       x1="0.9375"
-       gradientTransform="matrix(2.3199889,0,0,2.3199889,10.199693,1043.1852)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3093-5-2-7-0-9"
-       xlink:href="#linearGradient6281-8-0-1-6-6-4-2-8-0"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient6281-8-0-1-6-6-4-2-8-0">
-      <stop
-         style="stop-color:#f7f9fb;stop-opacity:1"
-         offset="0"
-         id="stop6283-0-2-2-1-2-0-1-6-0" />
-      <stop
-         style="stop-color:#ffd680;stop-opacity:1"
-         offset="1"
-         id="stop6285-5-0-9-7-6-9-9-1-9" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4284">
-      <stop
-         style="stop-color:#6588c1;stop-opacity:0"
-         offset="0"
-         id="stop4286" />
-      <stop
-         id="stop4288"
-         offset="0.49999967"
-         style="stop-color:#becce3;stop-opacity:1" />
-      <stop
-         style="stop-color:#809dcb;stop-opacity:0"
-         offset="1"
-         id="stop4290" />
-    </linearGradient>
-    <linearGradient
-       y2="519.39288"
-       x2="323.26462"
-       y1="528.64294"
-       x1="323.26462"
-       gradientTransform="matrix(0.197686,0,0,0.32432277,-38.574335,887.91126)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient10770-6"
-       xlink:href="#linearGradient10448-9-7-0-5"
-       inkscape:collect="always" />
     <linearGradient
        id="linearGradient10448-9-7-0-5">
       <stop
@@ -375,158 +104,6 @@
          style="stop-color:#fceaaf;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       id="linearGradient10440-1-0-0-3">
-      <stop
-         id="stop10442-43-2-0-9"
-         offset="0"
-         style="stop-color:#ae7603;stop-opacity:1;" />
-      <stop
-         style="stop-color:#e8d8a3;stop-opacity:1"
-         offset="0.5"
-         id="stop10521-1-2-5-3" />
-      <stop
-         id="stop10444-3-4-0-4"
-         offset="1"
-         style="stop-color:#bb9221;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10748-8">
-      <stop
-         style="stop-color:#ecac18;stop-opacity:1"
-         offset="0"
-         id="stop10750-5" />
-      <stop
-         id="stop10752-8"
-         offset="0.25"
-         style="stop-color:#f1ce66;stop-opacity:1" />
-      <stop
-         id="stop10754-8"
-         offset="0.5"
-         style="stop-color:#f6e5a6;stop-opacity:1" />
-      <stop
-         style="stop-color:#f1cf6c;stop-opacity:1"
-         offset="0.75"
-         id="stop10756-4" />
-      <stop
-         style="stop-color:#e5b630;stop-opacity:1"
-         offset="1"
-         id="stop10758-7" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10448-90">
-      <stop
-         id="stop10450-0"
-         offset="0"
-         style="stop-color:#ecac18;stop-opacity:1" />
-      <stop
-         style="stop-color:#ffe38d;stop-opacity:1"
-         offset="0.25"
-         id="stop10458-2" />
-      <stop
-         style="stop-color:#fdf5d2;stop-opacity:1"
-         offset="0.5"
-         id="stop10456-96" />
-      <stop
-         id="stop10460-3"
-         offset="0.75"
-         style="stop-color:#ffeba7;stop-opacity:1" />
-      <stop
-         id="stop10452-1"
-         offset="1"
-         style="stop-color:#e5b630;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10414-9">
-      <stop
-         id="stop10416-3"
-         offset="0"
-         style="stop-color:#5078b9;stop-opacity:1;" />
-      <stop
-         style="stop-color:#6d8cbd;stop-opacity:1"
-         offset="0.5"
-         id="stop10422-8" />
-      <stop
-         id="stop10418-4"
-         offset="1"
-         style="stop-color:#5f88c9;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10432-3">
-      <stop
-         style="stop-color:#1f4d9a;stop-opacity:1"
-         offset="0"
-         id="stop10434-4" />
-      <stop
-         id="stop10436-2"
-         offset="0.5"
-         style="stop-color:#4e6da1;stop-opacity:1" />
-      <stop
-         style="stop-color:#567ebc;stop-opacity:1"
-         offset="1"
-         id="stop10438-9" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10157-6">
-      <stop
-         id="stop10159-5"
-         offset="0"
-         style="stop-color:#6588c1;stop-opacity:1" />
-      <stop
-         style="stop-color:#becce3;stop-opacity:1"
-         offset="0.5"
-         id="stop10165-9" />
-      <stop
-         id="stop10161-55"
-         offset="1"
-         style="stop-color:#809dcb;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10396-5">
-      <stop
-         id="stop10398-7"
-         offset="0"
-         style="stop-color:#1b3e79;stop-opacity:1;" />
-      <stop
-         style="stop-color:#728fbf;stop-opacity:1"
-         offset="0.5"
-         id="stop10404-9" />
-      <stop
-         id="stop10400-9"
-         offset="1"
-         style="stop-color:#1f4d9a;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10157-2-5">
-      <stop
-         id="stop10159-8-3"
-         offset="0"
-         style="stop-color:#6588c1;stop-opacity:1" />
-      <stop
-         style="stop-color:#becce3;stop-opacity:1"
-         offset="0.49999985"
-         id="stop10165-3-9" />
-      <stop
-         id="stop10161-5-0"
-         offset="1"
-         style="stop-color:#809dcb;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10149-6-5-4">
-      <stop
-         id="stop10151-5-7-2"
-         offset="0"
-         style="stop-color:#1f4d9a;stop-opacity:1" />
-      <stop
-         style="stop-color:#b9c7df;stop-opacity:1"
-         offset="0.5"
-         id="stop10394-3" />
-      <stop
-         id="stop10153-8-1-2"
-         offset="1"
-         style="stop-color:#567ebc;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10448-9-7-0-5"
        id="linearGradient5123"
        gradientUnits="userSpaceOnUse"
@@ -536,7 +113,6 @@
        x2="323.26462"
        y2="519.39288" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10448-9-7-0-5"
        id="linearGradient5173"
        gradientUnits="userSpaceOnUse"
@@ -546,7 +122,6 @@
        x2="323.26462"
        y2="519.39288" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10798-1-9-3-7-6-8-9-0-9-1"
        id="linearGradient3929-5-9-8"
        gradientUnits="userSpaceOnUse"
@@ -556,35 +131,6 @@
        y2="462.11539"
        gradientTransform="matrix(0.37647059,0,0,0.37647062,-135.61764,871.58461)" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="36.2"
-     inkscape:cx="16.911188"
-     inkscape:cy="6.4513204"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1920"
-     inkscape:window-height="1018"
-     inkscape:window-x="-8"
-     inkscape:window-y="-8"
-     inkscape:window-maximized="1"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="true"
-     inkscape:snap-bbox="true"
-     inkscape:bbox-nodes="true"
-     inkscape:snap-others="false"
-     inkscape:snap-nodes="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3999" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -593,13 +139,11 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
@@ -615,23 +159,19 @@
     <path
        style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ba9726;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
        d="m 14.992384,1039.3694 v 1 h 1 v -1 z"
-       id="path4313-8-8"
-       inkscape:connector-curvature="0" />
+       id="path4313-8-8" />
     <path
        style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ac851f;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
        d="m 15.989463,1041.3602 -0.997079,0.031 0.0029,1 0.9971,-0.031 z"
-       id="path4313-5-1-8"
-       inkscape:connector-curvature="0" />
+       id="path4313-5-1-8" />
     <path
        style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ac851f;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
        d="m 15.009737,1042.37 -3.017353,0.031 0.0088,1 3.017353,-0.031 z"
-       id="path4313-5-1"
-       inkscape:connector-curvature="0" />
+       id="path4313-5-1" />
     <path
        style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ba9726;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
        d="m 15,1038.3622 -3.007616,0.031 0.0088,1 3.007615,-0.031 z"
-       id="path4313-8"
-       inkscape:connector-curvature="0" />
+       id="path4313-8" />
     <rect
        style="fill:url(#linearGradient5173);fill-opacity:1;stroke:none;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        id="rect10007-0-74-2-7-6-8"
@@ -644,41 +184,24 @@
     <path
        style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ba9726;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
        d="m 15,1046.3688 v 1 h 1 v -1 z"
-       id="path4313-8-8-2"
-       inkscape:connector-curvature="0" />
+       id="path4313-8-8-2" />
     <path
        style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ac851f;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
        d="M 15.997079,1048.3596 15,1048.3906 l 0.0029,1 0.9971,-0.031 z"
-       id="path4313-5-1-8-4"
-       inkscape:connector-curvature="0" />
+       id="path4313-5-1-8-4" />
     <path
        style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ac851f;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
        d="M 15.017353,1049.3694 12,1049.4004 l 0.0088,1 3.017353,-0.031 z"
-       id="path4313-5-1-6"
-       inkscape:connector-curvature="0" />
+       id="path4313-5-1-6" />
     <path
        style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ba9726;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
        d="M 15.007616,1045.3616 12,1045.3926 l 0.0088,1 3.007615,-0.031 z"
-       id="path4313-8-3"
-       inkscape:connector-curvature="0" />
+       id="path4313-8-3" />
     <image
        y="1036.3622"
        x="17"
        id="image838"
-       xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAnpJREFU
-OI2Fk0tIlFEYhp8z86t/4yVTNPGClogohlBhhZdIqVRUMhEKMlxFEQVKLbqhLbTUCEwwa1lQuyJG
-jbRC8gLZhS6iKcbUDNbIoKMmTaPOOS2qURdjZ3kO3/O9nIdXKKVY69yo61NzTjdKSoQQhITpnL6Q
-Jf69i7UAZ4+1q5AQnaBgfzTNwNKSZP7HAnNzv2i6XSQANF/DLXW9Sg/wQ9f9qKrJ8d7fufmW8REH
-3W3Jau/xUWHwBZiwzuJ2LzLlmKelvu8PtL6P4XffcbkWyC1roLstWflMYP82i5QePFKiBUgAJu1O
-bNYpDAaBy3SAXRWD+EywPsyEAqRSyL//JJVCSomUEt1xiyfN6b4BcfGhGI0aiUmR1LeUAFDfUkJ2
-XhL+/gE8utdK2fkvYpUFc2e/uv7CRnVOHMWFmeLk4QcqMMiPiKggBKCACdsMygPNd0sFsDpBY4+V
-7QmhNPVYAXDnv0SmWNBiHRijnYiYSQxbrMzkDnhntJXbF6XCIAQLUmHu7FcJEeEczN9NSmQa0z+n
-CA+MYMwxzMWH17wavYCaLguX922itsvC/rQoarssNJ/KJHVjOuYPHTwbfkpyVDKBuonokFBy81Zo
-NHf2K7dHUlyYKc49/qyMRoHbo3COAonQMdTH8/ev6DUNE6QHohkNuEx7ljVWm8e5WpAIwJWCRO4P
-2ijPiKXKPA7AoYwS4iNjOJJdTmtlA2HBG5Y1rtwOUFyYKdwehWY0srAkMXf2szN+K22VjRzdUcqY
-/RN2p2NZI+Wta9cRMF/azIBlkOl5JyM2CynRqbRV1An4TxsBBsZeq/ahZ7z5+pF1fjpZCds4U3TC
-W+ffrxsXz3nBD/wAAAAASUVORK5CYII=
-"
+       xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAnpJREFU OI2Fk0tIlFEYhp8z86t/4yVTNPGClogohlBhhZdIqVRUMhEKMlxFEQVKLbqhLbTUCEwwa1lQuyJG jbRC8gLZhS6iKcbUDNbIoKMmTaPOOS2qURdjZ3kO3/O9nIdXKKVY69yo61NzTjdKSoQQhITpnL6Q Jf69i7UAZ4+1q5AQnaBgfzTNwNKSZP7HAnNzv2i6XSQANF/DLXW9Sg/wQ9f9qKrJ8d7fufmW8REH 3W3Jau/xUWHwBZiwzuJ2LzLlmKelvu8PtL6P4XffcbkWyC1roLstWflMYP82i5QePFKiBUgAJu1O bNYpDAaBy3SAXRWD+EywPsyEAqRSyL//JJVCSomUEt1xiyfN6b4BcfGhGI0aiUmR1LeUAFDfUkJ2 XhL+/gE8utdK2fkvYpUFc2e/uv7CRnVOHMWFmeLk4QcqMMiPiKggBKCACdsMygPNd0sFsDpBY4+V 7QmhNPVYAXDnv0SmWNBiHRijnYiYSQxbrMzkDnhntJXbF6XCIAQLUmHu7FcJEeEczN9NSmQa0z+n CA+MYMwxzMWH17wavYCaLguX922itsvC/rQoarssNJ/KJHVjOuYPHTwbfkpyVDKBuonokFBy81Zo NHf2K7dHUlyYKc49/qyMRoHbo3COAonQMdTH8/ev6DUNE6QHohkNuEx7ljVWm8e5WpAIwJWCRO4P 2ijPiKXKPA7AoYwS4iNjOJJdTmtlA2HBG5Y1rtwOUFyYKdwehWY0srAkMXf2szN+K22VjRzdUcqY /RN2p2NZI+Wta9cRMF/azIBlkOl5JyM2CynRqbRV1An4TxsBBsZeq/ahZ7z5+pF1fjpZCds4U3TC W+ffrxsXz3nBD/wAAAAASUVORK5CYII= "
        style="image-rendering:optimizeSpeed"
        preserveAspectRatio="none"
        height="16"
@@ -688,8 +211,6 @@ W+ffrxsXz3nBD/wAAAAASUVORK5CYII=
        transform="translate(-6.9937282,-1.024912)">
       <path
          transform="translate(0,1036.3622)"
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
          id="path4005"
          d="M 7.9991455,15.524912 11.490485,8.4869904 15.026019,15.524912 H 13.015184 L 10.518213,10.497825"
          style="fill:url(#linearGradient4823);fill-opacity:1;stroke:#095799;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
@@ -740,25 +261,18 @@ W+ffrxsXz3nBD/wAAAAASUVORK5CYII=
     <path
        style="font-style:normal;font-weight:normal;font-size:13.58917427px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;display:inline;fill:url(#linearGradient3929-5-9);fill-opacity:1;stroke:#55429f;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        d="m 13.5,1043.3622 c -0.690867,1.1985 -1.517266,1.5 -3,1.5 -2.2091388,0 -3.9999997,-1.7909 -4,-4 3e-7,-2.2091 1.7908612,-4 4,-4 1.492204,0 2.312494,0.2888 3,1.5 z"
-       id="path10796-2-6-2-3"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cssscc" />
+       id="path10796-2-6-2-3" />
     <path
        style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="M 9.0078124,1038.8622 H 12 Z m 1.4960936,0.5 v 2.9902 z m -1.4999998,3.5 h 2.9902348 z"
-       id="path1108"
-       inkscape:connector-curvature="0" />
+       id="path1108" />
     <path
        style="font-style:normal;font-weight:normal;font-size:13.58917427px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;display:inline;fill:url(#linearGradient3929-5-9-8);fill-opacity:1;stroke:#14733c;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        d="m 13.5,1050.3622 c -0.690867,1.1985 -1.517266,1.5 -3,1.5 -2.2091388,0 -3.9999997,-1.7909 -4,-4 3e-7,-2.2091 1.7908612,-4 4,-4 1.492204,0 2.312494,0.2888 3,1.5 z"
-       id="path10796-2-6-2-3-3"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cssscc" />
+       id="path10796-2-6-2-3-3" />
     <path
        d="m 11.334615,1047.2497 c -0.03726,-0.2692 -0.122425,-0.4719 -0.255489,-0.6082 -0.130409,-0.1362 -0.300734,-0.2043 -0.510979,-0.2043 -0.279443,0 -0.502995,0.1185 -0.6706584,0.3553 -0.165005,0.2333 -0.247507,0.3859 -0.247505,0.9372 -2e-6,0.6131 0.08383,0.8859 0.251498,1.139 0.1703234,0.253 0.3978684,0.3794 0.6826344,0.3794 0.212905,0 0.387223,-0.072 0.522954,-0.2189 0.135725,-0.1493 0.231534,-0.4038 0.287425,-0.7639 l 1.101796,-0.011 c -0.114442,0.6162 -0.334002,1.3216 -0.658682,1.6362 -0.324688,0.3146 -0.759817,0.4719 -1.305389,0.4719 -0.6200954,0 -1.1151044,-0.2384 -1.4850304,-0.7151 -0.367266,-0.4767 -0.550899,-0.9768 -0.550899,-1.8201 0,-0.8529 0.184963,-1.2763 0.554891,-1.7496 0.369925,-0.4769 0.870258,-0.7152 1.5009984,-0.7152 0.516298,0 0.926144,0.1361 1.229541,0.4087 0.30605,0.269 0.559493,0.9009 0.692564,1.4554 z"
        style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:15.56941891px;line-height:125%;font-family:Arial;letter-spacing:0px;word-spacing:0px;display:inline;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1"
-       id="path3817"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccscscscccsscscsccc" />
+       id="path3817" />
   </g>
 </svg>
diff --git a/apitools/org.eclipse.pde.api.tools.ui/icons/full/elcl16/configure_problem_severity.svg b/apitools/org.eclipse.pde.api.tools.ui/icons/full/elcl16/configure_problem_severity.svg
index 1077c3cf372..ba38eaa9652 100644
--- a/apitools/org.eclipse.pde.api.tools.ui/icons/full/elcl16/configure_problem_severity.svg
+++ b/apitools/org.eclipse.pde.api.tools.ui/icons/full/elcl16/configure_problem_severity.svg
@@ -2,20 +2,16 @@
 <!-- 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="16"
    height="16"
    id="svg3156"
    version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="New document 3">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs3158">
     <linearGradient
@@ -25,8 +21,7 @@
        y1="7.0159616"
        x1="3.3833356"
        id="linearGradient5087"
-       xlink:href="#linearGradient5081"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient5081" />
     <linearGradient
        id="linearGradient5081">
       <stop
@@ -49,11 +44,9 @@
        y1="7.2369323"
        x1="6.3885393"
        id="linearGradient5097"
-       xlink:href="#linearGradient5091"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient5091" />
     <linearGradient
-       id="linearGradient5091"
-       inkscape:collect="always">
+       id="linearGradient5091">
       <stop
          id="stop5093"
          offset="0"
@@ -69,7 +62,6 @@
       <g
          id="g25146">
         <g
-           inkscape:label="Layer 1"
            id="g25148"
            style="fill:#ffffff;stroke:none;display:inline"
            transform="translate(8.9848537,-0.99390417)">
@@ -85,7 +77,6 @@
                x="15.590192"
                y="1043.4797" />
             <path
-               inkscape:connector-curvature="0"
                style="font-size:7.68999243px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:0px;word-spacing:0px;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.27519909;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
                d="m 1.25,1.78125 0,0.125 0,0.5 0,0.125 0.125,0 0.375,0 1.1875,1.40625 -1.21875,1.53125 -0.34375,0 -0.125,0 0,0.125 0,0.5 0,0.125 0.125,0 1.5,0 0.125,0 0,-0.125 0,-0.5 0,-0.125 -0.125,0 L 3.5,4.625 l 0.625,0.84375 -0.125,0 0,0.125 0,0.5 0,0.125 0.125,0 1.5,0 0.125,0 0,-0.125 0,-0.5 0,-0.125 -0.125,0 -0.3125,0 -1.25,-1.5625 1.15625,-1.375 0.40625,0 0.125,0 0,-0.125 0,-0.5 0,-0.125 -0.125,0 -1.5,0 -0.125,0 0,0.125 0,0.5 0,0.125 0.0625,0 L 3.5,3.25 2.9375,2.53125 l 0.0625,0 0,-0.125 0,-0.5 0,-0.125 -0.125,0 -1.5,0 -0.125,0 z"
                transform="matrix(1.0698871,0,0,1.0698871,15.590192,1043.4798)"
@@ -93,7 +84,6 @@
           </g>
         </g>
         <g
-           inkscape:label="Layer 1"
            id="g25156"
            style="fill:#ffffff;stroke:#ffffff;display:inline"
            transform="translate(4.9852807,-7.9432158)">
@@ -105,69 +95,32 @@
                style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
                d="M 2.8125,0.90625 0.78125,5 C 0.17522066,6.0251238 0.58843406,7.4816983 1.71875,7.5 L 3,7.5 l 1,0 1.28125,0 C 6.4115665,7.4817738 6.8247794,6.0250615 6.21875,5 L 4.1875,0.90625 c -0.2942923,-0.55673837 -1.1188077,-0.46727236 -1.375,0 z"
                id="path25160"
-               inkscape:connector-curvature="0"
-               sodipodi:nodetypes="ccccccccc"
                transform="matrix(1.0698871,0,0,1.0698871,15.590192,1043.4798)" />
             <path
-               sodipodi:type="arc"
                style="fill:#ffffff;fill-opacity:1;stroke:#ffffff"
                id="path25162"
-               sodipodi:cx="3.484375"
-               sodipodi:cy="5.484375"
-               sodipodi:rx="0.625"
-               sodipodi:ry="0.625"
                d="m 4.109375,5.484375 c 0,0.345178 -0.279822,0.625 -0.625,0.625 -0.345178,0 -0.625,-0.279822 -0.625,-0.625 0,-0.345178 0.279822,-0.625 0.625,-0.625 0.345178,0 0.625,0.279822 0.625,0.625 z"
                transform="matrix(1.125929,0,0,1.125929,15.411638,1043.3738)" />
             <path
                style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;display:inline"
                d="m 19.350026,1045.5028 c -0.378471,0 -0.700512,0.3368 -0.700512,0.774 l 0.09137,1.4889 c 0,0.3887 0.272722,0.7037 0.609141,0.7037 0.336419,0 0.609139,-0.315 0.609139,-0.7037 l 0.06091,-1.4889 c 0,-0.4372 -0.291583,-0.774 -0.670056,-0.774 z"
-               id="path25164"
-               inkscape:connector-curvature="0"
-               sodipodi:nodetypes="sccsccs" />
+               id="path25164" />
           </g>
         </g>
       </g>
     </mask>
     <filter
        color-interpolation-filters="sRGB"
-       inkscape:collect="always"
        id="filter25166"
-       x="-0.23445988"
-       width="1.4689198"
-       y="-0.24580829"
-       height="1.4916166">
+       x="-0.3241778"
+       width="1.6760303"
+       y="-0.36202789"
+       height="1.7240558">
       <feGaussianBlur
-         inkscape:collect="always"
          stdDeviation="1.0667455"
          id="feGaussianBlur25168" />
     </filter>
   </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.0256044"
-     inkscape:cy="1.3124776"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="668"
-     inkscape:window-height="604"
-     inkscape:window-x="1652"
-     inkscape:window-y="473"
-     inkscape:window-maximized="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3164"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
   <metadata
      id="metadata3161">
     <rdf:RDF>
@@ -176,20 +129,17 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      transform="translate(0,-1036.3622)">
     <g
        transform="translate(8.9848532,-0.99391581)"
        style="display:inline"
-       id="layer1-3"
-       inkscape:label="Layer 1">
+       id="layer1-3">
       <g
          transform="matrix(0.9346781,0,0,0.9346781,-14.571811,69.044514)"
          id="g8472-2"
@@ -205,39 +155,28 @@
            id="path4187"
            transform="matrix(1.0698871,0,0,1.0698871,15.590192,1043.4798)"
            d="m 1.25,1.78125 0,0.125 0,0.5 0,0.125 0.125,0 0.375,0 1.1875,1.40625 -1.21875,1.53125 -0.34375,0 -0.125,0 0,0.125 0,0.5 0,0.125 0.125,0 1.5,0 0.125,0 0,-0.125 0,-0.5 0,-0.125 -0.125,0 L 3.5,4.625 l 0.625,0.84375 -0.125,0 0,0.125 0,0.5 0,0.125 0.125,0 1.5,0 0.125,0 0,-0.125 0,-0.5 0,-0.125 -0.125,0 -0.3125,0 -1.25,-1.5625 1.15625,-1.375 0.40625,0 0.125,0 0,-0.125 0,-0.5 0,-0.125 -0.125,0 -1.5,0 -0.125,0 0,0.125 0,0.5 0,0.125 0.0625,0 L 3.5,3.25 2.9375,2.53125 l 0.0625,0 0,-0.125 0,-0.5 0,-0.125 -0.125,0 -1.5,0 -0.125,0 z"
-           style="font-size:7.68999243px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:0px;word-spacing:0px;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.27519909;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-           inkscape:connector-curvature="0" />
+           style="font-size:7.68999243px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:0px;word-spacing:0px;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.27519909;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" />
       </g>
     </g>
     <g
        transform="translate(4.9852807,-7.9432158)"
        style="display:inline"
-       id="layer1-8"
-       inkscape:label="Layer 1">
+       id="layer1-8">
       <g
          transform="matrix(0.9346781,0,0,0.9346781,-14.571811,69.044514)"
          id="g8472"
          style="display:inline">
         <path
            transform="matrix(1.0698871,0,0,1.0698871,15.590192,1043.4798)"
-           sodipodi:nodetypes="ccccccccc"
-           inkscape:connector-curvature="0"
            id="path4292"
            d="M 2.8125,0.90625 0.78125,5 C 0.17522066,6.0251238 0.58843406,7.4816983 1.71875,7.5 L 3,7.5 l 1,0 1.28125,0 C 6.4115665,7.4817738 6.8247794,6.0250615 6.21875,5 L 4.1875,0.90625 c -0.2942923,-0.55673837 -1.1188077,-0.46727236 -1.375,0 z"
            style="fill:url(#linearGradient5087);fill-opacity:1;stroke:url(#linearGradient5097);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
         <path
            transform="matrix(1.125929,0,0,1.125929,15.411638,1043.3738)"
            d="m 4.109375,5.484375 c 0,0.345178 -0.279822,0.625 -0.625,0.625 -0.345178,0 -0.625,-0.279822 -0.625,-0.625 0,-0.345178 0.279822,-0.625 0.625,-0.625 0.345178,0 0.625,0.279822 0.625,0.625 z"
-           sodipodi:ry="0.625"
-           sodipodi:rx="0.625"
-           sodipodi:cy="5.484375"
-           sodipodi:cx="3.484375"
            id="path4253"
-           style="fill:#502800;fill-opacity:1;stroke:none"
-           sodipodi:type="arc" />
+           style="fill:#502800;fill-opacity:1;stroke:none" />
         <path
-           sodipodi:nodetypes="sccsccs"
-           inkscape:connector-curvature="0"
            id="path4253-7"
            d="m 19.350026,1045.5028 c -0.378471,0 -0.700512,0.3368 -0.700512,0.774 l 0.09137,1.4889 c 0,0.3887 0.272722,0.7037 0.609141,0.7037 0.336419,0 0.609139,-0.315 0.609139,-0.7037 l 0.06091,-1.4889 c 0,-0.4372 -0.291583,-0.774 -0.670056,-0.774 z"
            style="fill:#502800;fill-opacity:1;stroke:none;display:inline" />
@@ -250,7 +189,6 @@
        mask="url(#mask25144)">
       <g
          transform="matrix(0.8261236,0,0,0.8261236,-0.70848,186.15135)"
-         inkscape:label="Layer 1"
          id="layer1-4-9"
          style="fill:#ffffff;stroke:#ffffff;stroke-width:2.42094517;stroke-miterlimit:4;stroke-dasharray:none;display:inline;filter:url(#filter25166)">
         <g
@@ -258,24 +196,15 @@
            id="g17594-4"
            transform="matrix(1.2065384,0,0,1.2065384,1.2248827,-221.37405)">
           <path
-             sodipodi:type="arc"
              style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:2.00652146;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
              id="path6139-9"
-             sodipodi:cx="-6.7838054"
-             sodipodi:cy="9.7465248"
-             sodipodi:rx="4.3089318"
-             sodipodi:ry="4.3089318"
              d="m -2.4748735,9.7465248 c 0,2.3797572 -1.9291745,4.3089322 -4.3089319,4.3089322 -2.3797573,0 -4.3089316,-1.929175 -4.3089316,-4.3089322 0,-2.3797573 1.9291743,-4.3089318 4.3089316,-4.3089318 2.3797574,0 4.3089319,1.9291745 4.3089319,4.3089318 z"
              transform="translate(12.005651,1037.2461)" />
           <path
-             sodipodi:nodetypes="scccccscccccccccccccccsccccccccccscccccccccccccccccsccc"
-             inkscape:connector-curvature="0"
              id="path6139-5-5"
              d="m 5.2901155,1042.6691 c -0.4193865,0 -0.827937,0.074 -1.2109584,0.1863 l 0.4968033,0.6521 0.8073063,1.0246 0.7762559,-1.0246 0.4968036,-0.59 c -0.429042,-0.1444 -0.8885091,-0.2484 -1.3662107,-0.2484 z m -2.1114149,0.59 c -0.7184889,0.4103 -1.2964352,1.0016 -1.6767124,1.7388 l 0.6520553,0.093 1.2730592,0.1553 -0.1552509,-1.2731 -0.093148,-0.7141 z m 4.2228311,0 -0.093148,0.7141 -0.155251,1.2731 1.3041096,-0.1553 0.6210049,-0.061 c -0.3798299,-0.7481 -0.9503317,-1.3549 -1.6767123,-1.7698 z m -6.2100454,2.484 c -0.112404,0.383 -0.1863014,0.7916 -0.1863014,1.2109 0,0.433 0.09783,0.8481 0.2173518,1.2421 l 0.5278537,-0.4348 1.0246571,-0.7761 -1.0246571,-0.8074 z m 8.1972597,0.031 -0.5278537,0.4037 -1.024658,0.8074 1.024658,0.7762 0.4968033,0.4036 c 0.1140598,-0.3856 0.2173518,-0.7884 0.2173518,-1.211 0,-0.409 -0.079196,-0.8053 -0.1863014,-1.1799 z m -5.9616433,2.9499 -1.2730592,0.1552 -0.6210049,0.062 c 0.3807416,0.7204 0.9395255,1.3044 1.645662,1.7079 l 0.093148,-0.6522 0.155251,-1.273 z m 3.7260268,0 0.155251,1.2729 0.093148,0.6522 c 0.7061365,-0.4034 1.2649204,-0.9875 1.645662,-1.7079 l -0.5899545,-0.062 c -0.4345689,-0.052 -0.8703802,-0.1039 -1.3041096,-0.1557 z m -1.7698628,0.7141 -0.8073063,0.9936 -0.4657529,0.6209 c 0.3746086,0.1072 0.7709056,0.1864 1.179908,0.1864 0.4641221,0 0.9166457,-0.081 1.3351603,-0.2173 l -0.4657532,-0.59 z"
              style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:2.00652146;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
           <path
-             sodipodi:nodetypes="ccccccscccs"
-             inkscape:connector-curvature="0"
              id="rect9436-2"
              d="m 0.524759,1042.9675 3.79253,5.2259 c 0,0 1.216807,0.4672 1.684108,-1e-4 l 0.19297,-0.193 c 0.467299,-0.4673 -8e-6,-1.6841 -8e-6,-1.6841 z m 4.055643,3.5242 c 0.376798,-0.3768 0.991528,-0.3769 1.368362,0 0.376788,0.3767 0.376773,0.9914 -2.5e-5,1.3682 -0.376798,0.3769 -0.991507,0.3769 -1.368294,0 -0.376855,-0.3768 -0.376841,-0.9915 -4.3e-5,-1.3682 z"
              style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:2.00652146;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
@@ -285,7 +214,6 @@
     <g
        style="display:inline"
        id="layer1-4"
-       inkscape:label="Layer 1"
        transform="matrix(0.8261236,0,0,0.8261236,-0.70848002,186.15128)">
       <g
          transform="matrix(1.2065384,0,0,1.2065384,1.2248827,-221.37405)"
@@ -293,25 +221,16 @@
         <path
            transform="translate(12.005651,1037.2461)"
            d="m -2.4748735,9.7465248 c 0,2.3797572 -1.9291745,4.3089322 -4.3089319,4.3089322 -2.3797573,0 -4.3089316,-1.929175 -4.3089316,-4.3089322 0,-2.3797573 1.9291743,-4.3089318 4.3089316,-4.3089318 2.3797574,0 4.3089319,1.9291745 4.3089319,4.3089318 z"
-           sodipodi:ry="4.3089318"
-           sodipodi:rx="4.3089318"
-           sodipodi:cy="9.7465248"
-           sodipodi:cx="-6.7838054"
            id="path6139"
-           style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#4d607b;stroke-width:0.82881737;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           sodipodi:type="arc" />
+           style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#4d607b;stroke-width:0.82881737;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
         <path
            style="color:#000000;fill:#4e8fbd;fill-opacity:1;fill-rule:nonzero;stroke:#4d607b;stroke-width:0.59773082;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
            d="m 5.2901155,1042.6691 c -0.4193865,0 -0.827937,0.074 -1.2109584,0.1863 l 0.4968033,0.6521 0.8073063,1.0246 0.7762559,-1.0246 0.4968036,-0.59 c -0.429042,-0.1444 -0.8885091,-0.2484 -1.3662107,-0.2484 z m -2.1114149,0.59 c -0.7184889,0.4103 -1.2964352,1.0016 -1.6767124,1.7388 l 0.6520553,0.093 1.2730592,0.1553 -0.1552509,-1.2731 -0.093148,-0.7141 z m 4.2228311,0 -0.093148,0.7141 -0.155251,1.2731 1.3041096,-0.1553 0.6210049,-0.061 c -0.3798299,-0.7481 -0.9503317,-1.3549 -1.6767123,-1.7698 z m -6.2100454,2.484 c -0.112404,0.383 -0.1863014,0.7916 -0.1863014,1.2109 0,0.433 0.09783,0.8481 0.2173518,1.2421 l 0.5278537,-0.4348 1.0246571,-0.7761 -1.0246571,-0.8074 z m 8.1972597,0.031 -0.5278537,0.4037 -1.024658,0.8074 1.024658,0.7762 0.4968033,0.4036 c 0.1140598,-0.3856 0.2173518,-0.7884 0.2173518,-1.211 0,-0.409 -0.079196,-0.8053 -0.1863014,-1.1799 z m -5.9616433,2.9499 -1.2730592,0.1552 -0.6210049,0.062 c 0.3807416,0.7204 0.9395255,1.3044 1.645662,1.7079 l 0.093148,-0.6522 0.155251,-1.273 z m 3.7260268,0 0.155251,1.2729 0.093148,0.6522 c 0.7061365,-0.4034 1.2649204,-0.9875 1.645662,-1.7079 l -0.5899545,-0.062 c -0.4345689,-0.052 -0.8703802,-0.1039 -1.3041096,-0.1557 z m -1.7698628,0.7141 -0.8073063,0.9936 -0.4657529,0.6209 c 0.3746086,0.1072 0.7709056,0.1864 1.179908,0.1864 0.4641221,0 0.9166457,-0.081 1.3351603,-0.2173 l -0.4657532,-0.59 z"
-           id="path6139-5"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="scccccscccccccccccccccsccccccccccscccccccccccccccccsccc" />
+           id="path6139-5" />
         <path
            style="color:#000000;fill:#4d607b;fill-opacity:1;fill-rule:nonzero;stroke:#384e6e;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
            d="m 0.524759,1042.9675 3.79253,5.2259 c 0,0 1.216807,0.4672 1.684108,-1e-4 l 0.19297,-0.193 c 0.467299,-0.4673 -8e-6,-1.6841 -8e-6,-1.6841 z m 4.055643,3.5242 c 0.376798,-0.3768 0.991528,-0.3769 1.368362,0 0.376788,0.3767 0.376773,0.9914 -2.5e-5,1.3682 -0.376798,0.3769 -0.991507,0.3769 -1.368294,0 -0.376855,-0.3768 -0.376841,-0.9915 -4.3e-5,-1.3682 z"
-           id="rect9436"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccccscccs" />
+           id="rect9436" />
       </g>
     </g>
   </g>
diff --git a/apitools/org.eclipse.pde.api.tools.ui/icons/full/elcl16/expandall.svg b/apitools/org.eclipse.pde.api.tools.ui/icons/full/elcl16/expandall.svg
index e46d2b628a7..13faf7471ba 100644
--- a/apitools/org.eclipse.pde.api.tools.ui/icons/full/elcl16/expandall.svg
+++ b/apitools/org.eclipse.pde.api.tools.ui/icons/full/elcl16/expandall.svg
@@ -2,20 +2,16 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
-   sodipodi:docname="collapseall.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
@@ -30,7 +26,6 @@
          id="stop5084-3-8" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient5080-79"
        id="linearGradient5113-12"
        gradientUnits="userSpaceOnUse"
@@ -57,34 +52,8 @@
        x1="16.774115"
        gradientUnits="userSpaceOnUse"
        id="linearGradient5178"
-       xlink:href="#linearGradient5080-7-5"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient5080-7-5" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="32.000001"
-     inkscape:cx="1.6268851"
-     inkscape:cy="7.7733305"
-     inkscape:document-units="px"
-     inkscape:current-layer="g4827"
-     showgrid="true"
-     inkscape:window-width="1842"
-     inkscape:window-height="1058"
-     inkscape:window-x="74"
-     inkscape:window-y="-4"
-     inkscape:window-maximized="1"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2997" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -93,13 +62,11 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
diff --git a/apitools/org.eclipse.pde.api.tools.ui/icons/full/elcl16/export.svg b/apitools/org.eclipse.pde.api.tools.ui/icons/full/elcl16/export.svg
index 76454d41990..2af06b746f8 100644
--- a/apitools/org.eclipse.pde.api.tools.ui/icons/full/elcl16/export.svg
+++ b/apitools/org.eclipse.pde.api.tools.ui/icons/full/elcl16/export.svg
@@ -2,24 +2,19 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="export_log.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4483">
       <stop
          style="stop-color:#4077a7;stop-opacity:1"
@@ -31,7 +26,6 @@
          id="stop4487" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4460">
       <stop
          style="stop-color:#a8a286;stop-opacity:1"
@@ -69,26 +63,21 @@
        maskUnits="userSpaceOnUse"
        id="mask7366">
       <path
-         sodipodi:nodetypes="ccccccc"
-         inkscape:connector-curvature="0"
          id="path7368"
          d="m -16.593048,1040.862 9.990206,0 0,10.0018 -2.983353,3.0385 -5.966213,0 c -0.53033,-0.022 -1.04064,-0.5519 -1.04064,-1.0385 z"
          style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;display:inline" />
     </mask>
     <filter
-       inkscape:collect="always"
        id="filter7378"
-       x="-0.11264625"
-       width="1.2252925"
-       y="-0.44767511"
-       height="1.8953502">
+       x="-0.23764625"
+       width="1.4752925"
+       y="-0.94444611"
+       height="2.8888922">
       <feGaussianBlur
-         inkscape:collect="always"
          stdDeviation="0.3754875"
          id="feGaussianBlur7380" />
     </filter>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient7087"
        id="linearGradient7541"
        gradientUnits="userSpaceOnUse"
@@ -128,8 +117,7 @@
        gradientTransform="translate(-18,4.7e-5)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient7117"
-       xlink:href="#linearGradient7087-7"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient7087-7" />
     <linearGradient
        id="linearGradient7087-7-4">
       <stop
@@ -161,8 +149,7 @@
        gradientTransform="translate(-16,4.7e-5)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient7160"
-       xlink:href="#linearGradient7087-7-4"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient7087-7-4" />
     <linearGradient
        id="linearGradient7087-7-4-2">
       <stop
@@ -194,8 +181,7 @@
        gradientTransform="translate(-14,4.7e-5)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient7203"
-       xlink:href="#linearGradient7087-7-4-2"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient7087-7-4-2" />
     <linearGradient
        id="linearGradient7087-7-4-2-2">
       <stop
@@ -227,30 +213,7 @@
        gradientTransform="translate(-12,4.7e-5)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient7246"
-       xlink:href="#linearGradient7087-7-4-2-2"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient7584-5">
-      <stop
-         style="stop-color:#f9cd5f;stop-opacity:1"
-         offset="0"
-         id="stop7586-4" />
-      <stop
-         style="stop-color:#fbf0b4;stop-opacity:1"
-         offset="1"
-         id="stop7588-5" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient7592-1">
-      <stop
-         style="stop-color:#bd8416;stop-opacity:1"
-         offset="0"
-         id="stop7594-6" />
-      <stop
-         style="stop-color:#a66b10;stop-opacity:1"
-         offset="1"
-         id="stop7596-9" />
-    </linearGradient>
+       xlink:href="#linearGradient7087-7-4-2-2" />
     <linearGradient
        gradientTransform="matrix(0.72293526,0,0,1,-0.03086799,-2091.7193)"
        gradientUnits="userSpaceOnUse"
@@ -259,10 +222,8 @@
        y1="1047.8571"
        x1="7.0070496"
        id="linearGradient4871"
-       xlink:href="#linearGradient5147"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient5147" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient5147">
       <stop
          style="stop-color:#91a5c7;stop-opacity:1;"
@@ -281,8 +242,7 @@
        y1="1045.8571"
        x1="7.0070496"
        id="linearGradient4869"
-       xlink:href="#linearGradient5147"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient5147" />
     <linearGradient
        gradientTransform="matrix(0.82571734,0,0,1,-0.75106699,-2091.7193)"
        gradientUnits="userSpaceOnUse"
@@ -291,10 +251,8 @@
        y1="1043.8571"
        x1="7.0070496"
        id="linearGradient4867"
-       xlink:href="#linearGradient4877"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4877" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4877">
       <stop
          style="stop-color:#91a5c7;stop-opacity:1;"
@@ -313,10 +271,8 @@
        y1="1047.8571"
        x1="7.0070496"
        id="linearGradient4871-8"
-       xlink:href="#linearGradient5147"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient5147" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4460"
        id="linearGradient4466"
        x1="-1046.3622"
@@ -326,7 +282,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-2.1667483e-7,3)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4483"
        id="linearGradient4489"
        x1="13"
@@ -336,33 +291,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(0,-1,1,0,-1047.2885,1063.3622)" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="43.583483"
-     inkscape:cx="17.092315"
-     inkscape:cy="4.0148715"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="2348"
-     inkscape:window-height="1311"
-     inkscape:window-x="57"
-     inkscape:window-y="54"
-     inkscape:window-maximized="0"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="true"
-     inkscape:snap-bbox="true"
-     inkscape:bbox-nodes="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid6272" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -371,19 +299,15 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
     <path
-       sodipodi:nodetypes="ccccccc"
-       inkscape:connector-curvature="0"
        id="rect3997-9"
        d="m 6,1037.3622 9.226335,0 0.0058,9.4978 -2.568358,3.0564 -5.7180776,0.018 c -0.4153006,-0.022 -0.9041922,-0.5519 -0.9041922,-1.0385 z"
        style="display:inline;fill:#e6f8ff;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1" />
@@ -395,8 +319,6 @@
        x="6"
        y="1049.3622" />
     <path
-       sodipodi:nodetypes="ccccc"
-       inkscape:connector-curvature="0"
        id="rect3997-9-4-5"
        d="M 12.720747,1050.3622 16,1047.0482 l 0,-0.686 -3.99982,4 z"
        style="display:inline;fill:#d4b268;fill-opacity:1;stroke:none;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
@@ -410,65 +332,45 @@
         <path
            style="fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
            d="m -15.584151,1041.8789 0,-2.013"
-           id="path7045-6"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cc" />
+           id="path7045-6" />
         <path
            style="display:inline;fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
            d="m -13.584151,1041.8789 0,-2.013"
-           id="path7045-0-6"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cc" />
+           id="path7045-0-6" />
         <path
            style="display:inline;fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
            d="m -11.584151,1041.8789 0,-2.013"
-           id="path7045-3-5"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cc" />
+           id="path7045-3-5" />
         <path
            style="display:inline;fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
            d="m -9.584151,1041.8789 0,-2.013"
-           id="path7045-3-4-1"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cc" />
+           id="path7045-3-4-1" />
         <path
            style="display:inline;fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
            d="m -7.584151,1041.8789 0,-2.013"
-           id="path7045-3-4-7-2"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cc" />
+           id="path7045-3-4-7-2" />
       </g>
     </g>
     <g
        id="g7205"
        transform="matrix(0,-1,-1,0,1047.386,1032.2781)">
       <path
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
          id="path7045"
          d="m -15.584151,1041.8789 0,-2.013"
          style="fill:none;stroke:url(#linearGradient7541);stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
       <path
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
          id="path7045-8"
          d="m -13.584151,1041.8789 0,-2.013"
          style="display:inline;fill:none;stroke:url(#linearGradient7117);stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
       <path
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
          id="path7045-8-1"
          d="m -11.584151,1041.8789 0,-2.013"
          style="display:inline;fill:none;stroke:url(#linearGradient7160);stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
       <path
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
          id="path7045-8-1-3"
          d="m -9.584151,1041.8789 0,-2.013"
          style="display:inline;fill:none;stroke:url(#linearGradient7203);stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
       <path
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
          id="path7045-8-1-3-6"
          d="m -7.584151,1041.8789 0,-2.013"
          style="display:inline;fill:none;stroke:url(#linearGradient7246);stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
@@ -533,14 +435,10 @@
          y="-1042.3674" />
     </g>
     <path
-       sodipodi:nodetypes="cccc"
-       inkscape:connector-curvature="0"
        id="rect3997-9-4"
        d="m 12.002413,1046.3622 3.997407,0 -3.99982,4 z"
        style="display:inline;fill:#e6c8ad;fill-opacity:1;stroke:none" />
     <path
-       sodipodi:nodetypes="cccc"
-       inkscape:connector-curvature="0"
        id="rect3997-9-4-1"
        d="m 5.0737,1048.3647 0,3.9974 L 1,1048.3622 Z"
        style="display:inline;fill:url(#linearGradient4489);fill-opacity:1;stroke:none" />
@@ -548,15 +446,7 @@
        y="1036.3622"
        x="17"
        id="image4633"
-       xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAWdJREFU
-OI2lk8ErRFEUxr87KStrZWdtZzErkT9ANhYW2Cm2o0QzshHKYspGUxZCzWOkTCELYSFTbEiUlUQj
-BuW9O+67b2Y+i6eZN817Rjn1dU6dztevzjmCJP4TDUGNzF7kT84iiOCriLoGlwcRhPwaXWMGT26e
-0Boe+tWgVAoFE+SLIAhAAMsbGShbQ0oFUyrYSmMh1ofz3XGAZI06I0nuXz2yuX2QpkOaBdZkyyEP
-tycZSPDpgBBuvbKZgVIallSQ8gvKdjAX7cPZTqw+wYdmrRxXaWM6mODdqWxhPfVDkHcJopFegMBx
-aqY+wavNsl489atNJldngwledIXA2HK3YFkKo2ELGg/Q8g1a5uoTPCsy69F9Js67wxiv0yMk6d5B
-94RB0y7iLpd3N7A2LLK2/yVap1PQMoe2niUBeE7Za/K5NiwSiUVfg46W2/JwlUHFpICL+IDwG/aL
-ql84mu8XTY2BD+ob3xcTczsCvhyeAAAAAElFTkSuQmCC
-"
+       xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAWdJREFU OI2lk8ErRFEUxr87KStrZWdtZzErkT9ANhYW2Cm2o0QzshHKYspGUxZCzWOkTCELYSFTbEiUlUQj BuW9O+67b2Y+i6eZN817Rjn1dU6dztevzjmCJP4TDUGNzF7kT84iiOCriLoGlwcRhPwaXWMGT26e 0Boe+tWgVAoFE+SLIAhAAMsbGShbQ0oFUyrYSmMh1ofz3XGAZI06I0nuXz2yuX2QpkOaBdZkyyEP tycZSPDpgBBuvbKZgVIallSQ8gvKdjAX7cPZTqw+wYdmrRxXaWM6mODdqWxhPfVDkHcJopFegMBx aqY+wavNsl489atNJldngwledIXA2HK3YFkKo2ELGg/Q8g1a5uoTPCsy69F9Js67wxiv0yMk6d5B 94RB0y7iLpd3N7A2LLK2/yVap1PQMoe2niUBeE7Za/K5NiwSiUVfg46W2/JwlUHFpICL+IDwG/aL ql84mu8XTY2BD+ob3xcTczsCvhyeAAAAAElFTkSuQmCC "
        style="image-rendering:optimizeSpeed"
        preserveAspectRatio="none"
        height="16"
diff --git a/apitools/org.eclipse.pde.api.tools.ui/icons/full/elcl16/filter_ps.svg b/apitools/org.eclipse.pde.api.tools.ui/icons/full/elcl16/filter_ps.svg
index 67c16bb3096..4d6d8e583f7 100644
--- a/apitools/org.eclipse.pde.api.tools.ui/icons/full/elcl16/filter_ps.svg
+++ b/apitools/org.eclipse.pde.api.tools.ui/icons/full/elcl16/filter_ps.svg
@@ -2,27 +2,19 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
-   sodipodi:docname="filter_ps.svg"
-   inkscape:export-filename="C:\Users\jmietling\Documents\rect3997-9-1.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient1047">
       <stop
          style="stop-color:#96a0b9;stop-opacity:1"
@@ -34,7 +26,6 @@
          id="stop1045" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient1039">
       <stop
          style="stop-color:#fbffff;stop-opacity:1"
@@ -46,22 +37,6 @@
          id="stop1037" />
     </linearGradient>
     <linearGradient
-       id="linearGradient4989">
-      <stop
-         id="stop4991"
-         offset="0"
-         style="stop-color:#c3e9ff;stop-opacity:0.49019608;" />
-      <stop
-         style="stop-color:#c3e9ff;stop-opacity:1;"
-         offset="0.5"
-         id="stop4995" />
-      <stop
-         id="stop4993"
-         offset="1"
-         style="stop-color:#c3e9ff;stop-opacity:0.49019608;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient1039"
        id="linearGradient1041"
        x1="2.1048543"
@@ -70,7 +45,6 @@
        y2="1039.2937"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient1047"
        id="linearGradient1049"
        x1="1"
@@ -79,38 +53,6 @@
        y2="1044.8622"
        gradientUnits="userSpaceOnUse" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#444248"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="22.627416"
-     inkscape:cx="2.7020062"
-     inkscape:cy="8.7735937"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1920"
-     inkscape:window-height="1017"
-     inkscape:window-x="-8"
-     inkscape:window-y="-8"
-     inkscape:window-maximized="1"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="true"
-     inkscape:snap-bbox="true"
-     inkscape:bbox-nodes="true"
-     inkscape:snap-nodes="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3999"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -119,13 +61,11 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
diff --git a/apitools/org.eclipse.pde.api.tools.ui/icons/full/elcl16/help.svg b/apitools/org.eclipse.pde.api.tools.ui/icons/full/elcl16/help.svg
index cfe92203561..d3a148d6f87 100644
--- a/apitools/org.eclipse.pde.api.tools.ui/icons/full/elcl16/help.svg
+++ b/apitools/org.eclipse.pde.api.tools.ui/icons/full/elcl16/help.svg
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <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"
    version="1.1"
    id="svg2"
    height="16"
-   width="16">
+   width="16"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
@@ -40,7 +40,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
diff --git a/apitools/org.eclipse.pde.api.tools.ui/icons/full/elcl16/next_nav.svg b/apitools/org.eclipse.pde.api.tools.ui/icons/full/elcl16/next_nav.svg
index 973c4eda7b6..1560e53e656 100644
--- a/apitools/org.eclipse.pde.api.tools.ui/icons/full/elcl16/next_nav.svg
+++ b/apitools/org.eclipse.pde.api.tools.ui/icons/full/elcl16/next_nav.svg
@@ -2,24 +2,19 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.48.0 r9654"
-   sodipodi:docname="next_nav.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4749">
       <stop
          style="stop-color:#ffffee;stop-opacity:1"
@@ -31,7 +26,6 @@
          id="stop4753" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4741">
       <stop
          style="stop-color:#bd8416;stop-opacity:1"
@@ -43,7 +37,6 @@
          id="stop4745" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4741"
        id="linearGradient4747"
        x1="1.0625"
@@ -53,7 +46,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(0,1,1,0,-1036.3626,1036.3626)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4749"
        id="linearGradient4755"
        x1="1.6861235"
@@ -63,29 +55,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(0,1,1,0,-1036.3626,1036.3626)" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="16"
-     inkscape:cx="-7.4627612"
-     inkscape:cy="10.319471"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1164"
-     inkscape:window-height="982"
-     inkscape:window-x="104"
-     inkscape:window-y="89"
-     inkscape:window-maximized="0"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3966" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -99,15 +68,12 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
     <path
        style="fill:url(#linearGradient4755);fill-opacity:1;stroke:url(#linearGradient4747);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
        d="m 2.5,1044.8626 3,0 0,-5.7812 c 0,-0.6679 0.5509,-1.2188 1.2188,-1.2188 l 2.5625,0 c 0.6678,0 1.2187,0.5508 1.2187,1.2188 l 0,5.7812 3,0 0,1 -5.5,5.5 -5.5,-5.5 0,-1 z"
-       id="rect3968"
-       inkscape:connector-curvature="0" />
+       id="rect3968" />
   </g>
 </svg>
diff --git a/apitools/org.eclipse.pde.api.tools.ui/icons/full/elcl16/open_page.svg b/apitools/org.eclipse.pde.api.tools.ui/icons/full/elcl16/open_page.svg
index a42a8d1190b..057e55bd1f1 100644
--- a/apitools/org.eclipse.pde.api.tools.ui/icons/full/elcl16/open_page.svg
+++ b/apitools/org.eclipse.pde.api.tools.ui/icons/full/elcl16/open_page.svg
@@ -2,24 +2,19 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.92.3 (2405546, 2018-03-11)"
-   sodipodi:docname="open_page.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient6042">
       <stop
          style="stop-color:#9c956f;stop-opacity:1"
@@ -31,7 +26,6 @@
          id="stop6040" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient6034">
       <stop
          style="stop-color:#928f76;stop-opacity:1"
@@ -43,8 +37,7 @@
          id="stop6032" />
     </linearGradient>
     <linearGradient
-       id="linearGradient6020"
-       inkscape:collect="always">
+       id="linearGradient6020">
       <stop
          id="stop6016"
          offset="0"
@@ -55,7 +48,6 @@
          style="stop-color:#7a8086;stop-opacity:0" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient6004">
       <stop
          style="stop-color:#a79c68;stop-opacity:1"
@@ -67,26 +59,6 @@
          id="stop6002" />
     </linearGradient>
     <linearGradient
-       id="linearGradient5103-3">
-      <stop
-         style="stop-color:#fefdef;stop-opacity:1"
-         offset="0"
-         id="stop5105-5" />
-      <stop
-         id="stop7550-07"
-         offset="0.26694915"
-         style="stop-color:#fef5d4;stop-opacity:1" />
-      <stop
-         id="stop7548-6"
-         offset="0.51694918"
-         style="stop-color:#fbe08e;stop-opacity:1" />
-      <stop
-         style="stop-color:#fbdd83;stop-opacity:1"
-         offset="1"
-         id="stop5107-7" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        id="linearGradient8287-7-5-4">
       <stop
          style="stop-color:#6eb6e2;stop-opacity:1;"
@@ -98,22 +70,6 @@
          id="stop8291-0-7-3" />
     </linearGradient>
     <linearGradient
-       id="linearGradient4082-3-4-1-2">
-      <stop
-         style="stop-color:#4476aa;stop-opacity:1"
-         offset="0"
-         id="stop4084-8-8-5-1" />
-      <stop
-         id="stop4864-7-8-2-6"
-         offset="0.5"
-         style="stop-color:#5a9ccc;stop-opacity:1" />
-      <stop
-         style="stop-color:#4476aa;stop-opacity:1"
-         offset="1"
-         id="stop4086-2-2-7-8" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient8287-7-5-4"
        id="linearGradient8293"
        x1="-16.963362"
@@ -123,7 +79,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(0.72365309,0,0,1.0027501,17.960733,1.3811984)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient6004"
        id="linearGradient8887"
        gradientUnits="userSpaceOnUse"
@@ -133,8 +88,7 @@
        x2="8.5172787"
        y2="1049.3088" />
     <linearGradient
-       id="linearGradient4810-5"
-       inkscape:collect="always">
+       id="linearGradient4810-5">
       <stop
          id="stop4812-0"
          offset="0"
@@ -145,18 +99,6 @@
          style="stop-color:#615941;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       id="linearGradient6281-8-0-1-6">
-      <stop
-         id="stop6283-0-2-2-1"
-         offset="0"
-         style="stop-color:#f7f9fb;stop-opacity:1" />
-      <stop
-         id="stop6285-5-0-9-7"
-         offset="1"
-         style="stop-color:#ffd680;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4810-5"
        id="linearGradient5941"
        gradientUnits="userSpaceOnUse"
@@ -166,7 +108,6 @@
        x2="8.0137892"
        y2="1050.0707" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient8287-7-5-4"
        id="linearGradient5947"
        gradientUnits="userSpaceOnUse"
@@ -176,7 +117,6 @@
        x2="-4.9919548"
        y2="1038.8951" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient6020"
        id="linearGradient6014"
        gradientUnits="userSpaceOnUse"
@@ -185,7 +125,6 @@
        x2="8"
        y2="1049.3622" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient6004"
        id="linearGradient6028"
        x1="8"
@@ -194,7 +133,6 @@
        y2="1049.3622"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient6034"
        id="linearGradient6036"
        x1="6"
@@ -203,7 +141,6 @@
        y2="1047.3622"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient6042"
        id="linearGradient6044"
        x1="9"
@@ -212,35 +149,6 @@
        y2="1046.3622"
        gradientUnits="userSpaceOnUse" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="32"
-     inkscape:cx="7.7381087"
-     inkscape:cy="6.3635628"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1920"
-     inkscape:window-height="1018"
-     inkscape:window-x="-8"
-     inkscape:window-y="-8"
-     inkscape:window-maximized="1"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="true"
-     inkscape:snap-bbox="true"
-     inkscape:object-nodes="false"
-     inkscape:snap-others="false"
-     inkscape:bbox-nodes="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3999" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -249,25 +157,19 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
     <path
-       sodipodi:nodetypes="ccccc"
-       inkscape:connector-curvature="0"
        id="rect3997-9-1"
        d="M 1.5286379,1037.8622 H 14.5 v 13 H 1.5286379 Z"
        style="display:inline;fill:#f4fcff;fill-opacity:1;stroke:url(#linearGradient5941);stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1" />
     <path
-       sodipodi:nodetypes="ccccc"
-       inkscape:connector-curvature="0"
        id="rect3997-9-9-2"
        d="m 1.5,1037.8622 h 13 v 2 h -13 z"
        style="display:inline;fill:url(#linearGradient5947);fill-opacity:1;stroke:#315b91;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1" />
@@ -275,50 +177,30 @@
        y="1036.3622"
        x="17"
        id="image5867"
-       xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAcpJREFU
-OI2lkz1rFUEUhp9zzsxs9mYtTCTgDxALtQ4ptFGsUthtIaS3SWFAiQYMoojBXIWgaQSxEAlC/oBY
-CYaAnaVgq6WmuV9771rM5N69ZcjAcnbYmfd9zrszUtc1pxkO4HLZrkUUVcEsVTXMFGeKqaWqOFXU
-xfn+81IcwOj8IheunMWrkAcld0rujSIorRnjTKbMOqPwSh6M3Am77z9PCPT3Ib/+gKphGgmcRQJT
-nXo3U8wiwVhg7dInFu8enKj3w/YSUEaBahjV5jzcWGljZgTvCN6RBU8WPN4Zzow3j0sAqlGDoBoJ
-AJryuHb9IvOzxkLhWSg88y1HkRlbr/ZQgbqGwVAmAr2hRQGJeXz7+J3gHCHEJ/Me713MAqiBftrj
-ALpVnBiwcfMnV2/vAnCwd4+lcmvc99cPdxApUYHuoCHQq3RM0OkHvEabLz/O0as2oE6ug4Alsf6w
-kcExgQJH3Zz9t0/TMs/yypMxwbud9diCQKdqEPQbGfztFNxffQjA652XzGh0B/jXaaGSCKqpFlIG
-AkednAebLxDiyvVH24jU1IAwEeg1Qzz+JSrwbHMNYeIqCTkpjD8MhlPnQNlevcXJRjSV017n/8dN
-e99qIay7AAAAAElFTkSuQmCC
-"
+       xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAcpJREFU OI2lkz1rFUEUhp9zzsxs9mYtTCTgDxALtQ4ptFGsUthtIaS3SWFAiQYMoojBXIWgaQSxEAlC/oBY CYaAnaVgq6WmuV9771rM5N69ZcjAcnbYmfd9zrszUtc1pxkO4HLZrkUUVcEsVTXMFGeKqaWqOFXU xfn+81IcwOj8IheunMWrkAcld0rujSIorRnjTKbMOqPwSh6M3Am77z9PCPT3Ib/+gKphGgmcRQJT nXo3U8wiwVhg7dInFu8enKj3w/YSUEaBahjV5jzcWGljZgTvCN6RBU8WPN4Zzow3j0sAqlGDoBoJ AJryuHb9IvOzxkLhWSg88y1HkRlbr/ZQgbqGwVAmAr2hRQGJeXz7+J3gHCHEJ/Me713MAqiBftrj ALpVnBiwcfMnV2/vAnCwd4+lcmvc99cPdxApUYHuoCHQq3RM0OkHvEabLz/O0as2oE6ug4Alsf6w kcExgQJH3Zz9t0/TMs/yypMxwbud9diCQKdqEPQbGfztFNxffQjA652XzGh0B/jXaaGSCKqpFlIG AkednAebLxDiyvVH24jU1IAwEeg1Qzz+JSrwbHMNYeIqCTkpjD8MhlPnQNlevcXJRjSV017n/8dN e99qIay7AAAAAElFTkSuQmCC "
        style="image-rendering:optimizeSpeed"
        preserveAspectRatio="none"
        height="16"
        width="16" />
     <path
-       sodipodi:nodetypes="ccccc"
-       inkscape:connector-curvature="0"
        id="rect3997-9"
        d="m 4.5176236,1043.0321 h 7.9823774 v 5.8301 H 4.5176236 Z"
        style="display:inline;fill:#f4fcff;fill-opacity:1;stroke:url(#linearGradient8887);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1" />
     <path
-       sodipodi:nodetypes="ccccc"
-       inkscape:connector-curvature="0"
        id="rect3997-9-9"
        d="M 4.5000002,1041.8622 H 12.5 v 2 H 4.5000002 Z"
        style="display:inline;fill:url(#linearGradient8293);fill-opacity:1;stroke:#315b91;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1" />
     <path
-       inkscape:connector-curvature="0"
        id="path4299"
        d="m 7.5,1044.3622 v 4"
-       style="fill:url(#linearGradient6014);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient6028);stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       sodipodi:nodetypes="cc" />
+       style="fill:url(#linearGradient6014);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient6028);stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
     <path
-       inkscape:connector-curvature="0"
        id="path4301"
        d="m 8,1045.8622 h 4"
-       style="fill:#a79d79;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient6044);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       sodipodi:nodetypes="cc" />
+       style="fill:#a79d79;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient6044);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
     <path
-       inkscape:connector-curvature="0"
        id="path4303"
        d="M 7,1046.8622 H 5"
-       style="fill:#a79d79;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient6036);stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       sodipodi:nodetypes="cc" />
+       style="fill:#a79d79;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient6036);stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
   </g>
 </svg>
diff --git a/apitools/org.eclipse.pde.api.tools.ui/icons/full/elcl16/prev_nav.svg b/apitools/org.eclipse.pde.api.tools.ui/icons/full/elcl16/prev_nav.svg
index 1faf803af31..efb0325cd96 100644
--- a/apitools/org.eclipse.pde.api.tools.ui/icons/full/elcl16/prev_nav.svg
+++ b/apitools/org.eclipse.pde.api.tools.ui/icons/full/elcl16/prev_nav.svg
@@ -2,24 +2,19 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.48.0 r9654"
-   sodipodi:docname="prev_nav.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4749">
       <stop
          style="stop-color:#fbdd83;stop-opacity:1"
@@ -31,7 +26,6 @@
          id="stop4753" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4741">
       <stop
          style="stop-color:#a66b10;stop-opacity:1"
@@ -43,7 +37,6 @@
          id="stop4745" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4741"
        id="linearGradient4747"
        x1="1.0625"
@@ -53,7 +46,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(0,-1,1,0,-1036.3626,1052.3618)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4749"
        id="linearGradient4755"
        x1="1.6861235"
@@ -63,29 +55,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(0,-1,1,0,-1036.3626,1052.3618)" />
   </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.5683281"
-     inkscape:cy="9.6786205"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1164"
-     inkscape:window-height="982"
-     inkscape:window-x="104"
-     inkscape:window-y="89"
-     inkscape:window-maximized="0"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3966" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -99,15 +68,12 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
     <path
        style="fill:url(#linearGradient4755);fill-opacity:1;stroke:url(#linearGradient4747);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
        d="m 2.5,1043.8618 3,0 0,5.7812 c 0,0.6679 0.5509,1.2188 1.2188,1.2188 l 2.5625,0 c 0.6678,0 1.2187,-0.5508 1.2187,-1.2188 l 0,-5.7812 3,0 0,-1 -5.5,-5.5 -5.5,5.5 0,1 z"
-       id="rect3968"
-       inkscape:connector-curvature="0" />
+       id="rect3968" />
   </g>
 </svg>
diff --git a/apitools/org.eclipse.pde.api.tools.ui/icons/full/elcl16/remove_exc.svg b/apitools/org.eclipse.pde.api.tools.ui/icons/full/elcl16/remove_exc.svg
index 646eabf6710..c76f0bee3cd 100644
--- a/apitools/org.eclipse.pde.api.tools.ui/icons/full/elcl16/remove_exc.svg
+++ b/apitools/org.eclipse.pde.api.tools.ui/icons/full/elcl16/remove_exc.svg
@@ -2,24 +2,19 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.48.5 r10040"
-   sodipodi:docname="remove_exc.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4852-7">
       <stop
          style="stop-color:#707070;stop-opacity:1"
@@ -49,8 +44,7 @@
        gradientTransform="matrix(0.99104673,0,0,1.0377289,-0.03213967,-39.635801)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient4047"
-       xlink:href="#linearGradient4852-7"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4852-7" />
     <linearGradient
        y2="1037.7"
        x2="8.6566515"
@@ -59,34 +53,8 @@
        gradientTransform="matrix(0.99104673,0,0,1.0377289,-0.03213967,-39.635801)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient4049"
-       xlink:href="#linearGradient4844-4"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4844-4" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="31.999998"
-     inkscape:cx="5.5301136"
-     inkscape:cy="7.9227098"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1241"
-     inkscape:window-height="814"
-     inkscape:window-x="963"
-     inkscape:window-y="622"
-     inkscape:window-maximized="0"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3999" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -100,16 +68,12 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
     <path
        style="fill:url(#linearGradient4047);fill-opacity:1;stroke:url(#linearGradient4049);stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline"
        d="m 13.267004,1038.2068 c -0.463993,-0.4858 -1.211033,-0.4858 -1.675002,-10e-5 l -3.0849275,3.2304 -3.0849031,-3.2303 c -0.4639226,-0.4858 -1.2110333,-0.4858 -1.6750018,0 l -0.8523552,0.8927 c -0.4639479,0.4856 -0.463936,1.2678 3.62e-5,1.7537 l 3.0848535,3.2303 -3.084858,3.2302 c -0.4640179,0.4858 -0.4640062,1.268 -1.34e-5,1.7538 l 0.852401,0.8927 c 0.4639431,0.4858 1.2109842,0.4858 1.6750016,0 l 3.084908,-3.2302 3.1063417,3.2526 c 0.463945,0.4859 1.210985,0.4859 1.675003,0 l 0.852355,-0.8925 c 0.463969,-0.4859 0.459308,-1.2632 -3.6e-5,-1.7539 l -3.106344,-3.2527 3.084908,-3.2302 c 0.46399,-0.4859 0.463978,-1.2681 3.4e-5,-1.7538 z"
-       id="rect4043"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="sccccccccssccsccsccss" />
+       id="rect4043" />
   </g>
 </svg>
diff --git a/apitools/org.eclipse.pde.api.tools.ui/icons/full/elcl16/text_edit.svg b/apitools/org.eclipse.pde.api.tools.ui/icons/full/elcl16/text_edit.svg
index 006bf49da0b..ea2e36d573f 100644
--- a/apitools/org.eclipse.pde.api.tools.ui/icons/full/elcl16/text_edit.svg
+++ b/apitools/org.eclipse.pde.api.tools.ui/icons/full/elcl16/text_edit.svg
@@ -2,24 +2,19 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="text_edit.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient5135-7"
        id="linearGradient4873-1"
        x1="7.0070496"
@@ -29,8 +24,7 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-1.977903,-3.044194)" />
     <linearGradient
-       id="linearGradient5135-7"
-       inkscape:collect="always">
+       id="linearGradient5135-7">
       <stop
          id="stop5137-4"
          offset="0"
@@ -41,7 +35,6 @@
          style="stop-color:#637aa7;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient5141-4"
        id="linearGradient4875-9"
        x1="7.0070496"
@@ -51,8 +44,7 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-1.977903,-3.044194)" />
     <linearGradient
-       id="linearGradient5141-4"
-       inkscape:collect="always">
+       id="linearGradient5141-4">
       <stop
          id="stop5143-8"
          offset="0"
@@ -63,7 +55,6 @@
          style="stop-color:#637aa7;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient5147-4"
        id="linearGradient4871-2"
        x1="7.0070496"
@@ -73,8 +64,7 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-1.977903,-3.044194)" />
     <linearGradient
-       id="linearGradient5147-4"
-       inkscape:collect="always">
+       id="linearGradient5147-4">
       <stop
          id="stop5149-5"
          offset="0"
@@ -85,7 +75,6 @@
          style="stop-color:#637aa7;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4861-1"
        id="linearGradient4869-17"
        x1="7.0070496"
@@ -95,7 +84,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-1.977903,-3.044194)" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4861-1">
       <stop
          style="stop-color:#91a5c7;stop-opacity:1;"
@@ -107,7 +95,6 @@
          id="stop4865-52" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4877-6"
        id="linearGradient4867-7"
        x1="7.0070496"
@@ -117,8 +104,7 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-1.977903,-3.044194)" />
     <linearGradient
-       id="linearGradient4877-6"
-       inkscape:collect="always">
+       id="linearGradient4877-6">
       <stop
          id="stop4879-1"
          offset="0"
@@ -129,7 +115,6 @@
          style="stop-color:#5e76a3;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4902-3"
        id="linearGradient4908-2"
        x1="10.544736"
@@ -139,7 +124,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-1.977903,-1.044194)" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4902-3">
       <stop
          style="stop-color:#b28a30;stop-opacity:1"
@@ -151,7 +135,6 @@
          id="stop4906-2" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4894-6"
        id="linearGradient4900-1"
        x1="7.9987183"
@@ -161,7 +144,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(2.022097,-1.044194)" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4894-6">
       <stop
          style="stop-color:#e0c88f;stop-opacity:1"
@@ -173,7 +155,6 @@
          id="stop4898-5" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4994-6">
       <stop
          style="stop-color:#f9fafc;stop-opacity:1;"
@@ -192,42 +173,7 @@
        gradientUnits="userSpaceOnUse"
        id="linearGradient4101"
        xlink:href="#linearGradient4994-6"
-       inkscape:collect="always"
        gradientTransform="translate(-1.977903,-1.044194)" />
-    <linearGradient
-       id="linearGradient5300">
-      <stop
-         style="stop-color:#4d4d4d;stop-opacity:1;"
-         offset="0"
-         id="stop5302" />
-      <stop
-         id="stop5308"
-         offset="0.29405674"
-         style="stop-color:#727272;stop-opacity:1;" />
-      <stop
-         style="stop-color:#4d4d4d;stop-opacity:1"
-         offset="1"
-         id="stop5304" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5077-5">
-      <stop
-         style="stop-color:#e4cf94;stop-opacity:1"
-         offset="0"
-         id="stop5079-7" />
-      <stop
-         id="stop5087-6"
-         offset="0.32186735"
-         style="stop-color:#ede0ba;stop-opacity:1" />
-      <stop
-         id="stop5085-1"
-         offset="0.64764118"
-         style="stop-color:#c1aa7e;stop-opacity:1" />
-      <stop
-         style="stop-color:#ad8865;stop-opacity:1"
-         offset="1"
-         id="stop5081-8" />
-    </linearGradient>
     <linearGradient
        y2="1044.6704"
        x2="-8.7005796"
@@ -236,10 +182,8 @@
        gradientUnits="userSpaceOnUse"
        id="linearGradient5173-0"
        xlink:href="#linearGradient4908-52-3-2-9"
-       inkscape:collect="always"
        gradientTransform="translate(20,0)" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4908-52-3-2-9">
       <stop
          style="stop-color:#986443;stop-opacity:1"
@@ -252,15 +196,16 @@
     </linearGradient>
     <filter
        color-interpolation-filters="sRGB"
-       inkscape:collect="always"
-       id="filter5428-9">
+       id="filter5428-9"
+       x="-0.14437388"
+       y="-0.14806311"
+       width="1.2887478"
+       height="1.2961262">
       <feGaussianBlur
-         inkscape:collect="always"
          stdDeviation="0.22207033"
          id="feGaussianBlur5430-2" />
     </filter>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient5077-5-8"
        id="linearGradient5196-0"
        gradientUnits="userSpaceOnUse"
@@ -288,15 +233,6 @@
          offset="1"
          id="stop5081-8-7" />
     </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5300-6"
-       id="linearGradient5306-8"
-       x1="2.65625"
-       y1="1049.3976"
-       x2="4.0822439"
-       y2="1050.5304"
-       gradientUnits="userSpaceOnUse" />
     <linearGradient
        id="linearGradient5300-6">
       <stop
@@ -319,91 +255,25 @@
        x1="2.65625"
        gradientUnits="userSpaceOnUse"
        id="linearGradient3208"
-       xlink:href="#linearGradient5300-6"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4902-3-3"
-       id="linearGradient4908-2-4"
-       x1="10.544736"
-       y1="1038.5779"
-       x2="10.544736"
-       y2="1052.3228"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-1.977903,-1.044194)" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient4902-3-3">
-      <stop
-         style="stop-color:#b28a30;stop-opacity:1"
-         offset="0"
-         id="stop4904-2-7" />
-      <stop
-         style="stop-color:#7b703e;stop-opacity:1"
-         offset="1"
-         id="stop4906-2-6" />
-    </linearGradient>
+       xlink:href="#linearGradient5300-6" />
     <filter
        color-interpolation-filters="sRGB"
-       inkscape:collect="always"
-       id="filter5428-9-1">
+       id="filter5428-9-1"
+       x="-0.20818877"
+       y="-0.21422231"
+       width="1.4163775"
+       height="1.4284446">
       <feGaussianBlur
-         inkscape:collect="always"
          stdDeviation="0.22207033"
          id="feGaussianBlur5430-2-9" />
     </filter>
-    <linearGradient
-       id="linearGradient5077-5-8-7">
-      <stop
-         style="stop-color:#e4cf94;stop-opacity:1"
-         offset="0"
-         id="stop5079-7-9-4" />
-      <stop
-         id="stop5087-6-0-2"
-         offset="0.32186735"
-         style="stop-color:#ede0ba;stop-opacity:1" />
-      <stop
-         id="stop5085-1-4-6"
-         offset="0.64764118"
-         style="stop-color:#c1aa7e;stop-opacity:1" />
-      <stop
-         style="stop-color:#ad8865;stop-opacity:1"
-         offset="1"
-         id="stop5081-8-7-6" />
-    </linearGradient>
-    <linearGradient
-       y2="1050.5304"
-       x2="4.0822439"
-       y1="1049.3976"
-       x1="2.65625"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3208-6"
-       xlink:href="#linearGradient5300-6-8"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient5300-6-8">
-      <stop
-         style="stop-color:#4d4d4d;stop-opacity:1;"
-         offset="0"
-         id="stop5302-7-1" />
-      <stop
-         id="stop5308-2-6"
-         offset="0.29405674"
-         style="stop-color:#727272;stop-opacity:1;" />
-      <stop
-         style="stop-color:#4d4d4d;stop-opacity:1"
-         offset="1"
-         id="stop5304-3-8" />
-    </linearGradient>
     <filter
-       inkscape:collect="always"
        id="filter4177"
-       x="-0.11984986"
-       width="1.2396997"
-       y="-0.12015051"
-       height="1.240301">
+       x="-0.23618249"
+       width="1.5518694"
+       y="-0.23209324"
+       height="1.548569">
       <feGaussianBlur
-         inkscape:collect="always"
          stdDeviation="0.40384366"
          id="feGaussianBlur4179" />
     </filter>
@@ -413,36 +283,9 @@
       <path
          style="fill:#ffffff;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;display:inline"
          d="m 3.5193795,1037.8597 7.0096695,0 3.062057,3.0066 0,9.9546 -10.0717265,0 z"
-         id="path4183"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccc" />
+         id="path4183" />
     </mask>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="8.0000004"
-     inkscape:cx="10.666768"
-     inkscape:cy="4.4401945"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1440"
-     inkscape:window-height="779"
-     inkscape:window-x="98"
-     inkscape:window-y="25"
-     inkscape:window-maximized="0"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3999" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -456,28 +299,21 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
     <path
        style="fill:url(#linearGradient4101);fill-opacity:1;stroke:none;display:inline"
        d="m 3.5193795,1037.8597 7.0096695,0 3.062057,3.0066 0,9.9546 -10.0717265,0 z"
-       id="rect4001-3"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccc" />
+       id="rect4001-3" />
     <path
        style="fill:url(#linearGradient4900-1);fill-opacity:1;stroke:none;display:inline"
        d="m 9.998718,1037.397 0,3.9112 3.977478,0 z"
-       id="path4884"
-       inkscape:connector-curvature="0" />
+       id="path4884" />
     <path
        style="fill:none;stroke:url(#linearGradient4908-2);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;display:inline"
        d="m 3.5193795,1037.8597 7.0096695,0 3.062057,3.0066 0,9.9546 -10.0717265,0 z"
-       id="rect4001"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccc" />
+       id="rect4001" />
     <rect
        style="fill:url(#linearGradient4867-7);fill-opacity:1;stroke:none;display:inline"
        id="rect4001-1"
@@ -520,48 +356,33 @@
       <g
          style="display:inline;fill:#ffffff;stroke:#ffffff;stroke-width:2.11441896;stroke-miterlimit:4;stroke-dasharray:none"
          id="layer1-5-0"
-         inkscape:label="Layer 1"
          transform="matrix(-0.70941475,0,0,0.70941475,9.6234575,302.66333)">
         <path
-           sodipodi:nodetypes="ccccccc"
-           inkscape:connector-curvature="0"
            id="path5226-6-14-1-5-6"
            d="m 12.866728,1043.3715 -5.928369,5.8862 -5.461084,2.5938 2.59375,-5.4564 5.8445857,-5.9039 c 1.2698873,0.6025 2.2104673,1.6169 2.9511173,2.8807 z"
            style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#ffffff;stroke:#ffffff;stroke-width:2.11441896;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" />
         <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
            id="path5424-4"
            d="M 9.9307747,1040.4939 4.0625,1046.3935 5,1047.2997 l 6.118275,-6.0558 c -0.362696,-0.2963 -0.752826,-0.5438 -1.1875003,-0.75 z"
            style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:2.11441896;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;stroke-miterlimit:4;stroke-dasharray:none" />
         <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
            id="path5226-6-14-1-5-2-0"
            d="m 12.493275,1042.7752 -5.962025,6.087 0.40625,0.4063 5.930775,-5.8996 c -0.120121,-0.205 -0.24381,-0.4026 -0.375,-0.5937 z"
            style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:2.11441896;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans;stroke-miterlimit:4;stroke-dasharray:none" />
         <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
            id="path5226-6-14-1-5-2-7-6"
            d="m 6.536718,1048.8567 -1.548139,-1.5456 6.120492,-6.0629 c 0.52506,0.4288 0.980135,0.9451 1.380966,1.5292 z"
            style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:2.11441896;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans;stroke-miterlimit:4;stroke-dasharray:none" />
         <path
-           sodipodi:nodetypes="cc"
-           inkscape:connector-curvature="0"
            id="path5426-2"
            d="m 4.984376,1047.2528 6.118276,-6.0089"
            style="opacity:0.50000000000000000;fill:#ffffff;stroke:#ffffff;stroke-width:2.11441896;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;filter:url(#filter5428-9-1)" />
         <path
            transform="translate(0,1036.3622)"
-           sodipodi:nodetypes="cccccccccc"
-           inkscape:connector-curvature="0"
            id="path5006-9"
            d="M 5.40625,8.6875 4.09375,10 2.6875,12.9375 l 1.375,1.28125 -0.03125,0.0625 2.9375,-1.40625 0.75,-0.75 0.1875,-2 L 5.1875,9.96875 c 0,0 0.127199,-0.74275 0.21875,-1.28125 z"
            style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;display:inline;stroke-width:2.11441896;stroke-miterlimit:4;stroke-dasharray:none" />
         <path
-           sodipodi:nodetypes="ccccccccc"
-           inkscape:connector-curvature="0"
            id="path5006-1-9"
            d="m 3.25,1049.1435 c -0.211528,0.024 -0.41079,0.089 -0.5625,0.1562 l -1.21875,2.5625 2.5625,-1.2187 0.03125,-0.062 c 0.121601,-0.3002 0.273127,-0.8318 -0.09375,-1.2188 -0.132606,-0.1402 -0.331591,-0.1963 -0.5,-0.2187 -0.08057,-0.011 -0.138928,-0.01 -0.21875,0 z"
            style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;display:inline;stroke-width:2.11441896;stroke-miterlimit:4;stroke-dasharray:none" />
@@ -569,52 +390,37 @@
     </g>
     <g
        transform="matrix(-0.70941475,0,0,0.70941475,9.6234575,302.66333)"
-       inkscape:label="Layer 1"
        id="layer1-5"
        style="display:inline">
       <path
          style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:none;stroke:url(#linearGradient5173-0);stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
          d="m 12.866728,1043.3715 -5.928369,5.8862 -5.461084,2.5938 2.59375,-5.4564 5.8445857,-5.9039 c 1.2698873,0.6025 2.2104673,1.6169 2.9511173,2.8807 z"
-         id="path5226-6-14-1-5"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccccc" />
+         id="path5226-6-14-1-5" />
       <path
          style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#ffcb72;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
          d="M 9.9307747,1040.4939 4.0625,1046.3935 5,1047.2997 l 6.118275,-6.0558 c -0.362696,-0.2963 -0.752826,-0.5438 -1.1875003,-0.75 z"
-         id="path5424"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
+         id="path5424" />
       <path
          style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#e5a856;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
          d="m 12.493275,1042.7752 -5.962025,6.087 0.40625,0.4063 5.930775,-5.8996 c -0.120121,-0.205 -0.24381,-0.4026 -0.375,-0.5937 z"
-         id="path5226-6-14-1-5-2"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
+         id="path5226-6-14-1-5-2" />
       <path
          style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#fbbc67;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
          d="m 6.536718,1048.8567 -1.548139,-1.5456 6.120492,-6.0629 c 0.52506,0.4288 0.980135,0.9451 1.380966,1.5292 z"
-         id="path5226-6-14-1-5-2-7"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
+         id="path5226-6-14-1-5-2-7" />
       <path
          style="opacity:0.5;fill:none;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;filter:url(#filter5428-9)"
          d="m 4.984376,1047.2528 6.118276,-6.0089"
-         id="path5426"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
+         id="path5426" />
       <path
          style="fill:url(#linearGradient5196-0);fill-opacity:1;stroke:none;display:inline"
          d="M 5.40625,8.6875 4.09375,10 2.6875,12.9375 l 1.375,1.28125 -0.03125,0.0625 2.9375,-1.40625 0.75,-0.75 0.1875,-2 L 5.1875,9.96875 c 0,0 0.127199,-0.74275 0.21875,-1.28125 z"
          id="path5006"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccccccc"
          transform="translate(0,1036.3622)" />
       <path
          style="fill:url(#linearGradient3208);fill-opacity:1;stroke:none;display:inline"
          d="m 3.25,1049.1435 c -0.211528,0.024 -0.41079,0.089 -0.5625,0.1562 l -1.21875,2.5625 2.5625,-1.2187 0.03125,-0.062 c 0.121601,-0.3002 0.273127,-0.8318 -0.09375,-1.2188 -0.132606,-0.1402 -0.331591,-0.1963 -0.5,-0.2187 -0.08057,-0.011 -0.138928,-0.01 -0.21875,0 z"
-         id="path5006-1"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccccccc" />
+         id="path5006-1" />
     </g>
   </g>
 </svg>
diff --git a/apitools/org.eclipse.pde.api.tools.ui/icons/full/obj16/annotation_obj.svg b/apitools/org.eclipse.pde.api.tools.ui/icons/full/obj16/annotation_obj.svg
index ed205f3e64e..5bdcee33028 100644
--- a/apitools/org.eclipse.pde.api.tools.ui/icons/full/obj16/annotation_obj.svg
+++ b/apitools/org.eclipse.pde.api.tools.ui/icons/full/obj16/annotation_obj.svg
@@ -2,41 +2,18 @@
 <!-- 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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="16"
    height="16"
    viewBox="0 0 16 16"
    id="svg4061"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="annotation_obj.svg">
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4063" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="33.3125"
-     inkscape:cx="4.4577862"
-     inkscape:cy="8"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     units="px"
-     inkscape:window-width="1132"
-     inkscape:window-height="873"
-     inkscape:window-x="834"
-     inkscape:window-y="441"
-     inkscape:window-maximized="0" />
   <metadata
      id="metadata4066">
     <rdf:RDF>
@@ -50,21 +27,15 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      transform="translate(0,-1036.3622)">
     <path
        style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
        d="m 11.458315,1046.4119 0,-2.7842 0.0042,-0.8839 c 0,0 -0.0617,-1.9004 -0.105904,-2.1213 -0.04419,-0.221 -0.88388,-2.2915 -0.88388,-2.2915 l -1.137373,-0.9547 -1.1932427,-0.442 -1.0589922,-0.1941 -1.8228007,0.3344 -1.3458363,0.8147 -1.5501319,1.5559 -1.065664,2.3265 0.088388,1.812 0.7071068,1.6352 1.016466,1.5468 c 0,0 1.0681638,1.2741 1.3333289,1.2299 0.265165,-0.044 2.1972011,0.6346 2.1972011,0.6346 l 2.0079171,-0.1293 2.2347239,-1.5143 z"
-       id="path3840"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccccccccccccccccc" />
+       id="path3840" />
     <path
        style="font-size:11.05178356px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#236298;fill-opacity:1;stroke:#236298;stroke-width:0.28257138;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline;font-family:AustralianFlyingCorpsStencil;-inkscape-font-specification:AustralianFlyingCorpsStencil"
        d="m 11.309169,1039.7124 c -0.09375,-0.4062 -0.177236,-0.9956 -0.552237,-1.4332 -0.374998,-0.4374 -0.614324,-0.6075 -1.022557,-0.8389 -0.4082332,-0.2314 -1.6921375,-0.7905 -2.890625,-0.8594 -0.3994958,-0.023 -0.8168984,0.026 -1.1875,0.125 -1.8098211,0.485 -2.6365843,1.3182 -3.59375,2.8125 -0.991819,1.5427 -1.18883707,3.5664 -0.65625,5.3438 0.5272319,1.7597 1.555815,2.9531 3.09375,3.5937 1.4108866,0.5774 2.6810837,0.7061 4.5,0.2188 1.67339,-0.4485 2.016965,-0.7867 3.21875,-1.8438 l -0.4375,-0.3437 c -1.553801,1.2177 -1.622762,1.2331 -2.96875,1.5937 -1.5005895,0.4027 -3.1035995,0.1737 -4.25,-0.4062 -1.1463954,-0.5798 -1.9388113,-1.5074 -2.4375,-3.0938 -0.4986887,-1.5864 -0.022863,-3.5209 0.5625,-4.5312 0.5853631,-1.0103 1.2965074,-2.1937 2.90625,-2.625 1.282323,-0.3436 2.8157521,0.1597 3.788182,0.7279 0.97243,0.5683 1.292239,1.6525 1.258042,2.5824 -0.0342,0.9298 -0.664674,1.9656 -1.133042,2.368 -0.4683686,0.4027 -1.475682,0.4154 -1.475682,0.4154 0,0 0.1240658,-0.6578 0.125,-1.4687 0.030258,-0.6627 -0.1295408,-1.6952 -0.59375,-2.125 -0.4642092,-0.431 -1.2172197,-0.4323 -1.6875,-0.4063 -0.5523523,0.031 -0.932751,0.349 -1.34375,1.125 -0.4594324,0.8674 -0.5953852,2.7605 -0.4375,3.4688 0.1578852,0.7083 0.2457352,0.8707 0.65625,1.2812 0.4105148,0.4103 1.4233638,0.4191 1.96875,0.094 0.8226727,-0.5067 0.5968097,-1.091 1.21875,-1.125 0,0 1.2730873,-0.2595 2.067862,-0.8125 0.815373,-0.5226 1.093629,-1.2093 1.265854,-1.9429 0.172226,-0.7335 0.131703,-1.4881 0.03795,-1.8944 z M 6,1040.2997 c 0.1214058,0 0.264899,0.01 0.40625,0.031 0.5654037,0.1018 0.65625,1.125 0.65625,1.125 0,0 0.075363,0.6862 0.03125,1.5938 -0.044113,0.9079 -0.00335,1.2628 -0.34375,1.5312 -0.3403969,0.2684 -1.2509038,0.4278 -1.6875,-0.2812 -0.4365972,-0.7089 -0.3169368,-2.8026 0.0625,-3.4375 0.238137,-0.4 0.5107825,-0.5487 0.875,-0.5625 z"
-       id="path4719-2"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cczscccccccccssczzccccccscccczcssccsccs" />
+       id="path4719-2" />
   </g>
 </svg>
diff --git a/apitools/org.eclipse.pde.api.tools.ui/icons/full/obj16/api_tools.svg b/apitools/org.eclipse.pde.api.tools.ui/icons/full/obj16/api_tools.svg
index 1289469f77b..dac0dacb494 100644
--- a/apitools/org.eclipse.pde.api.tools.ui/icons/full/obj16/api_tools.svg
+++ b/apitools/org.eclipse.pde.api.tools.ui/icons/full/obj16/api_tools.svg
@@ -2,52 +2,18 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.92.3 (2405546, 2018-03-11)"
-   sodipodi:docname="api_tools.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
-    <linearGradient
-       id="linearGradient4805">
-      <stop
-         style="stop-color:#4b82b6;stop-opacity:1"
-         offset="0"
-         id="stop4807" />
-      <stop
-         id="stop4815"
-         offset="0.79358917"
-         style="stop-color:#9ab7d5;stop-opacity:1" />
-      <stop
-         style="stop-color:#a2bcd8;stop-opacity:1"
-         offset="1"
-         id="stop4809" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3827">
-      <stop
-         id="stop3829"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0.60149658"
-         id="stop3835" />
-      <stop
-         id="stop3831"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
     <linearGradient
        id="linearGradient10798-1-9-3-7-6-8-9-0-9-1">
       <stop
@@ -64,7 +30,6 @@
          style="stop-color:#91c168;stop-opacity:1;" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10798-1-9-3-7-6-8-9-0-9-1-7"
        id="linearGradient3929-5-9"
        gradientUnits="userSpaceOnUse"
@@ -88,240 +53,6 @@
          offset="1"
          style="stop-color:#9283c3;stop-opacity:1" />
     </linearGradient>
-    <linearGradient
-       id="linearGradient7540-2-3-8-7">
-      <stop
-         id="stop7542-8-7-5-3"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.502" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0.47623286"
-         id="stop7544-8-2-0-5" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0"
-         offset="0.5"
-         id="stop7546-1-7-9-5" />
-      <stop
-         id="stop7548-98-9-2-4"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient7272-66-4-5-5-5-8">
-      <stop
-         style="stop-color:#8f6c10;stop-opacity:1"
-         offset="0"
-         id="stop7274-6-0-1-7-4-7" />
-      <stop
-         style="stop-color:#c9a645;stop-opacity:1"
-         offset="1"
-         id="stop7276-66-6-3-9-1-4" />
-    </linearGradient>
-    <linearGradient
-       y2="1030.3411"
-       x2="-10.159802"
-       y1="1030.3411"
-       x1="-22.453552"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient10540"
-       xlink:href="#linearGradient7540-2-3-8-7"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="1030.3411"
-       x2="-10.159802"
-       y1="1030.3411"
-       x1="-22.453552"
-       gradientTransform="matrix(0,1,-1,0,1014.0344,1046.6478)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient10542"
-       xlink:href="#linearGradient7540-2-3-8-7"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="1023.2569"
-       x2="-15.945988"
-       y1="1037.4661"
-       x1="-15.945988"
-       gradientTransform="matrix(0.95585117,0,0,0.95585117,-0.71992063,45.488394)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient10544"
-       xlink:href="#linearGradient7272-66-4-5-5-5-8"
-       inkscape:collect="always" />
-    <mask
-       id="mask10620"
-       maskUnits="userSpaceOnUse">
-      <path
-         transform="matrix(0.55482947,0,0,0.55482947,-206.96039,787.08655)"
-         d="m 398.75,468.23718 a 10.625,10.625 0 1 1 -21.25,0 10.625,10.625 0 1 1 21.25,0 z"
-         sodipodi:ry="10.625"
-         sodipodi:rx="10.625"
-         sodipodi:cy="468.23718"
-         sodipodi:cx="388.125"
-         id="path10622"
-         style="font-size:13.58917427px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:2.16621375;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline;font-family:Sans"
-         sodipodi:type="arc" />
-    </mask>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5068-6-9-4-9"
-       id="linearGradient6323-7-1-1"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-15.015625,1046.6356)"
-       x1="10"
-       y1="5"
-       x2="10.007812"
-       y2="6.9843998" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient5068-6-9-4-9">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop5070-8-0-4-9" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop5072-3-6-1-7" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5068-6-9-4-9"
-       id="linearGradient5084-3-3-2-6"
-       x1="12"
-       y1="1043.3622"
-       x2="12"
-       y2="1045.3466"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-15.015625,10.2734)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5068-6-9-4-9"
-       id="linearGradient5086-8-0-8-5"
-       x1="13"
-       y1="1043.3622"
-       x2="15.007812"
-       y2="1043.3466"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-15.015625,10.2734)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5068-6-9-4-9"
-       id="linearGradient5082-1-0-8-1"
-       x1="12"
-       y1="1042.3622"
-       x2="10.007812"
-       y2="1042.3622"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-15.015625,10.2734)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5068-6-9-4-9"
-       id="linearGradient5078-8-2-1-4"
-       x1="10"
-       y1="1041.3622"
-       x2="8.0078125"
-       y2="1041.3466"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-15.015625,10.2734)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5068-6-9-4-9"
-       id="linearGradient5076-5-2-9-8"
-       x1="10"
-       y1="1040.3622"
-       x2="10.007812"
-       y2="1038.3466"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-15.015625,10.2734)" />
-    <linearGradient
-       y2="1038.3466"
-       x2="10.007812"
-       y1="1038.3622"
-       x1="12"
-       gradientTransform="translate(-15.015625,10.2734)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3500-5"
-       xlink:href="#linearGradient5068-6-9-4-9"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5068-6-9-4-9"
-       id="linearGradient5088-1-4-8-6"
-       x1="14"
-       y1="1041.3622"
-       x2="14"
-       y2="1043.3466"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-15.015625,10.2734)" />
-    <radialGradient
-       r="3.4803574"
-       fy="-738.83777"
-       fx="-757.20496"
-       cy="-738.83777"
-       cx="-757.20496"
-       gradientTransform="matrix(1.8508179,-8.813921e-6,8.4531434e-6,1.7750589,644.24981,572.63612)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient3091-1-9-6-4-6"
-       xlink:href="#linearGradient4528-9-5-7-9-7-3"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient4528-9-5-7-9-7-3">
-      <stop
-         id="stop4530-0-5-0-5-8-4"
-         offset="0"
-         style="stop-color:#e0c576;stop-opacity:1;" />
-      <stop
-         id="stop4532-7-9-3-3-6-1"
-         offset="1"
-         style="stop-color:#9e7916;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       y2="7.549418"
-       x2="0.9375"
-       y1="4.8437853"
-       x1="0.9375"
-       gradientTransform="matrix(2.3199889,0,0,2.3199889,10.199693,1043.1852)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3093-5-2-7-0-9"
-       xlink:href="#linearGradient6281-8-0-1-6-6-4-2-8-0"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient6281-8-0-1-6-6-4-2-8-0">
-      <stop
-         style="stop-color:#f7f9fb;stop-opacity:1"
-         offset="0"
-         id="stop6283-0-2-2-1-2-0-1-6-0" />
-      <stop
-         style="stop-color:#ffd680;stop-opacity:1"
-         offset="1"
-         id="stop6285-5-0-9-7-6-9-9-1-9" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4284">
-      <stop
-         style="stop-color:#6588c1;stop-opacity:0"
-         offset="0"
-         id="stop4286" />
-      <stop
-         id="stop4288"
-         offset="0.49999967"
-         style="stop-color:#becce3;stop-opacity:1" />
-      <stop
-         style="stop-color:#809dcb;stop-opacity:0"
-         offset="1"
-         id="stop4290" />
-    </linearGradient>
-    <linearGradient
-       y2="519.39288"
-       x2="323.26462"
-       y1="528.64294"
-       x1="323.26462"
-       gradientTransform="matrix(0.197686,0,0,0.32432277,-38.574335,887.91126)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient10770-6"
-       xlink:href="#linearGradient10448-9-7-0-5"
-       inkscape:collect="always" />
     <linearGradient
        id="linearGradient10448-9-7-0-5">
       <stop
@@ -354,158 +85,6 @@
          style="stop-color:#fceaaf;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       id="linearGradient10440-1-0-0-3">
-      <stop
-         id="stop10442-43-2-0-9"
-         offset="0"
-         style="stop-color:#ae7603;stop-opacity:1;" />
-      <stop
-         style="stop-color:#e8d8a3;stop-opacity:1"
-         offset="0.5"
-         id="stop10521-1-2-5-3" />
-      <stop
-         id="stop10444-3-4-0-4"
-         offset="1"
-         style="stop-color:#bb9221;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10748-8">
-      <stop
-         style="stop-color:#ecac18;stop-opacity:1"
-         offset="0"
-         id="stop10750-5" />
-      <stop
-         id="stop10752-8"
-         offset="0.25"
-         style="stop-color:#f1ce66;stop-opacity:1" />
-      <stop
-         id="stop10754-8"
-         offset="0.5"
-         style="stop-color:#f6e5a6;stop-opacity:1" />
-      <stop
-         style="stop-color:#f1cf6c;stop-opacity:1"
-         offset="0.75"
-         id="stop10756-4" />
-      <stop
-         style="stop-color:#e5b630;stop-opacity:1"
-         offset="1"
-         id="stop10758-7" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10448-90">
-      <stop
-         id="stop10450-0"
-         offset="0"
-         style="stop-color:#ecac18;stop-opacity:1" />
-      <stop
-         style="stop-color:#ffe38d;stop-opacity:1"
-         offset="0.25"
-         id="stop10458-2" />
-      <stop
-         style="stop-color:#fdf5d2;stop-opacity:1"
-         offset="0.5"
-         id="stop10456-96" />
-      <stop
-         id="stop10460-3"
-         offset="0.75"
-         style="stop-color:#ffeba7;stop-opacity:1" />
-      <stop
-         id="stop10452-1"
-         offset="1"
-         style="stop-color:#e5b630;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10414-9">
-      <stop
-         id="stop10416-3"
-         offset="0"
-         style="stop-color:#5078b9;stop-opacity:1;" />
-      <stop
-         style="stop-color:#6d8cbd;stop-opacity:1"
-         offset="0.5"
-         id="stop10422-8" />
-      <stop
-         id="stop10418-4"
-         offset="1"
-         style="stop-color:#5f88c9;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10432-3">
-      <stop
-         style="stop-color:#1f4d9a;stop-opacity:1"
-         offset="0"
-         id="stop10434-4" />
-      <stop
-         id="stop10436-2"
-         offset="0.5"
-         style="stop-color:#4e6da1;stop-opacity:1" />
-      <stop
-         style="stop-color:#567ebc;stop-opacity:1"
-         offset="1"
-         id="stop10438-9" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10157-6">
-      <stop
-         id="stop10159-5"
-         offset="0"
-         style="stop-color:#6588c1;stop-opacity:1" />
-      <stop
-         style="stop-color:#becce3;stop-opacity:1"
-         offset="0.5"
-         id="stop10165-9" />
-      <stop
-         id="stop10161-55"
-         offset="1"
-         style="stop-color:#809dcb;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10396-5">
-      <stop
-         id="stop10398-7"
-         offset="0"
-         style="stop-color:#1b3e79;stop-opacity:1;" />
-      <stop
-         style="stop-color:#728fbf;stop-opacity:1"
-         offset="0.5"
-         id="stop10404-9" />
-      <stop
-         id="stop10400-9"
-         offset="1"
-         style="stop-color:#1f4d9a;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10157-2-5">
-      <stop
-         id="stop10159-8-3"
-         offset="0"
-         style="stop-color:#6588c1;stop-opacity:1" />
-      <stop
-         style="stop-color:#becce3;stop-opacity:1"
-         offset="0.49999985"
-         id="stop10165-3-9" />
-      <stop
-         id="stop10161-5-0"
-         offset="1"
-         style="stop-color:#809dcb;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10149-6-5-4">
-      <stop
-         id="stop10151-5-7-2"
-         offset="0"
-         style="stop-color:#1f4d9a;stop-opacity:1" />
-      <stop
-         style="stop-color:#b9c7df;stop-opacity:1"
-         offset="0.5"
-         id="stop10394-3" />
-      <stop
-         id="stop10153-8-1-2"
-         offset="1"
-         style="stop-color:#567ebc;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10448-9-7-0-5"
        id="linearGradient5123"
        gradientUnits="userSpaceOnUse"
@@ -515,7 +94,6 @@
        x2="323.26462"
        y2="519.39288" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10448-9-7-0-5"
        id="linearGradient5173"
        gradientUnits="userSpaceOnUse"
@@ -525,7 +103,6 @@
        x2="323.26462"
        y2="519.39288" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10798-1-9-3-7-6-8-9-0-9-1"
        id="linearGradient3929-5-9-8"
        gradientUnits="userSpaceOnUse"
@@ -535,35 +112,6 @@
        y2="462.11539"
        gradientTransform="matrix(0.37647059,0,0,0.37647062,-139.62155,871.58461)" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="36.2"
-     inkscape:cx="16.911188"
-     inkscape:cy="4.5154977"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1920"
-     inkscape:window-height="1018"
-     inkscape:window-x="-8"
-     inkscape:window-y="-8"
-     inkscape:window-maximized="1"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="true"
-     inkscape:snap-bbox="true"
-     inkscape:bbox-nodes="true"
-     inkscape:snap-others="false"
-     inkscape:snap-nodes="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3999" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -572,13 +120,11 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
@@ -594,23 +140,19 @@
     <path
        style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ba9726;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
        d="m 10.988478,1039.3694 v 1 H 13 v -1 z"
-       id="path4313-8-8"
-       inkscape:connector-curvature="0" />
+       id="path4313-8-8" />
     <path
        style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ac851f;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
        d="m 12.994125,1041.3602 -2.005647,0.031 0.0058,1 L 13,1042.3602 Z"
-       id="path4313-5-1-8"
-       inkscape:connector-curvature="0" />
+       id="path4313-5-1-8" />
     <path
        style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ac851f;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
        d="m 11.005831,1042.37 -3.0173532,0.031 0.0088,1 3.0173532,-0.031 z"
-       id="path4313-5-1"
-       inkscape:connector-curvature="0" />
+       id="path4313-5-1" />
     <path
        style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ba9726;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
        d="m 10.996094,1038.3622 -3.0076162,0.031 0.0088,1 3.0076152,-0.031 z"
-       id="path4313-8"
-       inkscape:connector-curvature="0" />
+       id="path4313-8" />
     <rect
        style="fill:url(#linearGradient5173);fill-opacity:1;stroke:none;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        id="rect10007-0-74-2-7-6-8"
@@ -623,23 +165,19 @@
     <path
        style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ba9726;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
        d="m 10.996094,1046.3688 v 1 H 13 v -1 z"
-       id="path4313-8-8-2"
-       inkscape:connector-curvature="0" />
+       id="path4313-8-8-2" />
     <path
        style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ac851f;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
        d="m 12.994146,1048.3596 -1.998052,0.031 0.0058,1 L 13,1049.3596 Z"
-       id="path4313-5-1-8-4"
-       inkscape:connector-curvature="0" />
+       id="path4313-5-1-8-4" />
     <path
        style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ac851f;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
        d="m 11.013447,1049.3694 -3.0173532,0.031 0.0088,1 3.0173532,-0.031 z"
-       id="path4313-5-1-6"
-       inkscape:connector-curvature="0" />
+       id="path4313-5-1-6" />
     <path
        style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ba9726;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
        d="m 11.00371,1045.3616 -3.0076162,0.031 0.0088,1 3.0076152,-0.031 z"
-       id="path4313-8-3"
-       inkscape:connector-curvature="0" />
+       id="path4313-8-3" />
     <g
        transform="matrix(0.13972603,0,0,0.16234201,-43.593216,972.25873)"
        style="display:inline;stroke-width:1.85268462"
@@ -672,43 +210,24 @@
     <path
        style="font-style:normal;font-weight:normal;font-size:13.58917427px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;display:inline;fill:url(#linearGradient3929-5-9-8);fill-opacity:1;stroke:#14733c;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        d="m 9.4960938,1050.3622 c -0.690867,1.1985 -1.517266,1.5 -3,1.5 -2.2091388,0 -3.9999997,-1.7909 -4,-4 3e-7,-2.2091 1.7908612,-4 4,-4 1.492204,0 2.312494,0.2888 3,1.5 z"
-       id="path10796-2-6-2-3-3"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cssscc" />
+       id="path10796-2-6-2-3-3" />
     <path
        style="font-style:normal;font-weight:normal;font-size:13.58917427px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;display:inline;fill:url(#linearGradient3929-5-9);fill-opacity:1;stroke:#55429f;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        d="m 9.4960938,1043.3622 c -0.690867,1.1985 -1.517266,1.5 -3,1.5 -2.2091388,0 -3.9999997,-1.7909 -4,-4 3e-7,-2.2091 1.7908612,-4 4,-4 1.492204,0 2.312494,0.2888 3,1.5 z"
-       id="path10796-2-6-2-3"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cssscc" />
+       id="path10796-2-6-2-3" />
     <path
        style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="m 5.0039062,1038.8622 h 2.9921876 z m 1.4960936,0.5 v 2.9902 z M 5,1042.8622 h 2.9902348 z"
-       id="path1108"
-       inkscape:connector-curvature="0" />
+       id="path1108" />
     <path
        d="m 7.3307088,1047.2497 c -0.03726,-0.2692 -0.122425,-0.4719 -0.255489,-0.6082 -0.130409,-0.1362 -0.300734,-0.2043 -0.510979,-0.2043 -0.279443,0 -0.502995,0.1185 -0.6706584,0.3553 -0.165005,0.2333 -0.247507,0.3859 -0.247505,0.9372 -2e-6,0.6131 0.08383,0.8859 0.251498,1.139 0.1703234,0.253 0.3978684,0.3794 0.6826344,0.3794 0.212905,0 0.387223,-0.072 0.522954,-0.2189 0.135725,-0.1493 0.231534,-0.4038 0.287425,-0.7639 l 1.101796,-0.011 c -0.114442,0.6162 -0.334002,1.3216 -0.658682,1.6362 -0.324688,0.3146 -0.759817,0.4719 -1.305389,0.4719 -0.6200954,0 -1.1151044,-0.2384 -1.4850304,-0.7151 -0.367266,-0.4767 -0.550899,-0.9768 -0.550899,-1.8201 0,-0.8529 0.184963,-1.2763 0.554891,-1.7496 0.369925,-0.4769 0.870258,-0.7152 1.5009984,-0.7152 0.516298,0 0.926144,0.1361 1.229541,0.4087 0.30605,0.269 0.559493,0.9009 0.692564,1.4554 z"
        style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:15.56941891px;line-height:125%;font-family:Arial;letter-spacing:0px;word-spacing:0px;display:inline;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1"
-       id="path3817"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccscscscccsscscsccc" />
+       id="path3817" />
     <image
        y="1036.3622"
        x="17"
        id="image6344"
-       xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAk5JREFU
-OI19k1FI01EUh7//mvl3W8tWkRhRCLU0QsqHqKTIMCKsFCkokCQiiiIIjCCJelEwfaiknNKLhT5V
-JOlLppAOIYPQMkUwDZc5m3M5B8vp7ulBnRupBy6ch3M/7u9+92oiQnQ9LnGK3zeNKIWmaVhtOjeK
-MzWWKS0acOtyo1itOpY1qzEaDczOKgJTIfz+v5TX5CwJMS40lSXtosfHoetx3Lx3KDLwvOozA30e
-mh12yb7S/x/EsNCMDE8yPT2D1xOgstQ5By110ts1SjAYIiu/jGaHXZod9pjMkRO4f02iVJiwUhjj
-FQBjbh+uYS8Gg0bQlMv+gk4AGipSBOB00aAWAay1mZgYn0KJoObvRYmglAI0dE81DfVPAci/82Mx
-ioggIpTfbZULJ+uk+HqjRNeTsjYpPFUnL0u2ysJs9IqxcO3cazFb4tiYZEEDBBhx/UHC8OhF3soW
-AKaPfyTBuxmjOQmUkbAWwpA4htf2E8hbav9ihIeN1XL+2UX55u4SpWZlPDAmIkr6f/fImepCeVe1
-Y8kIkRO0DHVwYHsqaZvSefuliZbe99iT7Jh1E8nWRLKOzmkEiH4PEcCoz4trwg9AU4+T1u5PtJt6
-sehmjKsMBE1HVta4wWpj3D8OQFbaQb6PDnJiTzbHdh3m/psHy2qMALJS9vGqu4kaZy1n9+aSsWU3
-ibqFtoEO3D4PDfXNsf7nK0bjpdrb0uP6SnrKTtZb1jER8NHnGiI1OQ1HQcmSGmMAABWNVfJhsJNQ
-eIaEOJ3MbRkU5Vxd9jv/A+DLPt69H4LZAAAAAElFTkSuQmCC
-"
+       xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAk5JREFU OI19k1FI01EUh7//mvl3W8tWkRhRCLU0QsqHqKTIMCKsFCkokCQiiiIIjCCJelEwfaiknNKLhT5V JOlLppAOIYPQMkUwDZc5m3M5B8vp7ulBnRupBy6ch3M/7u9+92oiQnQ9LnGK3zeNKIWmaVhtOjeK MzWWKS0acOtyo1itOpY1qzEaDczOKgJTIfz+v5TX5CwJMS40lSXtosfHoetx3Lx3KDLwvOozA30e mh12yb7S/x/EsNCMDE8yPT2D1xOgstQ5By110ts1SjAYIiu/jGaHXZod9pjMkRO4f02iVJiwUhjj FQBjbh+uYS8Gg0bQlMv+gk4AGipSBOB00aAWAay1mZgYn0KJoObvRYmglAI0dE81DfVPAci/82Mx ioggIpTfbZULJ+uk+HqjRNeTsjYpPFUnL0u2ysJs9IqxcO3cazFb4tiYZEEDBBhx/UHC8OhF3soW AKaPfyTBuxmjOQmUkbAWwpA4htf2E8hbav9ihIeN1XL+2UX55u4SpWZlPDAmIkr6f/fImepCeVe1 Y8kIkRO0DHVwYHsqaZvSefuliZbe99iT7Jh1E8nWRLKOzmkEiH4PEcCoz4trwg9AU4+T1u5PtJt6 sehmjKsMBE1HVta4wWpj3D8OQFbaQb6PDnJiTzbHdh3m/psHy2qMALJS9vGqu4kaZy1n9+aSsWU3 ibqFtoEO3D4PDfXNsf7nK0bjpdrb0uP6SnrKTtZb1jER8NHnGiI1OQ1HQcmSGmMAABWNVfJhsJNQ eIaEOJ3MbRkU5Vxd9jv/A+DLPt69H4LZAAAAAElFTkSuQmCC "
        style="image-rendering:optimizeSpeed"
        preserveAspectRatio="none"
        height="16"
@@ -716,12 +235,10 @@ eIaEOJ3MbRkU5Vxd9jv/A+DLPt69H4LZAAAAAElFTkSuQmCC
     <path
        style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#b08b21;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
        d="m 13,1040.3622 v 1 h 2.011522 v -1 z"
-       id="path4313-8-8-6"
-       inkscape:connector-curvature="0" />
+       id="path4313-8-8-6" />
     <path
        style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#b08b21;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
        d="m 12.988478,1047.3622 v 1 H 15 v -1 z"
-       id="path4313-8-8-6-3"
-       inkscape:connector-curvature="0" />
+       id="path4313-8-8-6-3" />
   </g>
 </svg>
diff --git a/apitools/org.eclipse.pde.api.tools.ui/icons/full/obj16/bundleversion.svg b/apitools/org.eclipse.pde.api.tools.ui/icons/full/obj16/bundleversion.svg
index bcadf443ad6..ade7311320a 100644
--- a/apitools/org.eclipse.pde.api.tools.ui/icons/full/obj16/bundleversion.svg
+++ b/apitools/org.eclipse.pde.api.tools.ui/icons/full/obj16/bundleversion.svg
@@ -2,24 +2,19 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.92.3 (2405546, 2018-03-11)"
-   sodipodi:docname="bundleversion.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient7870">
       <stop
          style="stop-color:#fcd9b5;stop-opacity:1"
@@ -31,7 +26,6 @@
          id="stop7868" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient7842">
       <stop
          style="stop-color:#c4eeff;stop-opacity:1"
@@ -47,7 +41,6 @@
          id="stop7840" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient7832">
       <stop
          style="stop-color:#5aa5d7;stop-opacity:1"
@@ -59,7 +52,6 @@
          id="stop7830" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient7818">
       <stop
          style="stop-color:#6791de;stop-opacity:1"
@@ -71,7 +63,6 @@
          id="stop7816" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient7806">
       <stop
          style="stop-color:#686163;stop-opacity:1"
@@ -87,7 +78,6 @@
          id="stop7804" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient7806"
        id="linearGradient7808"
        x1="1"
@@ -96,7 +86,6 @@
        y2="1037.3622"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient7818"
        id="linearGradient7820"
        x1="7"
@@ -105,7 +94,6 @@
        y2="1041.3622"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient7832"
        id="linearGradient7834"
        x1="3"
@@ -114,7 +102,6 @@
        y2="1038.8622"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient7842"
        id="linearGradient7844"
        x1="4"
@@ -124,7 +111,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(0.99999997,1.735301e-5)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient7870"
        id="linearGradient7872"
        x1="3.6254385"
@@ -133,36 +119,6 @@
        y2="1037.9174"
        gradientUnits="userSpaceOnUse" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#dadada"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="27.0625"
-     inkscape:cx="8"
-     inkscape:cy="8"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1920"
-     inkscape:window-height="1018"
-     inkscape:window-x="-8"
-     inkscape:window-y="-8"
-     inkscape:window-maximized="1"
-     inkscape:snap-global="true"
-     inkscape:snap-bbox="true"
-     inkscape:bbox-nodes="true"
-     inkscape:object-nodes="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2985"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -171,35 +127,22 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      transform="translate(0,-1036.3622)">
     <path
        style="fill:url(#linearGradient7820);stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1"
        d="m 1.5981907,1047.8089 11.8205803,-0.03 0.09046,-6.8451 0.904636,-1.2363 0.03015,-1.2062 H 0.30154542 l 0.27139088,1.0856 1.055409,1.2966 z"
-       id="path7812"
-       inkscape:connector-curvature="0" />
+       id="path7812" />
     <image
        y="1036.3622"
        x="-18"
        id="image7782"
-       xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAc1JREFU
-OI2Vkz9oU1EUxn/3JSZ1EdeIUKmTBXVxeoNTDajgoIsFLZiGVkcbRZSiQzpJG12kHeIbqmBAcRBC
-7eCkhuqgqx2sIg4Opqml+fP+Hoe+3L4kpdoPPu693zn3O9zDuUpEiGJqdKRDmHw8r9gJIqKZz1wW
-b7ks3nJZgs9lcR/dlNtnTYnmdFNdvTKqK64P3aBWTfL7u/CntZ9W9QfNtW9cOFDetvisVVTxxS8p
-jp9PM3TG3CblaMhzHepb6xUfK58AMFYqeVV//xTP8XFDeraP6wiuLeE+ZKivfn3NSiWvAOIAtTUX
-u+EDwqnDSRTRPsaiHUNQHBq+ppU4gNs6hl33OH0kydz9hzs2vY2FD29EGwA06y6emwBgZDL3Xybz
-UzMYAOuqir3h4Hu+DpYKFulBk/4+NJeevyA9aFIqWPT3beYZABu1FE7Tx/e23n7rTqan4t17BZ6V
-HmAVi509AHCbDr4X6IBhRNZg66wvGhGDgRP7eDm7wMDekzohoSJrjB6043GApSeX9LyP5xYFIBFW
-SMQgddDk188KmWyW4YvXyWSz7Gmbds/22MS0vFsVaQSbbEUY1RqByNjEtKju3ziem+kU/oEeg93i
-L6jeDD0dxAiLAAAAAElFTkSuQmCC
-"
+       xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAc1JREFU OI2Vkz9oU1EUxn/3JSZ1EdeIUKmTBXVxeoNTDajgoIsFLZiGVkcbRZSiQzpJG12kHeIbqmBAcRBC 7eCkhuqgqx2sIg4Opqml+fP+Hoe+3L4kpdoPPu693zn3O9zDuUpEiGJqdKRDmHw8r9gJIqKZz1wW b7ks3nJZgs9lcR/dlNtnTYnmdFNdvTKqK64P3aBWTfL7u/CntZ9W9QfNtW9cOFDetvisVVTxxS8p jp9PM3TG3CblaMhzHepb6xUfK58AMFYqeVV//xTP8XFDeraP6wiuLeE+ZKivfn3NSiWvAOIAtTUX u+EDwqnDSRTRPsaiHUNQHBq+ppU4gNs6hl33OH0kydz9hzs2vY2FD29EGwA06y6emwBgZDL3Xybz UzMYAOuqir3h4Hu+DpYKFulBk/4+NJeevyA9aFIqWPT3beYZABu1FE7Tx/e23n7rTqan4t17BZ6V HmAVi509AHCbDr4X6IBhRNZg66wvGhGDgRP7eDm7wMDekzohoSJrjB6043GApSeX9LyP5xYFIBFW SMQgddDk188KmWyW4YvXyWSz7Gmbds/22MS0vFsVaQSbbEUY1RqByNjEtKju3ziem+kU/oEeg93i L6jeDD0dxAiLAAAAAElFTkSuQmCC "
        style="image-rendering:optimizeSpeed"
        preserveAspectRatio="none"
        height="16"
@@ -207,25 +150,19 @@ L6jeDD0dxAiLAAAAAElFTkSuQmCC
     <path
        style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#123596;stroke-width:1.02499998;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="m 0.5,1039.3622 1,1.5124 v 6.9751 h 12 v -6.9751 l 1,-1.5124"
-       id="path4168"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccc" />
+       id="path4168" />
     <path
        style="fill:url(#linearGradient7872);stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1"
        d="m 3.6254385,1038.9093 4.7427119,-0.046 -0.7524495,-1.8697 -3.0325994,-0.068 z"
-       id="path7864"
-       inkscape:connector-curvature="0" />
+       id="path7864" />
     <path
        style="fill:none;stroke:url(#linearGradient7834);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
        d="M 3,1038.8622 H 9"
-       id="path7826"
-       inkscape:connector-curvature="0" />
+       id="path7826" />
     <path
        id="path4224-0"
        style="fill:none;fill-rule:evenodd;stroke:url(#linearGradient7808);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 0,1038.8622 h 3.5 l 1,-2 h 3 l 1,2 H 15"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccc" />
+       d="m 0,1038.8622 h 3.5 l 1,-2 h 3 l 1,2 H 15" />
     <rect
        style="opacity:0.58;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect7836-8"
@@ -241,18 +178,14 @@ L6jeDD0dxAiLAAAAAElFTkSuQmCC
        x="4.5"
        y="1042.8622" />
     <path
-       inkscape:connector-curvature="0"
        id="path7854"
        style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:medium;line-height:1.25;font-family:Arial;-inkscape-font-specification:'Arial Bold';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1"
-       d="M 7.9938082,1049.3622 H 7 v -4 H 6 v -1 h 1.9938082 z"
-       sodipodi:nodetypes="ccccccc" />
+       d="M 7.9938082,1049.3622 H 7 v -4 H 6 v -1 h 1.9938082 z" />
     <path
-       inkscape:connector-curvature="0"
        id="path7856"
        style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:medium;line-height:1.25;font-family:Arial;-inkscape-font-specification:'Arial Bold';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1"
        d="m 8.9999999,1049.3622 v -1 h 1 v 1 z" />
     <path
-       inkscape:connector-curvature="0"
        id="path7858"
        style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:medium;line-height:1.25;font-family:Arial;-inkscape-font-specification:'Arial Bold';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1"
        d="m 12.5,1044.3622 q 0.671219,0 1.04937,0.5077 0.45063,0.6011 0.45063,1.994 0,1.3894 -0.453781,1.9973 -0.375,0.501 -1.046219,0.501 -0.67437,0 -1.087184,-0.5478 Q 11,1048.2633 11,1046.8538 q 0,-1.3828 0.453782,-1.9906 0.375,-0.501 1.046218,-0.501 z m 0,0.7782 q -0.160713,0 -0.286764,0.1102 -0.126051,0.1069 -0.195379,0.3875 -0.09138,0.364 -0.09138,1.2258 0,0.8617 0.08194,1.1856 0.08194,0.3208 0.204831,0.4276 0.126051,0.1069 0.286765,0.1069 0.160714,0 0.286764,-0.1069 0.126051,-0.1103 0.195379,-0.3908 0.09138,-0.3607 0.09138,-1.2224 0,-0.8618 -0.08194,-1.1824 -0.08194,-0.324 -0.207984,-0.4309 -0.122898,-0.1102 -0.283612,-0.1102 z" />
diff --git a/apitools/org.eclipse.pde.api.tools.ui/icons/full/obj16/category_menu.svg b/apitools/org.eclipse.pde.api.tools.ui/icons/full/obj16/category_menu.svg
index ece52eb34cb..5a753857413 100644
--- a/apitools/org.eclipse.pde.api.tools.ui/icons/full/obj16/category_menu.svg
+++ b/apitools/org.eclipse.pde.api.tools.ui/icons/full/obj16/category_menu.svg
@@ -2,20 +2,16 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="category_menu.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
@@ -52,7 +48,6 @@
          id="stop4736" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4732"
        id="linearGradient4738"
        x1="378.39279"
@@ -69,8 +64,7 @@
        gradientTransform="translate(18.403556,-37.37381)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient4755"
-       xlink:href="#linearGradient4814"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4814" />
     <linearGradient
        y2="509.39972"
        x2="378.39279"
@@ -79,31 +73,8 @@
        gradientTransform="translate(18.403556,-55.112769)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient4789"
-       xlink:href="#linearGradient4808"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4808" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="31.999999"
-     inkscape:cx="9.7384675"
-     inkscape:cy="8.2245465"
-     inkscape:document-units="px"
-     inkscape:current-layer="g4803"
-     showgrid="true"
-     inkscape:window-width="1440"
-     inkscape:window-height="1036"
-     inkscape:window-x="1329"
-     inkscape:window-y="365"
-     inkscape:window-maximized="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3962" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -117,8 +88,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
@@ -162,8 +131,6 @@
          id="g3004"
          transform="translate(-2.8912837,0)">
         <path
-           sodipodi:nodetypes="cccccccccscccc"
-           inkscape:connector-curvature="0"
            id="path4917"
            d="m 385.41478,456.68297 -9.22426,3.05897 -7.3916,6.49565 -2.68785,9.63148 0.44797,5.15172 3.13583,5.59969 6.27166,3.35982 6.94362,-1.11994 5.5997,-1.34393 c 0,0 12.02949,-11.19686 11.8896,-14.40082 -0.19915,-4.56128 0,-7.78755 0,-7.78755 l -2.72861,-5.60203 -5.49566,-2.83265 z"
            style="fill:#ffffff;fill-opacity:1;stroke:none" />
@@ -171,7 +138,6 @@
            id="text4820"
            style="font-size:39.59736252px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#3a78ad;fill-opacity:1;stroke:none;display:inline;font-family:Sans">
           <path
-             inkscape:connector-curvature="0"
              id="path4920"
              style="font-style:italic;font-variant:normal;font-weight:bold;font-stretch:normal;fill:#3a78ad;font-family:Nimbus Sans L;-inkscape-font-specification:Nimbus Sans L Bold Italic"
              d="m 391.25933,463.92131 -1.06913,2.33625 c -0.79194,-1.97987 -1.86108,-2.73222 -3.84094,-2.73222 -3.08859,0 -6.57317,1.90068 -9.30538,5.06846 -2.21745,2.61343 -3.56376,5.58323 -3.56376,7.95907 0,3.16779 2.21745,5.38524 5.42483,5.38524 2.17786,0 4.35572,-0.98993 6.29599,-2.8906 0.59396,1.82147 2.05906,2.77181 4.27651,2.77181 3.24698,0 6.65236,-1.97987 9.46377,-5.42484 2.29664,-2.81141 3.48457,-6.17719 3.48457,-9.74095 0,-2.57382 -0.87115,-4.94967 -2.65303,-7.08793 -2.73221,-3.36577 -6.61276,-5.02886 -11.68122,-5.02886 -6.49396,0 -12.71076,2.69262 -17.22485,7.4443 -4.03893,4.23692 -6.41477,9.74096 -6.41477,14.88861 0,3.36577 1.34631,6.57317 3.76175,8.83021 2.69261,2.57383 6.29598,3.76175 11.28525,3.76175 3.76174,0 6.77115,-0.55436 9.78054,-1.78188 l -0.47516,-3.12819 c -3.72215,1.18792 -5.90001,1.62349 -8.39465,1.62349 -7.04832,0 -11.998,-4.11813 -11.998,-9.89934 0,-3.56376 1.46511,-7.64229 3.92014,-11.04766 3.48457,-4.79128 8.63223,-7.40471 14.61143,-7.40471 4.15772,0 6.96914,1.10873 9.30538,3.60336 1.66309,1.78188 2.49463,3.76175 2.49463,5.78121 0,2.45504 -1.02953,5.22686 -2.73221,7.44431 -1.78188,2.29664 -4.11813,3.88054 -5.78122,3.88054 -0.91074,0 -1.5443,-0.55436 -1.5443,-1.38591 0,-0.55436 0.0792,-0.83154 0.75235,-2.13825 l 5.38524,-11.08727 -3.56376,0 m -5.70202,2.45504 c 1.5443,0.0792 2.57383,1.18792 2.57383,2.77182 0,1.62349 -0.98994,3.92014 -2.49463,5.9 -1.70269,2.29665 -3.76175,3.60336 -5.54363,3.60336 -1.5839,0 -2.65303,-1.26712 -2.65303,-3.12819 0,-4.03893 4.71209,-9.34498 8.11746,-9.14699" />
diff --git a/apitools/org.eclipse.pde.api.tools.ui/icons/full/obj16/correction_change.svg b/apitools/org.eclipse.pde.api.tools.ui/icons/full/obj16/correction_change.svg
index 991a1baa14b..5371a43509d 100644
--- a/apitools/org.eclipse.pde.api.tools.ui/icons/full/obj16/correction_change.svg
+++ b/apitools/org.eclipse.pde.api.tools.ui/icons/full/obj16/correction_change.svg
@@ -2,49 +2,20 @@
 <!-- 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="16"
    height="16"
    id="svg4223"
    version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="correction_change.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4225">
     <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3837">
-      <stop
-         style="stop-color:#6f8db9;stop-opacity:1;"
-         offset="0"
-         id="stop3839" />
-      <stop
-         style="stop-color:#1b639e;stop-opacity:1"
-         offset="1"
-         id="stop3841" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3829">
-      <stop
-         style="stop-color:#8297bc;stop-opacity:1"
-         offset="0"
-         id="stop3831" />
-      <stop
-         style="stop-color:#6c81ad;stop-opacity:1"
-         offset="1"
-         id="stop3833" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3047"
-       inkscape:collect="always">
+       id="linearGradient3047">
       <stop
          id="stop3049"
          offset="0"
@@ -54,31 +25,6 @@
          offset="1"
          style="stop-color:#359b58;stop-opacity:1" />
     </linearGradient>
-    <linearGradient
-       id="linearGradient23102">
-      <stop
-         style="stop-color:#c9473e;stop-opacity:1"
-         offset="0"
-         id="stop23104" />
-      <stop
-         id="stop23118"
-         offset="0.25388375"
-         style="stop-color:#f35863;stop-opacity:1" />
-      <stop
-         style="stop-color:#f6928e;stop-opacity:1"
-         offset="1"
-         id="stop23106" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5103-3-7"
-       id="linearGradient9563"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(19.911612,-20)"
-       x1="12.339488"
-       y1="1043.0511"
-       x2="12.339488"
-       y2="1048.0511" />
     <linearGradient
        id="linearGradient5103-3-7">
       <stop
@@ -99,210 +45,6 @@
          id="stop5107-7-48" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8562"
-       id="linearGradient9565"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(19.911612,-40)"
-       x1="11.339488"
-       y1="1064.0511"
-       x2="11.339488"
-       y2="1067.0511" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient8562">
-      <stop
-         style="stop-color:#6994ad;stop-opacity:1"
-         offset="0"
-         id="stop8564" />
-      <stop
-         style="stop-color:#005596;stop-opacity:1"
-         offset="1"
-         id="stop8566" />
-    </linearGradient>
-    <linearGradient
-       y2="1067.0511"
-       x2="11.339488"
-       y1="1064.0511"
-       x1="11.339488"
-       gradientTransform="translate(19.911612,-40)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient6482"
-       xlink:href="#linearGradient3047"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3829"
-       id="linearGradient3835"
-       x1="52.177807"
-       y1="-1019.7672"
-       x2="56.177807"
-       y2="-1019.7672"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3837"
-       id="linearGradient3843"
-       x1="53.177807"
-       y1="-1022.2672"
-       x2="53.177807"
-       y2="-1017.2672"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3837"
-       id="linearGradient3851"
-       gradientUnits="userSpaceOnUse"
-       x1="53.177807"
-       y1="-1022.2672"
-       x2="53.177807"
-       y2="-1017.2672" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3829"
-       id="linearGradient3853"
-       gradientUnits="userSpaceOnUse"
-       x1="52.177807"
-       y1="-1019.7672"
-       x2="56.177807"
-       y2="-1019.7672" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3047"
-       id="linearGradient3861"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,-1,-6.266193,2108.6294)"
-       x1="11.339488"
-       y1="1064.0511"
-       x2="11.339488"
-       y2="1067.0511" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5103-3-7"
-       id="linearGradient3864"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,-1,-6.266193,2088.6294)"
-       x1="12.339488"
-       y1="1043.0511"
-       x2="12.339488"
-       y2="1048.0511" />
-    <linearGradient
-       id="linearGradient5103-3-7-7">
-      <stop
-         style="stop-color:#96b956;stop-opacity:1"
-         offset="0"
-         id="stop5105-5-4-4" />
-      <stop
-         id="stop7550-07-0-0"
-         offset="0.26694915"
-         style="stop-color:#c6d560;stop-opacity:1" />
-      <stop
-         id="stop7548-6-9-9"
-         offset="0.51694918"
-         style="stop-color:#cfdc63;stop-opacity:1" />
-      <stop
-         style="stop-color:#abca52;stop-opacity:1"
-         offset="1"
-         id="stop5107-7-48-4" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3047-8"
-       id="linearGradient3861-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,-1,-6.266193,2108.6294)"
-       x1="11.339488"
-       y1="1064.0511"
-       x2="11.339488"
-       y2="1067.0511" />
-    <linearGradient
-       id="linearGradient3047-8"
-       inkscape:collect="always">
-      <stop
-         id="stop3049-2"
-         offset="0"
-         style="stop-color:#146d39;stop-opacity:1" />
-      <stop
-         id="stop3051-4"
-         offset="1"
-         style="stop-color:#359b58;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3829-7"
-       id="linearGradient3853-2"
-       gradientUnits="userSpaceOnUse"
-       x1="52.177807"
-       y1="-1019.7672"
-       x2="56.177807"
-       y2="-1019.7672" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3829-7">
-      <stop
-         style="stop-color:#8297bc;stop-opacity:1"
-         offset="0"
-         id="stop3831-6" />
-      <stop
-         style="stop-color:#6c81ad;stop-opacity:1"
-         offset="1"
-         id="stop3833-1" />
-    </linearGradient>
-    <mask
-       maskUnits="userSpaceOnUse"
-       id="mask3991">
-      <g
-         transform="matrix(1,0,0,-1,-46.177805,2068.6294)"
-         id="g3993"
-         style="fill:#ffffff">
-        <rect
-           style="fill:#ffffff;fill-opacity:1;stroke:none"
-           id="rect3995"
-           width="10"
-           height="5"
-           x="48.177807"
-           y="-1022.2672"
-           transform="scale(1,-1)" />
-        <rect
-           style="fill:#ffffff;fill-opacity:1;stroke:none"
-           id="rect3997"
-           width="8"
-           height="3"
-           x="49.177807"
-           y="-1021.2672"
-           transform="scale(1,-1)" />
-        <rect
-           style="fill:#ffffff;fill-opacity:1;stroke:none"
-           id="rect3999"
-           width="1"
-           height="1"
-           x="50.177807"
-           y="-1020.2672"
-           transform="scale(1,-1)" />
-        <rect
-           style="fill:#ffffff;fill-opacity:1;stroke:none"
-           id="rect4001"
-           width="4"
-           height="1"
-           x="52.177807"
-           y="-1020.2672"
-           transform="scale(1,-1)" />
-      </g>
-    </mask>
-    <filter
-       inkscape:collect="always"
-       id="filter4003"
-       x="-0.16799654"
-       width="1.3359931"
-       y="-0.19385077"
-       height="1.3877015">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="0.65774696"
-         id="feGaussianBlur4005" />
-    </filter>
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient3047"
        id="linearGradient3081"
        gradientUnits="userSpaceOnUse"
@@ -312,7 +54,6 @@
        x2="11.339488"
        y2="1067.0511" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient5103-3-7"
        id="linearGradient3083"
        gradientUnits="userSpaceOnUse"
@@ -322,33 +63,6 @@
        x2="12.339488"
        y2="1048.0511" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="31.678384"
-     inkscape:cx="4.01953"
-     inkscape:cy="10.558477"
-     inkscape:document-units="px"
-     inkscape:current-layer="g3866"
-     showgrid="true"
-     inkscape:window-width="1574"
-     inkscape:window-height="1098"
-     inkscape:window-x="115"
-     inkscape:window-y="119"
-     inkscape:window-maximized="0"
-     inkscape:snap-global="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid4999"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
   <metadata
      id="metadata4228">
     <rdf:RDF>
@@ -362,21 +76,15 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      transform="translate(0,-1036.3622)">
     <g
        id="g3866">
       <path
-         sodipodi:nodetypes="cccccccccc"
-         inkscape:connector-curvature="0"
          id="path4108-1"
          d="m 5.519236,1047.6671 -0.816057,-1.9944 0.88243,-2.3985 3.398198,0.051 0,-1.5313 3.781143,2.432 -3.781143,3.0027 0,-1.5156 -2.544844,0 z"
          style="fill:url(#linearGradient3083);fill-opacity:1;stroke:none;display:inline" />
       <path
-         sodipodi:nodetypes="cccccccccccccccccccccc"
-         inkscape:connector-curvature="0"
          id="path4108-1-6"
          d="m 7.983807,1047.8309 0,-1.5156 -0.07965,0 c -1.711191,0 -1.9036885,1.2987 -1.9036885,2.075 l -1,0 c -1.937334,-3.08 -0.6777005,-6.0631 1.8476505,-6.0884 l 1.135685,0.023 0,-1.5313 c 0,-0.6519 0.740915,-0.6375 1.5,0 l 3.923255,3.4983 -3.923255,3.5386 c -0.760225,0.7602 -1.5,0.5203 -1.5,0 z m 1,-1 2.985755,-2.5386 -2.985755,-2.4983 0,1.5313 -2.12809,0.07 c -1.65655,0 -2.276462,2.3386 -1.391431,3.4245 0.477391,-0.9138 0.93524,-1.5048 2.407536,-1.5048 l 1.111985,0 z"
          style="fill:url(#linearGradient3081);fill-opacity:1;stroke:none;display:inline" />
diff --git a/apitools/org.eclipse.pde.api.tools.ui/icons/full/obj16/eclipse16.svg b/apitools/org.eclipse.pde.api.tools.ui/icons/full/obj16/eclipse16.svg
index f5b63bb40dd..39e612e12cf 100644
--- a/apitools/org.eclipse.pde.api.tools.ui/icons/full/obj16/eclipse16.svg
+++ b/apitools/org.eclipse.pde.api.tools.ui/icons/full/obj16/eclipse16.svg
@@ -7,12 +7,6 @@
    viewBox="0 0 1.3617021 1.3617021"
    version="1.1"
    id="SVGRoot"
-   sodipodi:docname="eclipse16.svg"
-   inkscape:export-xdpi="192"
-   inkscape:export-ydpi="192"
-   inkscape:version="1.3.2 (091e20e, 2023-11-25, custom)"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
@@ -71,91 +65,7 @@
          style="stop-color:#2C2255"
          id="stop48" />
     </linearGradient>
-    <linearGradient
-       id="linearGradient4675"
-       gradientUnits="userSpaceOnUse"
-       x1="131.3853"
-       y1="358.5762"
-       x2="131.3853"
-       y2="432.21109"
-       gradientTransform="matrix(1,0,0,-1,0,793)">
-      <stop
-         offset="0.3033"
-         style="stop-color:#473788"
-         id="stop4671" />
-      <stop
-         offset="0.872"
-         style="stop-color:#2C2255"
-         id="stop4673" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4682"
-       gradientUnits="userSpaceOnUse"
-       x1="131.3853"
-       y1="358.5752"
-       x2="131.3853"
-       y2="432.21011"
-       gradientTransform="matrix(1,0,0,-1,0,793)">
-      <stop
-         offset="0.3033"
-         style="stop-color:#473788"
-         id="stop4678" />
-      <stop
-         offset="0.872"
-         style="stop-color:#2C2255"
-         id="stop4680" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4689"
-       gradientUnits="userSpaceOnUse"
-       x1="131.3853"
-       y1="358.57709"
-       x2="131.3853"
-       y2="432.2084"
-       gradientTransform="matrix(1,0,0,-1,0,793)">
-      <stop
-         offset="0.3033"
-         style="stop-color:#473788"
-         id="stop4685" />
-      <stop
-         offset="0.8631"
-         style="stop-color:#2C2255"
-         id="stop4687" />
-    </linearGradient>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="32"
-     inkscape:cx="7.3906251"
-     inkscape:cy="5.2343751"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="1682"
-     inkscape:window-height="1033"
-     inkscape:window-x="220"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     inkscape:grid-bbox="true"
-     showguides="false"
-     inkscape:pagecheckerboard="0"
-     inkscape:showpageshadow="0"
-     inkscape:deskcolor="#505050">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2674"
-       originx="0"
-       originy="0"
-       spacingy="1"
-       spacingx="1"
-       units="px"
-       visible="false" />
-  </sodipodi:namedview>
   <metadata
      id="metadata1981">
     <rdf:RDF>
@@ -168,63 +78,50 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1">
     <path
-       inkscape:connector-curvature="0"
        style="fill:#2c2255;stroke-width:0.133163"
        d="M 0.40346119,0.84984676 H 0.21424145 c 0.0250542,0.0911041 0.0715448,0.17275664 0.13960955,0.24492124 0.10850978,0.1150391 0.23898823,0.1724809 0.39157083,0.1724809 0.0305008,0 0.0600526,-0.00242 0.0887563,-0.00699 C 0.94910676,1.2418648 1.0497284,1.186783 1.1359419,1.0947681 1.2044471,1.022627 1.2512661,0.94095104 1.2765119,0.84984685 H 1.1997235 1.0874392 Z"
        id="path2" />
     <path
        d="m 0.29912249,0.57740797 h -0.0988478 c -0.003616,0.0230246 -0.00608,0.0465284 -0.007199,0.0706312 h 0.1174827 0.0589335 0.85066471 0.077648 c -0.00113,-0.0241028 -0.00359,-0.0476066 -0.00724,-0.0706312"
        id="path4"
-       inkscape:connector-curvature="0"
        style="fill:#2c2255;stroke-width:0.133164" />
     <path
        d="m 0.19307616,0.71362698 c 0.001119,0.0241148 0.003571,0.0476186 0.007199,0.0706312 h 0.10276911 0.0778961 0.83227843 0.077365 c 0.00364,-0.0230126 0.00612,-0.0465164 0.00726,-0.0706312"
        id="path6"
-       inkscape:connector-curvature="0"
        style="fill:#2c2255;stroke-width:0.133164" />
     <path
-       inkscape:connector-curvature="0"
        style="fill:#2c2255;stroke-width:0.133163"
        d="M 1.2765345,0.51180881 C 1.2513112,0.42045308 1.2044808,0.33841738 1.1359418,0.26574966 1.0499544,0.17459763 0.94961507,0.11991109 0.83505943,0.1015106 0.80608483,0.0968525 0.77623933,0.0944056 0.74542233,0.0944056 c -0.1525826,0 -0.28307238,0.05712998 -0.39157084,0.17134289 -0.0680866,0.0726676 -0.11460096,0.1547034 -0.13964335,0.24605915"
        id="path10" />
     <path
        d="m 0.16022485,0.68085105 c 0,-0.30935886 0.21917824,-0.56640322 0.50430771,-0.61161389 -0.007074,-2.7553e-4 -0.0141825,-5.7502e-4 -0.0213245,-5.7502e-4 -0.31996972,0 -0.57937867,0.2740912 -0.57937867,0.61218891 0,0.33810975 0.25939765,0.61218895 0.57937867,0.61218895 0.007165,0 0.0142729,-2.875e-4 0.0213697,-5.63e-4 C 0.37940309,1.2472663 0.16022485,0.9902219 0.16022485,0.68085105 Z"
        id="path12"
-       inkscape:connector-curvature="0"
        style="fill:#f7941e;stroke-width:0.133164" />
     <path
        d="M 1.1213884,0.6480272 C 1.1195384,0.6238166 1.1156884,0.60020499 1.1099524,0.577396 H 0.38093999 c -0.005741,0.022797 -0.009594,0.0464086 -0.0114477,0.0706312 z"
        id="path37"
-       inkscape:connector-curvature="0"
        style="fill:url(#SVGID_1_);stroke-width:0.133164" />
     <path
        d="M 1.1213884,0.71362698 H 0.36950362 c 0.001853,0.0242106 0.005684,0.0478222 0.0114364,0.0706312 H 1.1099633 c 0.00574,-0.022809 0.00957,-0.0464206 0.011425,-0.0706312 z"
        id="path44"
-       inkscape:connector-curvature="0"
        style="fill:url(#SVGID_2_);stroke-width:0.133164" />
     <path
        d="m 0.745446,1.080823 c 0.15139629,0 0.2818975,-0.0945544 0.3419949,-0.23097701 H 0.4034511 C 0.46354855,0.98626865 0.59404972,1.080823 0.745446,1.080823 Z"
        id="path51"
-       inkscape:connector-curvature="0"
        style="fill:url(#SVGID_3_);stroke-width:0.133164" />
     <path
        d="M 0.31377957,0.71362698 H 0.36897247 1.122801 1.22183 1.297059 c 5.198e-4,-0.0104342 8.137e-4,-0.0209402 8.137e-4,-0.0315181 0,-0.0114404 -3.956e-4,-0.022785 -0.00101,-0.0340817 H 1.2218182 1.1227897 0.36896118 0.30986951 0.19307616 c -6.1025e-4,0.0112847 -0.001006,0.0226413 -0.001006,0.0340817 0,0.0105779 2.9382e-4,0.0210839 8.1365e-4,0.0315181 z"
        id="path55"
-       inkscape:connector-curvature="0"
        style="fill:#ffffff;stroke-width:0.133164" />
     <path
        d="M 0.40124746,0.51180818 H 0.21419728 c -0.006148,0.0213595 -0.0101142,0.04327 -0.0139225,0.0655998 h 0.096339 0.0820322 0.73092182 0.103515 0.073986 c -0.00382,-0.0223178 -0.00874,-0.0442283 -0.014872,-0.0655998"
        id="path57"
-       inkscape:connector-curvature="0"
        style="fill:#ffffff;stroke-width:0.133164" />
     <path
        d="M 1.2160096,0.7842462 H 1.1124947 0.38158413 0.30347328 0.20026344 c 0.003707,0.0223178 0.007922,0.0442164 0.0139677,0.0655998 h 0.18993187 0.68575279 0.1125781 0.073319 c 0.00603,-0.0213714 0.010905,-0.04327 0.014623,-0.0655998 z"
        id="path59"
-       inkscape:connector-curvature="0"
        style="fill:#ffffff;stroke-width:0.133164" />
   </g>
 </svg>
diff --git a/apitools/org.eclipse.pde.api.tools.ui/icons/full/obj16/frgmt_obj.svg b/apitools/org.eclipse.pde.api.tools.ui/icons/full/obj16/frgmt_obj.svg
index 87758e9fcb5..88b9b1fc152 100644
--- a/apitools/org.eclipse.pde.api.tools.ui/icons/full/obj16/frgmt_obj.svg
+++ b/apitools/org.eclipse.pde.api.tools.ui/icons/full/obj16/frgmt_obj.svg
@@ -2,20 +2,16 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="frgmt_obj.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
@@ -34,7 +30,6 @@
          style="stop-color:#763db7;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10448-9-7-0-5"
        id="linearGradient10770-6"
        gradientUnits="userSpaceOnUse"
@@ -59,22 +54,6 @@
          id="stop10452-22-7-8-4" />
     </linearGradient>
     <linearGradient
-       id="linearGradient10440-1-0-0-3">
-      <stop
-         style="stop-color:#ae7603;stop-opacity:1;"
-         offset="0"
-         id="stop10442-43-2-0-9" />
-      <stop
-         id="stop10521-1-2-5-3"
-         offset="0.5"
-         style="stop-color:#e8d8a3;stop-opacity:1" />
-      <stop
-         style="stop-color:#bb9221;stop-opacity:1"
-         offset="1"
-         id="stop10444-3-4-0-4" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10748-8"
        id="linearGradient10774-5"
        gradientUnits="userSpaceOnUse"
@@ -107,22 +86,6 @@
          style="stop-color:#e5b630;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       id="linearGradient10440-1-3-4">
-      <stop
-         style="stop-color:#ae7603;stop-opacity:1;"
-         offset="0"
-         id="stop10442-43-0-5" />
-      <stop
-         id="stop10521-1-4-7"
-         offset="0.5"
-         style="stop-color:#e8d8a3;stop-opacity:1" />
-      <stop
-         style="stop-color:#bb9221;stop-opacity:1"
-         offset="1"
-         id="stop10444-3-2-0" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10448-90"
        id="linearGradient10778-6"
        gradientUnits="userSpaceOnUse"
@@ -155,52 +118,6 @@
          id="stop10452-1" />
     </linearGradient>
     <linearGradient
-       id="linearGradient10440-18">
-      <stop
-         style="stop-color:#ae7603;stop-opacity:1;"
-         offset="0"
-         id="stop10442-8" />
-      <stop
-         id="stop10521-7"
-         offset="0.5"
-         style="stop-color:#e8d8a3;stop-opacity:1" />
-      <stop
-         style="stop-color:#bb9221;stop-opacity:1"
-         offset="1"
-         id="stop10444-0" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10414-9">
-      <stop
-         style="stop-color:#5078b9;stop-opacity:1;"
-         offset="0"
-         id="stop10416-3" />
-      <stop
-         id="stop10422-8"
-         offset="0.5"
-         style="stop-color:#6d8cbd;stop-opacity:1" />
-      <stop
-         style="stop-color:#5f88c9;stop-opacity:1"
-         offset="1"
-         id="stop10418-4" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10432-3">
-      <stop
-         id="stop10434-4"
-         offset="0"
-         style="stop-color:#1f4d9a;stop-opacity:1" />
-      <stop
-         style="stop-color:#4e6da1;stop-opacity:1"
-         offset="0.5"
-         id="stop10436-2" />
-      <stop
-         id="stop10438-9"
-         offset="1"
-         style="stop-color:#567ebc;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10157-6"
        id="linearGradient10786-1"
        gradientUnits="userSpaceOnUse"
@@ -225,22 +142,6 @@
          id="stop10161-55" />
     </linearGradient>
     <linearGradient
-       id="linearGradient10396-5">
-      <stop
-         style="stop-color:#1b3e79;stop-opacity:1;"
-         offset="0"
-         id="stop10398-7" />
-      <stop
-         id="stop10404-9"
-         offset="0.5"
-         style="stop-color:#728fbf;stop-opacity:1" />
-      <stop
-         style="stop-color:#1f4d9a;stop-opacity:1"
-         offset="1"
-         id="stop10400-9" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10157-2-5"
        id="linearGradient10790-8"
        gradientUnits="userSpaceOnUse"
@@ -265,7 +166,6 @@
          id="stop10161-5-0" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10149-39-0"
        id="linearGradient10792-6"
        gradientUnits="userSpaceOnUse"
@@ -275,7 +175,6 @@
        x2="322.875"
        y2="504.44818" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient10149-39-0">
       <stop
          style="stop-color:#6936ae;stop-opacity:1"
@@ -287,22 +186,6 @@
          id="stop10153-72-3" />
     </linearGradient>
     <linearGradient
-       id="linearGradient10149-6-5-4">
-      <stop
-         style="stop-color:#1f4d9a;stop-opacity:1"
-         offset="0"
-         id="stop10151-5-7-2" />
-      <stop
-         id="stop10394-3"
-         offset="0.5"
-         style="stop-color:#b9c7df;stop-opacity:1" />
-      <stop
-         style="stop-color:#567ebc;stop-opacity:1"
-         offset="1"
-         id="stop10153-8-1-2" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4284"
        id="linearGradient10790-8-2"
        gradientUnits="userSpaceOnUse"
@@ -312,29 +195,6 @@
        x2="305"
        y2="545.35248" />
   </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="8.0832705"
-     inkscape:cy="12.606498"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1349"
-     inkscape:window-height="978"
-     inkscape:window-x="979"
-     inkscape:window-y="516"
-     inkscape:window-maximized="0"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid4210" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -348,8 +208,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
@@ -366,18 +224,14 @@
          id="rect10007-0-74-2-7-6"
          style="fill:url(#linearGradient10770-6);fill-opacity:1;stroke:none;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
       <path
-         inkscape:connector-curvature="0"
          id="path4313-8-8"
          d="m 12.648438,1043.3652 0,1 3.351562,0 0,-1 -3.351562,0 z"
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
       <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
          id="path4313-8-8-7"
          d="m 12.981809,1043.3594 0,3.0195 1.01551,0 0,-3.0195 z"
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.94926554px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
       <path
-         inkscape:connector-curvature="0"
          id="path4313-5-1-8"
          d="m 15.992188,1045.3613 -3.359376,0.031 0.0098,1 3.359375,-0.031 -0.0098,-1 z"
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#9e7400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
@@ -391,12 +245,10 @@
          id="rect10007-0-74-2-7"
          style="fill:url(#linearGradient10774-5);fill-opacity:1;stroke:none;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
       <path
-         inkscape:connector-curvature="0"
          id="path4313-5-1"
          d="m 13.005859,1046.3711 -3.3593746,0.031 0.00977,1 3.3593746,-0.031 -0.0098,-1 z"
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#9e7400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
       <path
-         inkscape:connector-curvature="0"
          id="path4313-8"
          d="m 11.991204,1043.3634 -2.3544852,0.028 0.00685,0.9091 2.3544842,-0.028 -0.0069,-0.909 z"
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
@@ -437,18 +289,14 @@
          id="rect10007-0-74"
          style="fill:url(#linearGradient10786-1);fill-opacity:1;stroke:none;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
       <path
-         inkscape:connector-curvature="0"
          id="path4313"
          d="m 11.042833,1043.3647 -3.4061142,0.029 0.00991,0.9204 3.4061132,-0.028 -0.0099,-0.9205 z"
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
       <path
-         inkscape:connector-curvature="0"
          id="path4313-5"
          d="m 11.001953,1047.3613 -3.3593749,0.031 0.00977,1 3.3593749,-0.031 -0.0098,-1 z"
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#9e7400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
       <path
-         sodipodi:nodetypes="cssssc"
-         inkscape:connector-curvature="0"
          id="rect10007-6"
          d="m 6.4755132,1043.9833 c 1.0259795,0 2.0241511,-0.1891 2.0241511,0.834 l 0,3.5451 c 0,0.8271 -0.6658339,1.4929 -1.4929011,1.4929 -0.8270672,0 -1.4929011,-0.6658 -1.4929011,-1.4929 l 0,-3.5537"
          style="fill:url(#linearGradient10790-8);fill-opacity:1;stroke:url(#linearGradient10792-6);stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
@@ -460,14 +308,10 @@
          id="rect10007-6-6"
          style="display:inline;fill:url(#linearGradient10790-8-2);fill-opacity:1;stroke:none;stroke-width:3.58380508;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
       <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
          id="path4313-8-8-7-8"
          d="m 11.003629,1043.3647 0,3.01 1.000277,0 0,-3.01 z"
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:0.64640886;fill-rule:evenodd;stroke:none;stroke-width:0.97351193px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
       <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
          id="path4313-8-8-7-5"
          d="m 11.992245,1042.3524 0,1.0351 1.01551,0 0,-1.0351 z"
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.94926554px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
diff --git a/apitools/org.eclipse.pde.api.tools.ui/icons/full/obj16/library_obj.svg b/apitools/org.eclipse.pde.api.tools.ui/icons/full/obj16/library_obj.svg
index dc249f69aa1..f877e2e190e 100644
--- a/apitools/org.eclipse.pde.api.tools.ui/icons/full/obj16/library_obj.svg
+++ b/apitools/org.eclipse.pde.api.tools.ui/icons/full/obj16/library_obj.svg
@@ -2,24 +2,19 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="library_obj.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4918-5"
        id="linearGradient4975-9"
        gradientUnits="userSpaceOnUse"
@@ -40,7 +35,6 @@
          id="stop4922-9" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4907-9"
        id="linearGradient4977-3"
        gradientUnits="userSpaceOnUse"
@@ -61,7 +55,6 @@
          id="stop4911-0" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4928-4"
        id="linearGradient4979-8"
        gradientUnits="userSpaceOnUse"
@@ -82,7 +75,6 @@
          id="stop4932-8" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4938-8"
        id="linearGradient4981-3"
        gradientUnits="userSpaceOnUse"
@@ -121,34 +113,8 @@
        gradientTransform="translate(-4.5808058,0.68500969)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient5020"
-       xlink:href="#linearGradient4961-6"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4961-6" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="11.313709"
-     inkscape:cx="0.52179164"
-     inkscape:cy="14.434565"
-     inkscape:document-units="px"
-     inkscape:current-layer="g4969"
-     showgrid="true"
-     inkscape:window-width="1395"
-     inkscape:window-height="1016"
-     inkscape:window-x="454"
-     inkscape:window-y="446"
-     inkscape:window-maximized="0"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3948" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -162,8 +128,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
@@ -193,7 +157,6 @@
          id="rect4936"
          style="fill:#0595d3;fill-opacity:1;stroke:url(#linearGradient4981-3);stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
       <path
-         inkscape:connector-curvature="0"
          id="path4949"
          d="m 9.6799362,1040.2751 c 0.08839,-0.044 1.5696578,-0.9063 1.5696578,-0.9063 l 3.976711,10.3859 -1.956435,0.5243 z"
          style="fill:#f0c028;fill-opacity:1;stroke:url(#linearGradient5020);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
diff --git a/apitools/org.eclipse.pde.api.tools.ui/icons/full/obj16/plugin_obj.svg b/apitools/org.eclipse.pde.api.tools.ui/icons/full/obj16/plugin_obj.svg
index 6741d827a52..9e20febec4f 100644
--- a/apitools/org.eclipse.pde.api.tools.ui/icons/full/obj16/plugin_obj.svg
+++ b/apitools/org.eclipse.pde.api.tools.ui/icons/full/obj16/plugin_obj.svg
@@ -2,20 +2,16 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="plugins.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
@@ -34,7 +30,6 @@
          style="stop-color:#809dcb;stop-opacity:0" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10448-9-7-0-5"
        id="linearGradient10770-6"
        gradientUnits="userSpaceOnUse"
@@ -59,22 +54,6 @@
          id="stop10452-22-7-8-4" />
     </linearGradient>
     <linearGradient
-       id="linearGradient10440-1-0-0-3">
-      <stop
-         style="stop-color:#ae7603;stop-opacity:1;"
-         offset="0"
-         id="stop10442-43-2-0-9" />
-      <stop
-         id="stop10521-1-2-5-3"
-         offset="0.5"
-         style="stop-color:#e8d8a3;stop-opacity:1" />
-      <stop
-         style="stop-color:#bb9221;stop-opacity:1"
-         offset="1"
-         id="stop10444-3-4-0-4" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10748-8"
        id="linearGradient10774-5"
        gradientUnits="userSpaceOnUse"
@@ -107,22 +86,6 @@
          style="stop-color:#e5b630;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       id="linearGradient10440-1-3-4">
-      <stop
-         style="stop-color:#ae7603;stop-opacity:1;"
-         offset="0"
-         id="stop10442-43-0-5" />
-      <stop
-         id="stop10521-1-4-7"
-         offset="0.5"
-         style="stop-color:#e8d8a3;stop-opacity:1" />
-      <stop
-         style="stop-color:#bb9221;stop-opacity:1"
-         offset="1"
-         id="stop10444-3-2-0" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10448-90"
        id="linearGradient10778-6"
        gradientUnits="userSpaceOnUse"
@@ -155,22 +118,6 @@
          id="stop10452-1" />
     </linearGradient>
     <linearGradient
-       id="linearGradient10440-18">
-      <stop
-         style="stop-color:#ae7603;stop-opacity:1;"
-         offset="0"
-         id="stop10442-8" />
-      <stop
-         id="stop10521-7"
-         offset="0.5"
-         style="stop-color:#e8d8a3;stop-opacity:1" />
-      <stop
-         style="stop-color:#bb9221;stop-opacity:1"
-         offset="1"
-         id="stop10444-0" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10414-9"
        id="linearGradient10782-3"
        gradientUnits="userSpaceOnUse"
@@ -195,7 +142,6 @@
          id="stop10418-4" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10432-3"
        id="linearGradient10784-2"
        gradientUnits="userSpaceOnUse"
@@ -220,7 +166,6 @@
          style="stop-color:#567ebc;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10157-6"
        id="linearGradient10786-1"
        gradientUnits="userSpaceOnUse"
@@ -245,22 +190,6 @@
          id="stop10161-55" />
     </linearGradient>
     <linearGradient
-       id="linearGradient10396-5">
-      <stop
-         style="stop-color:#1b3e79;stop-opacity:1;"
-         offset="0"
-         id="stop10398-7" />
-      <stop
-         id="stop10404-9"
-         offset="0.5"
-         style="stop-color:#728fbf;stop-opacity:1" />
-      <stop
-         style="stop-color:#1f4d9a;stop-opacity:1"
-         offset="1"
-         id="stop10400-9" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10157-2-5"
        id="linearGradient10790-8"
        gradientUnits="userSpaceOnUse"
@@ -285,7 +214,6 @@
          id="stop10161-5-0" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10149-39-0"
        id="linearGradient10792-6"
        gradientUnits="userSpaceOnUse"
@@ -295,7 +223,6 @@
        x2="322.875"
        y2="504.44818" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient10149-39-0">
       <stop
          style="stop-color:#1d4d9d;stop-opacity:1"
@@ -307,22 +234,6 @@
          id="stop10153-72-3" />
     </linearGradient>
     <linearGradient
-       id="linearGradient10149-6-5-4">
-      <stop
-         style="stop-color:#1f4d9a;stop-opacity:1"
-         offset="0"
-         id="stop10151-5-7-2" />
-      <stop
-         id="stop10394-3"
-         offset="0.5"
-         style="stop-color:#b9c7df;stop-opacity:1" />
-      <stop
-         style="stop-color:#567ebc;stop-opacity:1"
-         offset="1"
-         id="stop10153-8-1-2" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4284"
        id="linearGradient10790-8-2"
        gradientUnits="userSpaceOnUse"
@@ -332,29 +243,6 @@
        x2="305"
        y2="545.35248" />
   </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="47.607658"
-     inkscape:cy="-9.9169213"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1609"
-     inkscape:window-height="978"
-     inkscape:window-x="719"
-     inkscape:window-y="519"
-     inkscape:window-maximized="0"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid4210" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -368,8 +256,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
@@ -385,19 +271,15 @@
     <path
        style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
        d="m 12.648438,1043.3652 0,1 3.351562,0 0,-1 -3.351562,0 z"
-       id="path4313-8-8"
-       inkscape:connector-curvature="0" />
+       id="path4313-8-8" />
     <path
        style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.94926554px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
        d="m 12.981809,1043.3594 0,3.0195 1.01551,0 0,-3.0195 z"
-       id="path4313-8-8-7"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+       id="path4313-8-8-7" />
     <path
        style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#9e7400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
        d="m 15.992188,1045.3613 -3.359376,0.031 0.0098,1 3.359375,-0.031 -0.0098,-1 z"
-       id="path4313-5-1-8"
-       inkscape:connector-curvature="0" />
+       id="path4313-5-1-8" />
     <rect
        style="fill:url(#linearGradient10774-5);fill-opacity:1;stroke:none;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        id="rect10007-0-74-2-7"
@@ -410,13 +292,11 @@
     <path
        style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#9e7400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
        d="m 13.005859,1046.3711 -3.3593746,0.031 0.00977,1 3.359375,-0.031 -0.0098,-1 z"
-       id="path4313-5-1"
-       inkscape:connector-curvature="0" />
+       id="path4313-5-1" />
     <path
        style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
        d="m 12.996094,1042.3633 -3.3593752,0.031 0.00977,1 3.3593746,-0.031 -0.0098,-1 z"
-       id="path4313-8"
-       inkscape:connector-curvature="0" />
+       id="path4313-8" />
     <rect
        style="fill:url(#linearGradient10778-6);fill-opacity:1;stroke:none;stroke-width:1.50161433;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        id="rect10007-0-74-2"
@@ -456,13 +336,11 @@
     <path
        style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
        d="m 10.996094,1041.3613 -3.3593752,0.031 0.00977,1 3.3593746,-0.031 -0.0098,-1 z"
-       id="path4313"
-       inkscape:connector-curvature="0" />
+       id="path4313" />
     <path
        style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#9e7400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
        d="m 11.001953,1047.3613 -3.3593749,0.031 0.00977,1 3.3593752,-0.031 -0.0098,-1 z"
-       id="path4313-5"
-       inkscape:connector-curvature="0" />
+       id="path4313-5" />
     <rect
        ry="1.0288811"
        style="fill:url(#linearGradient10790-8);fill-opacity:1;stroke:url(#linearGradient10792-6);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
@@ -482,8 +360,6 @@
     <path
        style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:0.64640886;fill-rule:evenodd;stroke:none;stroke-width:0.97351193px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
        d="m 11.003629,1043.3647 0,3.01 1.000277,0 0,-3.01 z"
-       id="path4313-8-8-7-8"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+       id="path4313-8-8-7-8" />
   </g>
 </svg>
diff --git a/apitools/org.eclipse.pde.api.tools.ui/icons/full/ovr16/error_ovr.svg b/apitools/org.eclipse.pde.api.tools.ui/icons/full/ovr16/error_ovr.svg
index 73877578b15..95c7326d7a6 100644
--- a/apitools/org.eclipse.pde.api.tools.ui/icons/full/ovr16/error_ovr.svg
+++ b/apitools/org.eclipse.pde.api.tools.ui/icons/full/ovr16/error_ovr.svg
@@ -2,47 +2,17 @@
 <!-- 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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="7"
    height="8"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="error_ovr.svg">
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="256"
-     inkscape:cx="3.8095711"
-     inkscape:cy="2.2892427"
-     inkscape:document-units="px"
-     inkscape:current-layer="g4171"
-     showgrid="true"
-     inkscape:window-width="1236"
-     inkscape:window-height="1004"
-     inkscape:window-x="828"
-     inkscape:window-y="425"
-     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>
@@ -56,8 +26,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      transform="translate(0,-1044.3622)">
     <rect
@@ -73,27 +41,19 @@
          style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
          d="M 2,1 0.96143694,0.98353403 1,2 1,3 2,3 3,3 3,2 3,1 Z"
          transform="translate(0,1044.3622)"
-         id="rect4137"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccccccc" />
+         id="rect4137" />
       <path
-         inkscape:connector-curvature="0"
          style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
          d="m 5.0022321,1045.3622 1.0385631,-0.016 -0.038563,1.0165 0,1 -1,0 -1,0 0,-1 0,-1 z"
-         id="rect4137-2"
-         sodipodi:nodetypes="ccccccccc" />
+         id="rect4137-2" />
       <path
-         inkscape:connector-curvature="0"
          style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
          d="m 2,1051.3667 -1.00084097,0 L 1,1050.3667 l 0,-1 1,0 1,0 0,1 0,1 z"
-         id="rect4137-0"
-         sodipodi:nodetypes="ccccccccc" />
+         id="rect4137-0" />
       <path
-         inkscape:connector-curvature="0"
          style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
          d="m 5.0022321,1051.3667 1.000841,4e-4 -8.41e-4,-1.0009 0,-1 -1,0 -1,0 0,1 0,1 z"
-         id="rect4137-2-5"
-         sodipodi:nodetypes="ccccccccc" />
+         id="rect4137-2-5" />
       <rect
          style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
          id="rect4141"
diff --git a/apitools/org.eclipse.pde.api.tools.ui/icons/full/ovr16/success_ovr.svg b/apitools/org.eclipse.pde.api.tools.ui/icons/full/ovr16/success_ovr.svg
index 66f1dea6cfb..4991bab27b5 100644
--- a/apitools/org.eclipse.pde.api.tools.ui/icons/full/ovr16/success_ovr.svg
+++ b/apitools/org.eclipse.pde.api.tools.ui/icons/full/ovr16/success_ovr.svg
@@ -2,24 +2,19 @@
 <!-- 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="7"
    height="8"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="success_ovr.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4156"
        id="linearGradient4162"
        x1="3.7713745"
@@ -29,7 +24,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(0.99979136,0,0,1.0107427,-1.0170045,-1063.6918)" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4156">
       <stop
          style="stop-color:#81c6a2;stop-opacity:1"
@@ -41,33 +35,6 @@
          id="stop4160" />
     </linearGradient>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="70.375"
-     inkscape:cx="3.5044489"
-     inkscape:cy="4"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer2"
-     showgrid="true"
-     inkscape:window-width="2560"
-     inkscape:window-height="1391"
-     inkscape:window-x="0"
-     inkscape:window-y="1"
-     inkscape:window-maximized="1"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="true"
-     inkscape:snap-bbox="true"
-     inkscape:bbox-nodes="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3999" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -76,32 +43,24 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1044.3622)" />
   <g
-     inkscape:groupmode="layer"
      id="layer2"
-     inkscape:label="Layer 2"
      transform="translate(0,-8)">
     <path
        style="display:inline;opacity:1;fill:url(#linearGradient4162);fill-opacity:1;stroke:#029e4b;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        d="m 0.5,8.5 6.0088978,0 0,6.999965 -6.0088978,0 z"
-       id="rect7768"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+       id="rect7768" />
     <path
        style="display:inline;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:1.5;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none"
        id="path4065"
-       inkscape:connector-curvature="0"
-       d="m 1.761221,12.442778 c 0.4074842,0.627763 1.2262681,2.278541 1.5690748,1.64183 0.4243273,-0.788032 1.9178196,-4.349962 1.9178196,-4.349962"
-       sodipodi:nodetypes="csc" />
+       d="m 1.761221,12.442778 c 0.4074842,0.627763 1.2262681,2.278541 1.5690748,1.64183 0.4243273,-0.788032 1.9178196,-4.349962 1.9178196,-4.349962" />
   </g>
 </svg>
diff --git a/apitools/org.eclipse.pde.api.tools.ui/icons/full/ovr16/warning_ovr.svg b/apitools/org.eclipse.pde.api.tools.ui/icons/full/ovr16/warning_ovr.svg
index 56d9f9e3d99..c856a7df0a2 100644
--- a/apitools/org.eclipse.pde.api.tools.ui/icons/full/ovr16/warning_ovr.svg
+++ b/apitools/org.eclipse.pde.api.tools.ui/icons/full/ovr16/warning_ovr.svg
@@ -2,31 +2,18 @@
 <!-- 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="7"
    height="8"
    id="svg2"
    version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="New document 1">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5081"
-       id="linearGradient5087"
-       x1="3.3833356"
-       y1="7.0159616"
-       x2="3.3833356"
-       y2="0.98171616"
-       gradientUnits="userSpaceOnUse" />
     <linearGradient
        id="linearGradient5081">
       <stop
@@ -43,16 +30,6 @@
          id="stop5085" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5091"
-       id="linearGradient5097"
-       x1="6.3885393"
-       y1="7.2369323"
-       x2="6.3885393"
-       y2="0.39338252"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
        id="linearGradient5091">
       <stop
          style="stop-color:#c6852e;stop-opacity:1"
@@ -71,8 +48,7 @@
        x1="3.3833356"
        gradientUnits="userSpaceOnUse"
        id="linearGradient4230"
-       xlink:href="#linearGradient5081"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient5081" />
     <linearGradient
        gradientTransform="translate(3.8209032e-8,1044.3622)"
        y2="0.39338252"
@@ -81,35 +57,8 @@
        x1="6.3885393"
        gradientUnits="userSpaceOnUse"
        id="linearGradient4232"
-       xlink:href="#linearGradient5091"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient5091" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="31.678384"
-     inkscape:cx="-0.70863259"
-     inkscape:cy="2.3717404"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="945"
-     inkscape:window-height="1125"
-     inkscape:window-x="75"
-     inkscape:window-y="75"
-     inkscape:window-maximized="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3024"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -118,36 +67,25 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      transform="translate(0,-1044.3622)">
     <path
        style="fill:url(#linearGradient4230);fill-opacity:1;stroke:url(#linearGradient4232);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
        d="m 2.8125,1045.2684 -2.03124996,4.0938 c -0.60602934,1.0251 -0.19281594,2.4817 0.93749996,2.5 l 1.28125,0 1,0 1.28125,0 c 1.1303165,-0.018 1.5435294,-1.475 0.9375,-2.5 l -2.03125,-4.0938 c -0.2942923,-0.5567 -1.1188077,-0.4672 -1.375,0 z"
-       id="path4292"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccccc" />
+       id="path4292" />
     <path
-       sodipodi:type="arc"
        style="fill:#502800;fill-opacity:1;stroke:none;display:inline"
        id="path4253"
-       sodipodi:cx="3.484375"
-       sodipodi:cy="5.484375"
-       sodipodi:rx="0.625"
-       sodipodi:ry="0.625"
        d="m 4.109375,5.484375 a 0.625,0.625 0 1 1 -1.25,0 0.625,0.625 0 1 1 1.25,0 z"
        transform="matrix(1.0523812,0,0,1.0523812,-0.16689048,1044.2631)" />
     <path
        style="fill:#502800;fill-opacity:1;stroke:none;display:inline"
        d="m 3.5142345,1046.253 c -0.3537485,0 -0.6547532,0.3148 -0.6547532,0.7235 l 0.085402,1.3916 c 0,0.3633 0.2549073,0.6577 0.5693508,0.6577 0.3144435,0 0.5693489,-0.2944 0.5693489,-0.6577 l 0.056931,-1.3916 c 0,-0.4087 -0.2725362,-0.7235 -0.6262867,-0.7235 z"
-       id="path4253-7"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="sccsccs" />
+       id="path4253-7" />
   </g>
 </svg>
diff --git a/apitools/org.eclipse.pde.api.tools.ui/icons/full/wizban/compare_wiz.svg b/apitools/org.eclipse.pde.api.tools.ui/icons/full/wizban/compare_wiz.svg
index 51e41cc9d22..fa8ade4670f 100644
--- a/apitools/org.eclipse.pde.api.tools.ui/icons/full/wizban/compare_wiz.svg
+++ b/apitools/org.eclipse.pde.api.tools.ui/icons/full/wizban/compare_wiz.svg
@@ -2,413 +2,19 @@
 <!-- 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="75"
    height="66"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="applypatch_wizban.svg"
-   inkscape:export-filename="/Users/d021678/git/eclipse.jdt.ui/org.eclipse.jdt.ui/icons/full/wizban/newclass_wiz2.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       inkscape:collect="always"
-       id="linearGradient4972">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0"
-         id="stop4974" />
-      <stop
-         style="stop-color:#f5f8fd;stop-opacity:1"
-         offset="1"
-         id="stop4976" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient4964">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0"
-         id="stop4966" />
-      <stop
-         style="stop-color:#e8eefa;stop-opacity:1"
-         offset="1"
-         id="stop4968" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient4956">
-      <stop
-         style="stop-color:#fcfdfe;stop-opacity:1"
-         offset="0"
-         id="stop4958" />
-      <stop
-         style="stop-color:#dee6f8;stop-opacity:1"
-         offset="1"
-         id="stop4960" />
-    </linearGradient>
-    <filter
-       style="color-interpolation-filters:sRGB"
-       inkscape:label="Drop Shadow"
-       id="filter8854">
-      <feFlood
-         flood-opacity="0.933333"
-         flood-color="rgb(244,248,254)"
-         result="flood"
-         id="feFlood8856" />
-      <feComposite
-         in="flood"
-         in2="SourceGraphic"
-         operator="in"
-         result="composite1"
-         id="feComposite8858" />
-      <feGaussianBlur
-         in="composite1"
-         stdDeviation="1.2"
-         result="blur"
-         id="feGaussianBlur8860" />
-      <feOffset
-         dx="-1"
-         dy="3"
-         result="offset"
-         id="feOffset8862" />
-      <feComposite
-         in="SourceGraphic"
-         in2="offset"
-         operator="over"
-         result="composite2"
-         id="feComposite8864" />
-    </filter>
-    <linearGradient
-       id="linearGradient6122">
-      <stop
-         style="stop-color:#c0c0c0;stop-opacity:1"
-         offset="0"
-         id="stop6124" />
-      <stop
-         id="stop6132"
-         offset="0.5"
-         style="stop-color:#adadad;stop-opacity:1" />
-      <stop
-         style="stop-color:#808080;stop-opacity:1"
-         offset="1"
-         id="stop6126" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient7087">
-      <stop
-         style="stop-color:#17325d;stop-opacity:1;"
-         offset="0"
-         id="stop7089" />
-      <stop
-         id="stop7091"
-         offset="0.25"
-         style="stop-color:#b4d0e2;stop-opacity:1" />
-      <stop
-         id="stop7093"
-         offset="0.5"
-         style="stop-color:#b7d2e4;stop-opacity:1" />
-      <stop
-         style="stop-color:#acc9de;stop-opacity:1"
-         offset="0.75"
-         id="stop7095" />
-      <stop
-         style="stop-color:#3e72a7;stop-opacity:1"
-         offset="1"
-         id="stop7097" />
-    </linearGradient>
-    <mask
-       id="mask7366"
-       maskUnits="userSpaceOnUse">
-      <path
-         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;display:inline"
-         d="m -16.593048,1040.862 9.990206,0 0,10.0018 -2.983353,3.0385 -5.966213,0 c -0.53033,-0.022 -1.04064,-0.5519 -1.04064,-1.0385 z"
-         id="path7368"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccccc" />
-    </mask>
-    <linearGradient
-       id="linearGradient7584-5">
-      <stop
-         id="stop7586-4"
-         offset="0"
-         style="stop-color:#f9cd5f;stop-opacity:1" />
-      <stop
-         id="stop7588-5"
-         offset="1"
-         style="stop-color:#fbf0b4;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient7592-1">
-      <stop
-         id="stop7594-6"
-         offset="0"
-         style="stop-color:#bd8416;stop-opacity:1" />
-      <stop
-         id="stop7596-9"
-         offset="1"
-         style="stop-color:#a66b10;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10798-1-9-3-7-6-6-6-2-6-7-98-9-4-1">
-      <stop
-         style="stop-color:#5aad60;stop-opacity:1;"
-         offset="0"
-         id="stop10800-5-2-1-8-20-4-0-2-1-9-0-0-1-1" />
-      <stop
-         id="stop10806-6-8-5-3-9-2-2-7-0-4-2-7-8-9"
-         offset="0.5"
-         style="stop-color:#5bb26a;stop-opacity:1;" />
-      <stop
-         style="stop-color:#a4c589;stop-opacity:1"
-         offset="1"
-         id="stop10802-1-5-3-0-4-6-8-5-5-6-69-6-4-0" />
-    </linearGradient>
-    <mask
-       maskUnits="userSpaceOnUse"
-       id="mask7366-4">
-      <path
-         sodipodi:nodetypes="ccccccc"
-         inkscape:connector-curvature="0"
-         id="path7368-2"
-         d="m -16.593048,1040.862 9.990206,0 0,10.0018 -2.983353,3.0385 -5.966213,0 c -0.53033,-0.022 -1.04064,-0.5519 -1.04064,-1.0385 z"
-         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;display:inline" />
-    </mask>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient7087"
-       id="linearGradient9331"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-20,0)"
-       x1="4.7776356"
-       y1="1039.8118"
-       x2="4.7776356"
-       y2="1041.911" />
-    <linearGradient
-       y2="1041.911"
-       x2="4.7776356"
-       y1="1039.8118"
-       x1="4.7776356"
-       gradientTransform="translate(-18,4.7e-5)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient9333"
-       xlink:href="#linearGradient7087"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="1041.911"
-       x2="4.7776356"
-       y1="1039.8118"
-       x1="4.7776356"
-       gradientTransform="translate(-16,4.7e-5)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient9335"
-       xlink:href="#linearGradient7087"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="1041.911"
-       x2="4.7776356"
-       y1="1039.8118"
-       x1="4.7776356"
-       gradientTransform="translate(-14,4.7e-5)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient9337"
-       xlink:href="#linearGradient7087"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="1041.911"
-       x2="4.7776356"
-       y1="1039.8118"
-       x1="4.7776356"
-       gradientTransform="translate(-12,4.7e-5)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient9339"
-       xlink:href="#linearGradient7087"
-       inkscape:collect="always" />
-    <linearGradient
-       gradientTransform="translate(-80,0)"
-       gradientUnits="userSpaceOnUse"
-       y2="1042.7973"
-       x2="163.22012"
-       y1="1042.7973"
-       x1="88.220117"
-       id="linearGradient68073"
-       xlink:href="#linearGradient4956"
-       inkscape:collect="always" />
-    <linearGradient
-       gradientTransform="translate(-80,0)"
-       gradientUnits="userSpaceOnUse"
-       y2="1032.2669"
-       x2="163.22012"
-       y1="1032.2668"
-       x1="94.469681"
-       id="linearGradient68075"
-       xlink:href="#linearGradient4964"
-       inkscape:collect="always" />
-    <linearGradient
-       gradientTransform="translate(-80,0)"
-       gradientUnits="userSpaceOnUse"
-       y2="1032.2668"
-       x2="152.72206"
-       y1="1032.2668"
-       x1="88.220116"
-       id="linearGradient68077"
-       xlink:href="#linearGradient4972"
-       inkscape:collect="always" />
-    <filter
-       id="filter8854-9"
-       inkscape:label="Drop Shadow"
-       style="color-interpolation-filters:sRGB">
-      <feFlood
-         id="feFlood8856-0"
-         result="flood"
-         flood-color="rgb(244,248,254)"
-         flood-opacity="0.933333" />
-      <feComposite
-         id="feComposite8858-2"
-         result="composite1"
-         operator="in"
-         in2="SourceGraphic"
-         in="flood" />
-      <feGaussianBlur
-         id="feGaussianBlur8860-3"
-         result="blur"
-         stdDeviation="1.2"
-         in="composite1" />
-      <feOffset
-         id="feOffset8862-2"
-         result="offset"
-         dy="3"
-         dx="-1" />
-      <feComposite
-         id="feComposite8864-3"
-         result="composite2"
-         operator="over"
-         in2="offset"
-         in="SourceGraphic" />
-    </filter>
-    <linearGradient
-       id="linearGradient10798-1-9-3-7-6-8-9-0-9-1">
-      <stop
-         id="stop10800-5-2-1-8-20-6-4-9-8-2"
-         offset="0"
-         style="stop-color:#7564b1;stop-opacity:1" />
-      <stop
-         style="stop-color:#5d4aa1;stop-opacity:1"
-         offset="0.5"
-         id="stop10806-6-8-5-3-9-24-8-4-3-2" />
-      <stop
-         id="stop10802-1-5-3-0-4-8-4-2-9-2"
-         offset="1"
-         style="stop-color:#9283c3;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient7540-2-3-8-7">
-      <stop
-         id="stop7542-8-7-5-3"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.502" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0.47623286"
-         id="stop7544-8-2-0-5" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0"
-         offset="0.5"
-         id="stop7546-1-7-9-5" />
-      <stop
-         id="stop7548-98-9-2-4"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient7272-66-4-5-5-5-8">
-      <stop
-         style="stop-color:#8f6c10;stop-opacity:1"
-         offset="0"
-         id="stop7274-6-0-1-7-4-7" />
-      <stop
-         style="stop-color:#c9a645;stop-opacity:1"
-         offset="1"
-         id="stop7276-66-6-3-9-1-4" />
-    </linearGradient>
-    <linearGradient
-       y2="1030.3411"
-       x2="-10.159802"
-       y1="1030.3411"
-       x1="-22.453552"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient10540"
-       xlink:href="#linearGradient7540-2-3-8-7"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="1030.3411"
-       x2="-10.159802"
-       y1="1030.3411"
-       x1="-22.453552"
-       gradientTransform="matrix(0,1,-1,0,1014.0344,1046.6478)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient10542"
-       xlink:href="#linearGradient7540-2-3-8-7"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="1023.2569"
-       x2="-15.945988"
-       y1="1037.4661"
-       x1="-15.945988"
-       gradientTransform="matrix(0.95585117,0,0,0.95585117,-0.71992063,45.488394)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient10544"
-       xlink:href="#linearGradient7272-66-4-5-5-5-8"
-       inkscape:collect="always" />
-    <mask
-       id="mask10620"
-       maskUnits="userSpaceOnUse">
-      <path
-         transform="matrix(0.55482947,0,0,0.55482947,-206.96039,787.08655)"
-         d="m 398.75,468.23718 a 10.625,10.625 0 1 1 -21.25,0 10.625,10.625 0 1 1 21.25,0 z"
-         sodipodi:ry="10.625"
-         sodipodi:rx="10.625"
-         sodipodi:cy="468.23718"
-         sodipodi:cx="388.125"
-         id="path10622"
-         style="font-size:13.58917427px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:2.16621375;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline;font-family:Sans"
-         sodipodi:type="arc" />
-    </mask>
-    <linearGradient
-       id="linearGradient4528-9-5-7-9-7-3">
-      <stop
-         id="stop4530-0-5-0-5-8-4"
-         offset="0"
-         style="stop-color:#e0c576;stop-opacity:1;" />
-      <stop
-         id="stop4532-7-9-3-3-6-1"
-         offset="1"
-         style="stop-color:#9e7916;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient6281-8-0-1-6-6-4-2-8-0">
-      <stop
-         style="stop-color:#f7f9fb;stop-opacity:1"
-         offset="0"
-         id="stop6283-0-2-2-1-2-0-1-6-0" />
-      <stop
-         style="stop-color:#ffd680;stop-opacity:1"
-         offset="1"
-         id="stop6285-5-0-9-7-6-9-9-1-9" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4972-7"
        id="linearGradient4978"
        x1="88.220116"
@@ -418,7 +24,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-88.220116,-999.2669)" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4972-7">
       <stop
          style="stop-color:#b8ccf1;stop-opacity:0.10196079"
@@ -430,7 +35,6 @@
          id="stop4976-1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4964-3"
        id="linearGradient4970"
        x1="118.38584"
@@ -440,7 +44,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-88.220117,-999.2669)" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4964-3">
       <stop
          style="stop-color:#ffffff;stop-opacity:0.349"
@@ -452,7 +55,6 @@
          id="stop4968-1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4956-2"
        id="linearGradient4962"
        x1="88.220116"
@@ -462,7 +64,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-88.220116,-999.2669)" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4956-2">
       <stop
          style="stop-color:#fcfdfe;stop-opacity:0.25641027"
@@ -474,37 +75,6 @@
          id="stop4960-6" />
     </linearGradient>
     <linearGradient
-       id="linearGradient3827">
-      <stop
-         id="stop3829"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0.60149658"
-         id="stop3835" />
-      <stop
-         id="stop3831"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10798-1-9-3-7-6-8-9-0-9-1-0">
-      <stop
-         id="stop10800-5-2-1-8-20-6-4-9-8-2-9"
-         offset="0"
-         style="stop-color:#f3faed;stop-opacity:1" />
-      <stop
-         style="stop-color:#e7f4da;stop-opacity:1"
-         offset="0.65917557"
-         id="stop10806-6-8-5-3-9-24-8-4-3-2-4" />
-      <stop
-         id="stop10802-1-5-3-0-4-8-4-2-9-2-5"
-         offset="1"
-         style="stop-color:#67bf1f;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4994"
        id="linearGradient6375-6"
        x1="50.702839"
@@ -514,8 +84,7 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(0.80316308,0,0,0.84170722,22.503359,158.27907)" />
     <linearGradient
-       id="linearGradient4994"
-       inkscape:collect="always">
+       id="linearGradient4994">
       <stop
          id="stop4996"
          offset="0"
@@ -526,7 +95,6 @@
          style="stop-color:#dbe2eb;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4902"
        id="linearGradient4238"
        gradientUnits="userSpaceOnUse"
@@ -536,8 +104,7 @@
        x2="10.544736"
        y2="1052.3228" />
     <linearGradient
-       id="linearGradient4902"
-       inkscape:collect="always">
+       id="linearGradient4902">
       <stop
          id="stop4904"
          offset="0"
@@ -548,7 +115,6 @@
          style="stop-color:#9a9a8f;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient6411"
        id="linearGradient4240"
        gradientUnits="userSpaceOnUse"
@@ -558,7 +124,6 @@
        x2="47.429596"
        y2="1023.1616" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient6411">
       <stop
          style="stop-color:#4f605c;stop-opacity:1"
@@ -570,7 +135,6 @@
          id="stop6415" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4258"
        id="linearGradient4264"
        x1="59.220116"
@@ -580,7 +144,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1.4456935,0,0,1.5152448,-25.667265,-537.6685)" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4258">
       <stop
          style="stop-color:#f4ae5f;stop-opacity:1;"
@@ -596,7 +159,6 @@
          id="stop4262" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4527"
        id="linearGradient4533"
        x1="29.521629"
@@ -606,7 +168,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1,0,0,-1,-0.41994314,1068.4388)" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4527">
       <stop
          style="stop-color:#68b367;stop-opacity:1"
@@ -618,7 +179,6 @@
          id="stop4531" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4578"
        id="linearGradient4584"
        x1="42.780308"
@@ -628,7 +188,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1,0,0,-1,-8.6400594,2067.7057)" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4578">
       <stop
          style="stop-color:#c5f0b4;stop-opacity:1"
@@ -640,7 +199,6 @@
          id="stop4582" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient5517"
        id="linearGradient4314-5"
        x1="49.217129"
@@ -649,8 +207,7 @@
        y2="1023.2908"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       id="linearGradient5517"
-       inkscape:collect="always">
+       id="linearGradient5517">
       <stop
          id="stop5519"
          offset="0"
@@ -661,20 +218,17 @@
          style="stop-color:#c5c3d4;stop-opacity:0.72941178" />
     </linearGradient>
     <filter
-       inkscape:collect="always"
        style="color-interpolation-filters:sRGB"
        id="filter4344"
-       x="-0.027383927"
-       width="1.0547678"
-       y="-0.085576579"
+       x="-0.027383926"
+       width="1.0547679"
+       y="-0.085576576"
        height="1.1711532">
       <feGaussianBlur
-         inkscape:collect="always"
          stdDeviation="0.57051052"
          id="feGaussianBlur4346" />
     </filter>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4994"
        id="linearGradient4499"
        gradientUnits="userSpaceOnUse"
@@ -684,7 +238,6 @@
        x2="22.530088"
        y2="1014.1386" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4902"
        id="linearGradient4501"
        gradientUnits="userSpaceOnUse"
@@ -694,7 +247,6 @@
        x2="10.544736"
        y2="1052.3228" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient6411"
        id="linearGradient4503"
        gradientUnits="userSpaceOnUse"
@@ -704,7 +256,6 @@
        x2="47.429596"
        y2="1023.1616" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4258"
        id="linearGradient4505"
        gradientUnits="userSpaceOnUse"
@@ -714,7 +265,6 @@
        x2="62.220116"
        y2="1025.2668" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient5517"
        id="linearGradient4314-5-4"
        x1="49.217129"
@@ -723,50 +273,17 @@
        y2="1023.2908"
        gradientUnits="userSpaceOnUse" />
     <filter
-       inkscape:collect="always"
        style="color-interpolation-filters:sRGB"
        id="filter4344-1"
-       x="-0.027383927"
-       width="1.0547678"
-       y="-0.085576579"
+       x="-0.027383926"
+       width="1.0547679"
+       y="-0.085576576"
        height="1.1711532">
       <feGaussianBlur
-         inkscape:collect="always"
          stdDeviation="0.57051052"
          id="feGaussianBlur4346-7" />
     </filter>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#bcbcbc"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="13.293333"
-     inkscape:cx="74.924774"
-     inkscape:cy="33.000009"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer3"
-     showgrid="true"
-     inkscape:window-width="2560"
-     inkscape:window-height="1391"
-     inkscape:window-x="0"
-     inkscape:window-y="1"
-     inkscape:window-maximized="1"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="true"
-     inkscape:snap-bbox="true"
-     inkscape:bbox-nodes="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid4112"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -775,25 +292,18 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:groupmode="layer"
      id="layer2"
-     inkscape:label="Background"
-     style="display:inline"
-     sodipodi:insensitive="true">
+     style="display:inline">
     <path
-       sodipodi:nodetypes="cccc"
-       inkscape:connector-curvature="0"
        id="rect4113-1"
        d="M 75,0 75,66 1e-6,66 C 1e-6,41.2048 50.00969,0 75,0 Z"
        style="display:inline;fill:url(#linearGradient4978);fill-opacity:1;stroke:none" />
     <path
-       sodipodi:nodetypes="cccc"
-       inkscape:connector-curvature="0"
        id="rect4113-1-0"
        d="M 75,21.0607 75,66 1e-6,66 C 10.625001,47.804 43.509694,25.4357 75,21.0607 Z"
        style="display:inline;opacity:0.40400002;fill:url(#linearGradient4962);fill-opacity:1;stroke:none" />
@@ -806,179 +316,34 @@
          id="g13408-8-2" />
     </g>
     <path
-       sodipodi:nodetypes="cccc"
-       inkscape:connector-curvature="0"
        id="rect4113-1-7"
        d="M 75,4.0000001e-7 75,66 30.000003,66 C 30.000003,46.1545 47.70944,9.2500004 75,4e-7 Z"
        style="display:inline;opacity:0.18399999;fill:url(#linearGradient4970);fill-opacity:1;stroke:none" />
   </g>
   <g
-     inkscape:groupmode="layer"
      id="layer3"
-     inkscape:label="old"
      style="display:inline">
     <image
        transform="translate(0,-986.3622)"
        y="986.36218"
        x="86"
        id="image4401"
-       xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEsAAABCCAYAAAAfQSsiAAAACXBIWXMAAAsTAAALEwEAmpwYAAAK
-TWlDQ1BQaG90b3Nob3AgSUNDIHByb2ZpbGUAAHjanVN3WJP3Fj7f92UPVkLY8LGXbIEAIiOsCMgQ
-WaIQkgBhhBASQMWFiApWFBURnEhVxILVCkidiOKgKLhnQYqIWotVXDjuH9yntX167+3t+9f7vOec
-5/zOec8PgBESJpHmomoAOVKFPDrYH49PSMTJvYACFUjgBCAQ5svCZwXFAADwA3l4fnSwP/wBr28A
-AgBw1S4kEsfh/4O6UCZXACCRAOAiEucLAZBSAMguVMgUAMgYALBTs2QKAJQAAGx5fEIiAKoNAOz0
-ST4FANipk9wXANiiHKkIAI0BAJkoRyQCQLsAYFWBUiwCwMIAoKxAIi4EwK4BgFm2MkcCgL0FAHaO
-WJAPQGAAgJlCLMwAIDgCAEMeE80DIEwDoDDSv+CpX3CFuEgBAMDLlc2XS9IzFLiV0Bp38vDg4iHi
-wmyxQmEXKRBmCeQinJebIxNI5wNMzgwAABr50cH+OD+Q5+bk4eZm52zv9MWi/mvwbyI+IfHf/ryM
-AgQAEE7P79pf5eXWA3DHAbB1v2upWwDaVgBo3/ldM9sJoFoK0Hr5i3k4/EAenqFQyDwdHAoLC+0l
-YqG9MOOLPv8z4W/gi372/EAe/tt68ABxmkCZrcCjg/1xYW52rlKO58sEQjFu9+cj/seFf/2OKdHi
-NLFcLBWK8ViJuFAiTcd5uVKRRCHJleIS6X8y8R+W/QmTdw0ArIZPwE62B7XLbMB+7gECiw5Y0nYA
-QH7zLYwaC5EAEGc0Mnn3AACTv/mPQCsBAM2XpOMAALzoGFyolBdMxggAAESggSqwQQcMwRSswA6c
-wR28wBcCYQZEQAwkwDwQQgbkgBwKoRiWQRlUwDrYBLWwAxqgEZrhELTBMTgN5+ASXIHrcBcGYBie
-whi8hgkEQcgIE2EhOogRYo7YIs4IF5mOBCJhSDSSgKQg6YgUUSLFyHKkAqlCapFdSCPyLXIUOY1c
-QPqQ28ggMor8irxHMZSBslED1AJ1QLmoHxqKxqBz0XQ0D12AlqJr0Rq0Hj2AtqKn0UvodXQAfYqO
-Y4DRMQ5mjNlhXIyHRWCJWBomxxZj5Vg1Vo81Yx1YN3YVG8CeYe8IJAKLgBPsCF6EEMJsgpCQR1hM
-WEOoJewjtBK6CFcJg4Qxwicik6hPtCV6EvnEeGI6sZBYRqwm7iEeIZ4lXicOE1+TSCQOyZLkTgoh
-JZAySQtJa0jbSC2kU6Q+0hBpnEwm65Btyd7kCLKArCCXkbeQD5BPkvvJw+S3FDrFiOJMCaIkUqSU
-Eko1ZT/lBKWfMkKZoKpRzame1AiqiDqfWkltoHZQL1OHqRM0dZolzZsWQ8ukLaPV0JppZ2n3aC/p
-dLoJ3YMeRZfQl9Jr6Afp5+mD9HcMDYYNg8dIYigZaxl7GacYtxkvmUymBdOXmchUMNcyG5lnmA+Y
-b1VYKvYqfBWRyhKVOpVWlX6V56pUVXNVP9V5qgtUq1UPq15WfaZGVbNQ46kJ1Bar1akdVbupNq7O
-UndSj1DPUV+jvl/9gvpjDbKGhUaghkijVGO3xhmNIRbGMmXxWELWclYD6yxrmE1iW7L57Ex2Bfsb
-di97TFNDc6pmrGaRZp3mcc0BDsax4PA52ZxKziHODc57LQMtPy2x1mqtZq1+rTfaetq+2mLtcu0W
-7eva73VwnUCdLJ31Om0693UJuja6UbqFutt1z+o+02PreekJ9cr1Dund0Uf1bfSj9Rfq79bv0R83
-MDQINpAZbDE4Y/DMkGPoa5hpuNHwhOGoEctoupHEaKPRSaMnuCbuh2fjNXgXPmasbxxirDTeZdxr
-PGFiaTLbpMSkxeS+Kc2Ua5pmutG003TMzMgs3KzYrMnsjjnVnGueYb7ZvNv8jYWlRZzFSos2i8eW
-2pZ8ywWWTZb3rJhWPlZ5VvVW16xJ1lzrLOtt1ldsUBtXmwybOpvLtqitm63Edptt3xTiFI8p0in1
-U27aMez87ArsmuwG7Tn2YfYl9m32zx3MHBId1jt0O3xydHXMdmxwvOuk4TTDqcSpw+lXZxtnoXOd
-8zUXpkuQyxKXdpcXU22niqdun3rLleUa7rrStdP1o5u7m9yt2W3U3cw9xX2r+00umxvJXcM970H0
-8PdY4nHM452nm6fC85DnL152Xlle+70eT7OcJp7WMG3I28Rb4L3Le2A6Pj1l+s7pAz7GPgKfep+H
-vqa+It89viN+1n6Zfgf8nvs7+sv9j/i/4XnyFvFOBWABwQHlAb2BGoGzA2sDHwSZBKUHNQWNBbsG
-Lww+FUIMCQ1ZH3KTb8AX8hv5YzPcZyya0RXKCJ0VWhv6MMwmTB7WEY6GzwjfEH5vpvlM6cy2CIjg
-R2yIuB9pGZkX+X0UKSoyqi7qUbRTdHF09yzWrORZ+2e9jvGPqYy5O9tqtnJ2Z6xqbFJsY+ybuIC4
-qriBeIf4RfGXEnQTJAntieTE2MQ9ieNzAudsmjOc5JpUlnRjruXcorkX5unOy553PFk1WZB8OIWY
-EpeyP+WDIEJQLxhP5aduTR0T8oSbhU9FvqKNolGxt7hKPJLmnVaV9jjdO31D+miGT0Z1xjMJT1Ir
-eZEZkrkj801WRNberM/ZcdktOZSclJyjUg1plrQr1zC3KLdPZisrkw3keeZtyhuTh8r35CP5c/Pb
-FWyFTNGjtFKuUA4WTC+oK3hbGFt4uEi9SFrUM99m/ur5IwuCFny9kLBQuLCz2Lh4WfHgIr9FuxYj
-i1MXdy4xXVK6ZHhp8NJ9y2jLspb9UOJYUlXyannc8o5Sg9KlpUMrglc0lamUycturvRauWMVYZVk
-Ve9ql9VbVn8qF5VfrHCsqK74sEa45uJXTl/VfPV5bdra3kq3yu3rSOuk626s91m/r0q9akHV0Ibw
-Da0b8Y3lG19tSt50oXpq9Y7NtM3KzQM1YTXtW8y2rNvyoTaj9nqdf13LVv2tq7e+2Sba1r/dd3vz
-DoMdFTve75TsvLUreFdrvUV99W7S7oLdjxpiG7q/5n7duEd3T8Wej3ulewf2Re/ranRvbNyvv7+y
-CW1SNo0eSDpw5ZuAb9qb7Zp3tXBaKg7CQeXBJ9+mfHvjUOihzsPcw83fmX+39QjrSHkr0jq/dawt
-o22gPaG97+iMo50dXh1Hvrf/fu8x42N1xzWPV56gnSg98fnkgpPjp2Snnp1OPz3Umdx590z8mWtd
-UV29Z0PPnj8XdO5Mt1/3yfPe549d8Lxw9CL3Ytslt0utPa49R35w/eFIr1tv62X3y+1XPK509E3r
-O9Hv03/6asDVc9f41y5dn3m978bsG7duJt0cuCW69fh29u0XdwruTNxdeo94r/y+2v3qB/oP6n+0
-/rFlwG3g+GDAYM/DWQ/vDgmHnv6U/9OH4dJHzEfVI0YjjY+dHx8bDRq98mTOk+GnsqcTz8p+Vv95
-63Or59/94vtLz1j82PAL+YvPv655qfNy76uprzrHI8cfvM55PfGm/K3O233vuO+638e9H5ko/ED+
-UPPR+mPHp9BP9z7nfP78L/eE8/sl0p8zAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAAB6JQAAgIMA
-APn/AACA6QAAdTAAAOpgAAA6mAAAF2+SX8VGAAAS9ElEQVR42uybaXAlV3XHf+fe7n6rnp40+3hW
-ezAGGy8BHC8sXhJjh8IOpCpJhaUwVVSFpCqYJR9SldRkUlRBYRxC+JAUMbFDQoJZYkOI2UwMGGeA
-YHtsYw8eLzPSaKTRSKOR9KS3dt+TD/329zSj0YwcF86tkt573be7T//vWf7n3HuF/2992ye/dMSq
-klTVQVUGgJT3/7B0AOQDKVVyzmlGlVT7+Zc9WJ/+6rhVJeOUpHOaUqcZpwT9+r5swfrsvRMp50ir
-aqBgUR1ANXGya15WYP39N44apyRUdUAVKwKqpFHNAnKq6182YH3um5MDTjUtYFSBWJtyAoEs8x6/
-8mB9/v7JlFNiTQI0VqGUwoCA6GncS1ZLyDf81a4T1vPy1Urp1r17Ru5+sUG6+zvHAlVyquo7B05B
-VVFlQFXTzoFzitP4M6p/qsZ9X1Swrr/91/Tmm97Pvd/4DJUlALty9/b3Am8GdrQd3gf8cO+ekftW
-8tx/+d6Udao5VZINgOpgCWhelcC5+rGXCljX3f5a/eP3fIzJ6cN8+eufplIpNgG7cvf224Ddu3Zd
-kt92zg7WDQ1jxWFwjI6PcOD5Zzg6PXkI2HM6WvnFB6YyqmRV1ThtaZNTPGBQnXoNcF5SYF37ydfp
-R279OE6V8elRvnTfHVQqxQ8Bt2zbcdE1V151M8O5QTyJWFiYwZcIK450IiCdCBg9cogHf/JDRsfH
-fgC8fe+ekdmlnnXPg9N+XZsC1TYQYrA8YFgVaQfnJaZZr9O/eN/t7H3uKS7Ydi5HZ8b58tfv4LLX
-38yuV12Bqy1y5MhBZmenUFfFisbaZRzZpM/2DRvZvmEj9z3wTfbtf3IfcG0/wL7yg+mMU7KqGKf1
-l62DoLFGDauqOO0EZyVgrVo0NCJkrKVUWuThXzzCr1/4Wt79zo8RegFHjh1hdPRZNKqirkqlXABC
-rFE8cVSrAZVqmSPHxvmNq68lCIJLf/b4I/cC1zbu/+8PHTfOMaRoIBpHuQ4tEDwjDDtFVM/OO60a
-WFYEBySsYaZQ5Of7H+U1F1zK2NExDhw8AC5kbm6aUmkOKw5rWn9zC46EZxnK5XAHarzp9VdzdGry
-GnZz2949I39z34+PJ50yKNLkTF1AiSfCsDqkF8aXIFhGhFAdgTWkPEu1XOSxp37OfLGIBcYmJ4jC
-ElKbJQrnCSuF5rVBIkk6M0AYVimVF3DOccMbr+POe76w+4P/+OdfQyQU1b4wCHhiYh+lZ/udVg8s
-iJQ6WIaEZ9GwRmANVpRd552PHx0nXDwyG1YKe4Cde/eMyN49I1KtlC+bnZm6e3J8jPlCgbGpcabn
-TnDxBRfm909+99aTkEbPGhmWVfLFZjU1y6kSGEPCWhLWkLCGwBo25tdw3SVXcv0N7yYIUnng0N49
-I4ca1+7dM7Jv756RW51zl01OTMzOFwqMTBxm8/pNlKon3tIXKMFaK8PI6gWtVQPLIiiK3wDJGHwj
-+GIolhZ55OnHWLdmKze97Y9IJFJ31QlqR9u7Z2RfPrX5xmNHJzkxP8tscZ5Iw4v6qJRYQ15WMbqv
-umZFGnL46AGOHDvI6NGDHD46wtHpcY5OjXPg4AEefPgBJPB5+83vI5FI9gD23Z/P5m67/v5R36Tu
-mZ2bI5lIoupyPY7XyrCIrHqea1bv1o6xsScgrOIZwZr4WKVaplIpU66UGDsyyn3/+S0eO/Ac1117
-C9b6d125e/sOgAcemc0DGYD1A7u+UiqWWFhcQMTMdwBlJCcvUkFg1R4yMTOx73P3fvbS5fR95vHH
-eeZxAGaTftZ8/9HZtar4jfO3XvVP//3x713O2PgRApv6VtPUjaRFNOXci5OcrxpYe/eMXHa61/xg
-35xRZVhV/e6w72nqH07MLOSuOf+DuwGMITDCgNNVxUdU8eopk3Q4xKmH7nhvVwXgbLRDwH3r3viR
-2ZN1+tETc74qwxtLD2/PhYd+t3UmRqOdfCrGOPFTqi2Hrm1f2vGLr1MO1c7/xnPlV44vme44JHTq
-O6eeKn49VZIlc8Oph+54cG79TddIHUOp/+v4RJoQSz1mL3We4jThk3eTWLtt1vipW9e/6SN9yy4/
-fnLeV2XYqZodi/9xleZ2fDUK1vTK0Bze5csgQG3f5/GTAbXUli9+e/6WTzXAiSL1w0h959SPHF4j
-t9Tl5IahU8LkptaDuoRogigg7QLVf2sbsIggmc14A5upjD2ZN0Pb7x3/4adu3fzmj3aUXB7+RQxU
-I9hETnH+MFFy4zJkaAHVDqJAXZb4h91xHbV9d0Ju4Z2/NVy+/Efz1902Fa6pNhLn5eaOphsskbog
-Il3fpeccJ+tbfwH7yt8mk8tiFicI54/dNfpftzfpwd6nC75ICyiAqC2NOdVgtQMlbUB1y2S2vIH0
-uq0E4Qxuav8rrsh+/2/z3kz2jKhDLdK6gO0Pbheo+7d0vVDXdSLo4C68/DaGL72FoDZPVJi66/kH
-PnnNT/cXfKETqMaAcZLn9A5OHcQlBqshk9lwGYO7riabX4d3/JnzXpt56ANnBFbo9BRm12ckl9Su
-+j2MUAs2YIwhu+VCEqVxXHnh3vTMg5f043mRq08qyNLAyKlkaoLdurY2+GokqpDddhmphCVT2H/D
-FdnvveMMNes0zW4ZAqs3QHhsPxKVSQ4MERRG8lJ45jP9BGpq1nIHi5MMVpuMYXIjbm6MaG6MZG6Y
-ZHWKIXfwAzsTT523Ip5Vc0qyTcBSqUItjHqjToffaDl13/MIfItnDdYzmMZJdbi5I+AHWONImhrl
-wthVibF//r3SOe+6pxsspW2AlvBdjd8uckSRa4uUfSwDqDkPijNEYQWMECSTpAqH2JrLf+D50qs/
-evpgRa0XV1UOjh5jsVQmlfTw4nylOVsSOSWKHGHkCEMlco78YIa1QxnWDGZJpwJsEGuWC0NMZR4X
-eoixBImA7OIxFheHPgx0gRVzpVNFu4aPLBSKLBRLOOdQbfk72vwmda3cXCujURWMxbNC0oRkFw9e
-8prkgzc8Xrr2u6epWa5uaoIR4YJd5+Cc6zAHukasczQFYyTWLGswxhBFIV7hMD5x5dQZwfpJajUl
-WZzYWh751xvZ+gff7tGsPtSENrNrgDiUzzI4mOkBt9uUq0cejVmmKk4U4/loUsgUpkl7R68CThOs
-ZjSMBfJ9r8MvdI6snPxc/XitViNfeAGXHOJ45hWM1tYyOR9SK81BcZL1mcULLXy75eC1RSr7mF0P
-iGIw/fq19VVVvOnHMQ7KmU0c9bYxVkyzWCyileNkvcWrT9sMw0hbL68wOj5NqVTB901zhOLkoU7m
-nOJUm7MimXTAYDZNLpskmfDwfY+B2hThRe9iccPl1IpFkjPHGUgcZ35untnIY41bxPb4LF3S7LoH
-ZGGxRKlcaZogPUw/lnutpDl00Z+hqWFqlRKJ2RkWpqYomPXgDq7MwTd5C1ov3zVIYlcipg2gXBOs
-KHI454ici1mxgua3U8vvICEQBD6+7+F58V9YmaXmFjoWQ0XNaNjGnbq0tSOw0J0dSjMnFIkHVASm
-z7mJVNInmfBJpxL4ngV1eL5HZfrQCsBqN0Mj7Ni6vhl+YXlm12uiLX9nxJLNZlEXoRpRXshRm5/o
-5FkkEtphhr2+q913DubSDObSfc/1RNC2fNGzEIVVrDEcmZaVgtUaOdoSy4Zpan3piUh8LhZQ68fr
-IKkiRhBj2nxILLxnDAPZAaIoYv5EhskZ19AL65wO4A+uB6VYKTEyMdETWATYuXkzmVQMUBhGTfna
-zZU+5tu4h2eEZDJFbnAQpw4xHriVmGHDKTrliV8eZqFYIp30sEaayh5FMW2InBJGjiiKP4dyaTas
-HWQ4nyabTpBM+BjTm8P5vk82myGTyVCphtRXtWStkYxDrCqMTEyw586/6yv0n77r/Vx18auohRFf
-+ubPmJ6ZxxptAlKfjUZV6jPMgudZtm0cYufWNWzfPMy64SyZdBoXhRi7ErCitkTaCDu3raNWC1tm
-1+E8489GbQiUwPdIJjySCZ/AtxiRThbeZhrJRIJEMklEkFJlQARrjaQipyjC+qFh3vbG6ylXwp6K
-kmdjrfI9y5svP59SqdpBRmlzDWEUNYgIqaRPLpskl03iexbPM6TTGdSYMzRDA0O5dP/Mv29I7w7d
-/clk47f1PIIgwImx9UmHDCBRvVi3fniYd77lRsLI9alZSZ3Twblb1i7pI3v8aZ8SUyIRoKwUrIYZ
-ohybLlAsVTC2rbrQCIZ18jg4kCI/kCKZ8E8eubp8B4C1Hg4wRnwjEjhVGpoVa44h8E0X2G2DBRRL
-VUqVap9iZQxoMuGRTgX4ntfXh1lruwvGp0sdQB0cOz5PYbFEMrCIkQ4+FoYR1Zpj7VCWhG9JBh6C
-6SKM/clk01KMIXTgWRlo0KSGZvVEsD6OGmChWKawWEa1Xq6o50qCIEZIJxMEvsX3bB3ozllYEcGx
-ArCqbdTBWuHiV21taQe6NEkUMGJOSTO6m6qiYn0E06BJUVcifSpqsnFdnk3r6etPO2mLWVKBwmVW
-SpfwWf1CrunJy07X7HpmFhUiNR0yxJq1hNn18ZG1WtiqjPSbO2hLqK2N81ZjDNa0gk/kWKEZ9jjF
-PsJ3m8UpcrilmsbgSCdYiqouSTI7NVWZmikwO1/EuahzPl86qw7GCNl0HAkz6YCE72GtdNTQVsTg
-zzjayfJWZ6j2ChrTkM7S9ts++iEAvvaJO0glvLbBMmxan2fj2sHOigRLm74xcUXFtPvglYPVGslK
-pUa5WuuT6Us9ksQPbh9J3xp832KMwZiTg+ZUCSPtKitrW1m58/qpEyW2bxzoGCzfM8v2kUu10Omy
-lpQsAZYQRY7Hnh5loVgmk/JpDITSIKLxi4ZRFBf/IiU/mGbT2gHWDQ+QSSdIp3zsSQifNop9XWYI
-cHB8nDu/fm/Hub/+t8+TDCx/+I7f4bxz4lrbY/vHmCsUm2AZY2jGI1oB0hhDPpdiKJdmcCBFNh1H
-ySZY9rR9lms6aN8zXHzBFqrVsHdis53Rt323RvD9mBn7nq1r3anM0PXVrGK5xJPPP9dx7sBoXEp5
-+oVj7NpyDmGk7H/+KMdPzGNM25SxNgsjzZTHGMP64SzbzxlmuwyTCLw6nahXOuyKqEPL5+SyyTOK
-dsvxWbUufxHVX/TiXbv4wu5PMD1b5sOf+UsAPn3bno4Il0p4vOeWyzs5w7KXRLUuCR1n4ODrwzM5
-XaBcCeMkWrSVHbaKEi2+pBD4HqmUTzoREATxxIWc5CUcShjRo1kNMNYNpVg/1NofmUl57NyU6xis
-dke90nbGDj6K4ODhaQqLZZIJj4braVQb4spDPFERRQ6nkM+l2bw+x9p8lozWfdZJwOoXDSNHW8kl
-1tzf/823MFuodlEVqQ/oAvMLpZjBt41kY+oskwrID6bjDGMJWcJI8S2mVa04TZ7le8IVl53bnGnp
-njhYzso/Maf2WdZ66YStrVOJNS2VCPLdvOq9b30r5WqEZ6XDTTRWyFgrqJoOLUd681g5iWbtWscW
-1VZAOG2e5bUX787QPy1FHXzfH7JaOU+JfWw6GWzStpkjQbAWsmmvRwYRYcPa3FkxwzWZ6Hw9yQoR
-VaL+Dh5B1fHC6DSL5Urd97QicoM6RJGSyybZsDZHJp1oFgiX7eABz3hDhNWdjXv71mxabiJ+tlro
-IGVr5/ezP0WcIlWnsrikg1eF+cUy84USgW86TCqeXI3BEiPkqyHpVMDpLhZWBSt2natWLgRURKpW
-JaPd6Y3Iqi5DDp1iXe3czoVroipSVmQxQubBlvrUs6ivvre87qJtq7oGMSbOMuRqNSPGLGLsvKpK
-v5IMqwyWiWr1NQ/i1JgyyAJiqg5TjdSeKIXmsAF47tCR4NnnD68V46U6FoKscqvPPwaAQaQo1h6r
-KMe6Z6RfDLBQzcYby9UHKTqxEzX8g8XQf2Jywf+fZybso97+Xx58a2Wh9AoXRq8czA7slBdLwgYp
-VQpeIjFiPG8KY0rGyNoVcMwzanVupypmTq03Eol3uOy8Fwple2hyTg5PzTPnHOqF1dqNGrotURRt
-DYw38IX773/RhDw+O4fne9M2mRhRlYpGkajT4Ds/+SmPP/vsiybH0eMzOOs/44w3UlXv8ELFvjBV
-MKOTsxyvhjRnTOSpXzz3J6qaVqcJYyQH4hljUoDRPprQOwesPSuEG4clvo+0X1unBRHWLojxZtTY
-Ew4puwiHukBVPXXOtnK7FvfR+hLKjmONpQRt/WnrR1v/BgfruF/9d+SkWqpJYbYoJ04ssFCLiLpf
-qans5WqUUmXIOYad4rV2dTZ3hbZtp9XW0iNt7f5s7iCN6+ppayTtGhu6HTh19R2jvbtI1dWf1fHZ
-3o94qUDXs/r3bV2j6vqfd336n2K1sgGo1pwRJF9fNXzGGwlEEM9Kil+xZur6NaSwBjk7Oy48K4nV
-3qH1fwJWGLkksOlsAQXgW0nzK9gMsPNs7qryjQQiYn4VwfrfAQAc9dDnZ0sguwAAAABJRU5ErkJg
-gg==
-"
+       xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEsAAABCCAYAAAAfQSsiAAAACXBIWXMAAAsTAAALEwEAmpwYAAAK TWlDQ1BQaG90b3Nob3AgSUNDIHByb2ZpbGUAAHjanVN3WJP3Fj7f92UPVkLY8LGXbIEAIiOsCMgQ WaIQkgBhhBASQMWFiApWFBURnEhVxILVCkidiOKgKLhnQYqIWotVXDjuH9yntX167+3t+9f7vOec 5/zOec8PgBESJpHmomoAOVKFPDrYH49PSMTJvYACFUjgBCAQ5svCZwXFAADwA3l4fnSwP/wBr28A AgBw1S4kEsfh/4O6UCZXACCRAOAiEucLAZBSAMguVMgUAMgYALBTs2QKAJQAAGx5fEIiAKoNAOz0 ST4FANipk9wXANiiHKkIAI0BAJkoRyQCQLsAYFWBUiwCwMIAoKxAIi4EwK4BgFm2MkcCgL0FAHaO WJAPQGAAgJlCLMwAIDgCAEMeE80DIEwDoDDSv+CpX3CFuEgBAMDLlc2XS9IzFLiV0Bp38vDg4iHi wmyxQmEXKRBmCeQinJebIxNI5wNMzgwAABr50cH+OD+Q5+bk4eZm52zv9MWi/mvwbyI+IfHf/ryM AgQAEE7P79pf5eXWA3DHAbB1v2upWwDaVgBo3/ldM9sJoFoK0Hr5i3k4/EAenqFQyDwdHAoLC+0l YqG9MOOLPv8z4W/gi372/EAe/tt68ABxmkCZrcCjg/1xYW52rlKO58sEQjFu9+cj/seFf/2OKdHi NLFcLBWK8ViJuFAiTcd5uVKRRCHJleIS6X8y8R+W/QmTdw0ArIZPwE62B7XLbMB+7gECiw5Y0nYA QH7zLYwaC5EAEGc0Mnn3AACTv/mPQCsBAM2XpOMAALzoGFyolBdMxggAAESggSqwQQcMwRSswA6c wR28wBcCYQZEQAwkwDwQQgbkgBwKoRiWQRlUwDrYBLWwAxqgEZrhELTBMTgN5+ASXIHrcBcGYBie whi8hgkEQcgIE2EhOogRYo7YIs4IF5mOBCJhSDSSgKQg6YgUUSLFyHKkAqlCapFdSCPyLXIUOY1c QPqQ28ggMor8irxHMZSBslED1AJ1QLmoHxqKxqBz0XQ0D12AlqJr0Rq0Hj2AtqKn0UvodXQAfYqO Y4DRMQ5mjNlhXIyHRWCJWBomxxZj5Vg1Vo81Yx1YN3YVG8CeYe8IJAKLgBPsCF6EEMJsgpCQR1hM WEOoJewjtBK6CFcJg4Qxwicik6hPtCV6EvnEeGI6sZBYRqwm7iEeIZ4lXicOE1+TSCQOyZLkTgoh JZAySQtJa0jbSC2kU6Q+0hBpnEwm65Btyd7kCLKArCCXkbeQD5BPkvvJw+S3FDrFiOJMCaIkUqSU Eko1ZT/lBKWfMkKZoKpRzame1AiqiDqfWkltoHZQL1OHqRM0dZolzZsWQ8ukLaPV0JppZ2n3aC/p dLoJ3YMeRZfQl9Jr6Afp5+mD9HcMDYYNg8dIYigZaxl7GacYtxkvmUymBdOXmchUMNcyG5lnmA+Y b1VYKvYqfBWRyhKVOpVWlX6V56pUVXNVP9V5qgtUq1UPq15WfaZGVbNQ46kJ1Bar1akdVbupNq7O UndSj1DPUV+jvl/9gvpjDbKGhUaghkijVGO3xhmNIRbGMmXxWELWclYD6yxrmE1iW7L57Ex2Bfsb di97TFNDc6pmrGaRZp3mcc0BDsax4PA52ZxKziHODc57LQMtPy2x1mqtZq1+rTfaetq+2mLtcu0W 7eva73VwnUCdLJ31Om0693UJuja6UbqFutt1z+o+02PreekJ9cr1Dund0Uf1bfSj9Rfq79bv0R83 MDQINpAZbDE4Y/DMkGPoa5hpuNHwhOGoEctoupHEaKPRSaMnuCbuh2fjNXgXPmasbxxirDTeZdxr PGFiaTLbpMSkxeS+Kc2Ua5pmutG003TMzMgs3KzYrMnsjjnVnGueYb7ZvNv8jYWlRZzFSos2i8eW 2pZ8ywWWTZb3rJhWPlZ5VvVW16xJ1lzrLOtt1ldsUBtXmwybOpvLtqitm63Edptt3xTiFI8p0in1 U27aMez87ArsmuwG7Tn2YfYl9m32zx3MHBId1jt0O3xydHXMdmxwvOuk4TTDqcSpw+lXZxtnoXOd 8zUXpkuQyxKXdpcXU22niqdun3rLleUa7rrStdP1o5u7m9yt2W3U3cw9xX2r+00umxvJXcM970H0 8PdY4nHM452nm6fC85DnL152Xlle+70eT7OcJp7WMG3I28Rb4L3Le2A6Pj1l+s7pAz7GPgKfep+H vqa+It89viN+1n6Zfgf8nvs7+sv9j/i/4XnyFvFOBWABwQHlAb2BGoGzA2sDHwSZBKUHNQWNBbsG Lww+FUIMCQ1ZH3KTb8AX8hv5YzPcZyya0RXKCJ0VWhv6MMwmTB7WEY6GzwjfEH5vpvlM6cy2CIjg R2yIuB9pGZkX+X0UKSoyqi7qUbRTdHF09yzWrORZ+2e9jvGPqYy5O9tqtnJ2Z6xqbFJsY+ybuIC4 qriBeIf4RfGXEnQTJAntieTE2MQ9ieNzAudsmjOc5JpUlnRjruXcorkX5unOy553PFk1WZB8OIWY EpeyP+WDIEJQLxhP5aduTR0T8oSbhU9FvqKNolGxt7hKPJLmnVaV9jjdO31D+miGT0Z1xjMJT1Ir eZEZkrkj801WRNberM/ZcdktOZSclJyjUg1plrQr1zC3KLdPZisrkw3keeZtyhuTh8r35CP5c/Pb FWyFTNGjtFKuUA4WTC+oK3hbGFt4uEi9SFrUM99m/ur5IwuCFny9kLBQuLCz2Lh4WfHgIr9FuxYj i1MXdy4xXVK6ZHhp8NJ9y2jLspb9UOJYUlXyannc8o5Sg9KlpUMrglc0lamUycturvRauWMVYZVk Ve9ql9VbVn8qF5VfrHCsqK74sEa45uJXTl/VfPV5bdra3kq3yu3rSOuk626s91m/r0q9akHV0Ibw Da0b8Y3lG19tSt50oXpq9Y7NtM3KzQM1YTXtW8y2rNvyoTaj9nqdf13LVv2tq7e+2Sba1r/dd3vz DoMdFTve75TsvLUreFdrvUV99W7S7oLdjxpiG7q/5n7duEd3T8Wej3ulewf2Re/ranRvbNyvv7+y CW1SNo0eSDpw5ZuAb9qb7Zp3tXBaKg7CQeXBJ9+mfHvjUOihzsPcw83fmX+39QjrSHkr0jq/dawt o22gPaG97+iMo50dXh1Hvrf/fu8x42N1xzWPV56gnSg98fnkgpPjp2Snnp1OPz3Umdx590z8mWtd UV29Z0PPnj8XdO5Mt1/3yfPe549d8Lxw9CL3Ytslt0utPa49R35w/eFIr1tv62X3y+1XPK509E3r O9Hv03/6asDVc9f41y5dn3m978bsG7duJt0cuCW69fh29u0XdwruTNxdeo94r/y+2v3qB/oP6n+0 /rFlwG3g+GDAYM/DWQ/vDgmHnv6U/9OH4dJHzEfVI0YjjY+dHx8bDRq98mTOk+GnsqcTz8p+Vv95 63Or59/94vtLz1j82PAL+YvPv655qfNy76uprzrHI8cfvM55PfGm/K3O233vuO+638e9H5ko/ED+ UPPR+mPHp9BP9z7nfP78L/eE8/sl0p8zAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAAB6JQAAgIMA APn/AACA6QAAdTAAAOpgAAA6mAAAF2+SX8VGAAAS9ElEQVR42uybaXAlV3XHf+fe7n6rnp40+3hW ezAGGy8BHC8sXhJjh8IOpCpJhaUwVVSFpCqYJR9SldRkUlRBYRxC+JAUMbFDQoJZYkOI2UwMGGeA YHtsYw8eLzPSaKTRSKOR9KS3dt+TD/329zSj0YwcF86tkt573be7T//vWf7n3HuF/2992ye/dMSq klTVQVUGgJT3/7B0AOQDKVVyzmlGlVT7+Zc9WJ/+6rhVJeOUpHOaUqcZpwT9+r5swfrsvRMp50ir aqBgUR1ANXGya15WYP39N44apyRUdUAVKwKqpFHNAnKq6182YH3um5MDTjUtYFSBWJtyAoEs8x6/ 8mB9/v7JlFNiTQI0VqGUwoCA6GncS1ZLyDf81a4T1vPy1Urp1r17Ru5+sUG6+zvHAlVyquo7B05B VVFlQFXTzoFzitP4M6p/qsZ9X1Swrr/91/Tmm97Pvd/4DJUlALty9/b3Am8GdrQd3gf8cO+ekftW 8tx/+d6Udao5VZINgOpgCWhelcC5+rGXCljX3f5a/eP3fIzJ6cN8+eufplIpNgG7cvf224Ddu3Zd kt92zg7WDQ1jxWFwjI6PcOD5Zzg6PXkI2HM6WvnFB6YyqmRV1ThtaZNTPGBQnXoNcF5SYF37ydfp R279OE6V8elRvnTfHVQqxQ8Bt2zbcdE1V151M8O5QTyJWFiYwZcIK450IiCdCBg9cogHf/JDRsfH fgC8fe+ekdmlnnXPg9N+XZsC1TYQYrA8YFgVaQfnJaZZr9O/eN/t7H3uKS7Ydi5HZ8b58tfv4LLX 38yuV12Bqy1y5MhBZmenUFfFisbaZRzZpM/2DRvZvmEj9z3wTfbtf3IfcG0/wL7yg+mMU7KqGKf1 l62DoLFGDauqOO0EZyVgrVo0NCJkrKVUWuThXzzCr1/4Wt79zo8RegFHjh1hdPRZNKqirkqlXABC rFE8cVSrAZVqmSPHxvmNq68lCIJLf/b4I/cC1zbu/+8PHTfOMaRoIBpHuQ4tEDwjDDtFVM/OO60a WFYEBySsYaZQ5Of7H+U1F1zK2NExDhw8AC5kbm6aUmkOKw5rWn9zC46EZxnK5XAHarzp9VdzdGry GnZz2949I39z34+PJ50yKNLkTF1AiSfCsDqkF8aXIFhGhFAdgTWkPEu1XOSxp37OfLGIBcYmJ4jC ElKbJQrnCSuF5rVBIkk6M0AYVimVF3DOccMbr+POe76w+4P/+OdfQyQU1b4wCHhiYh+lZ/udVg8s iJQ6WIaEZ9GwRmANVpRd552PHx0nXDwyG1YKe4Cde/eMyN49I1KtlC+bnZm6e3J8jPlCgbGpcabn TnDxBRfm909+99aTkEbPGhmWVfLFZjU1y6kSGEPCWhLWkLCGwBo25tdw3SVXcv0N7yYIUnng0N49 I4ca1+7dM7Jv756RW51zl01OTMzOFwqMTBxm8/pNlKon3tIXKMFaK8PI6gWtVQPLIiiK3wDJGHwj +GIolhZ55OnHWLdmKze97Y9IJFJ31QlqR9u7Z2RfPrX5xmNHJzkxP8tscZ5Iw4v6qJRYQ15WMbqv umZFGnL46AGOHDvI6NGDHD46wtHpcY5OjXPg4AEefPgBJPB5+83vI5FI9gD23Z/P5m67/v5R36Tu mZ2bI5lIoupyPY7XyrCIrHqea1bv1o6xsScgrOIZwZr4WKVaplIpU66UGDsyyn3/+S0eO/Ac1117 C9b6d125e/sOgAcemc0DGYD1A7u+UiqWWFhcQMTMdwBlJCcvUkFg1R4yMTOx73P3fvbS5fR95vHH eeZxAGaTftZ8/9HZtar4jfO3XvVP//3x713O2PgRApv6VtPUjaRFNOXci5OcrxpYe/eMXHa61/xg 35xRZVhV/e6w72nqH07MLOSuOf+DuwGMITDCgNNVxUdU8eopk3Q4xKmH7nhvVwXgbLRDwH3r3viR 2ZN1+tETc74qwxtLD2/PhYd+t3UmRqOdfCrGOPFTqi2Hrm1f2vGLr1MO1c7/xnPlV44vme44JHTq O6eeKn49VZIlc8Oph+54cG79TddIHUOp/+v4RJoQSz1mL3We4jThk3eTWLtt1vipW9e/6SN9yy4/ fnLeV2XYqZodi/9xleZ2fDUK1vTK0Bze5csgQG3f5/GTAbXUli9+e/6WTzXAiSL1w0h959SPHF4j t9Tl5IahU8LkptaDuoRogigg7QLVf2sbsIggmc14A5upjD2ZN0Pb7x3/4adu3fzmj3aUXB7+RQxU I9hETnH+MFFy4zJkaAHVDqJAXZb4h91xHbV9d0Ju4Z2/NVy+/Efz1902Fa6pNhLn5eaOphsskbog Il3fpeccJ+tbfwH7yt8mk8tiFicI54/dNfpftzfpwd6nC75ICyiAqC2NOdVgtQMlbUB1y2S2vIH0 uq0E4Qxuav8rrsh+/2/z3kz2jKhDLdK6gO0Pbheo+7d0vVDXdSLo4C68/DaGL72FoDZPVJi66/kH PnnNT/cXfKETqMaAcZLn9A5OHcQlBqshk9lwGYO7riabX4d3/JnzXpt56ANnBFbo9BRm12ckl9Su +j2MUAs2YIwhu+VCEqVxXHnh3vTMg5f043mRq08qyNLAyKlkaoLdurY2+GokqpDddhmphCVT2H/D FdnvveMMNes0zW4ZAqs3QHhsPxKVSQ4MERRG8lJ45jP9BGpq1nIHi5MMVpuMYXIjbm6MaG6MZG6Y ZHWKIXfwAzsTT523Ip5Vc0qyTcBSqUItjHqjToffaDl13/MIfItnDdYzmMZJdbi5I+AHWONImhrl wthVibF//r3SOe+6pxsspW2AlvBdjd8uckSRa4uUfSwDqDkPijNEYQWMECSTpAqH2JrLf+D50qs/ evpgRa0XV1UOjh5jsVQmlfTw4nylOVsSOSWKHGHkCEMlco78YIa1QxnWDGZJpwJsEGuWC0NMZR4X eoixBImA7OIxFheHPgx0gRVzpVNFu4aPLBSKLBRLOOdQbfk72vwmda3cXCujURWMxbNC0oRkFw9e 8prkgzc8Xrr2u6epWa5uaoIR4YJd5+Cc6zAHukasczQFYyTWLGswxhBFIV7hMD5x5dQZwfpJajUl WZzYWh751xvZ+gff7tGsPtSENrNrgDiUzzI4mOkBt9uUq0cejVmmKk4U4/loUsgUpkl7R68CThOs ZjSMBfJ9r8MvdI6snPxc/XitViNfeAGXHOJ45hWM1tYyOR9SK81BcZL1mcULLXy75eC1RSr7mF0P iGIw/fq19VVVvOnHMQ7KmU0c9bYxVkyzWCyileNkvcWrT9sMw0hbL68wOj5NqVTB901zhOLkoU7m nOJUm7MimXTAYDZNLpskmfDwfY+B2hThRe9iccPl1IpFkjPHGUgcZ35untnIY41bxPb4LF3S7LoH ZGGxRKlcaZogPUw/lnutpDl00Z+hqWFqlRKJ2RkWpqYomPXgDq7MwTd5C1ov3zVIYlcipg2gXBOs KHI454ici1mxgua3U8vvICEQBD6+7+F58V9YmaXmFjoWQ0XNaNjGnbq0tSOw0J0dSjMnFIkHVASm z7mJVNInmfBJpxL4ngV1eL5HZfrQCsBqN0Mj7Ni6vhl+YXlm12uiLX9nxJLNZlEXoRpRXshRm5/o 5FkkEtphhr2+q913DubSDObSfc/1RNC2fNGzEIVVrDEcmZaVgtUaOdoSy4Zpan3piUh8LhZQ68fr IKkiRhBj2nxILLxnDAPZAaIoYv5EhskZ19AL65wO4A+uB6VYKTEyMdETWATYuXkzmVQMUBhGTfna zZU+5tu4h2eEZDJFbnAQpw4xHriVmGHDKTrliV8eZqFYIp30sEaayh5FMW2InBJGjiiKP4dyaTas HWQ4nyabTpBM+BjTm8P5vk82myGTyVCphtRXtWStkYxDrCqMTEyw586/6yv0n77r/Vx18auohRFf +ubPmJ6ZxxptAlKfjUZV6jPMgudZtm0cYufWNWzfPMy64SyZdBoXhRi7ErCitkTaCDu3raNWC1tm 1+E8489GbQiUwPdIJjySCZ/AtxiRThbeZhrJRIJEMklEkFJlQARrjaQipyjC+qFh3vbG6ylXwp6K kmdjrfI9y5svP59SqdpBRmlzDWEUNYgIqaRPLpskl03iexbPM6TTGdSYMzRDA0O5dP/Mv29I7w7d /clk47f1PIIgwImx9UmHDCBRvVi3fniYd77lRsLI9alZSZ3Twblb1i7pI3v8aZ8SUyIRoKwUrIYZ ohybLlAsVTC2rbrQCIZ18jg4kCI/kCKZ8E8eubp8B4C1Hg4wRnwjEjhVGpoVa44h8E0X2G2DBRRL VUqVap9iZQxoMuGRTgX4ntfXh1lruwvGp0sdQB0cOz5PYbFEMrCIkQ4+FoYR1Zpj7VCWhG9JBh6C 6SKM/clk01KMIXTgWRlo0KSGZvVEsD6OGmChWKawWEa1Xq6o50qCIEZIJxMEvsX3bB3ozllYEcGx ArCqbdTBWuHiV21taQe6NEkUMGJOSTO6m6qiYn0E06BJUVcifSpqsnFdnk3r6etPO2mLWVKBwmVW SpfwWf1CrunJy07X7HpmFhUiNR0yxJq1hNn18ZG1WtiqjPSbO2hLqK2N81ZjDNa0gk/kWKEZ9jjF PsJ3m8UpcrilmsbgSCdYiqouSTI7NVWZmikwO1/EuahzPl86qw7GCNl0HAkz6YCE72GtdNTQVsTg zzjayfJWZ6j2ChrTkM7S9ts++iEAvvaJO0glvLbBMmxan2fj2sHOigRLm74xcUXFtPvglYPVGslK pUa5WuuT6Us9ksQPbh9J3xp832KMwZiTg+ZUCSPtKitrW1m58/qpEyW2bxzoGCzfM8v2kUu10Omy lpQsAZYQRY7Hnh5loVgmk/JpDITSIKLxi4ZRFBf/IiU/mGbT2gHWDQ+QSSdIp3zsSQifNop9XWYI cHB8nDu/fm/Hub/+t8+TDCx/+I7f4bxz4lrbY/vHmCsUm2AZY2jGI1oB0hhDPpdiKJdmcCBFNh1H ySZY9rR9lms6aN8zXHzBFqrVsHdis53Rt323RvD9mBn7nq1r3anM0PXVrGK5xJPPP9dx7sBoXEp5 +oVj7NpyDmGk7H/+KMdPzGNM25SxNgsjzZTHGMP64SzbzxlmuwyTCLw6nahXOuyKqEPL5+SyyTOK dsvxWbUufxHVX/TiXbv4wu5PMD1b5sOf+UsAPn3bno4Il0p4vOeWyzs5w7KXRLUuCR1n4ODrwzM5 XaBcCeMkWrSVHbaKEi2+pBD4HqmUTzoREATxxIWc5CUcShjRo1kNMNYNpVg/1NofmUl57NyU6xis dke90nbGDj6K4ODhaQqLZZIJj4braVQb4spDPFERRQ6nkM+l2bw+x9p8lozWfdZJwOoXDSNHW8kl 1tzf/823MFuodlEVqQ/oAvMLpZjBt41kY+oskwrID6bjDGMJWcJI8S2mVa04TZ7le8IVl53bnGnp njhYzso/Maf2WdZ66YStrVOJNS2VCPLdvOq9b30r5WqEZ6XDTTRWyFgrqJoOLUd681g5iWbtWscW 1VZAOG2e5bUX787QPy1FHXzfH7JaOU+JfWw6GWzStpkjQbAWsmmvRwYRYcPa3FkxwzWZ6Hw9yQoR VaL+Dh5B1fHC6DSL5Urd97QicoM6RJGSyybZsDZHJp1oFgiX7eABz3hDhNWdjXv71mxabiJ+tlro IGVr5/ezP0WcIlWnsrikg1eF+cUy84USgW86TCqeXI3BEiPkqyHpVMDpLhZWBSt2natWLgRURKpW JaPd6Y3Iqi5DDp1iXe3czoVroipSVmQxQubBlvrUs6ivvre87qJtq7oGMSbOMuRqNSPGLGLsvKpK v5IMqwyWiWr1NQ/i1JgyyAJiqg5TjdSeKIXmsAF47tCR4NnnD68V46U6FoKscqvPPwaAQaQo1h6r KMe6Z6RfDLBQzcYby9UHKTqxEzX8g8XQf2Jywf+fZybso97+Xx58a2Wh9AoXRq8czA7slBdLwgYp VQpeIjFiPG8KY0rGyNoVcMwzanVupypmTq03Eol3uOy8Fwple2hyTg5PzTPnHOqF1dqNGrotURRt DYw38IX773/RhDw+O4fne9M2mRhRlYpGkajT4Ds/+SmPP/vsiybH0eMzOOs/44w3UlXv8ELFvjBV MKOTsxyvhjRnTOSpXzz3J6qaVqcJYyQH4hljUoDRPprQOwesPSuEG4clvo+0X1unBRHWLojxZtTY Ew4puwiHukBVPXXOtnK7FvfR+hLKjmONpQRt/WnrR1v/BgfruF/9d+SkWqpJYbYoJ04ssFCLiLpf qans5WqUUmXIOYad4rV2dTZ3hbZtp9XW0iNt7f5s7iCN6+ppayTtGhu6HTh19R2jvbtI1dWf1fHZ 3o94qUDXs/r3bV2j6vqfd336n2K1sgGo1pwRJF9fNXzGGwlEEM9Kil+xZur6NaSwBjk7Oy48K4nV 3qH1fwJWGLkksOlsAQXgW0nzK9gMsPNs7qryjQQiYn4VwfrfAQAc9dDnZ0sguwAAAABJRU5ErkJg gg== "
        style="display:inline;image-rendering:optimizeSpeed"
        preserveAspectRatio="none"
        height="66.000015"
        width="75" />
   </g>
   <g
-     inkscape:label="Foreground"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-986.3622)">
     <path
-       sodipodi:nodetypes="cccccc"
-       inkscape:connector-curvature="0"
        id="rect4001-3-4-5-7"
        d="m 61.725004,1022.8099 21.27431,-0.1009 1.654984,3.7793 -20.678174,12.1198 -29.322882,0.1009 z"
        style="display:inline;opacity:0.62999998;fill:url(#linearGradient4314-5-4);fill-opacity:1;stroke:none;filter:url(#filter4344-1)"
        transform="matrix(0.81385308,0,0,0.61823795,-26.010509,404.93119)" />
     <path
-       sodipodi:nodetypes="cccccc"
-       inkscape:connector-curvature="0"
        id="rect4001-3-4-5"
        d="m 61.725004,1022.8099 21.27431,-0.1009 1.654984,3.7793 -20.678174,12.1198 -29.322882,0.1009 z"
        style="display:inline;opacity:0.62999998;fill:url(#linearGradient4314-5);fill-opacity:1;stroke:none;filter:url(#filter4344)"
@@ -1024,149 +389,113 @@ gg==
          style="fill:#737986;fill-opacity:1;stroke:#595e68;stroke-opacity:1" />
     </g>
     <path
-       sodipodi:nodetypes="cccccc"
-       inkscape:connector-curvature="0"
        id="rect4001-3-4"
        d="m 37.506494,1008.8603 19.753919,-0.2323 7.608429,8.7088 0.07385,27.9289 -27.288467,0.2323 z"
        style="display:inline;fill:url(#linearGradient6375-6);fill-opacity:1;stroke:none" />
     <path
-       sodipodi:nodetypes="ccscccc"
-       inkscape:connector-curvature="0"
        id="rect4001-1"
        d="m 37.555332,1008.952 19.486128,0 c 0,0 5.85893,1.2059 4.373085,3.9843 -0.04608,0.087 4.030127,4.7374 4.030127,4.7374 l 0,28.1389 -27.88934,0 z"
        style="fill:none;stroke:url(#linearGradient4238);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1" />
     <path
-       sodipodi:nodetypes="cccccc"
-       inkscape:connector-curvature="0"
        id="rect4001-3-9-0"
        d="m 57.260413,1008.9265 7.577969,8.4882 0,8.8212 -11.121134,-7.7162 c 1.458578,-3.0944 2.515266,-6.3264 3.543105,-9.5932 z"
        style="display:inline;fill:url(#linearGradient4240);fill-opacity:1;stroke:none" />
     <path
-       sodipodi:nodetypes="cccc"
        id="path5675-4"
        d="m 57.057798,1008.3236 c 1.63519,2.2276 3.607055,5.0773 2.145555,9.9462 3.363056,-1.9023 6.847609,-0.8933 6.847609,-0.8933 0,-4.5455 -5.518386,-9.2672 -8.993164,-9.0529 z"
-       style="display:inline;fill:url(#linearGradient4264);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       inkscape:connector-curvature="0" />
+       style="display:inline;fill:url(#linearGradient4264);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
     <path
        style="fill:none;fill-rule:evenodd;stroke:#bbc5d8;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="m 47,1038.3622 9.700639,0"
-       id="path4696"
-       inkscape:connector-curvature="0" />
+       id="path4696" />
     <path
        style="display:inline;fill:none;fill-rule:evenodd;stroke:#879ab6;stroke-width:1.99999988;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="m 47,1034.3622 14,0"
-       id="path4696-4"
-       inkscape:connector-curvature="0" />
+       id="path4696-4" />
     <path
        style="display:inline;fill:none;fill-rule:evenodd;stroke:#bbc5d8;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="m 47,1016.3622 12,0"
-       id="path4696-0"
-       inkscape:connector-curvature="0" />
+       id="path4696-0" />
     <path
        style="display:inline;fill:none;fill-rule:evenodd;stroke:#bbc5d8;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="m 47,1020.3622 12,0"
-       id="path4696-9"
-       inkscape:connector-curvature="0" />
+       id="path4696-9" />
     <path
        style="display:inline;fill:none;fill-rule:evenodd;stroke:#7b8fae;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="m 47.000001,1024.3622 14,0"
-       id="path4696-8"
-       inkscape:connector-curvature="0" />
+       id="path4696-8" />
     <path
        style="display:inline;fill:none;fill-rule:evenodd;stroke:#bbc5d8;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="m 47,1030.3622 12,0"
-       id="path4696-2"
-       inkscape:connector-curvature="0" />
+       id="path4696-2" />
     <g
        id="g8662"
        transform="matrix(-1.0520896,0,0,-1.0534376,64.741831,2090.0588)">
       <path
          style="fill:url(#linearGradient4533);fill-opacity:1;fill-rule:evenodd;stroke:#398a43;stroke-width:0.94988102px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
          d="m 40.244943,1041.4693 c -0.24182,0.7378 -4.276215,-4.6418 -4.276215,-4.6418 -11.44876,7.9356 -17.573348,-1.4122 -16.632852,-8.3285 0.287455,-2.114 2.873263,9.5491 13.24418,4.9398 0,0 -6.161054,-4.0913 -5.456972,-5.1523 0.390532,-0.5886 13.008987,-0.7195 13.731155,0.03 0.722169,0.75 -0.343071,12.3401 -0.609296,13.1524 z"
-         id="path4522"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="scscszs" />
+         id="path4522" />
       <path
          style="display:inline;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4584);stroke-width:0.94988102px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
          d="m 40.029866,1028.5266 c 0.335464,3.4409 -0.540551,10.8513 -0.558812,11.097 -0.130143,-0.1351 -3.305251,-4.1177 -3.305251,-4.1177 -13.489832,9.4517 -15.979945,-3.8837 -15.944315,-4.5632 0,0 4.159907,8.1407 14.425918,2.5964 -3.722931,-2.2 -6.36447,-4.7334 -6.416153,-4.8694"
-         id="path4522-3"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccscc" />
+         id="path4522-3" />
     </g>
     <path
-       sodipodi:nodetypes="cccccc"
-       inkscape:connector-curvature="0"
        id="rect4001-3-4-3"
        d="m 5.4557968,1008.9145 19.7539192,-0.2324 7.608429,8.7088 0.07385,27.9289 -27.2884668,0.2324 z"
        style="display:inline;fill:url(#linearGradient4499);fill-opacity:1;stroke:none" />
     <path
-       sodipodi:nodetypes="ccscccc"
-       inkscape:connector-curvature="0"
        id="rect4001-1-8"
        d="m 5.5046347,1009.0062 19.4861283,0 c 0,0 5.85893,1.2058 4.373085,3.9843 -0.04608,0.087 4.030127,4.7373 4.030127,4.7373 l 0,28.139 -27.8893403,0 z"
        style="fill:none;stroke:url(#linearGradient4501);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1" />
     <path
-       sodipodi:nodetypes="cccccc"
-       inkscape:connector-curvature="0"
        id="rect4001-3-9-0-0"
        d="m 25.209716,1008.9807 7.577969,8.4882 0,8.8212 -11.121134,-7.7163 c 1.458578,-3.0943 2.515266,-6.3264 3.543104,-9.5931 z"
        style="display:inline;fill:url(#linearGradient4503);fill-opacity:1;stroke:none" />
     <path
-       sodipodi:nodetypes="cccc"
        id="path5675-4-7"
        d="m 25.007101,1008.3777 c 1.63519,2.2277 3.607055,5.0774 2.145555,9.9463 3.363056,-1.9023 6.847609,-0.8933 6.847609,-0.8933 0,-4.5456 -5.518387,-9.2672 -8.993164,-9.053 z"
-       style="display:inline;fill:url(#linearGradient4505);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       inkscape:connector-curvature="0" />
+       style="display:inline;fill:url(#linearGradient4505);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
     <path
        style="fill:none;fill-rule:evenodd;stroke:#bbc5d8;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="m 9,1041.3622 9.700638,0"
-       id="path4696-88"
-       inkscape:connector-curvature="0" />
+       id="path4696-88" />
     <path
        style="display:inline;fill:none;fill-rule:evenodd;stroke:#bbc5d8;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="m 9,1037.3622 13.338378,0"
-       id="path4696-5-1"
-       inkscape:connector-curvature="0" />
+       id="path4696-5-1" />
     <path
        style="display:inline;fill:none;fill-rule:evenodd;stroke:#bbc5d8;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="m 9,1033.3622 14.550958,0"
-       id="path4696-4-0"
-       inkscape:connector-curvature="0" />
+       id="path4696-4-0" />
     <path
        style="display:inline;fill:none;fill-rule:evenodd;stroke:#bbc5d8;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="m 9,1016.3622 13.338378,0"
-       id="path4696-0-9"
-       inkscape:connector-curvature="0" />
+       id="path4696-0-9" />
     <path
        style="display:inline;fill:none;fill-rule:evenodd;stroke:#bbc5d8;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="m 9,1020.3622 13.338378,0"
-       id="path4696-9-9"
-       inkscape:connector-curvature="0" />
+       id="path4696-9-9" />
     <path
        style="display:inline;fill:none;fill-rule:evenodd;stroke:#bbc5d8;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="m 9,1024.3622 13.338378,0"
-       id="path4696-8-8"
-       inkscape:connector-curvature="0" />
+       id="path4696-8-8" />
     <path
        style="display:inline;fill:none;fill-rule:evenodd;stroke:#bbc5d8;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="m 9,1028.3622 10.913218,0"
-       id="path4696-2-9"
-       inkscape:connector-curvature="0" />
+       id="path4696-2-9" />
     <path
        style="display:inline;fill:none;fill-rule:evenodd;stroke:#bbc5d8;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="m 47,1027.3622 10,0"
-       id="path4696-2-4"
-       inkscape:connector-curvature="0" />
+       id="path4696-2-4" />
     <g
        id="g4574"
        transform="translate(-55,-20)">
       <path
-         inkscape:connector-curvature="0"
          id="path4696-09"
          d="m 94,1054.3622 6,0"
          style="display:inline;fill:none;fill-rule:evenodd;stroke:#3b6568;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
       <path
-         inkscape:connector-curvature="0"
          id="path4696-09-2"
          d="m 97,1051.3622 0,6"
          style="display:inline;fill:none;fill-rule:evenodd;stroke:#3b6568;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
@@ -1174,7 +503,6 @@ gg==
     <path
        style="display:inline;fill:none;fill-rule:evenodd;stroke:#3b6568;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="m 39,1024.3622 6,0"
-       id="path4696-09-1"
-       inkscape:connector-curvature="0" />
+       id="path4696-09-1" />
   </g>
 </svg>
diff --git a/apitools/org.eclipse.pde.api.tools.ui/icons/full/wizban/profile_wiz.svg b/apitools/org.eclipse.pde.api.tools.ui/icons/full/wizban/profile_wiz.svg
index 737bc05e293..49088fd811d 100644
--- a/apitools/org.eclipse.pde.api.tools.ui/icons/full/wizban/profile_wiz.svg
+++ b/apitools/org.eclipse.pde.api.tools.ui/icons/full/wizban/profile_wiz.svg
@@ -6,13 +6,6 @@
    height="66"
    id="svg2"
    version="1.1"
-   inkscape:version="1.3 (0e150ed, 2023-07-21)"
-   sodipodi:docname="profile_wiz.svg"
-   inkscape:export-filename="/Users/d021678/git/eclipse.jdt.ui/org.eclipse.jdt.ui/icons/full/wizban/newclass_wiz2.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:svg="http://www.w3.org/2000/svg"
@@ -22,7 +15,6 @@
   <defs
      id="defs4">
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient8785">
       <stop
          style="stop-color:#bb8d2d;stop-opacity:1"
@@ -38,7 +30,6 @@
          id="stop8783" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient8777">
       <stop
          style="stop-color:#fbeaab;stop-opacity:1;"
@@ -50,7 +41,6 @@
          id="stop8775" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient8767">
       <stop
          style="stop-color:#6a8ec1;stop-opacity:1"
@@ -62,7 +52,6 @@
          id="stop8765" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient8759">
       <stop
          style="stop-color:#d3e0eb;stop-opacity:1"
@@ -74,7 +63,6 @@
          id="stop8757" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient8751">
       <stop
          style="stop-color:#2e5d8f;stop-opacity:1"
@@ -86,7 +74,6 @@
          id="stop8749" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient8490">
       <stop
          style="stop-color:#fdfefd;stop-opacity:1"
@@ -98,7 +85,6 @@
          id="stop8488" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient8458">
       <stop
          style="stop-color:#c1cee6;stop-opacity:1"
@@ -110,393 +96,6 @@
          id="stop8456" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       id="linearGradient4972">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0"
-         id="stop4974" />
-      <stop
-         style="stop-color:#f5f8fd;stop-opacity:1"
-         offset="1"
-         id="stop4976" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient4964">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0"
-         id="stop4966" />
-      <stop
-         style="stop-color:#e8eefa;stop-opacity:1"
-         offset="1"
-         id="stop4968" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient4956">
-      <stop
-         style="stop-color:#fcfdfe;stop-opacity:1"
-         offset="0"
-         id="stop4958" />
-      <stop
-         style="stop-color:#dee6f8;stop-opacity:1"
-         offset="1"
-         id="stop4960" />
-    </linearGradient>
-    <filter
-       style="color-interpolation-filters:sRGB"
-       inkscape:label="Drop Shadow"
-       id="filter8854">
-      <feFlood
-         flood-opacity="0.933333"
-         flood-color="rgb(244,248,254)"
-         result="flood"
-         id="feFlood8856" />
-      <feComposite
-         in="flood"
-         in2="SourceGraphic"
-         operator="in"
-         result="composite1"
-         id="feComposite8858" />
-      <feGaussianBlur
-         in="composite1"
-         stdDeviation="1.2"
-         result="blur"
-         id="feGaussianBlur8860" />
-      <feOffset
-         dx="-1"
-         dy="3"
-         result="offset"
-         id="feOffset8862" />
-      <feComposite
-         in="SourceGraphic"
-         in2="offset"
-         operator="over"
-         result="composite2"
-         id="feComposite8864" />
-    </filter>
-    <linearGradient
-       id="linearGradient6122">
-      <stop
-         style="stop-color:#c0c0c0;stop-opacity:1"
-         offset="0"
-         id="stop6124" />
-      <stop
-         id="stop6132"
-         offset="0.5"
-         style="stop-color:#adadad;stop-opacity:1" />
-      <stop
-         style="stop-color:#808080;stop-opacity:1"
-         offset="1"
-         id="stop6126" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient7087">
-      <stop
-         style="stop-color:#17325d;stop-opacity:1;"
-         offset="0"
-         id="stop7089" />
-      <stop
-         id="stop7091"
-         offset="0.25"
-         style="stop-color:#b4d0e2;stop-opacity:1" />
-      <stop
-         id="stop7093"
-         offset="0.5"
-         style="stop-color:#b7d2e4;stop-opacity:1" />
-      <stop
-         style="stop-color:#acc9de;stop-opacity:1"
-         offset="0.75"
-         id="stop7095" />
-      <stop
-         style="stop-color:#3e72a7;stop-opacity:1"
-         offset="1"
-         id="stop7097" />
-    </linearGradient>
-    <mask
-       id="mask7366"
-       maskUnits="userSpaceOnUse">
-      <path
-         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;display:inline"
-         d="m -16.593048,1040.862 9.990206,0 0,10.0018 -2.983353,3.0385 -5.966213,0 c -0.53033,-0.022 -1.04064,-0.5519 -1.04064,-1.0385 z"
-         id="path7368"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccccc" />
-    </mask>
-    <linearGradient
-       id="linearGradient7584-5">
-      <stop
-         id="stop7586-4"
-         offset="0"
-         style="stop-color:#f9cd5f;stop-opacity:1" />
-      <stop
-         id="stop7588-5"
-         offset="1"
-         style="stop-color:#fbf0b4;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient7592-1">
-      <stop
-         id="stop7594-6"
-         offset="0"
-         style="stop-color:#bd8416;stop-opacity:1" />
-      <stop
-         id="stop7596-9"
-         offset="1"
-         style="stop-color:#a66b10;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10798-1-9-3-7-6-6-6-2-6-7-98-9-4-1">
-      <stop
-         style="stop-color:#5aad60;stop-opacity:1;"
-         offset="0"
-         id="stop10800-5-2-1-8-20-4-0-2-1-9-0-0-1-1" />
-      <stop
-         id="stop10806-6-8-5-3-9-2-2-7-0-4-2-7-8-9"
-         offset="0.5"
-         style="stop-color:#5bb26a;stop-opacity:1;" />
-      <stop
-         style="stop-color:#a4c589;stop-opacity:1"
-         offset="1"
-         id="stop10802-1-5-3-0-4-6-8-5-5-6-69-6-4-0" />
-    </linearGradient>
-    <mask
-       maskUnits="userSpaceOnUse"
-       id="mask7366-4">
-      <path
-         sodipodi:nodetypes="ccccccc"
-         inkscape:connector-curvature="0"
-         id="path7368-2"
-         d="m -16.593048,1040.862 9.990206,0 0,10.0018 -2.983353,3.0385 -5.966213,0 c -0.53033,-0.022 -1.04064,-0.5519 -1.04064,-1.0385 z"
-         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;display:inline" />
-    </mask>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient7087"
-       id="linearGradient9331"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-20,0)"
-       x1="4.7776356"
-       y1="1039.8118"
-       x2="4.7776356"
-       y2="1041.911" />
-    <linearGradient
-       y2="1041.911"
-       x2="4.7776356"
-       y1="1039.8118"
-       x1="4.7776356"
-       gradientTransform="translate(-18,4.7e-5)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient9333"
-       xlink:href="#linearGradient7087"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="1041.911"
-       x2="4.7776356"
-       y1="1039.8118"
-       x1="4.7776356"
-       gradientTransform="translate(-16,4.7e-5)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient9335"
-       xlink:href="#linearGradient7087"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="1041.911"
-       x2="4.7776356"
-       y1="1039.8118"
-       x1="4.7776356"
-       gradientTransform="translate(-14,4.7e-5)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient9337"
-       xlink:href="#linearGradient7087"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="1041.911"
-       x2="4.7776356"
-       y1="1039.8118"
-       x1="4.7776356"
-       gradientTransform="translate(-12,4.7e-5)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient9339"
-       xlink:href="#linearGradient7087"
-       inkscape:collect="always" />
-    <linearGradient
-       gradientTransform="translate(-80,0)"
-       gradientUnits="userSpaceOnUse"
-       y2="1042.7973"
-       x2="163.22012"
-       y1="1042.7973"
-       x1="88.220117"
-       id="linearGradient68073"
-       xlink:href="#linearGradient4956"
-       inkscape:collect="always" />
-    <linearGradient
-       gradientTransform="translate(-80,0)"
-       gradientUnits="userSpaceOnUse"
-       y2="1032.2669"
-       x2="163.22012"
-       y1="1032.2668"
-       x1="94.469681"
-       id="linearGradient68075"
-       xlink:href="#linearGradient4964"
-       inkscape:collect="always" />
-    <linearGradient
-       gradientTransform="translate(-80,0)"
-       gradientUnits="userSpaceOnUse"
-       y2="1032.2668"
-       x2="152.72206"
-       y1="1032.2668"
-       x1="88.220116"
-       id="linearGradient68077"
-       xlink:href="#linearGradient4972"
-       inkscape:collect="always" />
-    <filter
-       id="filter8854-9"
-       inkscape:label="Drop Shadow"
-       style="color-interpolation-filters:sRGB">
-      <feFlood
-         id="feFlood8856-0"
-         result="flood"
-         flood-color="rgb(244,248,254)"
-         flood-opacity="0.933333" />
-      <feComposite
-         id="feComposite8858-2"
-         result="composite1"
-         operator="in"
-         in2="SourceGraphic"
-         in="flood" />
-      <feGaussianBlur
-         id="feGaussianBlur8860-3"
-         result="blur"
-         stdDeviation="1.2"
-         in="composite1" />
-      <feOffset
-         id="feOffset8862-2"
-         result="offset"
-         dy="3"
-         dx="-1" />
-      <feComposite
-         id="feComposite8864-3"
-         result="composite2"
-         operator="over"
-         in2="offset"
-         in="SourceGraphic" />
-    </filter>
-    <linearGradient
-       id="linearGradient10798-1-9-3-7-6-8-9-0-9-1">
-      <stop
-         id="stop10800-5-2-1-8-20-6-4-9-8-2"
-         offset="0"
-         style="stop-color:#7564b1;stop-opacity:1" />
-      <stop
-         style="stop-color:#5d4aa1;stop-opacity:1"
-         offset="0.5"
-         id="stop10806-6-8-5-3-9-24-8-4-3-2" />
-      <stop
-         id="stop10802-1-5-3-0-4-8-4-2-9-2"
-         offset="1"
-         style="stop-color:#9283c3;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient7540-2-3-8-7">
-      <stop
-         id="stop7542-8-7-5-3"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.502" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0.47623286"
-         id="stop7544-8-2-0-5" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0"
-         offset="0.5"
-         id="stop7546-1-7-9-5" />
-      <stop
-         id="stop7548-98-9-2-4"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient7272-66-4-5-5-5-8">
-      <stop
-         style="stop-color:#8f6c10;stop-opacity:1"
-         offset="0"
-         id="stop7274-6-0-1-7-4-7" />
-      <stop
-         style="stop-color:#c9a645;stop-opacity:1"
-         offset="1"
-         id="stop7276-66-6-3-9-1-4" />
-    </linearGradient>
-    <linearGradient
-       y2="1030.3411"
-       x2="-10.159802"
-       y1="1030.3411"
-       x1="-22.453552"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient10540"
-       xlink:href="#linearGradient7540-2-3-8-7"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="1030.3411"
-       x2="-10.159802"
-       y1="1030.3411"
-       x1="-22.453552"
-       gradientTransform="matrix(0,1,-1,0,1014.0344,1046.6478)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient10542"
-       xlink:href="#linearGradient7540-2-3-8-7"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="1023.2569"
-       x2="-15.945988"
-       y1="1037.4661"
-       x1="-15.945988"
-       gradientTransform="matrix(0.95585117,0,0,0.95585117,-0.71992063,45.488394)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient10544"
-       xlink:href="#linearGradient7272-66-4-5-5-5-8"
-       inkscape:collect="always" />
-    <mask
-       id="mask10620"
-       maskUnits="userSpaceOnUse">
-      <path
-         transform="matrix(0.55482947,0,0,0.55482947,-206.96039,787.08655)"
-         d="m 398.75,468.23718 a 10.625,10.625 0 1 1 -21.25,0 10.625,10.625 0 1 1 21.25,0 z"
-         sodipodi:ry="10.625"
-         sodipodi:rx="10.625"
-         sodipodi:cy="468.23718"
-         sodipodi:cx="388.125"
-         id="path10622"
-         style="font-size:13.58917427px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:2.16621375;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline;font-family:Sans"
-         sodipodi:type="arc" />
-    </mask>
-    <linearGradient
-       id="linearGradient4528-9-5-7-9-7-3">
-      <stop
-         id="stop4530-0-5-0-5-8-4"
-         offset="0"
-         style="stop-color:#e0c576;stop-opacity:1;" />
-      <stop
-         id="stop4532-7-9-3-3-6-1"
-         offset="1"
-         style="stop-color:#9e7916;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient6281-8-0-1-6-6-4-2-8-0">
-      <stop
-         style="stop-color:#f7f9fb;stop-opacity:1"
-         offset="0"
-         id="stop6283-0-2-2-1-2-0-1-6-0" />
-      <stop
-         style="stop-color:#ffd680;stop-opacity:1"
-         offset="1"
-         id="stop6285-5-0-9-7-6-9-9-1-9" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4972-7"
        id="linearGradient4978"
        x1="88.220116"
@@ -506,7 +105,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-88.220116,-999.2669)" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4972-7">
       <stop
          style="stop-color:#b8ccf1;stop-opacity:0.10196079"
@@ -518,7 +116,6 @@
          id="stop4976-1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4964-3"
        id="linearGradient4970"
        x1="118.38584"
@@ -528,7 +125,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-88.220117,-999.2669)" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4964-3">
       <stop
          style="stop-color:#ffffff;stop-opacity:0.349"
@@ -540,7 +136,6 @@
          id="stop4968-1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4956-2"
        id="linearGradient4962"
        x1="88.220116"
@@ -550,7 +145,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-88.220116,-999.2669)" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4956-2">
       <stop
          style="stop-color:#fcfdfe;stop-opacity:0.25641027"
@@ -562,37 +156,6 @@
          id="stop4960-6" />
     </linearGradient>
     <linearGradient
-       id="linearGradient3827">
-      <stop
-         id="stop3829"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0.60149658"
-         id="stop3835" />
-      <stop
-         id="stop3831"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10798-1-9-3-7-6-8-9-0-9-1-0">
-      <stop
-         id="stop10800-5-2-1-8-20-6-4-9-8-2-9"
-         offset="0"
-         style="stop-color:#f3faed;stop-opacity:1" />
-      <stop
-         style="stop-color:#e7f4da;stop-opacity:1"
-         offset="0.65917557"
-         id="stop10806-6-8-5-3-9-24-8-4-3-2-4" />
-      <stop
-         id="stop10802-1-5-3-0-4-8-4-2-9-2-5"
-         offset="1"
-         style="stop-color:#67bf1f;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4994"
        id="linearGradient6375-6"
        x1="50.702839"
@@ -602,8 +165,7 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(0.95292719,0,0,0.9400082,-4.3529074,51.703107)" />
     <linearGradient
-       id="linearGradient4994"
-       inkscape:collect="always">
+       id="linearGradient4994">
       <stop
          id="stop4996"
          offset="0"
@@ -614,7 +176,6 @@
          style="stop-color:#dbe2eb;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4902"
        id="linearGradient4238"
        gradientUnits="userSpaceOnUse"
@@ -624,8 +185,7 @@
        x2="10.544736"
        y2="1052.3228" />
     <linearGradient
-       id="linearGradient4902"
-       inkscape:collect="always">
+       id="linearGradient4902">
       <stop
          id="stop4904"
          offset="0"
@@ -636,7 +196,6 @@
          style="stop-color:#9a9a8f;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient6411"
        id="linearGradient4240"
        gradientUnits="userSpaceOnUse"
@@ -646,7 +205,6 @@
        x2="47.429596"
        y2="1023.1616" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient6411">
       <stop
          style="stop-color:#4f605c;stop-opacity:1"
@@ -658,7 +216,6 @@
          id="stop6415" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4258"
        id="linearGradient4264"
        x1="59.220116"
@@ -668,7 +225,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1.7683014,0,0,1.8268252,-65.185236,-863.52445)" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4258">
       <stop
          style="stop-color:#f4ae5f;stop-opacity:1;"
@@ -689,15 +245,12 @@
        width="1.0967932"
        x="-0.048396592"
        id="filter4285-9"
-       style="color-interpolation-filters:sRGB"
-       inkscape:collect="always">
+       style="color-interpolation-filters:sRGB">
       <feGaussianBlur
          id="feGaussianBlur4287-9"
-         stdDeviation="0.10000000000000001"
-         inkscape:collect="always" />
+         stdDeviation="0.10000000000000001" />
     </filter>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4308"
        id="linearGradient6406"
        gradientUnits="userSpaceOnUse"
@@ -706,7 +259,6 @@
        x2="75.020309"
        y2="1023.2908" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4308">
       <stop
          style="stop-color:#d5d2d9;stop-opacity:1"
@@ -718,7 +270,6 @@
          id="stop4312" />
     </linearGradient>
     <filter
-       inkscape:collect="always"
        style="color-interpolation-filters:sRGB"
        id="filter4344"
        x="-0.027383926"
@@ -726,12 +277,10 @@
        y="-0.085576576"
        height="1.1711532">
       <feGaussianBlur
-         inkscape:collect="always"
          stdDeviation="0.57051052"
          id="feGaussianBlur4346" />
     </filter>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient8458"
        id="linearGradient8460"
        x1="44"
@@ -740,7 +289,6 @@
        y2="1038.3622"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient8490"
        id="linearGradient8492"
        x1="89"
@@ -750,7 +298,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-52.5,-34.49997)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient8490"
        id="linearGradient8492-0"
        x1="89"
@@ -760,7 +307,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(0.41176473,0,0,0.41176481,3.676469,589.53652)" />
     <filter
-       inkscape:collect="always"
        style="color-interpolation-filters:sRGB"
        id="filter8641"
        x="-0.096127967"
@@ -768,21 +314,10 @@
        y="-0.1596458"
        height="1.3192916">
       <feGaussianBlur
-         inkscape:collect="always"
          stdDeviation="0.92592472"
          id="feGaussianBlur8643" />
     </filter>
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8751"
-       id="linearGradient8753"
-       x1="50"
-       y1="1019.3622"
-       x2="50"
-       y2="1024.3622"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient8759"
        id="linearGradient8761"
        x1="57"
@@ -790,35 +325,7 @@
        x2="62"
        y2="1030.3622"
        gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8767"
-       id="linearGradient8769"
-       x1="51.658199"
-       y1="1020.4141"
-       x2="51.933025"
-       y2="1023.234"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8777"
-       id="linearGradient8779"
-       x1="63.98344"
-       y1="1016.2225"
-       x2="68.598152"
-       y2="1026.0538"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8785"
-       id="linearGradient8787"
-       x1="68.47998"
-       y1="1015.6127"
-       x2="67.683601"
-       y2="1028.4165"
-       gradientUnits="userSpaceOnUse" />
     <filter
-       inkscape:collect="always"
        style="color-interpolation-filters:sRGB"
        id="filter8813"
        x="-0.53770523"
@@ -826,12 +333,10 @@
        y="-0.24307477"
        height="1.4861495">
       <feGaussianBlur
-         inkscape:collect="always"
          stdDeviation="1.1269452"
          id="feGaussianBlur8815" />
     </filter>
     <filter
-       inkscape:collect="always"
        style="color-interpolation-filters:sRGB"
        id="filter8835"
        x="-0.313344"
@@ -839,12 +344,10 @@
        y="-0.30129232"
        height="1.6025846">
       <feGaussianBlur
-         inkscape:collect="always"
          stdDeviation="0.49751501"
          id="feGaussianBlur8837" />
     </filter>
     <filter
-       inkscape:collect="always"
        style="color-interpolation-filters:sRGB"
        id="filter8871"
        x="-0.41554753"
@@ -852,12 +355,10 @@
        y="-0.11828489"
        height="1.2365698">
       <feGaussianBlur
-         inkscape:collect="always"
          stdDeviation="0.53588249"
          id="feGaussianBlur8873" />
     </filter>
     <filter
-       inkscape:collect="always"
        style="color-interpolation-filters:sRGB"
        id="filter8881"
        x="-0.49425547"
@@ -865,12 +366,10 @@
        y="-0.77112415"
        height="2.5422483">
       <feGaussianBlur
-         inkscape:collect="always"
          stdDeviation="0.61211194"
          id="feGaussianBlur8883" />
     </filter>
     <filter
-       inkscape:collect="always"
        style="color-interpolation-filters:sRGB"
        id="filter8996"
        x="-0.088669853"
@@ -878,12 +377,10 @@
        y="-0.11527081"
        height="1.2305416">
       <feGaussianBlur
-         inkscape:collect="always"
          stdDeviation="0.5635"
          id="feGaussianBlur8998" />
     </filter>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient8767"
        id="linearGradient9006"
        gradientUnits="userSpaceOnUse"
@@ -892,7 +389,6 @@
        x2="51.933025"
        y2="1023.234" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient8751"
        id="linearGradient9008"
        gradientUnits="userSpaceOnUse"
@@ -901,7 +397,6 @@
        x2="50"
        y2="1024.3622" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient8777"
        id="linearGradient9010"
        gradientUnits="userSpaceOnUse"
@@ -910,7 +405,6 @@
        x2="68.598152"
        y2="1026.0538" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient8785"
        id="linearGradient9012"
        gradientUnits="userSpaceOnUse"
@@ -919,7 +413,6 @@
        x2="67.683601"
        y2="1028.4165" />
     <filter
-       inkscape:collect="always"
        style="color-interpolation-filters:sRGB"
        id="filter8871-1"
        x="-0.41554753"
@@ -927,55 +420,10 @@
        y="-0.11828489"
        height="1.2365698">
       <feGaussianBlur
-         inkscape:collect="always"
          stdDeviation="0.53588249"
          id="feGaussianBlur8873-8" />
     </filter>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#bcbcbc"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="9.2780981"
-     inkscape:cx="36.699332"
-     inkscape:cy="43.435626"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1728"
-     inkscape:window-height="1051"
-     inkscape:window-x="0"
-     inkscape:window-y="38"
-     inkscape:window-maximized="1"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="false"
-     inkscape:snap-bbox="true"
-     inkscape:bbox-nodes="true"
-     inkscape:object-nodes="false"
-     inkscape:snap-bbox-midpoints="false"
-     inkscape:snap-bbox-edge-midpoints="false"
-     inkscape:snap-object-midpoints="true"
-     inkscape:snap-others="false"
-     inkscape:showpageshadow="2"
-     inkscape:pagecheckerboard="0"
-     inkscape:deskcolor="#d1d1d1">
-    <inkscape:grid
-       type="xygrid"
-       id="grid4112"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       originx="0"
-       originy="0"
-       spacingy="1"
-       spacingx="1"
-       units="px" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -989,20 +437,13 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:groupmode="layer"
      id="layer2"
-     inkscape:label="Background"
-     style="display:inline"
-     sodipodi:insensitive="true">
+     style="display:inline">
     <path
-       sodipodi:nodetypes="cccc"
-       inkscape:connector-curvature="0"
        id="rect4113-1"
        d="M 75,0 75,66 1e-6,66 C 1e-6,41.2048 50.00969,0 75,0 Z"
        style="display:inline;fill:url(#linearGradient4978);fill-opacity:1;stroke:none" />
     <path
-       sodipodi:nodetypes="cccc"
-       inkscape:connector-curvature="0"
        id="rect4113-1-0"
        d="M 75,21.0607 75,66 1e-6,66 C 10.625001,47.804 43.509694,25.4357 75,21.0607 Z"
        style="display:inline;opacity:0.40400002;fill:url(#linearGradient4962);fill-opacity:1;stroke:none" />
@@ -1015,67 +456,40 @@
          id="g13408-8-2" />
     </g>
     <path
-       sodipodi:nodetypes="cccc"
-       inkscape:connector-curvature="0"
        id="rect4113-1-7"
        d="M 75,4.0000001e-7 75,66 30.000003,66 C 30.000003,46.1545 47.70944,9.2500004 75,4e-7 Z"
        style="display:inline;opacity:0.18399999;fill:url(#linearGradient4970);fill-opacity:1;stroke:none" />
   </g>
   <g
-     inkscape:label="Foreground"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-986.3622)">
     <path
-       sodipodi:nodetypes="cccccc"
-       inkscape:connector-curvature="0"
        id="rect4001-3-4-5"
        d="m 61.725004,1022.8099 21.27431,-0.1009 1.654984,3.7793 -20.678174,12.1198 -29.322882,0.1009 z"
        style="display:inline;opacity:0.62999998;fill:url(#linearGradient6406);fill-opacity:1;stroke:none;filter:url(#filter4344)"
        transform="matrix(1.0651476,0,0,0.83720885,-20.627749,171.5995)" />
     <path
-       sodipodi:nodetypes="cccccc"
-       inkscape:connector-curvature="0"
        id="rect4001-3-4"
        d="m 13.663391,1000.9751 23.221829,0.3871 9.027157,9.726 0.08762,31.1905 -32.37689,0.2595 z"
        style="display:inline;fill:url(#linearGradient6375-6);fill-opacity:1;stroke:none;stroke-width:1" />
     <path
-       sodipodi:nodetypes="ccscccc"
-       inkscape:connector-curvature="0"
        id="rect4001-1"
        d="m 13.5,1000.8622 h 23.04854 c 0,0 6.930048,1.3741 5.172564,4.5397 -0.0545,0.099 4.766907,5.3979 4.766907,5.3979 v 32.0624 H 13.5 Z"
        style="fill:none;stroke:url(#linearGradient4238);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1" />
     <path
-       sodipodi:nodetypes="cccccc"
-       inkscape:connector-curvature="0"
        id="rect4001-3-9-0"
        d="m 37.370949,1001.3622 8.629053,9.3172 v 9.6828 l -12.663665,-8.4699 c 1.660888,-3.3965 2.864141,-6.9443 4.034543,-10.5301 z"
        style="display:inline;fill:url(#linearGradient4240);fill-opacity:1;stroke:none;stroke-width:1.00000012" />
     <path
-       sodipodi:nodetypes="cccc"
        id="path5675-4"
        d="m 36,1000.3707 c 2.000085,2.6856 4.411975,6.1214 2.624338,11.9915 4.113526,-2.2935 8.37566,-1.077 8.37566,-1.077 0,-5.4803 -6.749821,-11.1729 -10.999998,-10.9145 z"
-       style="display:inline;fill:url(#linearGradient4264);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       inkscape:connector-curvature="0" />
+       style="display:inline;fill:url(#linearGradient4264);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
     <path
-       sodipodi:type="star"
        style="display:inline;opacity:0.9;fill:#ffffff;fill-opacity:0.81584156;stroke:none;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;filter:url(#filter4285-9)"
        id="path4252-6"
-       sodipodi:sides="4"
-       sodipodi:cx="4.7729707"
-       sodipodi:cy="1041.2474"
-       sodipodi:r1="3.3255017"
-       sodipodi:r2="0.49178758"
-       sodipodi:arg1="2.432965"
-       sodipodi:arg2="-3.0800218"
-       inkscape:flatsided="false"
-       inkscape:rounded="0"
-       inkscape:randomized="-0.017554997"
        d="m 2.2999628,1043.3702 1.9823895,-2.1047 -1.6734053,-2.5419 2.1987064,2.0209 2.4513363,-1.6427 -2.0383649,2.1623 1.7419712,2.4882 -2.2030799,-2.0431 z"
-       transform="matrix(0,0.85573635,-0.89764149,0,975.36983,1001.8184)"
-       inkscape:transform-center-x="-0.020119543"
-       inkscape:transform-center-y="0.26977445" />
+       transform="matrix(0,0.85573635,-0.89764149,0,975.36983,1001.8184)" />
     <g
        id="g8557"
        transform="translate(-14,2.5936079e-5)">
@@ -1104,43 +518,32 @@
     <path
        style="opacity:0.52100004;fill:#ffffff;fill-opacity:0.81584156;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter8641)"
        d="m 17.207763,1028.749 c 7.306631,-6.772 14.405975,-7.9839 22.922194,-6.4311 -4.27551,-7.06 -6.952168,-8.5211 -15.538905,-6.8744 -4.413263,2.3533 -8.532831,6.1883 -7.383289,13.3055 z"
-       id="path8579"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccc" />
+       id="path8579" />
     <g
        id="g9048"
        transform="translate(-43.990779,-20.979869)">
       <path
-         inkscape:connector-curvature="0"
          id="path8791"
          d="m 53.577367,1026.9835 -0.152425,-8.8407 0.91455,-1.2194 3.124711,-0.076 0.07621,-0.9908 h 0.91455 l -0.07621,1.9054 -3.048499,1.2194 -0.152425,4.9538 z"
          style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter8813)" />
       <path
          transform="matrix(1.0486083,0,0,1.0499923,-3.0656229,-51.085241)"
-         inkscape:connector-curvature="0"
          d="m 70.499999,1023.8622 -10e-7,0.7084 c 0,0.7154 -0.630695,1.3084 -1.581494,1.2913 -0.950799,-0.017 -1.418505,0 -1.418505,0 v 0.1348 c 0,1.0333 -0.846416,1.865 -1.897793,1.8652 l -1.204207,2e-4 c -0.993831,2e-4 -0.897896,0.3654 -0.897896,-1.9999 v -8 c 0,-2.3654 -0.149817,-2 0.897896,-2 h 1.204207 c 1.051377,0 1.897793,0.8319 1.897793,1.8652 v 0.1348 h 1.418506 c 0.876148,0 1.581494,0.5759 1.581494,1.2913 v 1.7087 z m 0.01,-3 h 3.99 v 3 h -3.7903 m -8.209702,-2 2e-6,-7.4174 c 0,-1.4308 -0.846416,-2.5826 -1.897793,-2.5826 h -2.204414 c -1.051377,0 -1.897793,1.1518 -1.897793,2.5826 v 1.4174 h -2.418506 c -0.876148,0 -1.581494,0.7039 -1.581494,1.5782 v 1.3017 3.1196 m 9.999998,5e-4 2e-6,7.4174 c 0,1.4308 -0.846416,2.5826 -1.897793,2.5826 h -2.204414 c -1.051377,0 -1.897793,-1.1518 -1.897793,-2.5826 v -1.4174 h -2.418506 c -0.876148,0 -1.581494,-0.7039 -1.581494,-1.5782 v -1.3017 -3.1196 m -4,-5e-4 v 2 h 4 v -4 h -4 v 2"
          style="display:inline;opacity:1;fill:#fdf6d8;fill-opacity:0.88627451;stroke:#f9f2d9;stroke-width:1.90603244;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.92941176;filter:url(#filter8996)"
          id="rect8645-2-5-3" />
       <path
-         sodipodi:nodetypes="cccccc"
-         inkscape:connector-curvature="0"
          d="m 48.5,1021.8622 v 2 h 4 v -4 h -4 v 2"
          style="display:inline;opacity:1;fill:url(#linearGradient9006);fill-opacity:1;stroke:url(#linearGradient9008);stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
          id="path8722-7" />
       <path
-         inkscape:connector-curvature="0"
          d="m 62.499998,1021.8622 2e-6,-7.4174 c 0,-1.4308 -0.846416,-2.5826 -1.897793,-2.5826 h -2.204414 c -1.051377,0 -1.897793,1.1518 -1.897793,2.5826 v 1.4174 h -2.418506 c -0.876148,0 -1.581494,0.7039 -1.581494,1.5782 v 1.3017 3.1196 m 9.999998,5e-4 2e-6,7.4174 c 0,1.4308 -0.846416,2.5826 -1.897793,2.5826 h -2.204414 c -1.051377,0 -1.897793,-1.1518 -1.897793,-2.5826 v -1.4174 h -2.418506 c -0.876148,0 -1.581494,-0.7039 -1.581494,-1.5782 v -1.3017 -3.1196"
          style="display:inline;opacity:1;fill:url(#linearGradient8761);fill-opacity:1;stroke:#4d73ae;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
          id="rect8645-3" />
       <path
-         sodipodi:nodetypes="cczccssssssccsccccccc"
-         inkscape:connector-curvature="0"
          d="m 70.5,1023.8622 -10e-7,0.7084 c 0,0.7154 -0.630695,1.3084 -1.581494,1.2913 -0.950799,-0.017 -1.418505,0 -1.418505,0 v 0.1348 c 0,1.0333 -0.846416,1.865 -1.897793,1.8652 l -1.204207,2e-4 c -0.993831,2e-4 -0.897896,0.3654 -0.897896,-1.9999 v -8 c 0,-2.3654 -0.149817,-2 0.897896,-2 h 1.204207 c 1.051377,0 1.897793,0.8319 1.897793,1.8652 v 0.1348 h 1.418506 c 0.876148,0 1.581494,0.5759 1.581494,1.2913 v 1.7087 z m 0.01,-3 h 3.99 v 3 h -3.7903"
          style="display:inline;opacity:1;fill:url(#linearGradient9010);fill-opacity:1;stroke:url(#linearGradient9012);stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
          id="rect8645-2-5" />
       <path
-         sodipodi:nodetypes="cccc"
-         inkscape:connector-curvature="0"
          id="path8861"
          d="m 64.018476,1016.5423 -0.152427,10.8222 c 2.375507,-3.3036 3.484206,-4.2052 2.972286,-9.2217 0.305009,-1.654 -1.117834,-1.7529 -2.819859,-1.6005 z"
          style="opacity:0.63899997;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter8871)" />
@@ -1152,13 +555,10 @@
          id="path8817"
          style="opacity:0.70499998;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter8835)" />
       <path
-         inkscape:connector-curvature="0"
          id="path8875"
          d="m 70.953811,1023.4014 v -1.8291 l 2.972286,-0.076 z"
          style="opacity:0.86199999;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter8881)" />
       <path
-         sodipodi:nodetypes="cccc"
-         inkscape:connector-curvature="0"
          id="path8861-7"
          d="m 53.924652,1016.631 -0.152427,10.8222 c 2.375507,-3.3036 3.484206,-4.2052 2.972286,-9.2217 0.305009,-1.654 -1.117834,-1.7529 -2.819859,-1.6005 z"
          style="display:inline;opacity:0.48500001;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter8871-1)" />
diff --git a/ds/org.eclipse.pde.ds.ui/META-INF/MANIFEST.MF b/ds/org.eclipse.pde.ds.ui/META-INF/MANIFEST.MF
index 6825a800400..aa78f9cde15 100644
--- a/ds/org.eclipse.pde.ds.ui/META-INF/MANIFEST.MF
+++ b/ds/org.eclipse.pde.ds.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.pde.ds.ui;singleton:=true
-Bundle-Version: 1.4.200.qualifier
+Bundle-Version: 1.4.300.qualifier
 Bundle-Activator: org.eclipse.pde.internal.ds.ui.Activator
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.30.0,4.0.0)",
  org.eclipse.core.resources;bundle-version="[3.20.0,4.0.0)",
diff --git a/ds/org.eclipse.pde.ds.ui/icons/obj16/attribute_obj.svg b/ds/org.eclipse.pde.ds.ui/icons/obj16/attribute_obj.svg
index 0ca1755dfb1..184d5958540 100644
--- a/ds/org.eclipse.pde.ds.ui/icons/obj16/attribute_obj.svg
+++ b/ds/org.eclipse.pde.ds.ui/icons/obj16/attribute_obj.svg
@@ -2,74 +2,17 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="attribute_obj.svg">
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
-     id="defs4">
-    <linearGradient
-       y2="462.11539"
-       x2="388.63736"
-       y1="478.18777"
-       x1="388.63736"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3929-5"
-       xlink:href="#linearGradient10798-1-9-3-7-6-8-9-0-9-1"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient10798-1-9-3-7-6-8-9-0-9-1">
-      <stop
-         style="stop-color:#7564b1;stop-opacity:1"
-         offset="0"
-         id="stop10800-5-2-1-8-20-6-4-9-8-2" />
-      <stop
-         id="stop10806-6-8-5-3-9-24-8-4-3-2"
-         offset="0.5"
-         style="stop-color:#5d4aa1;stop-opacity:1" />
-      <stop
-         style="stop-color:#9283c3;stop-opacity:1"
-         offset="1"
-         id="stop10802-1-5-3-0-4-8-4-2-9-2" />
-    </linearGradient>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="22.627416"
-     inkscape:cx="-2.6155138"
-     inkscape:cy="12.037537"
-     inkscape:document-units="px"
-     inkscape:current-layer="g3353"
-     showgrid="true"
-     inkscape:window-width="1104"
-     inkscape:window-height="956"
-     inkscape:window-x="1151"
-     inkscape:window-y="564"
-     inkscape:window-maximized="0"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2985"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
+     id="defs4" />
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -83,8 +26,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      transform="translate(0,-1036.3622)">
     <g
@@ -105,8 +46,7 @@
           <path
              d="m 22.556023,999.80708 0,-0.98786 -1.040543,0 q -0.601495,0 -0.895657,0.25904 -0.294162,0.25904 -0.294162,0.79468 0,0.48736 0.298552,0.77276 0.298553,0.2853 0.807848,0.2853 0.504904,0 0.812238,-0.3117 0.311724,-0.3117 0.311724,-0.81222 z m 0.807847,-1.44886 0,2.44988 0.720038,0 0,0.4654 -1.527885,0 0,-0.5049 q -0.267819,0.3249 -0.619058,0.4786 -0.351238,0.1536 -0.821018,0.1536 -0.777115,0 -1.233724,-0.4127 -0.456609,-0.4127 -0.456609,-1.11516 0,-0.72443 0.522466,-1.12396 0.522467,-0.39954 1.4752,-0.39954 l 1.132743,0 0,-0.3205 q 0,-0.53125 -0.324896,-0.82102 -0.320504,-0.29416 -0.904438,-0.29416 -0.482952,0 -0.768333,0.21952 -0.285381,0.21952 -0.355628,0.64979 l -0.417095,0 0,-0.94395 q 0.421485,-0.18001 0.816628,-0.26782 0.399533,-0.0922 0.777114,-0.0922 0.970295,0 1.4752,0.48295 0.509295,0.47856 0.509295,1.39617 z"
              style="stroke-width:0.42076299;stroke:#266923;stroke-opacity:1;fill:#266923;fill-opacity:1"
-             id="path4156"
-             inkscape:connector-curvature="0" />
+             id="path4156" />
         </g>
       </g>
     </g>
diff --git a/ds/org.eclipse.pde.ds.ui/icons/obj16/class_obj.svg b/ds/org.eclipse.pde.ds.ui/icons/obj16/class_obj.svg
index 924f35b88bb..2460efad881 100644
--- a/ds/org.eclipse.pde.ds.ui/icons/obj16/class_obj.svg
+++ b/ds/org.eclipse.pde.ds.ui/icons/obj16/class_obj.svg
@@ -2,37 +2,18 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="class_obj.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
-    <linearGradient
-       id="linearGradient3827">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="0"
-         id="stop3829" />
-      <stop
-         id="stop3835"
-         offset="0.60149658"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop3831" />
-    </linearGradient>
     <linearGradient
        id="linearGradient10798-1-9-3-7-6-8-9-0-9-1">
       <stop
@@ -55,46 +36,8 @@
        x1="388.63736"
        gradientUnits="userSpaceOnUse"
        id="linearGradient3929-5"
-       xlink:href="#linearGradient10798-1-9-3-7-6-8-9-0-9-1"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient10798-1-9-3-7-6-8-9-0-9-1" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="32"
-     inkscape:cx="4.7612267"
-     inkscape:cy="14.85226"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1195"
-     inkscape:window-height="849"
-     inkscape:window-x="1319"
-     inkscape:window-y="509"
-     inkscape:window-maximized="0"
-     inkscape:snap-global="false"
-     showguides="true"
-     inkscape:guide-bbox="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3950" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="5,3.25"
-       id="guide3797" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="6.4375,3.75"
-       id="guide3801" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="12.0625,5.3125"
-       id="guide3803" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -108,8 +51,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
@@ -151,8 +92,6 @@
         </g>
       </g>
       <path
-         sodipodi:nodetypes="ccscscscccsscscsccc"
-         inkscape:connector-curvature="0"
          id="path3817"
          style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:15.56941891px;line-height:125%;font-family:Arial;letter-spacing:0px;word-spacing:0px;display:inline;fill:#ffffff;fill-opacity:1;stroke:none"
          d="m 9.9582435,1043.873 c -0.068736,-0.4207 -0.2258257,-0.7375 -0.4712765,-0.9505 -0.2405524,-0.2129 -0.5547364,-0.3192 -0.9425527,-0.3192 -0.5154625,0 -0.927829,0.185 -1.2371006,0.5551 -0.3043689,0.3648 -0.4565517,0.6031 -0.4565489,1.4648 -2.8e-6,0.958 0.1546346,1.3845 0.4639127,1.7799 0.3141807,0.3954 0.7339108,0.593 1.2591915,0.593 0.3927255,0 0.7142731,-0.114 0.9646439,-0.3422 0.2503599,-0.2332 0.4270885,-0.6309 0.5301861,-1.1937 l 2.032379,-0.017 c -0.211101,0.9629 -0.616102,2.0653 -1.215009,2.557 -0.598921,0.4917 -1.401562,0.7374 -2.407928,0.7374 -1.1438303,0 -2.0569271,-0.3724 -2.7392935,-1.1176 -0.6774613,-0.7449 -1.0161905,-1.5264 -1.0161905,-2.8443 0,-1.333 0.3411837,-1.9946 1.0235539,-2.7344 0.6823664,-0.7452 1.6052818,-1.1177 2.7687486,-1.1177 0.9523657,0 1.7083715,0.2129 2.2680175,0.6387 0.564543,0.4205 1.032045,1.4081 1.277509,2.2745 z" />
diff --git a/ds/org.eclipse.pde.ds.ui/icons/obj16/component_obj.svg b/ds/org.eclipse.pde.ds.ui/icons/obj16/component_obj.svg
index 58829144c61..7f8bded25e4 100644
--- a/ds/org.eclipse.pde.ds.ui/icons/obj16/component_obj.svg
+++ b/ds/org.eclipse.pde.ds.ui/icons/obj16/component_obj.svg
@@ -2,24 +2,19 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="component_obj.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3798">
       <stop
          style="stop-color:#3f3f9f;stop-opacity:1"
@@ -31,7 +26,6 @@
          id="stop3802" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3788">
       <stop
          style="stop-color:#d8bb8c;stop-opacity:1"
@@ -43,7 +37,6 @@
          id="stop3792" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3780">
       <stop
          style="stop-color:#fdf2d0;stop-opacity:1;"
@@ -55,31 +48,6 @@
          id="stop3784" />
     </linearGradient>
     <linearGradient
-       y2="462.11539"
-       x2="388.63736"
-       y1="478.18777"
-       x1="388.63736"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3929-5"
-       xlink:href="#linearGradient10798-1-9-3-7-6-8-9-0-9-1"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient10798-1-9-3-7-6-8-9-0-9-1">
-      <stop
-         style="stop-color:#7564b1;stop-opacity:1"
-         offset="0"
-         id="stop10800-5-2-1-8-20-6-4-9-8-2" />
-      <stop
-         id="stop10806-6-8-5-3-9-24-8-4-3-2"
-         offset="0.5"
-         style="stop-color:#5d4aa1;stop-opacity:1" />
-      <stop
-         style="stop-color:#9283c3;stop-opacity:1"
-         offset="1"
-         id="stop10802-1-5-3-0-4-8-4-2-9-2" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient3780"
        id="linearGradient3786"
        x1="22.377558"
@@ -89,7 +57,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-20,0)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient3788"
        id="linearGradient3794"
        x1="22.03125"
@@ -99,7 +66,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-20,0)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient3798"
        id="linearGradient3804"
        x1="22"
@@ -109,33 +75,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-20,0)" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7.9999996"
-     inkscape:cx="-3.3920643"
-     inkscape:cy="-17.145081"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="925"
-     inkscape:window-height="900"
-     inkscape:window-x="671"
-     inkscape:window-y="25"
-     inkscape:window-maximized="0"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2985"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -149,8 +88,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      transform="translate(0,-1036.3622)">
     <rect
@@ -165,7 +102,6 @@
     <path
        style="fill:#b0c0e0;fill-opacity:1;stroke:url(#linearGradient3804);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
        d="m 2.5,1047.8622 0,-2.9688 3.03125,0 0,-3.0312 3,0 0,3.0312 3.000001,0 0,2.9688 z"
-       id="path3796"
-       inkscape:connector-curvature="0" />
+       id="path3796" />
   </g>
 </svg>
diff --git a/ds/org.eclipse.pde.ds.ui/icons/obj16/details_obj.svg b/ds/org.eclipse.pde.ds.ui/icons/obj16/details_obj.svg
index 0f5b7439f57..0b5ec088f2f 100644
--- a/ds/org.eclipse.pde.ds.ui/icons/obj16/details_obj.svg
+++ b/ds/org.eclipse.pde.ds.ui/icons/obj16/details_obj.svg
@@ -2,28 +2,20 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.48.0 r9654"
-   sodipodi:docname="problem_category.svg"
-   inkscape:export-filename="C:\Users\jmietling\Documents\rect3997-9-1.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient4980"
-       inkscape:collect="always">
+       id="linearGradient4980">
       <stop
          id="stop4982"
          offset="0"
@@ -34,8 +26,7 @@
          style="stop-color:#607ead;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       id="linearGradient4974"
-       inkscape:collect="always">
+       id="linearGradient4974">
       <stop
          id="stop4976"
          offset="0"
@@ -46,7 +37,6 @@
          style="stop-color:#607ead;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4962">
       <stop
          style="stop-color:#6c8ab7;stop-opacity:1"
@@ -58,7 +48,6 @@
          id="stop4966" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4871">
       <stop
          style="stop-color:#ffffff;stop-opacity:1;"
@@ -70,7 +59,6 @@
          id="stop4875" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4871"
        id="linearGradient4877"
        x1="3"
@@ -79,7 +67,6 @@
        y2="1045.8622"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4871"
        id="linearGradient4879"
        x1="4.4999781"
@@ -88,7 +75,6 @@
        y2="1045.3433"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4871-7"
        id="linearGradient4877-1"
        x1="3"
@@ -97,7 +83,6 @@
        y2="1045.8622"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4871-7">
       <stop
          style="stop-color:#ffffff;stop-opacity:1;"
@@ -109,7 +94,6 @@
          id="stop4875-0" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4871-7"
        id="linearGradient4879-9"
        x1="4.4999781"
@@ -118,7 +102,6 @@
        y2="1045.3433"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4871-7-1"
        id="linearGradient4877-1-7"
        x1="3"
@@ -127,7 +110,6 @@
        y2="1045.8622"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4871-7-1">
       <stop
          style="stop-color:#ffffff;stop-opacity:1;"
@@ -139,7 +121,6 @@
          id="stop4875-0-5" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4871-7-1"
        id="linearGradient4879-9-2"
        x1="4.4999781"
@@ -148,7 +129,6 @@
        y2="1045.3433"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4962"
        id="linearGradient4968"
        x1="11"
@@ -157,7 +137,6 @@
        y2="1048.8622"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4980"
        id="linearGradient4970"
        x1="11"
@@ -166,7 +145,6 @@
        y2="1044.8622"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4974"
        id="linearGradient4972"
        x1="7"
@@ -175,31 +153,6 @@
        y2="1040.8622"
        gradientUnits="userSpaceOnUse" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="15.999999"
-     inkscape:cx="12.066523"
-     inkscape:cy="7.9808044"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1458"
-     inkscape:window-height="814"
-     inkscape:window-x="865"
-     inkscape:window-y="645"
-     inkscape:window-maximized="0"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3999" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -213,32 +166,24 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
     <path
        style="fill:url(#linearGradient4970);fill-opacity:1;stroke:none;display:inline"
        d="m 11,1044.3622 3,0 0,1 -3,0 z"
-       id="rect4035-1-1-5-2-2-6-5"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+       id="rect4035-1-1-5-2-2-6-5" />
     <path
        style="fill:url(#linearGradient4968);fill-opacity:1;stroke:none;display:inline"
        d="m 11,1048.3622 3,0 0,1 -3,0 z"
-       id="rect4035-1-1-5-2-2-6-5-2"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+       id="rect4035-1-1-5-2-2-6-5-2" />
     <g
        id="g5029"
        transform="matrix(0.59562329,0,0,0.59562329,1.42626,418.31576)">
       <path
          id="rect4035-17"
          d="m 2.6421734,1042.6833 0,5.0367 5.0367406,0 0,-5.0367 z m 1.6789131,1.6789 1.6789135,0 0,1.6789 -1.6789135,0 z"
-         style="fill:#5c7aaa;fill-opacity:1;stroke:none;display:inline"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccccccc" />
+         style="fill:#5c7aaa;fill-opacity:1;stroke:none;display:inline" />
       <g
          id="g4094"
          transform="matrix(0.55964608,0,0,0.55963589,2.6421482,459.89962)">
@@ -252,15 +197,11 @@
         <path
            style="opacity:0.5;fill:url(#linearGradient4877);fill-opacity:1;stroke:none;display:inline"
            d="m 3,1044.3622 1,1 0,2 -1,0 z"
-           id="rect4035-1-7-1"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
+           id="rect4035-1-7-1" />
         <path
            style="opacity:0.5;fill:url(#linearGradient4879);fill-opacity:1;stroke:none;display:inline"
            d="m 3,1044.3622 1,1 2,0 0,-1 z"
-           id="rect4035-1-7-4-5"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
+           id="rect4035-1-7-4-5" />
       </g>
     </g>
     <g
@@ -270,9 +211,7 @@
       <path
          id="rect4035-17-2"
          d="m 2.6421734,1042.6833 0,5.0367 5.0367406,0 0,-5.0367 z m 1.6789131,1.6789 1.6789135,0 0,1.6789 -1.6789135,0 z"
-         style="fill:#5c7aaa;fill-opacity:1;stroke:none;display:inline"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccccccc" />
+         style="fill:#5c7aaa;fill-opacity:1;stroke:none;display:inline" />
       <g
          id="g4094-4"
          transform="matrix(0.55964608,0,0,0.55963589,2.6421482,459.89962)">
@@ -286,15 +225,11 @@
         <path
            style="opacity:0.5;fill:url(#linearGradient4877-1);fill-opacity:1;stroke:none;display:inline"
            d="m 3,1044.3622 1,1 0,2 -1,0 z"
-           id="rect4035-1-7-1-5"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
+           id="rect4035-1-7-1-5" />
         <path
            style="opacity:0.5;fill:url(#linearGradient4879-9);fill-opacity:1;stroke:none;display:inline"
            d="m 3,1044.3622 1,1 2,0 0,-1 z"
-           id="rect4035-1-7-4-5-1"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
+           id="rect4035-1-7-4-5-1" />
       </g>
     </g>
     <g
@@ -304,9 +239,7 @@
       <path
          id="rect4035-17-2-6"
          d="m 2.6421734,1042.6833 0,5.0367 5.0367406,0 0,-5.0367 z m 1.6789135,1.6912 1.6789135,0 0,1.6913 -1.6789135,0 z"
-         style="fill:#5c7aaa;fill-opacity:1;stroke:none;display:inline"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccccccc" />
+         style="fill:#5c7aaa;fill-opacity:1;stroke:none;display:inline" />
       <g
          id="g4094-4-1"
          transform="matrix(0.55964608,0,0,0.55963589,2.6421482,459.89962)">
@@ -320,37 +253,28 @@
         <path
            style="opacity:0.5;fill:url(#linearGradient4877-1-7);fill-opacity:1;stroke:none;display:inline"
            d="m 3,1044.3622 1,1 0,2 -1,0 z"
-           id="rect4035-1-7-1-5-2"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
+           id="rect4035-1-7-1-5-2" />
         <path
            style="opacity:0.5;fill:url(#linearGradient4879-9-2);fill-opacity:1;stroke:none;display:inline"
            d="m 3,1044.3622 1,1 2,0 0,-1 z"
-           id="rect4035-1-7-4-5-1-3"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
+           id="rect4035-1-7-4-5-1-3" />
       </g>
     </g>
     <path
        style="fill:#5c7aaa;fill-opacity:1;stroke:none;display:inline"
        d="m 3.9999997,1042.3622 1.0000146,0 0,7 -1.0000146,0 z"
-       id="rect4035-1-1-5-2"
-       inkscape:connector-curvature="0" />
+       id="rect4035-1-1-5-2" />
     <path
        style="fill:#5c7aaa;fill-opacity:1;stroke:none;display:inline"
        d="m 3.9999997,1044.3622 3.0000003,0 0,1 -3.0000003,0 z"
-       id="rect4035-1-1-5-2-2"
-       inkscape:connector-curvature="0" />
+       id="rect4035-1-1-5-2-2" />
     <path
        style="fill:#5c7aaa;fill-opacity:1;stroke:none;display:inline"
        d="m 3.9999997,1048.3622 3.0000003,0 0,0.9999 -3.0000003,0 z"
-       id="rect4035-1-1-5-2-2-1"
-       inkscape:connector-curvature="0" />
+       id="rect4035-1-1-5-2-2-1" />
     <path
        style="fill:url(#linearGradient4972);fill-opacity:1;stroke:none;display:inline"
        d="m 7,1040.3622 7,0 0,1 -7,0 z"
-       id="rect4035-1-1-5-2-2-6"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+       id="rect4035-1-1-5-2-2-6" />
   </g>
 </svg>
diff --git a/ds/org.eclipse.pde.ds.ui/icons/obj16/ds_obj.svg b/ds/org.eclipse.pde.ds.ui/icons/obj16/ds_obj.svg
index e194272cb30..8be050ff0d2 100644
--- a/ds/org.eclipse.pde.ds.ui/icons/obj16/ds_obj.svg
+++ b/ds/org.eclipse.pde.ds.ui/icons/obj16/ds_obj.svg
@@ -2,48 +2,19 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="ds_obj.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       inkscape:collect="always"
-       id="linearGradient9354">
-      <stop
-         style="stop-color:#1b639e;stop-opacity:1;"
-         offset="0"
-         id="stop9356" />
-      <stop
-         style="stop-color:#6f8db9;stop-opacity:1"
-         offset="1"
-         id="stop9358" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient8562">
-      <stop
-         style="stop-color:#6994ad;stop-opacity:1"
-         offset="0"
-         id="stop8564" />
-      <stop
-         style="stop-color:#005596;stop-opacity:1"
-         offset="1"
-         id="stop8566" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        id="linearGradient4902-3">
       <stop
          style="stop-color:#b28a30;stop-opacity:1"
@@ -55,7 +26,6 @@
          id="stop4906-2" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4894-6">
       <stop
          style="stop-color:#e0c88f;stop-opacity:1"
@@ -67,7 +37,6 @@
          id="stop4898-5" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4994-6">
       <stop
          style="stop-color:#f9fafc;stop-opacity:1;"
@@ -79,7 +48,6 @@
          id="stop4998-89" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4994-6"
        id="linearGradient4084"
        gradientUnits="userSpaceOnUse"
@@ -89,7 +57,6 @@
        x2="9.8946028"
        y2="1051.8378" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4894-6"
        id="linearGradient4086"
        gradientUnits="userSpaceOnUse"
@@ -99,7 +66,6 @@
        x2="9.9874563"
        y2="1040.3303" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4902-3"
        id="linearGradient4088"
        gradientUnits="userSpaceOnUse"
@@ -108,137 +74,6 @@
        y1="1038.5779"
        x2="10.544736"
        y2="1052.3228" />
-    <linearGradient
-       id="linearGradient5103-3-7">
-      <stop
-         style="stop-color:#c1ebca;stop-opacity:1"
-         offset="0"
-         id="stop5105-5-4" />
-      <stop
-         id="stop7550-07-0"
-         offset="0.26694915"
-         style="stop-color:#b3dac7;stop-opacity:1" />
-      <stop
-         id="stop7548-6-9"
-         offset="0.51694918"
-         style="stop-color:#9ec2c3;stop-opacity:1" />
-      <stop
-         style="stop-color:#7a99bb;stop-opacity:1"
-         offset="1"
-         id="stop5107-7-48" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient9354"
-       id="linearGradient9369"
-       gradientUnits="userSpaceOnUse"
-       x1="-1045.2971"
-       y1="-34.1688"
-       x2="-1045.2971"
-       y2="-39.1688" />
-    <filter
-       inkscape:collect="always"
-       id="filter9501"
-       x="-0.19332488"
-       width="1.3866498"
-       y="-0.16839351"
-       height="1.336787">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="0.72716254"
-         id="feGaussianBlur9503" />
-    </filter>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5103-3-7"
-       id="linearGradient9563"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(19.911612,-20)"
-       x1="13.706096"
-       y1="1045.2537"
-       x2="8.8684521"
-       y2="1045.2537" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8562"
-       id="linearGradient9565"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(19.911612,-40)"
-       x1="13.537925"
-       y1="1065.152"
-       x2="8.7441578"
-       y2="1065.152" />
-    <mask
-       maskUnits="userSpaceOnUse"
-       id="mask9640">
-      <g
-         transform="translate(-3.5400399e-7,-20)"
-         id="g9642"
-         style="fill:#ffffff;display:inline">
-        <rect
-           style="fill:#ffffff;fill-opacity:1;stroke:none"
-           id="rect9644"
-           width="9"
-           height="5"
-           x="-1049.2971"
-           y="-39.1688"
-           transform="matrix(0,-1,-1,0,0,0)" />
-        <rect
-           style="fill:#ffffff;fill-opacity:1;stroke:none"
-           id="rect9646"
-           width="7"
-           height="3"
-           x="-1048.2971"
-           y="-38.1688"
-           transform="matrix(0,-1,-1,0,0,0)" />
-        <rect
-           style="fill:#ffffff;fill-opacity:1;stroke:none"
-           id="rect9648"
-           width="1"
-           height="1"
-           x="-1047.2971"
-           y="-37.1688"
-           transform="matrix(0,-1,-1,0,0,0)" />
-        <rect
-           style="fill:#ffffff;fill-opacity:1;stroke:none"
-           id="rect9650"
-           width="1"
-           height="1"
-           x="-1045.2971"
-           y="-37.1688"
-           transform="matrix(0,-1,-1,0,0,0)" />
-        <rect
-           style="fill:#ffffff;fill-opacity:1;stroke:none"
-           id="rect9652"
-           width="1"
-           height="1"
-           x="-1043.2971"
-           y="-37.1688"
-           transform="matrix(0,-1,-1,0,0,0)" />
-        <g
-           style="fill:#ffffff;stroke:#ffffff;display:inline"
-           id="g9654"
-           transform="matrix(0,-1,-1,0,1074.4897,1048.3882)">
-          <path
-             sodipodi:nodetypes="cccccc"
-             inkscape:connector-curvature="0"
-             id="path9656"
-             d="m 3.5193795,1037.8597 7.0096695,0 3.062057,3.0066 0,9.9546 -10.0717265,0 z"
-             style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;display:inline" />
-          <path
-             inkscape:connector-curvature="0"
-             id="path9658"
-             d="m 9.998718,1037.397 0,3.9112 3.977478,0 z"
-             style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;display:inline" />
-          <path
-             sodipodi:nodetypes="cccccc"
-             inkscape:connector-curvature="0"
-             id="path9660"
-             d="m 3.5193795,1037.8597 7.0096695,0 3.062057,3.0066 0,9.9546 -10.0717265,0 z"
-             style="fill:#ffffff;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;display:inline" />
-        </g>
-      </g>
-    </mask>
     <linearGradient
        gradientTransform="translate(-20,0)"
        gradientUnits="userSpaceOnUse"
@@ -247,8 +82,7 @@
        y1="1044.8622"
        x1="22"
        id="linearGradient3804"
-       xlink:href="#linearGradient3798"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient3798" />
     <linearGradient
        gradientTransform="translate(-20,0)"
        gradientUnits="userSpaceOnUse"
@@ -257,8 +91,7 @@
        y1="1043.3622"
        x1="22.03125"
        id="linearGradient3794"
-       xlink:href="#linearGradient3788"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient3788" />
     <linearGradient
        gradientTransform="translate(-20,0)"
        gradientUnits="userSpaceOnUse"
@@ -267,35 +100,9 @@
        y1="1040.4054"
        x1="22.377558"
        id="linearGradient3786"
-       xlink:href="#linearGradient3780"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient10798-1-9-3-7-6-8-9-0-9-1">
-      <stop
-         id="stop10800-5-2-1-8-20-6-4-9-8-2"
-         offset="0"
-         style="stop-color:#7564b1;stop-opacity:1" />
-      <stop
-         style="stop-color:#5d4aa1;stop-opacity:1"
-         offset="0.5"
-         id="stop10806-6-8-5-3-9-24-8-4-3-2" />
-      <stop
-         id="stop10802-1-5-3-0-4-8-4-2-9-2"
-         offset="1"
-         style="stop-color:#9283c3;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient10798-1-9-3-7-6-8-9-0-9-1"
-       id="linearGradient3929-5"
-       gradientUnits="userSpaceOnUse"
-       x1="388.63736"
-       y1="478.18777"
-       x2="388.63736"
-       y2="462.11539" />
+       xlink:href="#linearGradient3780" />
     <linearGradient
-       id="linearGradient3780"
-       inkscape:collect="always">
+       id="linearGradient3780">
       <stop
          id="stop3782"
          offset="0"
@@ -306,8 +113,7 @@
          style="stop-color:#fffdf9;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       id="linearGradient3788"
-       inkscape:collect="always">
+       id="linearGradient3788">
       <stop
          id="stop3790"
          offset="0"
@@ -318,8 +124,7 @@
          style="stop-color:#dfc38d;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       id="linearGradient3798"
-       inkscape:collect="always">
+       id="linearGradient3798">
       <stop
          id="stop3800"
          offset="0"
@@ -330,31 +135,6 @@
          style="stop-color:#3f5fbf;stop-opacity:1" />
     </linearGradient>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="30.184621"
-     inkscape:cx="6.2283212"
-     inkscape:cy="6.2261272"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="900"
-     inkscape:window-x="81"
-     inkscape:window-y="25"
-     inkscape:window-maximized="0"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3999" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -368,8 +148,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
@@ -377,26 +155,20 @@
        id="g4078"
        transform="translate(-0.091106,-0.97334116)">
       <path
-         sodipodi:nodetypes="cccccc"
-         inkscape:connector-curvature="0"
          id="rect4001-3"
          d="m 3.0274322,1037.8597 7.5016168,0 3.062057,3.0066 0,10.6105 -10.5636738,0 z"
          style="fill:url(#linearGradient4084);fill-opacity:1;stroke:none;display:inline" />
       <path
-         inkscape:connector-curvature="0"
          id="path4884"
          d="m 9.998718,1037.397 0,3.9112 3.977478,0 z"
          style="fill:url(#linearGradient4086);fill-opacity:1;stroke:none;display:inline" />
       <path
-         sodipodi:nodetypes="cccccc"
-         inkscape:connector-curvature="0"
          id="rect4001"
          d="m 2.582337,1037.8597 7.946712,0 3.062057,3.0066 0,10.9853 -11.008769,0 z"
          style="fill:none;stroke:url(#linearGradient4088);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;display:inline" />
     </g>
     <g
        id="layer1-4"
-       inkscape:label="Layer 1"
        transform="translate(-1.0185535,4.0336836)">
       <rect
          ry="0.62500006"
@@ -408,7 +180,6 @@
          id="rect3002"
          style="fill:url(#linearGradient3786);fill-opacity:1;stroke:url(#linearGradient3794);stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
       <path
-         inkscape:connector-curvature="0"
          id="path3796"
          d="m 2.5,1047.8622 0,-2.9688 3.03125,0 0,-3.0312 3,0 0,3.0312 3.000001,0 0,2.9688 z"
          style="fill:#b0c0e0;fill-opacity:1;stroke:url(#linearGradient3804);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
diff --git a/ds/org.eclipse.pde.ds.ui/icons/obj16/ds_wizard_obj.svg b/ds/org.eclipse.pde.ds.ui/icons/obj16/ds_wizard_obj.svg
index 0b6d5af3b1c..db915bc6a06 100644
--- a/ds/org.eclipse.pde.ds.ui/icons/obj16/ds_wizard_obj.svg
+++ b/ds/org.eclipse.pde.ds.ui/icons/obj16/ds_wizard_obj.svg
@@ -2,48 +2,19 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="ds_wizard_obj.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       inkscape:collect="always"
-       id="linearGradient9354">
-      <stop
-         style="stop-color:#1b639e;stop-opacity:1;"
-         offset="0"
-         id="stop9356" />
-      <stop
-         style="stop-color:#6f8db9;stop-opacity:1"
-         offset="1"
-         id="stop9358" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient8562">
-      <stop
-         style="stop-color:#6994ad;stop-opacity:1"
-         offset="0"
-         id="stop8564" />
-      <stop
-         style="stop-color:#005596;stop-opacity:1"
-         offset="1"
-         id="stop8566" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        id="linearGradient4902-3">
       <stop
          style="stop-color:#b28a30;stop-opacity:1"
@@ -55,7 +26,6 @@
          id="stop4906-2" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4894-6">
       <stop
          style="stop-color:#e0c88f;stop-opacity:1"
@@ -67,7 +37,6 @@
          id="stop4898-5" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4994-6">
       <stop
          style="stop-color:#f9fafc;stop-opacity:1;"
@@ -79,7 +48,6 @@
          id="stop4998-89" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4994-6"
        id="linearGradient4084"
        gradientUnits="userSpaceOnUse"
@@ -89,7 +57,6 @@
        x2="9.8946028"
        y2="1051.8378" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4894-6"
        id="linearGradient4086"
        gradientUnits="userSpaceOnUse"
@@ -99,7 +66,6 @@
        x2="9.9874563"
        y2="1040.3303" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4902-3"
        id="linearGradient4088"
        gradientUnits="userSpaceOnUse"
@@ -108,125 +74,6 @@
        y1="1038.5779"
        x2="10.544736"
        y2="1052.3228" />
-    <linearGradient
-       id="linearGradient5103-3-7">
-      <stop
-         style="stop-color:#c1ebca;stop-opacity:1"
-         offset="0"
-         id="stop5105-5-4" />
-      <stop
-         id="stop7550-07-0"
-         offset="0.26694915"
-         style="stop-color:#b3dac7;stop-opacity:1" />
-      <stop
-         id="stop7548-6-9"
-         offset="0.51694918"
-         style="stop-color:#9ec2c3;stop-opacity:1" />
-      <stop
-         style="stop-color:#7a99bb;stop-opacity:1"
-         offset="1"
-         id="stop5107-7-48" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient9354"
-       id="linearGradient9369"
-       gradientUnits="userSpaceOnUse"
-       x1="-1045.2971"
-       y1="-34.1688"
-       x2="-1045.2971"
-       y2="-39.1688" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5103-3-7"
-       id="linearGradient9563"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(19.911612,-20)"
-       x1="13.706096"
-       y1="1045.2537"
-       x2="8.8684521"
-       y2="1045.2537" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8562"
-       id="linearGradient9565"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(19.911612,-40)"
-       x1="13.537925"
-       y1="1065.152"
-       x2="8.7441578"
-       y2="1065.152" />
-    <mask
-       maskUnits="userSpaceOnUse"
-       id="mask9640">
-      <g
-         transform="translate(-3.5400399e-7,-20)"
-         id="g9642"
-         style="fill:#ffffff;display:inline">
-        <rect
-           style="fill:#ffffff;fill-opacity:1;stroke:none"
-           id="rect9644"
-           width="9"
-           height="5"
-           x="-1049.2971"
-           y="-39.1688"
-           transform="matrix(0,-1,-1,0,0,0)" />
-        <rect
-           style="fill:#ffffff;fill-opacity:1;stroke:none"
-           id="rect9646"
-           width="7"
-           height="3"
-           x="-1048.2971"
-           y="-38.1688"
-           transform="matrix(0,-1,-1,0,0,0)" />
-        <rect
-           style="fill:#ffffff;fill-opacity:1;stroke:none"
-           id="rect9648"
-           width="1"
-           height="1"
-           x="-1047.2971"
-           y="-37.1688"
-           transform="matrix(0,-1,-1,0,0,0)" />
-        <rect
-           style="fill:#ffffff;fill-opacity:1;stroke:none"
-           id="rect9650"
-           width="1"
-           height="1"
-           x="-1045.2971"
-           y="-37.1688"
-           transform="matrix(0,-1,-1,0,0,0)" />
-        <rect
-           style="fill:#ffffff;fill-opacity:1;stroke:none"
-           id="rect9652"
-           width="1"
-           height="1"
-           x="-1043.2971"
-           y="-37.1688"
-           transform="matrix(0,-1,-1,0,0,0)" />
-        <g
-           style="fill:#ffffff;stroke:#ffffff;display:inline"
-           id="g9654"
-           transform="matrix(0,-1,-1,0,1074.4897,1048.3882)">
-          <path
-             sodipodi:nodetypes="cccccc"
-             inkscape:connector-curvature="0"
-             id="path9656"
-             d="m 3.5193795,1037.8597 7.0096695,0 3.062057,3.0066 0,9.9546 -10.0717265,0 z"
-             style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;display:inline" />
-          <path
-             inkscape:connector-curvature="0"
-             id="path9658"
-             d="m 9.998718,1037.397 0,3.9112 3.977478,0 z"
-             style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;display:inline" />
-          <path
-             sodipodi:nodetypes="cccccc"
-             inkscape:connector-curvature="0"
-             id="path9660"
-             d="m 3.5193795,1037.8597 7.0096695,0 3.062057,3.0066 0,9.9546 -10.0717265,0 z"
-             style="fill:#ffffff;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;display:inline" />
-        </g>
-      </g>
-    </mask>
     <linearGradient
        gradientTransform="translate(-20,0)"
        gradientUnits="userSpaceOnUse"
@@ -235,8 +82,7 @@
        y1="1044.8622"
        x1="22"
        id="linearGradient3804"
-       xlink:href="#linearGradient3798"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient3798" />
     <linearGradient
        gradientTransform="translate(-20,0)"
        gradientUnits="userSpaceOnUse"
@@ -245,8 +91,7 @@
        y1="1043.3622"
        x1="22.03125"
        id="linearGradient3794"
-       xlink:href="#linearGradient3788"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient3788" />
     <linearGradient
        gradientTransform="translate(-20,0)"
        gradientUnits="userSpaceOnUse"
@@ -255,35 +100,9 @@
        y1="1040.4054"
        x1="22.377558"
        id="linearGradient3786"
-       xlink:href="#linearGradient3780"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient10798-1-9-3-7-6-8-9-0-9-1">
-      <stop
-         id="stop10800-5-2-1-8-20-6-4-9-8-2"
-         offset="0"
-         style="stop-color:#7564b1;stop-opacity:1" />
-      <stop
-         style="stop-color:#5d4aa1;stop-opacity:1"
-         offset="0.5"
-         id="stop10806-6-8-5-3-9-24-8-4-3-2" />
-      <stop
-         id="stop10802-1-5-3-0-4-8-4-2-9-2"
-         offset="1"
-         style="stop-color:#9283c3;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient10798-1-9-3-7-6-8-9-0-9-1"
-       id="linearGradient3929-5"
-       gradientUnits="userSpaceOnUse"
-       x1="388.63736"
-       y1="478.18777"
-       x2="388.63736"
-       y2="462.11539" />
+       xlink:href="#linearGradient3780" />
     <linearGradient
-       id="linearGradient3780"
-       inkscape:collect="always">
+       id="linearGradient3780">
       <stop
          id="stop3782"
          offset="0"
@@ -294,8 +113,7 @@
          style="stop-color:#fffdf9;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       id="linearGradient3788"
-       inkscape:collect="always">
+       id="linearGradient3788">
       <stop
          id="stop3790"
          offset="0"
@@ -306,8 +124,7 @@
          style="stop-color:#dfc38d;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       id="linearGradient3798"
-       inkscape:collect="always">
+       id="linearGradient3798">
       <stop
          id="stop3800"
          offset="0"
@@ -318,1411 +135,6 @@
          style="stop-color:#3f5fbf;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       y2="1038.3466"
-       x2="10.007812"
-       y1="1038.3622"
-       x1="12"
-       gradientTransform="translate(-15.015625,10.2734)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3500"
-       xlink:href="#linearGradient5068-6-9-4"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient6281-8-0-1-6-6-4-2-8">
-      <stop
-         style="stop-color:#f7f9fb;stop-opacity:1"
-         offset="0"
-         id="stop6283-0-2-2-1-2-0-1-6" />
-      <stop
-         style="stop-color:#ffd680;stop-opacity:1"
-         offset="1"
-         id="stop6285-5-0-9-7-6-9-9-1" />
-    </linearGradient>
-    <linearGradient
-       y2="7.549418"
-       x2="0.9375"
-       y1="4.8437853"
-       x1="0.9375"
-       gradientTransform="matrix(2.3199889,0,0,2.3199889,10.199693,1043.1852)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3093-5-2-7-0"
-       xlink:href="#linearGradient6281-8-0-1-6-6-4-2-8"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient4528-9-5-7-9-7">
-      <stop
-         id="stop4530-0-5-0-5-8"
-         offset="0"
-         style="stop-color:#e0c576;stop-opacity:1;" />
-      <stop
-         id="stop4532-7-9-3-3-6"
-         offset="1"
-         style="stop-color:#9e7916;stop-opacity:1" />
-    </linearGradient>
-    <radialGradient
-       r="3.4803574"
-       fy="-738.83777"
-       fx="-757.20496"
-       cy="-738.83777"
-       cx="-757.20496"
-       gradientTransform="matrix(1.8508179,-8.813921e-6,8.4531434e-6,1.7750589,644.24981,572.63612)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient3091-1-9-6-4"
-       xlink:href="#linearGradient4528-9-5-7-9-7"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5068-6-9-4"
-       id="linearGradient5088-1-4-8"
-       x1="14"
-       y1="1041.3622"
-       x2="14"
-       y2="1043.3466"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-15.015625,10.2734)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5068-6-9-4"
-       id="linearGradient5074-2-1-3"
-       x1="12"
-       y1="1038.3622"
-       x2="10.007812"
-       y2="1038.3466"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-15.015625,10.2734)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5068-6-9-4"
-       id="linearGradient5076-5-2-9"
-       x1="10"
-       y1="1040.3622"
-       x2="10.007812"
-       y2="1038.3466"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-15.015625,10.2734)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5068-6-9-4"
-       id="linearGradient5078-8-2-1"
-       x1="10"
-       y1="1041.3622"
-       x2="8.0078125"
-       y2="1041.3466"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-15.015625,10.2734)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5068-6-9-4"
-       id="linearGradient5082-1-0-8"
-       x1="12"
-       y1="1042.3622"
-       x2="10.007812"
-       y2="1042.3622"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-15.015625,10.2734)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5068-6-9-4"
-       id="linearGradient5086-8-0-8"
-       x1="13"
-       y1="1043.3622"
-       x2="15.007812"
-       y2="1043.3466"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-15.015625,10.2734)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5068-6-9-4"
-       id="linearGradient5084-3-3-2"
-       x1="12"
-       y1="1043.3622"
-       x2="12"
-       y2="1045.3466"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-15.015625,10.2734)" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient5068-6-9-4">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop5070-8-0-4" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop5072-3-6-1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5068-6-9-4"
-       id="linearGradient6323-7-1"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-15.015625,1046.6356)"
-       x1="10"
-       y1="5"
-       x2="10.007812"
-       y2="6.9843998" />
-    <linearGradient
-       id="linearGradient6281-8-0-1-6-6-4-2">
-      <stop
-         style="stop-color:#f7f9fb;stop-opacity:1"
-         offset="0"
-         id="stop6283-0-2-2-1-2-0-1" />
-      <stop
-         style="stop-color:#ffd680;stop-opacity:1"
-         offset="1"
-         id="stop6285-5-0-9-7-6-9-9" />
-    </linearGradient>
-    <linearGradient
-       y2="7.549418"
-       x2="0.9375"
-       y1="4.8437853"
-       x1="0.9375"
-       gradientTransform="matrix(2.3199889,0,0,2.3199889,10.199693,1043.1852)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3093-5-2-7"
-       xlink:href="#linearGradient6281-8-0-1-6-6-4-2"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient4528-9-5-7-9">
-      <stop
-         id="stop4530-0-5-0-5"
-         offset="0"
-         style="stop-color:#e0c576;stop-opacity:1;" />
-      <stop
-         id="stop4532-7-9-3-3"
-         offset="1"
-         style="stop-color:#9e7916;stop-opacity:1" />
-    </linearGradient>
-    <radialGradient
-       r="3.4803574"
-       fy="-738.83777"
-       fx="-757.20496"
-       cy="-738.83777"
-       cx="-757.20496"
-       gradientTransform="matrix(1.8508179,-8.813921e-6,8.4531434e-6,1.7750589,644.24981,572.63612)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient3091-1-9-6"
-       xlink:href="#linearGradient4528-9-5-7-9"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5068-6-9"
-       id="linearGradient5088-1-4"
-       x1="14"
-       y1="1041.3622"
-       x2="14"
-       y2="1043.3466"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-15.015625,10.2734)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5068-6-9"
-       id="linearGradient5074-2-1"
-       x1="12"
-       y1="1038.3622"
-       x2="10.007812"
-       y2="1038.3466"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-15.015625,10.2734)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5068-6-9"
-       id="linearGradient5076-5-2"
-       x1="10"
-       y1="1040.3622"
-       x2="10.007812"
-       y2="1038.3466"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-15.015625,10.2734)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5068-6-9"
-       id="linearGradient5078-8-2"
-       x1="10"
-       y1="1041.3622"
-       x2="8.0078125"
-       y2="1041.3466"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-15.015625,10.2734)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5068-6-9"
-       id="linearGradient5082-1-0"
-       x1="12"
-       y1="1042.3622"
-       x2="10.007812"
-       y2="1042.3622"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-15.015625,10.2734)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5068-6-9"
-       id="linearGradient5086-8-0"
-       x1="13"
-       y1="1043.3622"
-       x2="15.007812"
-       y2="1043.3466"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-15.015625,10.2734)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5068-6-9"
-       id="linearGradient5084-3-3"
-       x1="12"
-       y1="1043.3622"
-       x2="12"
-       y2="1045.3466"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-15.015625,10.2734)" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient5068-6-9">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop5070-8-0" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop5072-3-6" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5068-6-9"
-       id="linearGradient6323-7"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-15.015625,1046.6356)"
-       x1="10"
-       y1="5"
-       x2="10.007812"
-       y2="6.9843998" />
-    <linearGradient
-       y2="1023.2569"
-       x2="-15.945988"
-       y1="1037.4661"
-       x1="-15.945988"
-       gradientTransform="matrix(0.95585117,0,0,0.95585117,-0.71992063,45.488394)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4790"
-       xlink:href="#linearGradient7272-66-4-5-5-5"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="1030.3411"
-       x2="-10.159802"
-       y1="1030.3411"
-       x1="-22.453552"
-       gradientTransform="matrix(0,1,-1,0,1014.0344,1046.6478)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4788"
-       xlink:href="#linearGradient7540-6-33-6-3"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="1030.3411"
-       x2="-10.159802"
-       y1="1030.3411"
-       x1="-22.453552"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4786"
-       xlink:href="#linearGradient7540-2-3-8"
-       inkscape:collect="always" />
-    <filter
-       height="1.5975104"
-       y="-0.29875519"
-       width="1.5975104"
-       x="-0.29875519"
-       id="filter4755"
-       inkscape:collect="always">
-      <feGaussianBlur
-         id="feGaussianBlur4757"
-         stdDeviation="1.2136929"
-         inkscape:collect="always" />
-    </filter>
-    <linearGradient
-       id="linearGradient7272-66-4-5-5-5"
-       inkscape:collect="always">
-      <stop
-         id="stop7274-6-0-1-7-4"
-         offset="0"
-         style="stop-color:#8f6c10;stop-opacity:1" />
-      <stop
-         id="stop7276-66-6-3-9-1"
-         offset="1"
-         style="stop-color:#c9a645;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient7540-6-33-6-3">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.502"
-         offset="0"
-         id="stop7542-4-4-3-3" />
-      <stop
-         id="stop7544-5-3-8-5"
-         offset="0.47623286"
-         style="stop-color:#ffffff;stop-opacity:1" />
-      <stop
-         id="stop7546-2-9-1-2"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop7548-9-2-0-9" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient7540-2-3-8">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.502"
-         offset="0"
-         id="stop7542-8-7-5" />
-      <stop
-         id="stop7544-8-2-0"
-         offset="0.47623286"
-         style="stop-color:#ffffff;stop-opacity:1" />
-      <stop
-         id="stop7546-1-7-9"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop7548-98-9-2" />
-    </linearGradient>
-    <linearGradient
-       y2="269.33588"
-       x2="636.09375"
-       y1="275.53125"
-       x1="636.09375"
-       gradientTransform="translate(0,0.34375262)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient8703"
-       xlink:href="#linearGradient8337-1"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="272.22238"
-       x2="658.34216"
-       y1="272.22238"
-       x1="616.34216"
-       gradientTransform="translate(0,2.6171875e-6)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient8701"
-       xlink:href="#linearGradient8153-2-4"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="283.2832"
-       x2="657.71722"
-       y1="283.2832"
-       x1="617.06256"
-       gradientTransform="translate(0,2.6171875e-6)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient8699"
-       xlink:href="#linearGradient8137-93"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="276.3064"
-       x2="641.07611"
-       y1="308.68875"
-       x1="641.07611"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient8697"
-       xlink:href="#linearGradient8653"
-       inkscape:collect="always" />
-    <linearGradient
-       gradientTransform="translate(-0.79191653,0)"
-       y2="276.3064"
-       x2="641.07611"
-       y1="308.68875"
-       x1="641.07611"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient8695"
-       xlink:href="#linearGradient8653"
-       inkscape:collect="always" />
-    <linearGradient
-       gradientTransform="translate(0,-0.95029984)"
-       y2="276.3064"
-       x2="641.07611"
-       y1="308.68875"
-       x1="641.07611"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient8693"
-       xlink:href="#linearGradient8653"
-       inkscape:collect="always" />
-    <linearGradient
-       gradientTransform="translate(0,-0.95029984)"
-       y2="276.3064"
-       x2="641.07611"
-       y1="308.68875"
-       x1="641.07611"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient8691"
-       xlink:href="#linearGradient8653"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="276.3064"
-       x2="641.07611"
-       y1="308.68875"
-       x1="641.07611"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient8689"
-       xlink:href="#linearGradient8653"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="269.33588"
-       x2="636.09375"
-       y1="275.53125"
-       x1="636.09375"
-       gradientTransform="translate(0,0.34375)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient8687"
-       xlink:href="#linearGradient8337"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="272.22238"
-       x2="658.34216"
-       y1="272.22238"
-       x1="616.34216"
-       gradientTransform="translate(0,3e-6)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient8685"
-       xlink:href="#linearGradient8153-2"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="283.2832"
-       x2="657.71722"
-       y1="283.2832"
-       x1="617.06256"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient8683"
-       xlink:href="#linearGradient8137"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="308.57455"
-       x2="636.99469"
-       y1="277.45544"
-       x1="636.99469"
-       gradientTransform="translate(0,2.6171875e-6)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient8681"
-       xlink:href="#linearGradient8661"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient8137-93"
-       inkscape:collect="always">
-      <stop
-         id="stop8139-9"
-         offset="0"
-         style="stop-color:#326097;stop-opacity:1" />
-      <stop
-         id="stop8141-8"
-         offset="1"
-         style="stop-color:#2e73c5;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient8153-2-4"
-       inkscape:collect="always">
-      <stop
-         id="stop8155-7-78"
-         offset="0"
-         style="stop-color:#75b1e3;stop-opacity:1;" />
-      <stop
-         id="stop8157-7-0"
-         offset="1"
-         style="stop-color:#c1def7;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient8337-1"
-       inkscape:collect="always">
-      <stop
-         id="stop8339-4"
-         offset="0"
-         style="stop-color:#4e86ca;stop-opacity:1;" />
-      <stop
-         id="stop8341-2"
-         offset="1"
-         style="stop-color:#4e86ca;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient8153-2"
-       inkscape:collect="always">
-      <stop
-         id="stop8155-7"
-         offset="0"
-         style="stop-color:#75b1e3;stop-opacity:1;" />
-      <stop
-         id="stop8157-7"
-         offset="1"
-         style="stop-color:#c1def7;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient8137"
-       inkscape:collect="always">
-      <stop
-         id="stop8139"
-         offset="0"
-         style="stop-color:#326097;stop-opacity:1" />
-      <stop
-         id="stop8141"
-         offset="1"
-         style="stop-color:#2e73c5;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient8337"
-       inkscape:collect="always">
-      <stop
-         id="stop8339"
-         offset="0"
-         style="stop-color:#4e86ca;stop-opacity:1;" />
-      <stop
-         id="stop8341"
-         offset="1"
-         style="stop-color:#4e86ca;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient8653"
-       inkscape:collect="always">
-      <stop
-         id="stop8655"
-         offset="0"
-         style="stop-color:#676656;stop-opacity:1;" />
-      <stop
-         id="stop8657"
-         offset="1"
-         style="stop-color:#9e884e;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient8661">
-      <stop
-         style="stop-color:#c6e7f9;stop-opacity:1"
-         offset="0"
-         id="stop8663" />
-      <stop
-         style="stop-color:#f9fcff;stop-opacity:1"
-         offset="1"
-         id="stop8665" />
-    </linearGradient>
-    <linearGradient
-       y2="1043.3466"
-       x2="14"
-       y1="1041.3622"
-       x1="14"
-       gradientTransform="translate(13.866995,2.4648957)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3123"
-       xlink:href="#linearGradient5068"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="1038.3466"
-       x2="10.007812"
-       y1="1038.3622"
-       x1="12"
-       gradientTransform="translate(13.866995,2.4648957)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3121"
-       xlink:href="#linearGradient5068"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="1038.3466"
-       x2="10.007812"
-       y1="1040.3622"
-       x1="10"
-       gradientTransform="translate(13.866995,2.4648957)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3119"
-       xlink:href="#linearGradient5068"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="1041.3466"
-       x2="8.0078125"
-       y1="1041.3622"
-       x1="10"
-       gradientTransform="translate(40.491994,1.0273958)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3117"
-       xlink:href="#linearGradient5068"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="1042.3622"
-       x2="10.007812"
-       y1="1042.3622"
-       x1="12"
-       gradientTransform="matrix(1.5333047,-0.8452528,1.5333047,0.8452528,-1566.5485,172.95576)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3115"
-       xlink:href="#linearGradient5068"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="1043.3466"
-       x2="15.007812"
-       y1="1043.3622"
-       x1="13"
-       gradientTransform="translate(13.866995,2.4648957)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3113"
-       xlink:href="#linearGradient5068"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="1045.3466"
-       x2="12"
-       y1="1043.3622"
-       x1="12"
-       gradientTransform="translate(13.866995,2.4648957)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3111"
-       xlink:href="#linearGradient5068"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="7.549418"
-       x2="0.9375"
-       y1="4.8437853"
-       x1="0.9375"
-       gradientTransform="matrix(1.8479968,0,0,1.8479968,24.14231,1031.8602)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3109"
-       xlink:href="#linearGradient4823"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="1043.7627"
-       x2="12.578125"
-       y1="1037.7841"
-       x1="12.578125"
-       gradientTransform="translate(13.874807,2.4492957)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3107"
-       xlink:href="#linearGradient4863"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="6.9843998"
-       x2="10.007812"
-       y1="5"
-       x1="10"
-       gradientTransform="translate(13.866995,1038.8271)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3105"
-       xlink:href="#linearGradient5068"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient6281-8-0-1-6">
-      <stop
-         style="stop-color:#f7f9fb;stop-opacity:1"
-         offset="0"
-         id="stop6283-0-2-2-1" />
-      <stop
-         style="stop-color:#ffd680;stop-opacity:1"
-         offset="1"
-         id="stop6285-5-0-9-7" />
-    </linearGradient>
-    <linearGradient
-       y2="7.549418"
-       x2="0.9375"
-       y1="4.8437853"
-       x1="0.9375"
-       gradientTransform="matrix(2.3199889,0,0,2.3199889,10.199693,1043.1852)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4526-2"
-       xlink:href="#linearGradient6281-8-0-1-6"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient4528-9">
-      <stop
-         id="stop4530-0"
-         offset="0"
-         style="stop-color:#e0c576;stop-opacity:1;" />
-      <stop
-         id="stop4532-7"
-         offset="1"
-         style="stop-color:#9e7916;stop-opacity:1" />
-    </linearGradient>
-    <radialGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.8508179,-8.813921e-6,8.4531434e-6,1.7750589,644.24981,572.63612)"
-       r="3.4803574"
-       fy="-738.83777"
-       fx="-757.20496"
-       cy="-738.83777"
-       cx="-757.20496"
-       id="radialGradient4534-5"
-       xlink:href="#linearGradient4528-9"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient4863"
-       inkscape:collect="always">
-      <stop
-         id="stop4865"
-         offset="0"
-         style="stop-color:#ba9726;stop-opacity:1;" />
-      <stop
-         id="stop4867"
-         offset="1"
-         style="stop-color:#997413;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4823">
-      <stop
-         style="stop-color:#fefdef;stop-opacity:1"
-         offset="0"
-         id="stop4825" />
-      <stop
-         style="stop-color:#fbdd83;stop-opacity:1"
-         offset="1"
-         id="stop4827" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5068"
-       inkscape:collect="always">
-      <stop
-         id="stop5070"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         id="stop5072"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4830"
-       id="linearGradient4795"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-60.558592,7.1608197e-6)"
-       x1="548.45923"
-       y1="398.98798"
-       x2="548.45923"
-       y2="373.77069" />
-    <linearGradient
-       y2="374.21222"
-       x2="538.00562"
-       y1="396.2229"
-       x1="538.00562"
-       gradientTransform="translate(-60.558602,0)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4933"
-       xlink:href="#linearGradient4762"
-       inkscape:collect="always" />
-    <filter
-       height="1.7548983"
-       y="-0.37744917"
-       width="1.2751431"
-       x="-0.13757156"
-       id="filter4929"
-       inkscape:collect="always">
-      <feGaussianBlur
-         id="feGaussianBlur4931"
-         stdDeviation="3.5620748"
-         inkscape:collect="always" />
-    </filter>
-    <mask
-       id="mask4917"
-       maskUnits="userSpaceOnUse">
-      <path
-         sodipodi:nodetypes="sssssssss"
-         inkscape:connector-curvature="0"
-         id="path4919"
-         d="m 462.77563,373.22885 29.11636,0 c 1.45425,0 2.625,1.17075 2.625,2.625 l 0,18.76896 c 0,1.45425 -1.17412,2.52598 -2.625,2.625 l -29.11636,1.98708 c -1.45088,0.099 -2.625,-1.17075 -2.625,-2.625 l 0,-20.75604 c 0,-1.45425 1.17075,-2.625 2.625,-2.625 z"
-         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;display:inline" />
-    </mask>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4807"
-       id="linearGradient4778"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.95640793,0,1.3306873e-8,1.3548175,367.50712,24.15968)"
-       x1="546.63287"
-       y1="397.26389"
-       x2="546.58252"
-       y2="382.12424" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4756"
-       id="linearGradient4776"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.95640793,0,1.3306873e-8,1.3548175,367.50712,24.15968)"
-       x1="537.94318"
-       y1="397.56107"
-       x2="537.90186"
-       y2="385.15216" />
-    <linearGradient
-       gradientTransform="translate(-60.558602,0)"
-       y2="373.2294"
-       x2="543.91406"
-       y1="373.2294"
-       x1="523.00781"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3945"
-       xlink:href="#linearGradient3955"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="371.17883"
-       x2="531.09253"
-       y1="366.78851"
-       x1="529.21912"
-       gradientTransform="translate(-58.381352,-1.4843182)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3939"
-       xlink:href="#linearGradient3967"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient3955">
-      <stop
-         style="stop-color:#c38536;stop-opacity:0"
-         offset="0"
-         id="stop3957" />
-      <stop
-         id="stop3959"
-         offset="0.15381166"
-         style="stop-color:#f2dc91;stop-opacity:1" />
-      <stop
-         id="stop3961"
-         offset="0.5"
-         style="stop-color:#fbdc8b;stop-opacity:1" />
-      <stop
-         style="stop-color:#e6bd7a;stop-opacity:1"
-         offset="0.75"
-         id="stop3963" />
-      <stop
-         style="stop-color:#ba772f;stop-opacity:0"
-         offset="1"
-         id="stop3965" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3967">
-      <stop
-         style="stop-color:#84909f;stop-opacity:1"
-         offset="0"
-         id="stop3969" />
-      <stop
-         style="stop-color:#757c8a;stop-opacity:1"
-         offset="1"
-         id="stop3971" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient4807">
-      <stop
-         style="stop-color:#2846b3;stop-opacity:1"
-         offset="0"
-         id="stop4809" />
-      <stop
-         style="stop-color:#60649d;stop-opacity:1"
-         offset="1"
-         id="stop4811" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4756"
-       inkscape:collect="always">
-      <stop
-         id="stop4758"
-         offset="0"
-         style="stop-color:#92b5eb;stop-opacity:1" />
-      <stop
-         id="stop4760"
-         offset="1"
-         style="stop-color:#b1e1fd;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4762"
-       inkscape:collect="always">
-      <stop
-         id="stop4764"
-         offset="0"
-         style="stop-color:#ffd175;stop-opacity:1" />
-      <stop
-         id="stop4766"
-         offset="1"
-         style="stop-color:#fff1c2;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4830">
-      <stop
-         id="stop4832"
-         offset="0"
-         style="stop-color:#2e49b0;stop-opacity:1" />
-      <stop
-         style="stop-color:#565f9e;stop-opacity:1"
-         offset="0.5"
-         id="stop4836" />
-      <stop
-         id="stop4834"
-         offset="1"
-         style="stop-color:#8591c8;stop-opacity:0" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient6281-8-0-1-6-6-4-2-84">
-      <stop
-         style="stop-color:#f7f9fb;stop-opacity:1"
-         offset="0"
-         id="stop6283-0-2-2-1-2-0-1-5" />
-      <stop
-         style="stop-color:#ffd680;stop-opacity:1"
-         offset="1"
-         id="stop6285-5-0-9-7-6-9-9-6" />
-    </linearGradient>
-    <linearGradient
-       y2="7.549418"
-       x2="0.9375"
-       y1="4.8437853"
-       x1="0.9375"
-       gradientTransform="matrix(2.3199889,0,0,2.3199889,10.199693,1043.1852)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3093-5-2-7-6"
-       xlink:href="#linearGradient6281-8-0-1-6-6-4-2-84"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient4528-9-5-7-9-3">
-      <stop
-         id="stop4530-0-5-0-5-9"
-         offset="0"
-         style="stop-color:#e0c576;stop-opacity:1;" />
-      <stop
-         id="stop4532-7-9-3-3-4"
-         offset="1"
-         style="stop-color:#9e7916;stop-opacity:1" />
-    </linearGradient>
-    <radialGradient
-       r="3.4803574"
-       fy="-738.83777"
-       fx="-757.20496"
-       cy="-738.83777"
-       cx="-757.20496"
-       gradientTransform="matrix(1.8508179,-8.813921e-6,8.4531434e-6,1.7750589,644.24981,572.63612)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient3091-1-9-6-2"
-       xlink:href="#linearGradient4528-9-5-7-9-3"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5068-6-9-8"
-       id="linearGradient5088-1-4-1"
-       x1="14"
-       y1="1041.3622"
-       x2="14"
-       y2="1043.3466"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-15.015625,10.2734)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5068-6-9-8"
-       id="linearGradient5074-2-1-4"
-       x1="12"
-       y1="1038.3622"
-       x2="10.007812"
-       y2="1038.3466"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-15.015625,10.2734)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5068-6-9-8"
-       id="linearGradient5076-5-2-3"
-       x1="10"
-       y1="1040.3622"
-       x2="10.007812"
-       y2="1038.3466"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-15.015625,10.2734)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5068-6-9-8"
-       id="linearGradient5078-8-2-5"
-       x1="10"
-       y1="1041.3622"
-       x2="8.0078125"
-       y2="1041.3466"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-15.015625,10.2734)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5068-6-9-8"
-       id="linearGradient5082-1-0-9"
-       x1="12"
-       y1="1042.3622"
-       x2="10.007812"
-       y2="1042.3622"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-15.015625,10.2734)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5068-6-9-8"
-       id="linearGradient5086-8-0-0"
-       x1="13"
-       y1="1043.3622"
-       x2="15.007812"
-       y2="1043.3466"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-15.015625,10.2734)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5068-6-9-8"
-       id="linearGradient5084-3-3-6"
-       x1="12"
-       y1="1043.3622"
-       x2="12"
-       y2="1045.3466"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-15.015625,10.2734)" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient5068-6-9-8">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop5070-8-0-45" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop5072-3-6-7" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5068-6-9-8"
-       id="linearGradient6323-7-9"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-15.015625,1046.6356)"
-       x1="10"
-       y1="5"
-       x2="10.007812"
-       y2="6.9843998" />
-    <linearGradient
-       id="linearGradient6281-8-0-1-6-6-4">
-      <stop
-         style="stop-color:#f7f9fb;stop-opacity:1"
-         offset="0"
-         id="stop6283-0-2-2-1-2-0" />
-      <stop
-         style="stop-color:#ffd680;stop-opacity:1"
-         offset="1"
-         id="stop6285-5-0-9-7-6-9" />
-    </linearGradient>
-    <linearGradient
-       y2="7.549418"
-       x2="0.9375"
-       y1="4.8437853"
-       x1="0.9375"
-       gradientTransform="matrix(2.3199889,0,0,2.3199889,10.199693,1043.1852)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3093-5-2"
-       xlink:href="#linearGradient6281-8-0-1-6-6-4"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient4528-9-5-7">
-      <stop
-         id="stop4530-0-5-0"
-         offset="0"
-         style="stop-color:#e0c576;stop-opacity:1;" />
-      <stop
-         id="stop4532-7-9-3"
-         offset="1"
-         style="stop-color:#9e7916;stop-opacity:1" />
-    </linearGradient>
-    <radialGradient
-       r="3.4803574"
-       fy="-738.83777"
-       fx="-757.20496"
-       cy="-738.83777"
-       cx="-757.20496"
-       gradientTransform="matrix(1.8508179,-8.813921e-6,8.4531434e-6,1.7750589,644.24981,572.63612)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient3091-1-9"
-       xlink:href="#linearGradient4528-9-5-7"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5068-6"
-       id="linearGradient5088-1"
-       x1="14"
-       y1="1041.3622"
-       x2="14"
-       y2="1043.3466"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-15.015625,10.2734)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5068-6"
-       id="linearGradient5074-2"
-       x1="12"
-       y1="1038.3622"
-       x2="10.007812"
-       y2="1038.3466"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-15.015625,10.2734)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5068-6"
-       id="linearGradient5076-5"
-       x1="10"
-       y1="1040.3622"
-       x2="10.007812"
-       y2="1038.3466"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-15.015625,10.2734)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5068-6"
-       id="linearGradient5078-8"
-       x1="10"
-       y1="1041.3622"
-       x2="8.0078125"
-       y2="1041.3466"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-15.015625,10.2734)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5068-6"
-       id="linearGradient5082-1"
-       x1="12"
-       y1="1042.3622"
-       x2="10.007812"
-       y2="1042.3622"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-15.015625,10.2734)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5068-6"
-       id="linearGradient5086-8"
-       x1="13"
-       y1="1043.3622"
-       x2="15.007812"
-       y2="1043.3466"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-15.015625,10.2734)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5068-6"
-       id="linearGradient5084-3"
-       x1="12"
-       y1="1043.3622"
-       x2="12"
-       y2="1045.3466"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-15.015625,10.2734)" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient5068-6">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop5070-8" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop5072-3" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5068-6"
-       id="linearGradient6323"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-15.015625,1046.6356)"
-       x1="10"
-       y1="5"
-       x2="10.007812"
-       y2="6.9843998" />
-    <mask
-       id="mask8465"
-       maskUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path8467"
-         d="m 2.005808,1041.3724 0,0.5 0,11.0313 0,0.5 0.5,0 12.9375,0 0.5,0 0,-0.5 0,-11.0313 0,-0.5 -0.5,0 -12.9375,0 -0.5,0 z"
-         style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" />
-    </mask>
-    <filter
-       height="1.4800004"
-       y="-0.24000018"
-       width="1.4799996"
-       x="-0.23999982"
-       id="filter8410"
-       inkscape:collect="always">
-      <feGaussianBlur
-         id="feGaussianBlur8412"
-         stdDeviation="1.4653611"
-         inkscape:collect="always" />
-    </filter>
-    <linearGradient
-       id="linearGradient7540-6-33-6-3-2">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.502"
-         offset="0"
-         id="stop7542-4-4-3-3-3" />
-      <stop
-         id="stop7544-5-3-8-5-5"
-         offset="0.47623286"
-         style="stop-color:#ffffff;stop-opacity:1" />
-      <stop
-         id="stop7546-2-9-1-2-0"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop7548-9-2-0-9-8" />
-    </linearGradient>
-    <linearGradient
-       y2="1030.3411"
-       x2="-10.159802"
-       y1="1030.3411"
-       x1="-22.453552"
-       gradientTransform="matrix(0,1,-1,0,1014.0344,1046.6478)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient7740-1-3-1"
-       xlink:href="#linearGradient7540-6-33-6-3-2"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient7540-2-3-8-4">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.502"
-         offset="0"
-         id="stop7542-8-7-5-6" />
-      <stop
-         id="stop7544-8-2-0-7"
-         offset="0.47623286"
-         style="stop-color:#ffffff;stop-opacity:1" />
-      <stop
-         id="stop7546-1-7-9-9"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop7548-98-9-2-8" />
-    </linearGradient>
-    <linearGradient
-       y2="1030.3411"
-       x2="-10.159802"
-       y1="1030.3411"
-       x1="-22.453552"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient7738-6-2-3"
-       xlink:href="#linearGradient7540-2-3-8-4"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient7272-66-4-5-5-5-8"
-       inkscape:collect="always">
-      <stop
-         id="stop7274-6-0-1-7-4-9"
-         offset="0"
-         style="stop-color:#8f6c10;stop-opacity:1" />
-      <stop
-         id="stop7276-66-6-3-9-1-8"
-         offset="1"
-         style="stop-color:#c9a645;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       y2="1023.2569"
-       x2="-15.945988"
-       y1="1037.4661"
-       x1="-15.945988"
-       gradientTransform="matrix(0.95585117,0,0,0.95585117,-0.71992063,45.488394)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient7736-9-7-1"
-       xlink:href="#linearGradient7272-66-4-5-5-5-8"
-       inkscape:collect="always" />
-    <filter
-       height="1.220829"
-       y="-0.11041452"
-       width="1.169829"
-       x="-0.084914483"
-       id="filter7823-3-4-6"
-       inkscape:collect="always"
-       color-interpolation-filters="sRGB">
-      <feGaussianBlur
-         id="feGaussianBlur7825-1-3-8"
-         stdDeviation="1.6188839"
-         inkscape:collect="always" />
-    </filter>
-    <linearGradient
-       id="linearGradient4082-3">
-      <stop
-         style="stop-color:#4476aa;stop-opacity:1"
-         offset="0"
-         id="stop4084-8" />
-      <stop
-         id="stop4864-7"
-         offset="0.5"
-         style="stop-color:#5a9ccc;stop-opacity:1" />
-      <stop
-         style="stop-color:#4476aa;stop-opacity:1"
-         offset="1"
-         id="stop4086-2" />
-    </linearGradient>
-    <linearGradient
-       y2="1041.8765"
-       x2="8.0137892"
-       y1="1039.876"
-       x1="8.0137892"
-       gradientTransform="translate(0,2.0001)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4063-8"
-       xlink:href="#linearGradient4082-3"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient4994-4-5"
-       inkscape:collect="always">
-      <stop
-         id="stop4996-5-9"
-         offset="0"
-         style="stop-color:#c5dff4;stop-opacity:1" />
-      <stop
-         id="stop4998-5-0"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       y2="1044.3622"
-       x2="-11"
-       y1="1042.3622"
-       x1="-11"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4975-2-1"
-       xlink:href="#linearGradient4994-4-5"
-       inkscape:collect="always"
-       gradientTransform="translate(18,1.999963)" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient4910-4-0">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0"
-         offset="0"
-         id="stop4912-8-5" />
-      <stop
-         style="stop-color:#c5dff4;stop-opacity:1"
-         offset="1"
-         id="stop4914-8-1" />
-    </linearGradient>
-    <linearGradient
-       y2="1047.3622"
-       x2="-15"
-       y1="1047.3622"
-       x1="-13"
-       gradientTransform="translate(18,-4.000037)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient5062-4"
-       xlink:href="#linearGradient4910-4-0"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient4810-5"
-       inkscape:collect="always">
-      <stop
-         id="stop4812-0"
-         offset="0"
-         style="stop-color:#be9a4b;stop-opacity:1" />
-      <stop
-         id="stop4814-4"
-         offset="1"
-         style="stop-color:#877e60;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4810-5"
-       id="linearGradient4046-24"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,2.000063)"
-       x1="8.0137892"
-       y1="1042.3622"
-       x2="8.0137892"
-       y2="1050.0707" />
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient5068-6-9-8-8"
        id="linearGradient6323-7-9-2"
        gradientUnits="userSpaceOnUse"
@@ -1732,7 +144,6 @@
        x2="10.007812"
        y2="6.9843998" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient5068-6-9-8-8">
       <stop
          style="stop-color:#ffffff;stop-opacity:1;"
@@ -1744,7 +155,6 @@
          id="stop5072-3-6-7-9" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient5068-6-9-8-8"
        id="linearGradient5084-3-3-6-8"
        x1="12"
@@ -1754,7 +164,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-15.015625,10.2734)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient5068-6-9-8-8"
        id="linearGradient5086-8-0-0-3"
        x1="13"
@@ -1764,7 +173,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-15.015625,10.2734)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient5068-6-9-8-8"
        id="linearGradient5082-1-0-9-8"
        x1="12"
@@ -1774,7 +182,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-15.015625,10.2734)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient5068-6-9-8-8"
        id="linearGradient5078-8-2-5-7"
        x1="10"
@@ -1784,7 +191,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-15.015625,10.2734)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient5068-6-9-8-8"
        id="linearGradient5076-5-2-3-0"
        x1="10"
@@ -1794,7 +200,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-15.015625,10.2734)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient5068-6-9-8-8"
        id="linearGradient5074-2-1-4-6"
        x1="12"
@@ -1804,7 +209,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-15.015625,10.2734)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient5068-6-9-8-8"
        id="linearGradient5088-1-4-1-4"
        x1="14"
@@ -1822,8 +226,7 @@
        gradientTransform="matrix(1.8508179,-8.813921e-6,8.4531434e-6,1.7750589,644.24981,572.63612)"
        gradientUnits="userSpaceOnUse"
        id="radialGradient3091-1-9-6-2-8"
-       xlink:href="#linearGradient4528-9-5-7-9-3-6"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4528-9-5-7-9-3-6" />
     <linearGradient
        id="linearGradient4528-9-5-7-9-3-6">
       <stop
@@ -1843,8 +246,7 @@
        gradientTransform="matrix(2.3199889,0,0,2.3199889,10.199693,1043.1852)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient3093-5-2-7-6-2"
-       xlink:href="#linearGradient6281-8-0-1-6-6-4-2-84-2"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient6281-8-0-1-6-6-4-2-84-2" />
     <linearGradient
        id="linearGradient6281-8-0-1-6-6-4-2-84-2">
       <stop
@@ -1857,31 +259,6 @@
          id="stop6285-5-0-9-7-6-9-9-6-6" />
     </linearGradient>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="15.092311"
-     inkscape:cx="4.8947251"
-     inkscape:cy="-3.5305629"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="900"
-     inkscape:window-x="81"
-     inkscape:window-y="25"
-     inkscape:window-maximized="0"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3999" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -1895,8 +272,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
@@ -1904,26 +279,20 @@
        id="g4078"
        transform="translate(-0.091106,-0.97334116)">
       <path
-         sodipodi:nodetypes="cccccc"
-         inkscape:connector-curvature="0"
          id="rect4001-3"
          d="m 3.0274322,1037.8597 7.5016168,0 3.062057,3.0066 0,10.6105 -10.5636738,0 z"
          style="fill:url(#linearGradient4084);fill-opacity:1;stroke:none;display:inline" />
       <path
-         inkscape:connector-curvature="0"
          id="path4884"
          d="m 9.998718,1037.397 0,3.9112 3.977478,0 z"
          style="fill:url(#linearGradient4086);fill-opacity:1;stroke:none;display:inline" />
       <path
-         sodipodi:nodetypes="cccccc"
-         inkscape:connector-curvature="0"
          id="rect4001"
          d="m 2.582337,1037.8597 7.946712,0 3.062057,3.0066 0,10.9853 -11.008769,0 z"
          style="fill:none;stroke:url(#linearGradient4088);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;display:inline" />
     </g>
     <g
        id="layer1-4"
-       inkscape:label="Layer 1"
        transform="translate(-1.0185535,4.0336836)">
       <rect
          ry="0.62500006"
@@ -1935,7 +304,6 @@
          id="rect3002"
          style="fill:url(#linearGradient3786);fill-opacity:1;stroke:url(#linearGradient3794);stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
       <path
-         inkscape:connector-curvature="0"
          id="path3796"
          d="m 2.5,1047.8622 0,-2.9688 3.03125,0 0,-3.0312 3,0 0,3.0312 3.000001,0 0,2.9688 z"
          style="fill:#b0c0e0;fill-opacity:1;stroke:url(#linearGradient3804);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
@@ -1943,13 +311,11 @@
     <g
        style="display:inline"
        id="layer1-48"
-       inkscape:label="Layer 1"
        transform="translate(-10.398998,21.985707)">
       <g
          transform="translate(17.6875,0)"
          id="g4908">
         <g
-           inkscape:label="Layer 1"
            id="layer1-8"
            style="display:inline"
            transform="translate(-18.599558,-2.010247)">
@@ -1966,53 +332,37 @@
              id="g6432-5"
              style="display:inline">
             <path
-               sodipodi:nodetypes="ccccc"
-               inkscape:connector-curvature="0"
                id="path5581-1-1-3"
                d="m -7.007813,1053.62 2,0 1.492188,-1.4844 -2.0312504,0 z"
                style="fill:url(#linearGradient6323-7-9-2);fill-opacity:1;stroke:none;display:inline" />
             <path
-               sodipodi:nodetypes="cccccc"
-               inkscape:connector-curvature="0"
                id="path5581-1-1-8-3"
                d="m -5.007813,1055.62 4,0 0,-1 -0.476562,-0.4844 -2.03125,0 z"
                style="fill:url(#linearGradient5084-3-3-6-8);fill-opacity:1;stroke:none;display:inline" />
             <path
-               sodipodi:nodetypes="ccccc"
                id="path5581-1-1-7-4"
                d="m -1.484375,1052.1356 0,2 0.476562,0.4844 0,-2 z"
-               style="fill:url(#linearGradient5086-8-0-0-3);fill-opacity:1;stroke:none;display:inline"
-               inkscape:connector-curvature="0" />
+               style="fill:url(#linearGradient5086-8-0-0-3);fill-opacity:1;stroke:none;display:inline" />
             <path
-               sodipodi:nodetypes="ccccc"
                id="path5581-1-1-6-1"
                d="m -5.007813,1053.62 0,2 1.492188,-1.4844 0,-2 z"
-               style="fill:url(#linearGradient5082-1-0-9-8);fill-opacity:1;stroke:none;display:inline"
-               inkscape:connector-curvature="0" />
+               style="fill:url(#linearGradient5082-1-0-9-8);fill-opacity:1;stroke:none;display:inline" />
             <path
-               sodipodi:nodetypes="ccccc"
                id="path5581-1-1-1-7"
                d="m -7.007813,1048.62 0,5 1.4609376,-1.4844 0,-2 z"
-               style="fill:url(#linearGradient5078-8-2-5-7);fill-opacity:1;stroke:none;display:inline"
-               inkscape:connector-curvature="0" />
+               style="fill:url(#linearGradient5078-8-2-5-7);fill-opacity:1;stroke:none;display:inline" />
             <path
-               sodipodi:nodetypes="ccccc"
                id="path5581-1-1-89-9"
                d="m -5.007813,1048.62 -2,0 1.4609375,1.5156 2.0312505,0 z"
-               style="fill:url(#linearGradient5076-5-2-3-0);fill-opacity:1;stroke:none;display:inline"
-               inkscape:connector-curvature="0" />
+               style="fill:url(#linearGradient5076-5-2-3-0);fill-opacity:1;stroke:none;display:inline" />
             <path
-               sodipodi:nodetypes="ccccc"
                id="path5581-1-1-2-9"
                d="m -5.007813,1048.62 0,0 1.503907,1.5273 0,-1.5156 z"
-               style="fill:url(#linearGradient5074-2-1-4-6);fill-opacity:1;stroke:none;display:inline"
-               inkscape:connector-curvature="0" />
+               style="fill:url(#linearGradient5074-2-1-4-6);fill-opacity:1;stroke:none;display:inline" />
             <path
-               sodipodi:nodetypes="ccccc"
                id="path5581-1-1-79-6"
                d="m -1.011718,1052.1356 -0.472657,0 0.476563,0.4844 -0.0039,0 z"
-               style="fill:url(#linearGradient5088-1-4-1-4);fill-opacity:1;stroke:none;display:inline"
-               inkscape:connector-curvature="0" />
+               style="fill:url(#linearGradient5088-1-4-1-4);fill-opacity:1;stroke:none;display:inline" />
             <g
                transform="translate(-5.536708,-5.6240351)"
                id="g4514-3"
@@ -2031,9 +381,7 @@
                 <path
                    style="fill:url(#linearGradient3093-5-2-7-6-2);fill-opacity:1;stroke:none;display:inline"
                    d="m 12.471186,1054.309 1.001133,0 0,1.946 1.986639,0 0,1.0167 -1.986639,0 0,2.043 -1.001133,0 0,-2.043 -1.98664,0 0,-1.0167 1.98664,0 z"
-                   id="path5581-5-5-7"
-                   inkscape:connector-curvature="0"
-                   sodipodi:nodetypes="ccccccccccccc" />
+                   id="path5581-5-5-7" />
               </g>
             </g>
           </g>
diff --git a/ds/org.eclipse.pde.ds.ui/icons/obj16/generic_obj.svg b/ds/org.eclipse.pde.ds.ui/icons/obj16/generic_obj.svg
index 76c6056e068..d2b9d022cca 100644
--- a/ds/org.eclipse.pde.ds.ui/icons/obj16/generic_obj.svg
+++ b/ds/org.eclipse.pde.ds.ui/icons/obj16/generic_obj.svg
@@ -2,48 +2,19 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="generic_obj.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       inkscape:collect="always"
-       id="linearGradient9354">
-      <stop
-         style="stop-color:#1b639e;stop-opacity:1;"
-         offset="0"
-         id="stop9356" />
-      <stop
-         style="stop-color:#6f8db9;stop-opacity:1"
-         offset="1"
-         id="stop9358" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient8562">
-      <stop
-         style="stop-color:#6994ad;stop-opacity:1"
-         offset="0"
-         id="stop8564" />
-      <stop
-         style="stop-color:#005596;stop-opacity:1"
-         offset="1"
-         id="stop8566" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        id="linearGradient4902-3">
       <stop
          style="stop-color:#b28a30;stop-opacity:1"
@@ -55,7 +26,6 @@
          id="stop4906-2" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4894-6">
       <stop
          style="stop-color:#e0c88f;stop-opacity:1"
@@ -67,7 +37,6 @@
          id="stop4898-5" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4994-6">
       <stop
          style="stop-color:#f9fafc;stop-opacity:1;"
@@ -79,7 +48,6 @@
          id="stop4998-89" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4994-6"
        id="linearGradient4084"
        gradientUnits="userSpaceOnUse"
@@ -89,7 +57,6 @@
        x2="9.8946028"
        y2="1051.8378" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4894-6"
        id="linearGradient4086"
        gradientUnits="userSpaceOnUse"
@@ -99,7 +66,6 @@
        x2="9.9874563"
        y2="1040.3303" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4902-3"
        id="linearGradient4088"
        gradientUnits="userSpaceOnUse"
@@ -108,241 +74,7 @@
        y1="1038.5779"
        x2="10.544736"
        y2="1052.3228" />
-    <linearGradient
-       id="linearGradient5103-3-7">
-      <stop
-         style="stop-color:#c1ebca;stop-opacity:1"
-         offset="0"
-         id="stop5105-5-4" />
-      <stop
-         id="stop7550-07-0"
-         offset="0.26694915"
-         style="stop-color:#b3dac7;stop-opacity:1" />
-      <stop
-         id="stop7548-6-9"
-         offset="0.51694918"
-         style="stop-color:#9ec2c3;stop-opacity:1" />
-      <stop
-         style="stop-color:#7a99bb;stop-opacity:1"
-         offset="1"
-         id="stop5107-7-48" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient9354"
-       id="linearGradient9369"
-       gradientUnits="userSpaceOnUse"
-       x1="-1045.2971"
-       y1="-34.1688"
-       x2="-1045.2971"
-       y2="-39.1688" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5103-3-7"
-       id="linearGradient9563"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(19.911612,-20)"
-       x1="13.706096"
-       y1="1045.2537"
-       x2="8.8684521"
-       y2="1045.2537" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8562"
-       id="linearGradient9565"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(19.911612,-40)"
-       x1="13.537925"
-       y1="1065.152"
-       x2="8.7441578"
-       y2="1065.152" />
-    <mask
-       maskUnits="userSpaceOnUse"
-       id="mask9640">
-      <g
-         transform="translate(-3.5400399e-7,-20)"
-         id="g9642"
-         style="fill:#ffffff;display:inline">
-        <rect
-           style="fill:#ffffff;fill-opacity:1;stroke:none"
-           id="rect9644"
-           width="9"
-           height="5"
-           x="-1049.2971"
-           y="-39.1688"
-           transform="matrix(0,-1,-1,0,0,0)" />
-        <rect
-           style="fill:#ffffff;fill-opacity:1;stroke:none"
-           id="rect9646"
-           width="7"
-           height="3"
-           x="-1048.2971"
-           y="-38.1688"
-           transform="matrix(0,-1,-1,0,0,0)" />
-        <rect
-           style="fill:#ffffff;fill-opacity:1;stroke:none"
-           id="rect9648"
-           width="1"
-           height="1"
-           x="-1047.2971"
-           y="-37.1688"
-           transform="matrix(0,-1,-1,0,0,0)" />
-        <rect
-           style="fill:#ffffff;fill-opacity:1;stroke:none"
-           id="rect9650"
-           width="1"
-           height="1"
-           x="-1045.2971"
-           y="-37.1688"
-           transform="matrix(0,-1,-1,0,0,0)" />
-        <rect
-           style="fill:#ffffff;fill-opacity:1;stroke:none"
-           id="rect9652"
-           width="1"
-           height="1"
-           x="-1043.2971"
-           y="-37.1688"
-           transform="matrix(0,-1,-1,0,0,0)" />
-        <g
-           style="fill:#ffffff;stroke:#ffffff;display:inline"
-           id="g9654"
-           transform="matrix(0,-1,-1,0,1074.4897,1048.3882)">
-          <path
-             sodipodi:nodetypes="cccccc"
-             inkscape:connector-curvature="0"
-             id="path9656"
-             d="m 3.5193795,1037.8597 7.0096695,0 3.062057,3.0066 0,9.9546 -10.0717265,0 z"
-             style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;display:inline" />
-          <path
-             inkscape:connector-curvature="0"
-             id="path9658"
-             d="m 9.998718,1037.397 0,3.9112 3.977478,0 z"
-             style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;display:inline" />
-          <path
-             sodipodi:nodetypes="cccccc"
-             inkscape:connector-curvature="0"
-             id="path9660"
-             d="m 3.5193795,1037.8597 7.0096695,0 3.062057,3.0066 0,9.9546 -10.0717265,0 z"
-             style="fill:#ffffff;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;display:inline" />
-        </g>
-      </g>
-    </mask>
-    <linearGradient
-       gradientTransform="translate(-20,0)"
-       gradientUnits="userSpaceOnUse"
-       y2="1044.8622"
-       x2="32.031251"
-       y1="1044.8622"
-       x1="22"
-       id="linearGradient3804"
-       xlink:href="#linearGradient3798"
-       inkscape:collect="always" />
-    <linearGradient
-       gradientTransform="translate(-20,0)"
-       gradientUnits="userSpaceOnUse"
-       y2="1043.3622"
-       x2="32.03125"
-       y1="1043.3622"
-       x1="22.03125"
-       id="linearGradient3794"
-       xlink:href="#linearGradient3788"
-       inkscape:collect="always" />
-    <linearGradient
-       gradientTransform="translate(-20,0)"
-       gradientUnits="userSpaceOnUse"
-       y2="1040.4054"
-       x2="31.388678"
-       y1="1040.4054"
-       x1="22.377558"
-       id="linearGradient3786"
-       xlink:href="#linearGradient3780"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient10798-1-9-3-7-6-8-9-0-9-1">
-      <stop
-         id="stop10800-5-2-1-8-20-6-4-9-8-2"
-         offset="0"
-         style="stop-color:#7564b1;stop-opacity:1" />
-      <stop
-         style="stop-color:#5d4aa1;stop-opacity:1"
-         offset="0.5"
-         id="stop10806-6-8-5-3-9-24-8-4-3-2" />
-      <stop
-         id="stop10802-1-5-3-0-4-8-4-2-9-2"
-         offset="1"
-         style="stop-color:#9283c3;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient10798-1-9-3-7-6-8-9-0-9-1"
-       id="linearGradient3929-5"
-       gradientUnits="userSpaceOnUse"
-       x1="388.63736"
-       y1="478.18777"
-       x2="388.63736"
-       y2="462.11539" />
-    <linearGradient
-       id="linearGradient3780"
-       inkscape:collect="always">
-      <stop
-         id="stop3782"
-         offset="0"
-         style="stop-color:#fdf2d0;stop-opacity:1;" />
-      <stop
-         id="stop3784"
-         offset="1"
-         style="stop-color:#fffdf9;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3788"
-       inkscape:collect="always">
-      <stop
-         id="stop3790"
-         offset="0"
-         style="stop-color:#d8bb8c;stop-opacity:1" />
-      <stop
-         id="stop3792"
-         offset="1"
-         style="stop-color:#dfc38d;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3798"
-       inkscape:collect="always">
-      <stop
-         id="stop3800"
-         offset="0"
-         style="stop-color:#3f3f9f;stop-opacity:1" />
-      <stop
-         id="stop3802"
-         offset="1"
-         style="stop-color:#3f5fbf;stop-opacity:1" />
-    </linearGradient>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="21.34375"
-     inkscape:cx="12.378283"
-     inkscape:cy="4.3958542"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="900"
-     inkscape:window-x="81"
-     inkscape:window-y="25"
-     inkscape:window-maximized="0"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3999" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -356,8 +88,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
@@ -365,19 +95,14 @@
        id="g4078"
        transform="translate(-1.0640915,-0.97334116)">
       <path
-         sodipodi:nodetypes="cccccc"
-         inkscape:connector-curvature="0"
          id="rect4001-3"
          d="m 3.0274322,1037.8597 7.5016168,0 3.062057,3.0066 0,10.6105 -10.5636738,0 z"
          style="fill:url(#linearGradient4084);fill-opacity:1;stroke:none;display:inline" />
       <path
-         inkscape:connector-curvature="0"
          id="path4884"
          d="m 9.998718,1038.4734 0,3.9112 3.977478,0 z"
          style="fill:url(#linearGradient4086);fill-opacity:1;stroke:none;display:inline" />
       <path
-         sodipodi:nodetypes="cccccc"
-         inkscape:connector-curvature="0"
          id="rect4001"
          d="m 3.5430912,1038.8205 6.9859578,0 3.062057,3.0066 0,10.0245 -10.0480148,0 z"
          style="fill:none;stroke:url(#linearGradient4088);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;display:inline" />
@@ -385,33 +110,27 @@
     <path
        style="fill:none;stroke:#29486b;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
        d="m 5.001464,1041.8555 1.9912152,0"
-       id="path3057"
-       inkscape:connector-curvature="0" />
+       id="path3057" />
     <path
        style="fill:none;stroke:#29486b;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
        d="m 8.005859,1041.8555 1.991215,0"
-       id="path3057-7"
-       inkscape:connector-curvature="0" />
+       id="path3057-7" />
     <path
        style="fill:none;stroke:#29486b;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
        d="m 5.001464,1047.8555 1.9912152,0"
-       id="path3057-8"
-       inkscape:connector-curvature="0" />
+       id="path3057-8" />
     <path
        style="fill:none;stroke:#29486b;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
        d="m 8.005859,1047.8555 1.991215,0"
-       id="path3057-7-9"
-       inkscape:connector-curvature="0" />
+       id="path3057-7-9" />
     <path
        style="fill:#29486b;stroke:#29486b;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1"
        d="M 5.9853587,11.525622 9.0073206,5.4816985"
        id="path3116"
-       inkscape:connector-curvature="0"
        transform="translate(0,1036.3622)" />
     <path
        style="fill:#29486b;stroke:#29486b;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline;fill-opacity:1"
        d="m 9.0073206,1047.8878 -3.0219619,-6.0439"
-       id="path3116-5"
-       inkscape:connector-curvature="0" />
+       id="path3116-5" />
   </g>
 </svg>
diff --git a/ds/org.eclipse.pde.ds.ui/icons/obj16/int_obj.svg b/ds/org.eclipse.pde.ds.ui/icons/obj16/int_obj.svg
index f9e84b00dd5..e84c6411d94 100644
--- a/ds/org.eclipse.pde.ds.ui/icons/obj16/int_obj.svg
+++ b/ds/org.eclipse.pde.ds.ui/icons/obj16/int_obj.svg
@@ -2,73 +2,18 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.48.5 r10040"
-   sodipodi:docname="int_obj.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
-    <linearGradient
-       y2="462.11539"
-       x2="388.63736"
-       y1="478.18777"
-       x1="388.63736"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3929-5"
-       xlink:href="#linearGradient10798-1-9-3-7-6-8-9-0-9-1"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient10798-1-9-3-7-6-8-9-0-9-1">
-      <stop
-         style="stop-color:#7564b1;stop-opacity:1"
-         offset="0"
-         id="stop10800-5-2-1-8-20-6-4-9-8-2" />
-      <stop
-         id="stop10806-6-8-5-3-9-24-8-4-3-2"
-         offset="0.5"
-         style="stop-color:#5d4aa1;stop-opacity:1" />
-      <stop
-         style="stop-color:#9283c3;stop-opacity:1"
-         offset="1"
-         id="stop10802-1-5-3-0-4-8-4-2-9-2" />
-    </linearGradient>
-    <filter
-       color-interpolation-filters="sRGB"
-       inkscape:collect="always"
-       id="filter8047">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="0.13789128"
-         id="feGaussianBlur8049" />
-    </filter>
-    <linearGradient
-       y2="462.11539"
-       x2="388.63736"
-       y1="478.18777"
-       x1="388.63736"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient7188"
-       xlink:href="#linearGradient10798-1-9-3-7-6-8-9-0-9-1"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="462.11539"
-       x2="388.63736"
-       y1="478.18777"
-       x1="388.63736"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3046"
-       xlink:href="#linearGradient10798-1-9-3-7-6-8-9-0-9-1-9"
-       inkscape:collect="always" />
     <linearGradient
        id="linearGradient10798-1-9-3-7-6-8-9-0-9-1-9">
       <stop
@@ -91,35 +36,8 @@
        x1="388.63736"
        gradientUnits="userSpaceOnUse"
        id="linearGradient3016"
-       xlink:href="#linearGradient10798-1-9-3-7-6-8-9-0-9-1-9"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient10798-1-9-3-7-6-8-9-0-9-1-9" />
   </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.9148766"
-     inkscape:cy="12.16319"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="925"
-     inkscape:window-height="1055"
-     inkscape:window-x="414"
-     inkscape:window-y="438"
-     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>
@@ -133,25 +51,16 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      transform="translate(0,-1036.3622)">
     <path
-       sodipodi:type="arc"
        style="font-size:13.58917427px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:url(#linearGradient3016);fill-opacity:1;stroke:#55429f;stroke-width:2.16621375;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline;font-family:Sans"
        id="path10796-2-6-2"
-       sodipodi:cx="388.125"
-       sodipodi:cy="468.23718"
-       sodipodi:rx="10.625"
-       sodipodi:ry="10.625"
        d="m 398.75,468.23718 a 10.625,10.625 0 1 1 -21.25,0 10.625,10.625 0 1 1 21.25,0 z"
        transform="matrix(0.55482947,0,0,0.55482947,-207.83019,783.15705)" />
     <path
        style="font-size:13.58917427px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;display:inline;font-family:Sans"
        d="m 5.0513836,1039.3735 0,1.0313 0.8880662,0 0,4.9687 -0.9322604,0 0,1.0313 4.789695,0 0,-1.0313 -1.2858115,0 0,-4.9687 1.2858115,0 0,-1.0313 z"
-       id="rect7222"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccccccccc" />
+       id="rect7222" />
   </g>
 </svg>
diff --git a/ds/org.eclipse.pde.ds.ui/icons/obj16/properties_obj.svg b/ds/org.eclipse.pde.ds.ui/icons/obj16/properties_obj.svg
index b427adc1751..219f27c2e8b 100644
--- a/ds/org.eclipse.pde.ds.ui/icons/obj16/properties_obj.svg
+++ b/ds/org.eclipse.pde.ds.ui/icons/obj16/properties_obj.svg
@@ -2,20 +2,16 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="properties_obj.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
@@ -30,7 +26,6 @@
          style="stop-color:#8b9aae;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4126">
       <stop
          style="stop-color:#8393a9;stop-opacity:1;"
@@ -74,298 +69,6 @@
          offset="1"
          style="stop-color:#c3ccd9;stop-opacity:1" />
     </linearGradient>
-    <linearGradient
-       id="linearGradient7491">
-      <stop
-         style="stop-color:#5b6c89;stop-opacity:1;"
-         offset="0"
-         id="stop7493" />
-      <stop
-         style="stop-color:#a0b0cc;stop-opacity:1;"
-         offset="1"
-         id="stop7495" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient7254">
-      <stop
-         style="stop-color:#5b6c89;stop-opacity:1;"
-         offset="0"
-         id="stop7256" />
-      <stop
-         style="stop-color:#95a3ba;stop-opacity:1;"
-         offset="1"
-         id="stop7258" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient7254"
-       id="linearGradient7260"
-       x1="15.000595"
-       y1="2"
-       x2="-8"
-       y2="1.375"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-20.03125,1035.7997)" />
-    <linearGradient
-       id="linearGradient7254-6">
-      <stop
-         style="stop-color:#5b6c89;stop-opacity:1;"
-         offset="0"
-         id="stop7256-5" />
-      <stop
-         style="stop-color:#95a3ba;stop-opacity:1;"
-         offset="1"
-         id="stop7258-7" />
-    </linearGradient>
-    <linearGradient
-       gradientTransform="matrix(0.93721973,0,0,1,1036.3976,16.437517)"
-       y2="2"
-       x2="-3.2642515"
-       y1="2"
-       x1="15.000595"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient7277"
-       xlink:href="#linearGradient7254-6"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient7254-62">
-      <stop
-         style="stop-color:#5b6c89;stop-opacity:1;"
-         offset="0"
-         id="stop7256-0" />
-      <stop
-         style="stop-color:#95a3ba;stop-opacity:1;"
-         offset="1"
-         id="stop7258-0" />
-    </linearGradient>
-    <linearGradient
-       gradientTransform="translate(3.96875,1037.7997)"
-       y2="2"
-       x2="-17.187742"
-       y1="2"
-       x1="15.000595"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient7328"
-       xlink:href="#linearGradient7254-62"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient7254-6-4">
-      <stop
-         style="stop-color:#5b6c89;stop-opacity:1"
-         offset="0"
-         id="stop7256-5-4" />
-      <stop
-         style="stop-color:#5b6c89;stop-opacity:1"
-         offset="1"
-         id="stop7258-7-4" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient7491"
-       id="linearGradient7497"
-       x1="1.9445436"
-       y1="3.0732041"
-       x2="14.142135"
-       y2="3.0732041"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.99637681,0,0,1,-19.98001,1035.7997)" />
-    <linearGradient
-       y2="-3.3750169"
-       x2="1.0291077"
-       y1="-3.3750169"
-       x1="10.631978"
-       gradientTransform="matrix(0.93721973,0,0,1,1036.3977,3.375017)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient7362-9"
-       xlink:href="#linearGradient7254-6-4-1"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient7254-6-4-1">
-      <stop
-         style="stop-color:#5b6c89;stop-opacity:1"
-         offset="0"
-         id="stop7256-5-4-9" />
-      <stop
-         style="stop-color:#5b6c89;stop-opacity:1"
-         offset="1"
-         id="stop7258-7-4-5" />
-    </linearGradient>
-    <linearGradient
-       y2="-3.3750169"
-       x2="4.2300644"
-       y1="-3.3750169"
-       x1="10.631978"
-       gradientTransform="matrix(0.93721973,0,0,1,1036.3977,-16.624983)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3063"
-       xlink:href="#linearGradient4134"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="-3.3750169"
-       x2="1.0291077"
-       y1="-3.3750169"
-       x1="10.631978"
-       gradientTransform="matrix(0.93721973,0,0,1,1036.3977,3.375017)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient7362-6"
-       xlink:href="#linearGradient7254-6-4-9"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient7254-6-4-9">
-      <stop
-         style="stop-color:#5b6c89;stop-opacity:1"
-         offset="0"
-         id="stop7256-5-4-2" />
-      <stop
-         style="stop-color:#5b6c89;stop-opacity:1"
-         offset="1"
-         id="stop7258-7-4-9" />
-    </linearGradient>
-    <linearGradient
-       y2="-3.3750169"
-       x2="1.0291077"
-       y1="-3.3750169"
-       x1="10.631978"
-       gradientTransform="matrix(0.93721973,0,0,1,1036.3977,-3.624983)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3063-8-8"
-       xlink:href="#linearGradient7254-6-4-9-2"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient7254-6-4-9-2">
-      <stop
-         style="stop-color:#5b6c89;stop-opacity:1"
-         offset="0"
-         id="stop7256-5-4-2-9" />
-      <stop
-         style="stop-color:#5b6c89;stop-opacity:1"
-         offset="1"
-         id="stop7258-7-4-9-1" />
-    </linearGradient>
-    <linearGradient
-       y2="-6.3750172"
-       x2="1.0291077"
-       y1="2.6249831"
-       x1="1.0291077"
-       gradientTransform="matrix(0.93721973,0,0,1,1036.3977,-23.624983)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3117"
-       xlink:href="#linearGradient3346"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="-3.3750169"
-       x2="1.0291077"
-       y1="-3.3750169"
-       x1="10.631978"
-       gradientTransform="matrix(0.93721973,0,0,1,1036.3977,-3.624983)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3117-1"
-       xlink:href="#linearGradient7254-6-4-9-2-0"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient7254-6-4-9-2-0">
-      <stop
-         style="stop-color:#5b6c89;stop-opacity:1"
-         offset="0"
-         id="stop7256-5-4-2-9-5" />
-      <stop
-         style="stop-color:#5b6c89;stop-opacity:1"
-         offset="1"
-         id="stop7258-7-4-9-1-8" />
-    </linearGradient>
-    <linearGradient
-       y2="-6.3750172"
-       x2="3.163079"
-       y1="2.6249831"
-       x1="3.163079"
-       gradientTransform="matrix(0.93721973,0,0,1,1038.3977,-23.624983)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3151"
-       xlink:href="#linearGradient3352"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="-3.3750169"
-       x2="1.0291077"
-       y1="-3.3750169"
-       x1="10.631978"
-       gradientTransform="matrix(0.93721973,0,0,1,1038.3977,-3.624983)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3151-7"
-       xlink:href="#linearGradient7254-6-4-9-2-0-7"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient7254-6-4-9-2-0-7">
-      <stop
-         style="stop-color:#5b6c89;stop-opacity:1"
-         offset="0"
-         id="stop7256-5-4-2-9-5-8" />
-      <stop
-         style="stop-color:#5b6c89;stop-opacity:1"
-         offset="1"
-         id="stop7258-7-4-9-1-8-9" />
-    </linearGradient>
-    <linearGradient
-       y2="-3.3750169"
-       x2="1.0291077"
-       y1="-3.3750169"
-       x1="10.631978"
-       gradientTransform="matrix(0.93721973,0,0,1,1038.3977,-3.624983)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3151-4"
-       xlink:href="#linearGradient7254-6-4-9-2-0-8"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient7254-6-4-9-2-0-8">
-      <stop
-         style="stop-color:#5b6c89;stop-opacity:1"
-         offset="0"
-         id="stop7256-5-4-2-9-5-2" />
-      <stop
-         style="stop-color:#5b6c89;stop-opacity:1"
-         offset="1"
-         id="stop7258-7-4-9-1-8-6" />
-    </linearGradient>
-    <linearGradient
-       y2="2.6249831"
-       x2="-1.1048636"
-       y1="-6.3750172"
-       x1="-1.1048636"
-       gradientTransform="matrix(0.93721973,0,0,1,1038.3977,-23.624983)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3219"
-       xlink:href="#linearGradient3340"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="-3.3750169"
-       x2="1.0291077"
-       y1="-3.3750169"
-       x1="10.631978"
-       gradientTransform="matrix(0.93721973,0,0,1,1038.3977,-3.624983)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3219-7"
-       xlink:href="#linearGradient7254-6-4-9-2-0-8-7"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient7254-6-4-9-2-0-8-7">
-      <stop
-         style="stop-color:#5b6c89;stop-opacity:1"
-         offset="0"
-         id="stop7256-5-4-2-9-5-2-2" />
-      <stop
-         style="stop-color:#5b6c89;stop-opacity:1"
-         offset="1"
-         id="stop7258-7-4-9-1-8-6-6" />
-    </linearGradient>
-    <linearGradient
-       y2="-3.3750169"
-       x2="1.0291077"
-       y1="-3.3750169"
-       x1="10.631978"
-       gradientTransform="matrix(0.93721973,0,0,1,1042.3977,-23.624983)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3185-9"
-       xlink:href="#linearGradient7254-6-4-9-2-0-7-7"
-       inkscape:collect="always" />
     <linearGradient
        id="linearGradient7254-6-4-9-2-0-7-7">
       <stop
@@ -378,47 +81,6 @@
          id="stop7258-7-4-9-1-8-9-0" />
     </linearGradient>
     <linearGradient
-       y2="-3.3750169"
-       x2="1.0291077"
-       y1="-3.3750169"
-       x1="10.631978"
-       gradientTransform="matrix(0.93721973,0,0,1,1044.3977,-23.624983)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3287"
-       xlink:href="#linearGradient7254-6-4-9-2-0-7-7"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="-3.3750169"
-       x2="1.0291077"
-       y1="-3.3750169"
-       x1="10.631978"
-       gradientTransform="matrix(0.93721973,0,0,1,1044.3977,-23.624983)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3287-6"
-       xlink:href="#linearGradient7254-6-4-9-2-0-7-7-8"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient7254-6-4-9-2-0-7-7-8">
-      <stop
-         style="stop-color:#5b6c89;stop-opacity:1"
-         offset="0"
-         id="stop7256-5-4-2-9-5-8-6-8" />
-      <stop
-         style="stop-color:#5b6c89;stop-opacity:1"
-         offset="1"
-         id="stop7258-7-4-9-1-8-9-0-8" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4126"
-       id="linearGradient4132"
-       x1="1040.3622"
-       y1="-29.5"
-       x2="1046.3622"
-       y2="-29.5"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4134"
        id="linearGradient4151"
        gradientUnits="userSpaceOnUse"
@@ -428,7 +90,6 @@
        x2="4.2300644"
        y2="-3.3750169" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4126"
        id="linearGradient4153"
        gradientUnits="userSpaceOnUse"
@@ -437,7 +98,6 @@
        x2="1046.3622"
        y2="-29.5" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient3346"
        id="linearGradient4155"
        gradientUnits="userSpaceOnUse"
@@ -447,7 +107,6 @@
        x2="1.0291077"
        y2="-6.3750172" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient3352"
        id="linearGradient4157"
        gradientUnits="userSpaceOnUse"
@@ -457,7 +116,6 @@
        x2="3.163079"
        y2="-6.3750172" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient3340"
        id="linearGradient4159"
        gradientUnits="userSpaceOnUse"
@@ -467,7 +125,6 @@
        x2="-1.1048636"
        y2="2.6249831" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient7254-6-4-9-2-0-7-7"
        id="linearGradient4161"
        gradientUnits="userSpaceOnUse"
@@ -477,7 +134,6 @@
        x2="1.0291077"
        y2="-3.3750169" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4134-9"
        id="linearGradient4151-2"
        gradientUnits="userSpaceOnUse"
@@ -498,7 +154,6 @@
          style="stop-color:#8b9aae;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4126-5"
        id="linearGradient4153-8"
        gradientUnits="userSpaceOnUse"
@@ -507,7 +162,6 @@
        x2="1046.3622"
        y2="-29.5" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4126-5">
       <stop
          style="stop-color:#8393a9;stop-opacity:1;"
@@ -519,7 +173,6 @@
          id="stop4130-7" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient3346-6"
        id="linearGradient4155-5"
        gradientUnits="userSpaceOnUse"
@@ -540,7 +193,6 @@
          style="stop-color:#8392a8;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient3352-7"
        id="linearGradient4157-6"
        gradientUnits="userSpaceOnUse"
@@ -561,7 +213,6 @@
          style="stop-color:#8494a9;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient3340-6"
        id="linearGradient4159-5"
        gradientUnits="userSpaceOnUse"
@@ -581,16 +232,6 @@
          offset="1"
          style="stop-color:#c3ccd9;stop-opacity:1" />
     </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient7254-6-4-9-2-0-7-7-9"
-       id="linearGradient4161-9"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.93721973,0,0,1,1044.3977,-23.624983)"
-       x1="10.631978"
-       y1="-3.3750169"
-       x2="1.0291077"
-       y2="-3.3750169" />
     <linearGradient
        id="linearGradient7254-6-4-9-2-0-7-7-9">
       <stop
@@ -610,150 +251,17 @@
        gradientTransform="matrix(0.93721973,0,0,1,1044.3977,-23.624983)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient4207"
-       xlink:href="#linearGradient7254-6-4-9-2-0-7-7-9"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient4134-9-1">
-      <stop
-         id="stop4136-3-6"
-         offset="0"
-         style="stop-color:#5b6c89;stop-opacity:1" />
-      <stop
-         id="stop4138-8-8"
-         offset="1"
-         style="stop-color:#8b9aae;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3346-6-1">
-      <stop
-         id="stop3348-3-8"
-         offset="0"
-         style="stop-color:#5b6c89;stop-opacity:1" />
-      <stop
-         id="stop3350-1-5"
-         offset="1"
-         style="stop-color:#8392a8;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3352-7-6">
-      <stop
-         id="stop3354-9-5"
-         offset="0"
-         style="stop-color:#5f708c;stop-opacity:1" />
-      <stop
-         id="stop3356-5-2"
-         offset="1"
-         style="stop-color:#8494a9;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3340-6-6">
-      <stop
-         id="stop3342-0-3"
-         offset="0"
-         style="stop-color:#a6b2c2;stop-opacity:1" />
-      <stop
-         id="stop3344-3-3"
-         offset="1"
-         style="stop-color:#c3ccd9;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       y2="-3.3750169"
-       x2="1.0291077"
-       y1="-3.3750169"
-       x1="10.631978"
-       gradientTransform="matrix(0.93721973,0,0,1,1044.3977,-23.624983)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4207-5"
-       xlink:href="#linearGradient7254-6-4-9-2-0-7-7-9-1"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient7254-6-4-9-2-0-7-7-9-1">
-      <stop
-         style="stop-color:#5b6c89;stop-opacity:1"
-         offset="0"
-         id="stop7256-5-4-2-9-5-8-6-1-7" />
-      <stop
-         style="stop-color:#5b6c89;stop-opacity:1"
-         offset="1"
-         id="stop7258-7-4-9-1-8-9-0-5-4" />
-    </linearGradient>
+       xlink:href="#linearGradient7254-6-4-9-2-0-7-7-9" />
     <filter
-       inkscape:collect="always"
        id="filter4405"
-       x="-0.12000011"
-       width="1.2400002"
-       y="-0.11999989"
-       height="1.2399998">
+       x="-0.23111123"
+       width="1.4622225"
+       y="-0.23111079"
+       height="1.4622216">
       <feGaussianBlur
-         inkscape:collect="always"
          stdDeviation="0.45000043"
          id="feGaussianBlur4407" />
     </filter>
-    <linearGradient
-       id="linearGradient4134-8">
-      <stop
-         id="stop4136-6"
-         offset="0"
-         style="stop-color:#5b6c89;stop-opacity:1" />
-      <stop
-         id="stop4138-3"
-         offset="1"
-         style="stop-color:#8b9aae;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3346-1">
-      <stop
-         id="stop3348-0"
-         offset="0"
-         style="stop-color:#5b6c89;stop-opacity:1" />
-      <stop
-         id="stop3350-5"
-         offset="1"
-         style="stop-color:#8392a8;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3352-5">
-      <stop
-         id="stop3354-0"
-         offset="0"
-         style="stop-color:#5f708c;stop-opacity:1" />
-      <stop
-         id="stop3356-59"
-         offset="1"
-         style="stop-color:#8494a9;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3340-9">
-      <stop
-         id="stop3342-9"
-         offset="0"
-         style="stop-color:#a6b2c2;stop-opacity:1" />
-      <stop
-         id="stop3344-0"
-         offset="1"
-         style="stop-color:#c3ccd9;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient7254-6-4-9-2-0-7-7-0"
-       id="linearGradient4161-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.93721973,0,0,1,1044.3977,-23.624983)"
-       x1="10.631978"
-       y1="-3.3750169"
-       x2="1.0291077"
-       y2="-3.3750169" />
-    <linearGradient
-       id="linearGradient7254-6-4-9-2-0-7-7-0">
-      <stop
-         style="stop-color:#5b6c89;stop-opacity:1"
-         offset="0"
-         id="stop7256-5-4-2-9-5-8-6-4" />
-      <stop
-         style="stop-color:#5b6c89;stop-opacity:1"
-         offset="1"
-         id="stop7258-7-4-9-1-8-9-0-9" />
-    </linearGradient>
     <mask
        maskUnits="userSpaceOnUse"
        id="mask4542">
@@ -836,31 +344,6 @@
       </g>
     </mask>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="8"
-     inkscape:cx="-8.8656421"
-     inkscape:cy="3.978573"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1600"
-     inkscape:window-height="851"
-     inkscape:window-x="0"
-     inkscape:window-y="25"
-     inkscape:window-maximized="1"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid4046" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -874,8 +357,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
diff --git a/ds/org.eclipse.pde.ds.ui/icons/obj16/property_obj.svg b/ds/org.eclipse.pde.ds.ui/icons/obj16/property_obj.svg
index a7b8ed7a619..b47711b094f 100644
--- a/ds/org.eclipse.pde.ds.ui/icons/obj16/property_obj.svg
+++ b/ds/org.eclipse.pde.ds.ui/icons/obj16/property_obj.svg
@@ -2,20 +2,16 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="property_obj.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
@@ -41,7 +37,6 @@
          id="stop7258" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient7254"
        id="linearGradient7260"
        x1="15.000595"
@@ -69,8 +64,7 @@
        x1="15.000595"
        gradientUnits="userSpaceOnUse"
        id="linearGradient7277"
-       xlink:href="#linearGradient7254-6"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient7254-6" />
     <linearGradient
        id="linearGradient7254-62">
       <stop
@@ -90,8 +84,7 @@
        x1="15.000595"
        gradientUnits="userSpaceOnUse"
        id="linearGradient7328"
-       xlink:href="#linearGradient7254-62"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient7254-62" />
     <linearGradient
        id="linearGradient7254-6-4">
       <stop
@@ -111,10 +104,8 @@
        gradientTransform="matrix(0.93721973,0,0,1,1036.3977,-16.624983)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient7362"
-       xlink:href="#linearGradient7254-6-4"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient7254-6-4" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient7491"
        id="linearGradient7497"
        x1="1.9445436"
@@ -124,30 +115,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(0.99637681,0,0,1,0.01998962,1035.7997)" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="2.8284272"
-     inkscape:cx="-55.825138"
-     inkscape:cy="79.639834"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1171"
-     inkscape:window-height="959"
-     inkscape:window-x="878"
-     inkscape:window-y="594"
-     inkscape:window-maximized="0"
-     showguides="true"
-     inkscape:guide-bbox="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid4046" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -161,8 +128,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
diff --git a/ds/org.eclipse.pde.ds.ui/icons/obj16/reference_obj.svg b/ds/org.eclipse.pde.ds.ui/icons/obj16/reference_obj.svg
index d6860305641..41d01df7628 100644
--- a/ds/org.eclipse.pde.ds.ui/icons/obj16/reference_obj.svg
+++ b/ds/org.eclipse.pde.ds.ui/icons/obj16/reference_obj.svg
@@ -2,24 +2,19 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="reference_obj.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3776">
       <stop
          style="stop-color:#fdf2d0;stop-opacity:1;"
@@ -31,75 +26,6 @@
          id="stop3780" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3788">
-      <stop
-         style="stop-color:#d8bb8c;stop-opacity:1"
-         offset="0"
-         id="stop3790" />
-      <stop
-         style="stop-color:#dfc38d;stop-opacity:1"
-         offset="1"
-         id="stop3792" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3780">
-      <stop
-         style="stop-color:#fdf2d0;stop-opacity:1;"
-         offset="0"
-         id="stop3782" />
-      <stop
-         style="stop-color:#fffdf9;stop-opacity:1"
-         offset="1"
-         id="stop3784" />
-    </linearGradient>
-    <linearGradient
-       y2="462.11539"
-       x2="388.63736"
-       y1="478.18777"
-       x1="388.63736"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3929-5"
-       xlink:href="#linearGradient10798-1-9-3-7-6-8-9-0-9-1"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient10798-1-9-3-7-6-8-9-0-9-1">
-      <stop
-         style="stop-color:#7564b1;stop-opacity:1"
-         offset="0"
-         id="stop10800-5-2-1-8-20-6-4-9-8-2" />
-      <stop
-         id="stop10806-6-8-5-3-9-24-8-4-3-2"
-         offset="0.5"
-         style="stop-color:#5d4aa1;stop-opacity:1" />
-      <stop
-         style="stop-color:#9283c3;stop-opacity:1"
-         offset="1"
-         id="stop10802-1-5-3-0-4-8-4-2-9-2" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3780"
-       id="linearGradient3786"
-       x1="22.377558"
-       y1="1040.4054"
-       x2="31.388678"
-       y2="1040.4054"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-20,0)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3788"
-       id="linearGradient3794"
-       x1="22.03125"
-       y1="1043.3622"
-       x2="32.03125"
-       y2="1043.3622"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-20,0)" />
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient3776"
        id="linearGradient3782"
        x1="2.9905782"
@@ -109,33 +35,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(0,-20)" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7.9999997"
-     inkscape:cx="9.0626167"
-     inkscape:cy="-10.629194"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="925"
-     inkscape:window-height="900"
-     inkscape:window-x="671"
-     inkscape:window-y="25"
-     inkscape:window-maximized="0"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2985"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -149,15 +48,11 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      transform="translate(0,-1036.3622)">
     <path
        style="fill:url(#linearGradient3782);fill-opacity:1;stroke:#d8bb8c;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
        d="m 3.4905782,1039.3602 0,5.5312 3.03125,0 0,-3.0312 2.9999998,0 0,3.0312 2.999997,0 0,-5.5312 -0.476562,-0.4688 -4.039061,0 -4.0390621,0 z"
-       id="path3796"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccccccccc" />
+       id="path3796" />
   </g>
 </svg>
diff --git a/ds/org.eclipse.pde.ds.ui/icons/obj16/reference_one_n_obj.svg b/ds/org.eclipse.pde.ds.ui/icons/obj16/reference_one_n_obj.svg
index 1655bd9acb0..df390bcb6bc 100644
--- a/ds/org.eclipse.pde.ds.ui/icons/obj16/reference_one_n_obj.svg
+++ b/ds/org.eclipse.pde.ds.ui/icons/obj16/reference_one_n_obj.svg
@@ -2,24 +2,19 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="reference_one_n_obj.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3776">
       <stop
          style="stop-color:#fdf2d0;stop-opacity:1;"
@@ -31,75 +26,6 @@
          id="stop3780" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3788">
-      <stop
-         style="stop-color:#d8bb8c;stop-opacity:1"
-         offset="0"
-         id="stop3790" />
-      <stop
-         style="stop-color:#dfc38d;stop-opacity:1"
-         offset="1"
-         id="stop3792" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3780">
-      <stop
-         style="stop-color:#fdf2d0;stop-opacity:1;"
-         offset="0"
-         id="stop3782" />
-      <stop
-         style="stop-color:#fffdf9;stop-opacity:1"
-         offset="1"
-         id="stop3784" />
-    </linearGradient>
-    <linearGradient
-       y2="462.11539"
-       x2="388.63736"
-       y1="478.18777"
-       x1="388.63736"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3929-5"
-       xlink:href="#linearGradient10798-1-9-3-7-6-8-9-0-9-1"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient10798-1-9-3-7-6-8-9-0-9-1">
-      <stop
-         style="stop-color:#7564b1;stop-opacity:1"
-         offset="0"
-         id="stop10800-5-2-1-8-20-6-4-9-8-2" />
-      <stop
-         id="stop10806-6-8-5-3-9-24-8-4-3-2"
-         offset="0.5"
-         style="stop-color:#5d4aa1;stop-opacity:1" />
-      <stop
-         style="stop-color:#9283c3;stop-opacity:1"
-         offset="1"
-         id="stop10802-1-5-3-0-4-8-4-2-9-2" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3780"
-       id="linearGradient3786"
-       x1="22.377558"
-       y1="1040.4054"
-       x2="31.388678"
-       y2="1040.4054"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-20,0)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3788"
-       id="linearGradient3794"
-       x1="22.03125"
-       y1="1043.3622"
-       x2="32.03125"
-       y2="1043.3622"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-20,0)" />
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient3776"
        id="linearGradient3782"
        x1="2.9905782"
@@ -109,33 +35,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(0,-20)" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="15.999999"
-     inkscape:cx="7.1416302"
-     inkscape:cy="-3.6954097"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="925"
-     inkscape:window-height="900"
-     inkscape:window-x="671"
-     inkscape:window-y="25"
-     inkscape:window-maximized="0"
-     inkscape:snap-global="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2985"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -149,23 +48,17 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      transform="translate(0,-1036.3622)">
     <path
        style="fill:url(#linearGradient3782);fill-opacity:1;stroke:#d8bb8c;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
        d="m 3.4905782,1039.3602 0,5.5312 3.03125,0 0,-3.0312 2.9999998,0 0,3.0312 2.999997,0 0,-5.5312 -0.476562,-0.4688 -4.039061,0 -4.0390621,0 z"
-       id="path3796"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccccccccc" />
+       id="path3796" />
     <path
        style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#3f3f9f;fill-opacity:1;stroke:none;display:inline;font-family:Gautami;-inkscape-font-specification:Gautami"
        d="m 4.21875,10.03125 -1.1875,1.1875 0.53125,0.5625 0.5625,-0.5625 0,3.778648 0.875,0 0,-4.966148 z"
        transform="translate(0,1036.3622)"
-       id="text4105-1"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccccc" />
+       id="text4105-1" />
     <rect
        style="fill:#3f3f9f;fill-opacity:1;stroke:none"
        id="rect3027"
@@ -191,8 +84,6 @@
     <path
        style="fill:none;stroke:#3f3f9f;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
        d="m 12.498039,1051.3899 0,-4.5299 1.999786,0 c 0.47525,0 1.016466,0.5176 1.016466,1.0165 l 0,3.4913"
-       id="path3786"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+       id="path3786" />
   </g>
 </svg>
diff --git a/ds/org.eclipse.pde.ds.ui/icons/obj16/reference_zero_n_obj.svg b/ds/org.eclipse.pde.ds.ui/icons/obj16/reference_zero_n_obj.svg
index 3690d382630..291cf865e01 100644
--- a/ds/org.eclipse.pde.ds.ui/icons/obj16/reference_zero_n_obj.svg
+++ b/ds/org.eclipse.pde.ds.ui/icons/obj16/reference_zero_n_obj.svg
@@ -2,24 +2,19 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="reference_zero_n_obj.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3776">
       <stop
          style="stop-color:#fdf2d0;stop-opacity:1;"
@@ -31,75 +26,6 @@
          id="stop3780" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3788">
-      <stop
-         style="stop-color:#d8bb8c;stop-opacity:1"
-         offset="0"
-         id="stop3790" />
-      <stop
-         style="stop-color:#dfc38d;stop-opacity:1"
-         offset="1"
-         id="stop3792" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3780">
-      <stop
-         style="stop-color:#fdf2d0;stop-opacity:1;"
-         offset="0"
-         id="stop3782" />
-      <stop
-         style="stop-color:#fffdf9;stop-opacity:1"
-         offset="1"
-         id="stop3784" />
-    </linearGradient>
-    <linearGradient
-       y2="462.11539"
-       x2="388.63736"
-       y1="478.18777"
-       x1="388.63736"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3929-5"
-       xlink:href="#linearGradient10798-1-9-3-7-6-8-9-0-9-1"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient10798-1-9-3-7-6-8-9-0-9-1">
-      <stop
-         style="stop-color:#7564b1;stop-opacity:1"
-         offset="0"
-         id="stop10800-5-2-1-8-20-6-4-9-8-2" />
-      <stop
-         id="stop10806-6-8-5-3-9-24-8-4-3-2"
-         offset="0.5"
-         style="stop-color:#5d4aa1;stop-opacity:1" />
-      <stop
-         style="stop-color:#9283c3;stop-opacity:1"
-         offset="1"
-         id="stop10802-1-5-3-0-4-8-4-2-9-2" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3780"
-       id="linearGradient3786"
-       x1="22.377558"
-       y1="1040.4054"
-       x2="31.388678"
-       y2="1040.4054"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-20,0)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3788"
-       id="linearGradient3794"
-       x1="22.03125"
-       y1="1043.3622"
-       x2="32.03125"
-       y2="1043.3622"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-20,0)" />
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient3776"
        id="linearGradient3782"
        x1="2.9905782"
@@ -109,33 +35,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(0,-20)" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="15.999999"
-     inkscape:cx="7.7737549"
-     inkscape:cy="0.51807131"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="925"
-     inkscape:window-height="900"
-     inkscape:window-x="671"
-     inkscape:window-y="25"
-     inkscape:window-maximized="0"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2985"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -149,16 +48,12 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      transform="translate(0,-1036.3622)">
     <path
        style="fill:url(#linearGradient3782);fill-opacity:1;stroke:#d8bb8c;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
        d="m 3.4905782,1039.3602 0,5.5312 3.03125,0 0,-3.0312 2.9999998,0 0,3.0312 2.999997,0 0,-5.5312 -0.476562,-0.4688 -4.039061,0 -4.0390621,0 z"
-       id="path3796"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccccccccc" />
+       id="path3796" />
     <rect
        style="fill:#3f3f9f;fill-opacity:1;stroke:none"
        id="rect3027-5"
@@ -175,22 +70,18 @@
        y="1050.3622" />
     <text
        xml:space="preserve"
-       style="font-size:6.83944941000000028px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#3f3f9f;fill-opacity:1;stroke:#3f3f9f;stroke-width:0.45000000000000001;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline;font-family:Gautami;-inkscape-font-specification:Gautami"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:0%;font-family:Gautami;-inkscape-font-specification:Gautami;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;display:inline;fill:#3f3f9f;fill-opacity:1;stroke:#3f3f9f;stroke-width:0.45;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        x="1.9358346"
        y="1063.114"
        id="text4105-1-1-6"
-       sodipodi:linespacing="125%"
        transform="scale(1.0114811,0.98864924)"><tspan
-         sodipodi:role="line"
          id="tspan4107-7-1"
          x="1.9358346"
          y="1063.114"
-         style="stroke-width:0.45000000000000001;stroke-miterlimit:4;stroke-dasharray:none;fill:#3f3f9f;fill-opacity:1;stroke:#3f3f9f;stroke-opacity:1">0</tspan></text>
+         style="font-size:6.83945px;line-height:1.25;fill:#3f3f9f;fill-opacity:1;stroke:#3f3f9f;stroke-width:0.45;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1">0</tspan></text>
     <path
        style="fill:none;stroke:#3f3f9f;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
        d="m 12.498039,1051.3899 0,-4.5299 1.999786,0 c 0.47525,0 1.016466,0.5176 1.016466,1.0165 l 0,3.4913"
-       id="path3786"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+       id="path3786" />
   </g>
 </svg>
diff --git a/ds/org.eclipse.pde.ds.ui/icons/obj16/reference_zero_one_obj.svg b/ds/org.eclipse.pde.ds.ui/icons/obj16/reference_zero_one_obj.svg
index dfa1893011a..db6922f5c5a 100644
--- a/ds/org.eclipse.pde.ds.ui/icons/obj16/reference_zero_one_obj.svg
+++ b/ds/org.eclipse.pde.ds.ui/icons/obj16/reference_zero_one_obj.svg
@@ -2,24 +2,19 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="reference_zero_one_obj.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3776">
       <stop
          style="stop-color:#fdf2d0;stop-opacity:1;"
@@ -31,75 +26,6 @@
          id="stop3780" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3788">
-      <stop
-         style="stop-color:#d8bb8c;stop-opacity:1"
-         offset="0"
-         id="stop3790" />
-      <stop
-         style="stop-color:#dfc38d;stop-opacity:1"
-         offset="1"
-         id="stop3792" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3780">
-      <stop
-         style="stop-color:#fdf2d0;stop-opacity:1;"
-         offset="0"
-         id="stop3782" />
-      <stop
-         style="stop-color:#fffdf9;stop-opacity:1"
-         offset="1"
-         id="stop3784" />
-    </linearGradient>
-    <linearGradient
-       y2="462.11539"
-       x2="388.63736"
-       y1="478.18777"
-       x1="388.63736"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3929-5"
-       xlink:href="#linearGradient10798-1-9-3-7-6-8-9-0-9-1"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient10798-1-9-3-7-6-8-9-0-9-1">
-      <stop
-         style="stop-color:#7564b1;stop-opacity:1"
-         offset="0"
-         id="stop10800-5-2-1-8-20-6-4-9-8-2" />
-      <stop
-         id="stop10806-6-8-5-3-9-24-8-4-3-2"
-         offset="0.5"
-         style="stop-color:#5d4aa1;stop-opacity:1" />
-      <stop
-         style="stop-color:#9283c3;stop-opacity:1"
-         offset="1"
-         id="stop10802-1-5-3-0-4-8-4-2-9-2" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3780"
-       id="linearGradient3786"
-       x1="22.377558"
-       y1="1040.4054"
-       x2="31.388678"
-       y2="1040.4054"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-20,0)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3788"
-       id="linearGradient3794"
-       x1="22.03125"
-       y1="1043.3622"
-       x2="32.03125"
-       y2="1043.3622"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-20,0)" />
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient3776"
        id="linearGradient3782"
        x1="2.9905782"
@@ -109,33 +35,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(0,-20)" />
   </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="7.7929533"
-     inkscape:cy="2.5044482"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="925"
-     inkscape:window-height="900"
-     inkscape:window-x="671"
-     inkscape:window-y="25"
-     inkscape:window-maximized="0"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2985"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -149,22 +48,16 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      transform="translate(0,-1036.3622)">
     <path
        style="fill:url(#linearGradient3782);fill-opacity:1;stroke:#d8bb8c;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
        d="m 3.4905782,1039.3602 0,5.5312 3.03125,0 0,-3.0312 2.9999998,0 0,3.0312 2.999997,0 0,-5.5312 -0.476562,-0.4688 -4.039061,0 -4.0390621,0 z"
-       id="path3796"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccccccccc" />
+       id="path3796" />
     <path
        style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#3f3f9f;fill-opacity:1;stroke:none;display:inline;font-family:Gautami;-inkscape-font-specification:Gautami"
        d="m 13.191018,1046.3935 -1.1875,1.1875 0.53125,0.5625 0.5625,-0.5625 0,3.7786 0.875,0 0,-4.9661 z"
-       id="text4105-1"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccccc" />
+       id="text4105-1" />
     <rect
        style="fill:#3f3f9f;fill-opacity:1;stroke:none"
        id="rect3027"
@@ -188,16 +81,14 @@
        y="1050.3622" />
     <text
        xml:space="preserve"
-       style="font-size:6.83944941px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#3f3f9f;fill-opacity:1;stroke:#3f3f9f;stroke-width:0.44999999;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline;font-family:Gautami;-inkscape-font-specification:Gautami"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:0%;font-family:Gautami;-inkscape-font-specification:Gautami;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;display:inline;fill:#3f3f9f;fill-opacity:1;stroke:#3f3f9f;stroke-width:0.45;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        x="1.9358346"
        y="1063.114"
        id="text4105-1-1-6"
-       sodipodi:linespacing="125%"
        transform="scale(1.0114811,0.98864922)"><tspan
-         sodipodi:role="line"
          id="tspan4107-7-1"
          x="1.9358346"
          y="1063.114"
-         style="fill:#3f3f9f;fill-opacity:1;stroke:#3f3f9f;stroke-width:0.44999999;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none">0</tspan></text>
+         style="font-size:6.83945px;line-height:1.25;fill:#3f3f9f;fill-opacity:1;stroke:#3f3f9f;stroke-width:0.45;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1">0</tspan></text>
   </g>
 </svg>
diff --git a/ds/org.eclipse.pde.ds.ui/icons/obj16/service_obj.svg b/ds/org.eclipse.pde.ds.ui/icons/obj16/service_obj.svg
index 862de98565b..d204b383caf 100644
--- a/ds/org.eclipse.pde.ds.ui/icons/obj16/service_obj.svg
+++ b/ds/org.eclipse.pde.ds.ui/icons/obj16/service_obj.svg
@@ -2,24 +2,19 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="service_obj.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3798">
       <stop
          style="stop-color:#3f3f9f;stop-opacity:1"
@@ -31,75 +26,6 @@
          id="stop3802" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3788">
-      <stop
-         style="stop-color:#d8bb8c;stop-opacity:1"
-         offset="0"
-         id="stop3790" />
-      <stop
-         style="stop-color:#dfc38d;stop-opacity:1"
-         offset="1"
-         id="stop3792" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3780">
-      <stop
-         style="stop-color:#fdf2d0;stop-opacity:1;"
-         offset="0"
-         id="stop3782" />
-      <stop
-         style="stop-color:#fffdf9;stop-opacity:1"
-         offset="1"
-         id="stop3784" />
-    </linearGradient>
-    <linearGradient
-       y2="462.11539"
-       x2="388.63736"
-       y1="478.18777"
-       x1="388.63736"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3929-5"
-       xlink:href="#linearGradient10798-1-9-3-7-6-8-9-0-9-1"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient10798-1-9-3-7-6-8-9-0-9-1">
-      <stop
-         style="stop-color:#7564b1;stop-opacity:1"
-         offset="0"
-         id="stop10800-5-2-1-8-20-6-4-9-8-2" />
-      <stop
-         id="stop10806-6-8-5-3-9-24-8-4-3-2"
-         offset="0.5"
-         style="stop-color:#5d4aa1;stop-opacity:1" />
-      <stop
-         style="stop-color:#9283c3;stop-opacity:1"
-         offset="1"
-         id="stop10802-1-5-3-0-4-8-4-2-9-2" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3780"
-       id="linearGradient3786"
-       x1="22.377558"
-       y1="1040.4054"
-       x2="31.388678"
-       y2="1040.4054"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-20,0)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3788"
-       id="linearGradient3794"
-       x1="22.03125"
-       y1="1043.3622"
-       x2="32.03125"
-       y2="1043.3622"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-20,0)" />
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient3798"
        id="linearGradient3804"
        x1="22"
@@ -109,33 +35,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-19.009426,-1.003522)" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="22.627416"
-     inkscape:cx="3.0223074"
-     inkscape:cy="3.5326037"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="925"
-     inkscape:window-height="900"
-     inkscape:window-x="671"
-     inkscape:window-y="25"
-     inkscape:window-maximized="0"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2985"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -149,14 +48,11 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      transform="translate(0,-1036.3622)">
     <path
        style="fill:#b0c0e0;fill-opacity:1;stroke:url(#linearGradient3804);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
        d="m 3.4905782,1046.8586 0,-2.9688 3.03125,0 0,-3.0312 3,0 0,3.0312 2.9999968,0 0,2.9688 z"
-       id="path3796"
-       inkscape:connector-curvature="0" />
+       id="path3796" />
   </g>
 </svg>
diff --git a/ds/org.eclipse.pde.ds.ui/icons/obj16/services_obj.svg b/ds/org.eclipse.pde.ds.ui/icons/obj16/services_obj.svg
index 8ecfaaf24be..808982e07a4 100644
--- a/ds/org.eclipse.pde.ds.ui/icons/obj16/services_obj.svg
+++ b/ds/org.eclipse.pde.ds.ui/icons/obj16/services_obj.svg
@@ -2,156 +2,19 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="services_obj.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3798">
-      <stop
-         style="stop-color:#3f3f9f;stop-opacity:1"
-         offset="0"
-         id="stop3800" />
-      <stop
-         style="stop-color:#3f5fbf;stop-opacity:1"
-         offset="1"
-         id="stop3802" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3788">
-      <stop
-         style="stop-color:#d8bb8c;stop-opacity:1"
-         offset="0"
-         id="stop3790" />
-      <stop
-         style="stop-color:#dfc38d;stop-opacity:1"
-         offset="1"
-         id="stop3792" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3780">
-      <stop
-         style="stop-color:#fdf2d0;stop-opacity:1;"
-         offset="0"
-         id="stop3782" />
-      <stop
-         style="stop-color:#fffdf9;stop-opacity:1"
-         offset="1"
-         id="stop3784" />
-    </linearGradient>
-    <linearGradient
-       y2="462.11539"
-       x2="388.63736"
-       y1="478.18777"
-       x1="388.63736"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3929-5"
-       xlink:href="#linearGradient10798-1-9-3-7-6-8-9-0-9-1"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient10798-1-9-3-7-6-8-9-0-9-1">
-      <stop
-         style="stop-color:#7564b1;stop-opacity:1"
-         offset="0"
-         id="stop10800-5-2-1-8-20-6-4-9-8-2" />
-      <stop
-         id="stop10806-6-8-5-3-9-24-8-4-3-2"
-         offset="0.5"
-         style="stop-color:#5d4aa1;stop-opacity:1" />
-      <stop
-         style="stop-color:#9283c3;stop-opacity:1"
-         offset="1"
-         id="stop10802-1-5-3-0-4-8-4-2-9-2" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3780"
-       id="linearGradient3786"
-       x1="22.377558"
-       y1="1040.4054"
-       x2="31.388678"
-       y2="1040.4054"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-20,0)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3788"
-       id="linearGradient3794"
-       x1="22.03125"
-       y1="1043.3622"
-       x2="32.03125"
-       y2="1043.3622"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-20,0)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3798"
-       id="linearGradient3804"
-       x1="22"
-       y1="1044.8622"
-       x2="32.031251"
-       y2="1044.8622"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-20.033147,1.0164661)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3798-0"
-       id="linearGradient3804-5"
-       x1="22"
-       y1="1044.8622"
-       x2="32.03125"
-       y2="1044.8622"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-20,1.0164661)" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3798-0">
-      <stop
-         style="stop-color:#3f3f9f;stop-opacity:1"
-         offset="0"
-         id="stop3800-5" />
-      <stop
-         style="stop-color:#3f5fbf;stop-opacity:1"
-         offset="1"
-         id="stop3802-1" />
-    </linearGradient>
-    <linearGradient
-       y2="1044.8622"
-       x2="32.03125"
-       y1="1044.8622"
-       x1="22"
-       gradientTransform="translate(-18,-0.9835)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3027"
-       xlink:href="#linearGradient3798-0"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="1044.8622"
-       x2="32.03125"
-       y1="1044.8622"
-       x1="22"
-       gradientTransform="translate(-18,-0.9835)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3027-3"
-       xlink:href="#linearGradient3798-0-4"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
        id="linearGradient3798-0-4">
       <stop
          style="stop-color:#3f3f9f;stop-opacity:1"
@@ -163,7 +26,6 @@
          id="stop3802-1-6" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient3798-1"
        id="linearGradient3804-4"
        x1="22"
@@ -173,7 +35,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-20.033146,1.0165)" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3798-1">
       <stop
          style="stop-color:#3f3f9f;stop-opacity:1"
@@ -192,36 +53,8 @@
        gradientTransform="translate(-18,-1.01475)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient3066"
-       xlink:href="#linearGradient3798-0-4"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient3798-0-4" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7.9999996"
-     inkscape:cx="-6.9766479"
-     inkscape:cy="-14.048324"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="925"
-     inkscape:window-height="900"
-     inkscape:window-x="671"
-     inkscape:window-y="25"
-     inkscape:window-maximized="0"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2985"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -235,19 +68,15 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      transform="translate(0,-1036.3622)">
     <path
        style="fill:#b0c0e0;fill-opacity:1;stroke:url(#linearGradient3804-4);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
        d="m 2.4668545,1048.8788 0,-2.9688 3.03125,0 0,-3.0312 3,0 0,3.0312 2.9999995,0 0,2.9688 z"
-       id="path3796"
-       inkscape:connector-curvature="0" />
+       id="path3796" />
     <path
        style="fill:#b0c0e0;fill-opacity:1;stroke:url(#linearGradient3066);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
        d="m 4.5,1046.8476 0,-2.9688 3.03125,0 0,-3.0312 3,0 0,3.0312 3.000002,0 0,2.9688 z"
-       id="path3796-7"
-       inkscape:connector-curvature="0" />
+       id="path3796-7" />
   </g>
 </svg>
diff --git a/ds/org.eclipse.pde.ds.ui/icons/ovr16/synch_co.svg b/ds/org.eclipse.pde.ds.ui/icons/ovr16/synch_co.svg
index eea33668131..e29822c44fb 100644
--- a/ds/org.eclipse.pde.ds.ui/icons/ovr16/synch_co.svg
+++ b/ds/org.eclipse.pde.ds.ui/icons/ovr16/synch_co.svg
@@ -2,24 +2,19 @@
 <!-- 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="7"
    height="8"
    id="svg2"
    version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="synch_co.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient13755"
        id="linearGradient8584"
        gradientUnits="userSpaceOnUse"
@@ -47,7 +42,6 @@
          id="stop13759" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient13831"
        id="linearGradient8586"
        gradientUnits="userSpaceOnUse"
@@ -56,7 +50,6 @@
        x2="30.033665"
        y2="1.9089624" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient13831">
       <stop
          style="stop-color:#055797;stop-opacity:1;"
@@ -68,32 +61,6 @@
          id="stop13835" />
     </linearGradient>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7.919596"
-     inkscape:cx="12.072526"
-     inkscape:cy="-15.644487"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="831"
-     inkscape:window-height="877"
-     inkscape:window-x="340"
-     inkscape:window-y="761"
-     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>
@@ -107,8 +74,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      transform="translate(0,-1044.3622)">
     <g
@@ -118,22 +83,13 @@
       <path
          transform="matrix(1.2249496,0,0,1.2249496,21.871427,1050.2166)"
          d="m 30,-2 a 4,4 0 1 1 -8,0 4,4 0 1 1 8,0 z"
-         sodipodi:ry="4"
-         sodipodi:rx="4"
-         sodipodi:cy="-2"
-         sodipodi:cx="26"
          id="path13745"
-         style="fill:url(#linearGradient8584);fill-opacity:1;stroke:url(#linearGradient8586);stroke-width:1.30471706;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         sodipodi:type="arc" />
+         style="fill:url(#linearGradient8584);fill-opacity:1;stroke:url(#linearGradient8586);stroke-width:1.30471706;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
       <path
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
          id="path13811"
          d="m 53.750446,1047.7972 0,-2.0313"
          style="fill:none;stroke:#1f4a83;stroke-width:1.62702001;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none" />
       <path
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
          id="path13811-9"
          d="m 53.750446,1047.7972 1.458408,2.3881"
          style="fill:none;stroke:#1f4a83;stroke-width:1.62702001;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;display:inline;stroke-miterlimit:4;stroke-dasharray:none" />
diff --git a/ds/org.eclipse.pde.ds.ui/icons/wizban/defcon_wiz.svg b/ds/org.eclipse.pde.ds.ui/icons/wizban/defcon_wiz.svg
index d9e1aa73419..6e53bdd8e92 100644
--- a/ds/org.eclipse.pde.ds.ui/icons/wizban/defcon_wiz.svg
+++ b/ds/org.eclipse.pde.ds.ui/icons/wizban/defcon_wiz.svg
@@ -6,14 +6,7 @@
    height="66"
    id="svg2"
    version="1.1"
-   inkscape:version="1.3 (0e150ed, 2023-07-21)"
-   sodipodi:docname="defcon_wiz.svg"
-   inkscape:export-filename="/Users/d021678/git/eclipse.jdt.ui/org.eclipse.jdt.ui/icons/full/wizban/newclass_wiz2.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90"
    xml:space="preserve"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:svg="http://www.w3.org/2000/svg"
@@ -21,23 +14,20 @@
    xmlns:cc="http://creativecommons.org/ns#"
    xmlns:dc="http://purl.org/dc/elements/1.1/"><defs
      id="defs4"><linearGradient
-       id="linearGradient5904"
-       inkscape:collect="always"><stop
+       id="linearGradient5904"><stop
          id="stop5906"
          offset="0"
          style="stop-color:#c5c6c6;stop-opacity:1" /><stop
          id="stop5908"
          offset="1"
          style="stop-color:#000000;stop-opacity:0;" /></linearGradient><linearGradient
-       id="linearGradient5898"
-       inkscape:collect="always"><stop
+       id="linearGradient5898"><stop
          id="stop5900"
          offset="0"
          style="stop-color:#c0c1c1;stop-opacity:1" /><stop
          id="stop5902"
          offset="1"
          style="stop-color:#000000;stop-opacity:0;" /></linearGradient><linearGradient
-       inkscape:collect="always"
        id="linearGradient4581"><stop
          style="stop-color:#dddddd;stop-opacity:1"
          offset="0"
@@ -45,7 +35,6 @@
          style="stop-color:#9f9f9f;stop-opacity:1"
          offset="1"
          id="stop4585" /></linearGradient><linearGradient
-       inkscape:collect="always"
        id="linearGradient4541"><stop
          style="stop-color:#a1adb2;stop-opacity:1"
          offset="0"
@@ -53,7 +42,6 @@
          style="stop-color:#000000;stop-opacity:0;"
          offset="1"
          id="stop4545" /></linearGradient><linearGradient
-       inkscape:collect="always"
        id="linearGradient4461"><stop
          style="stop-color:#d8d8d8;stop-opacity:1"
          offset="0"
@@ -67,299 +55,6 @@
          style="stop-color:#b4b4b4;stop-opacity:1"
          offset="1"
          id="stop4465" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       id="linearGradient4972"><stop
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0"
-         id="stop4974" /><stop
-         style="stop-color:#f5f8fd;stop-opacity:1"
-         offset="1"
-         id="stop4976" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       id="linearGradient4964"><stop
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0"
-         id="stop4966" /><stop
-         style="stop-color:#e8eefa;stop-opacity:1"
-         offset="1"
-         id="stop4968" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       id="linearGradient4956"><stop
-         style="stop-color:#fcfdfe;stop-opacity:1"
-         offset="0"
-         id="stop4958" /><stop
-         style="stop-color:#dee6f8;stop-opacity:1"
-         offset="1"
-         id="stop4960" /></linearGradient><filter
-       style="color-interpolation-filters:sRGB"
-       inkscape:label="Drop Shadow"
-       id="filter8854"><feFlood
-         flood-opacity="0.933333"
-         flood-color="rgb(244,248,254)"
-         result="flood"
-         id="feFlood8856" /><feComposite
-         in="flood"
-         in2="SourceGraphic"
-         operator="in"
-         result="composite1"
-         id="feComposite8858" /><feGaussianBlur
-         in="composite1"
-         stdDeviation="1.2"
-         result="blur"
-         id="feGaussianBlur8860" /><feOffset
-         dx="-1"
-         dy="3"
-         result="offset"
-         id="feOffset8862" /><feComposite
-         in="SourceGraphic"
-         in2="offset"
-         operator="over"
-         result="composite2"
-         id="feComposite8864" /></filter><linearGradient
-       id="linearGradient6122"><stop
-         style="stop-color:#c0c0c0;stop-opacity:1"
-         offset="0"
-         id="stop6124" /><stop
-         id="stop6132"
-         offset="0.5"
-         style="stop-color:#adadad;stop-opacity:1" /><stop
-         style="stop-color:#808080;stop-opacity:1"
-         offset="1"
-         id="stop6126" /></linearGradient><linearGradient
-       id="linearGradient7087"><stop
-         style="stop-color:#17325d;stop-opacity:1;"
-         offset="0"
-         id="stop7089" /><stop
-         id="stop7091"
-         offset="0.25"
-         style="stop-color:#b4d0e2;stop-opacity:1" /><stop
-         id="stop7093"
-         offset="0.5"
-         style="stop-color:#b7d2e4;stop-opacity:1" /><stop
-         style="stop-color:#acc9de;stop-opacity:1"
-         offset="0.75"
-         id="stop7095" /><stop
-         style="stop-color:#3e72a7;stop-opacity:1"
-         offset="1"
-         id="stop7097" /></linearGradient><mask
-       id="mask7366"
-       maskUnits="userSpaceOnUse"><path
-         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;display:inline"
-         d="m -16.593048,1040.862 9.990206,0 0,10.0018 -2.983353,3.0385 -5.966213,0 c -0.53033,-0.022 -1.04064,-0.5519 -1.04064,-1.0385 z"
-         id="path7368"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccccc" /></mask><linearGradient
-       id="linearGradient7584-5"><stop
-         id="stop7586-4"
-         offset="0"
-         style="stop-color:#f9cd5f;stop-opacity:1" /><stop
-         id="stop7588-5"
-         offset="1"
-         style="stop-color:#fbf0b4;stop-opacity:1" /></linearGradient><linearGradient
-       id="linearGradient7592-1"><stop
-         id="stop7594-6"
-         offset="0"
-         style="stop-color:#bd8416;stop-opacity:1" /><stop
-         id="stop7596-9"
-         offset="1"
-         style="stop-color:#a66b10;stop-opacity:1" /></linearGradient><linearGradient
-       id="linearGradient10798-1-9-3-7-6-6-6-2-6-7-98-9-4-1"><stop
-         style="stop-color:#5aad60;stop-opacity:1;"
-         offset="0"
-         id="stop10800-5-2-1-8-20-4-0-2-1-9-0-0-1-1" /><stop
-         id="stop10806-6-8-5-3-9-2-2-7-0-4-2-7-8-9"
-         offset="0.5"
-         style="stop-color:#5bb26a;stop-opacity:1;" /><stop
-         style="stop-color:#a4c589;stop-opacity:1"
-         offset="1"
-         id="stop10802-1-5-3-0-4-6-8-5-5-6-69-6-4-0" /></linearGradient><mask
-       maskUnits="userSpaceOnUse"
-       id="mask7366-4"><path
-         sodipodi:nodetypes="ccccccc"
-         inkscape:connector-curvature="0"
-         id="path7368-2"
-         d="m -16.593048,1040.862 9.990206,0 0,10.0018 -2.983353,3.0385 -5.966213,0 c -0.53033,-0.022 -1.04064,-0.5519 -1.04064,-1.0385 z"
-         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;display:inline" /></mask><linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient7087"
-       id="linearGradient9331"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-20,0)"
-       x1="4.7776356"
-       y1="1039.8118"
-       x2="4.7776356"
-       y2="1041.911" /><linearGradient
-       y2="1041.911"
-       x2="4.7776356"
-       y1="1039.8118"
-       x1="4.7776356"
-       gradientTransform="translate(-18,4.7e-5)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient9333"
-       xlink:href="#linearGradient7087"
-       inkscape:collect="always" /><linearGradient
-       y2="1041.911"
-       x2="4.7776356"
-       y1="1039.8118"
-       x1="4.7776356"
-       gradientTransform="translate(-16,4.7e-5)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient9335"
-       xlink:href="#linearGradient7087"
-       inkscape:collect="always" /><linearGradient
-       y2="1041.911"
-       x2="4.7776356"
-       y1="1039.8118"
-       x1="4.7776356"
-       gradientTransform="translate(-14,4.7e-5)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient9337"
-       xlink:href="#linearGradient7087"
-       inkscape:collect="always" /><linearGradient
-       y2="1041.911"
-       x2="4.7776356"
-       y1="1039.8118"
-       x1="4.7776356"
-       gradientTransform="translate(-12,4.7e-5)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient9339"
-       xlink:href="#linearGradient7087"
-       inkscape:collect="always" /><linearGradient
-       gradientTransform="translate(-80,0)"
-       gradientUnits="userSpaceOnUse"
-       y2="1042.7973"
-       x2="163.22012"
-       y1="1042.7973"
-       x1="88.220117"
-       id="linearGradient68073"
-       xlink:href="#linearGradient4956"
-       inkscape:collect="always" /><linearGradient
-       gradientTransform="translate(-80,0)"
-       gradientUnits="userSpaceOnUse"
-       y2="1032.2669"
-       x2="163.22012"
-       y1="1032.2668"
-       x1="94.469681"
-       id="linearGradient68075"
-       xlink:href="#linearGradient4964"
-       inkscape:collect="always" /><linearGradient
-       gradientTransform="translate(-80,0)"
-       gradientUnits="userSpaceOnUse"
-       y2="1032.2668"
-       x2="152.72206"
-       y1="1032.2668"
-       x1="88.220116"
-       id="linearGradient68077"
-       xlink:href="#linearGradient4972"
-       inkscape:collect="always" /><filter
-       id="filter8854-9"
-       inkscape:label="Drop Shadow"
-       style="color-interpolation-filters:sRGB"><feFlood
-         id="feFlood8856-0"
-         result="flood"
-         flood-color="rgb(244,248,254)"
-         flood-opacity="0.933333" /><feComposite
-         id="feComposite8858-2"
-         result="composite1"
-         operator="in"
-         in2="SourceGraphic"
-         in="flood" /><feGaussianBlur
-         id="feGaussianBlur8860-3"
-         result="blur"
-         stdDeviation="1.2"
-         in="composite1" /><feOffset
-         id="feOffset8862-2"
-         result="offset"
-         dy="3"
-         dx="-1" /><feComposite
-         id="feComposite8864-3"
-         result="composite2"
-         operator="over"
-         in2="offset"
-         in="SourceGraphic" /></filter><linearGradient
-       id="linearGradient10798-1-9-3-7-6-8-9-0-9-1"><stop
-         id="stop10800-5-2-1-8-20-6-4-9-8-2"
-         offset="0"
-         style="stop-color:#7564b1;stop-opacity:1" /><stop
-         style="stop-color:#5d4aa1;stop-opacity:1"
-         offset="0.5"
-         id="stop10806-6-8-5-3-9-24-8-4-3-2" /><stop
-         id="stop10802-1-5-3-0-4-8-4-2-9-2"
-         offset="1"
-         style="stop-color:#9283c3;stop-opacity:1" /></linearGradient><linearGradient
-       id="linearGradient7540-2-3-8-7"><stop
-         id="stop7542-8-7-5-3"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.502" /><stop
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0.47623286"
-         id="stop7544-8-2-0-5" /><stop
-         style="stop-color:#ffffff;stop-opacity:0"
-         offset="0.5"
-         id="stop7546-1-7-9-5" /><stop
-         id="stop7548-98-9-2-4"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       id="linearGradient7272-66-4-5-5-5-8"><stop
-         style="stop-color:#8f6c10;stop-opacity:1"
-         offset="0"
-         id="stop7274-6-0-1-7-4-7" /><stop
-         style="stop-color:#c9a645;stop-opacity:1"
-         offset="1"
-         id="stop7276-66-6-3-9-1-4" /></linearGradient><linearGradient
-       y2="1030.3411"
-       x2="-10.159802"
-       y1="1030.3411"
-       x1="-22.453552"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient10540"
-       xlink:href="#linearGradient7540-2-3-8-7"
-       inkscape:collect="always" /><linearGradient
-       y2="1030.3411"
-       x2="-10.159802"
-       y1="1030.3411"
-       x1="-22.453552"
-       gradientTransform="matrix(0,1,-1,0,1014.0344,1046.6478)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient10542"
-       xlink:href="#linearGradient7540-2-3-8-7"
-       inkscape:collect="always" /><linearGradient
-       y2="1023.2569"
-       x2="-15.945988"
-       y1="1037.4661"
-       x1="-15.945988"
-       gradientTransform="matrix(0.95585117,0,0,0.95585117,-0.71992063,45.488394)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient10544"
-       xlink:href="#linearGradient7272-66-4-5-5-5-8"
-       inkscape:collect="always" /><mask
-       id="mask10620"
-       maskUnits="userSpaceOnUse"><path
-         transform="matrix(0.55482947,0,0,0.55482947,-206.96039,787.08655)"
-         d="m 398.75,468.23718 a 10.625,10.625 0 1 1 -21.25,0 10.625,10.625 0 1 1 21.25,0 z"
-         sodipodi:ry="10.625"
-         sodipodi:rx="10.625"
-         sodipodi:cy="468.23718"
-         sodipodi:cx="388.125"
-         id="path10622"
-         style="font-size:13.58917427px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:2.16621375;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline;font-family:Sans"
-         sodipodi:type="arc" /></mask><linearGradient
-       id="linearGradient4528-9-5-7-9-7-3"><stop
-         id="stop4530-0-5-0-5-8-4"
-         offset="0"
-         style="stop-color:#e0c576;stop-opacity:1;" /><stop
-         id="stop4532-7-9-3-3-6-1"
-         offset="1"
-         style="stop-color:#9e7916;stop-opacity:1" /></linearGradient><linearGradient
-       id="linearGradient6281-8-0-1-6-6-4-2-8-0"><stop
-         style="stop-color:#f7f9fb;stop-opacity:1"
-         offset="0"
-         id="stop6283-0-2-2-1-2-0-1-6-0" /><stop
-         style="stop-color:#ffd680;stop-opacity:1"
-         offset="1"
-         id="stop6285-5-0-9-7-6-9-9-1-9" /></linearGradient><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4972-7"
        id="linearGradient4978"
        x1="88.220116"
@@ -368,7 +63,6 @@
        y2="1032.2668"
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-88.220116,-999.2669)" /><linearGradient
-       inkscape:collect="always"
        id="linearGradient4972-7"><stop
          style="stop-color:#b8ccf1;stop-opacity:0.10196079"
          offset="0"
@@ -376,7 +70,6 @@
          style="stop-color:#6e97e2;stop-opacity:0.10196079"
          offset="1"
          id="stop4976-1" /></linearGradient><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4964-3"
        id="linearGradient4970"
        x1="118.38584"
@@ -385,7 +78,6 @@
        y2="1032.2668"
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-88.220117,-999.2669)" /><linearGradient
-       inkscape:collect="always"
        id="linearGradient4964-3"><stop
          style="stop-color:#ffffff;stop-opacity:0.349"
          offset="0"
@@ -393,7 +85,6 @@
          style="stop-color:#91ade6;stop-opacity:1"
          offset="1"
          id="stop4968-1" /></linearGradient><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4956-2"
        id="linearGradient4962"
        x1="88.220116"
@@ -402,7 +93,6 @@
        y2="1042.7972"
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-88.220116,-999.2669)" /><linearGradient
-       inkscape:collect="always"
        id="linearGradient4956-2"><stop
          style="stop-color:#fcfdfe;stop-opacity:0.25641027"
          offset="0"
@@ -410,27 +100,6 @@
          style="stop-color:#98aae7;stop-opacity:0.40392157"
          offset="1"
          id="stop4960-6" /></linearGradient><linearGradient
-       id="linearGradient3827"><stop
-         id="stop3829"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0;" /><stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0.60149658"
-         id="stop3835" /><stop
-         id="stop3831"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" /></linearGradient><linearGradient
-       id="linearGradient10798-1-9-3-7-6-8-9-0-9-1-0"><stop
-         id="stop10800-5-2-1-8-20-6-4-9-8-2-9"
-         offset="0"
-         style="stop-color:#f3faed;stop-opacity:1" /><stop
-         style="stop-color:#e7f4da;stop-opacity:1"
-         offset="0.65917557"
-         id="stop10806-6-8-5-3-9-24-8-4-3-2-4" /><stop
-         id="stop10802-1-5-3-0-4-8-4-2-9-2-5"
-         offset="1"
-         style="stop-color:#67bf1f;stop-opacity:1" /></linearGradient><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4994"
        id="linearGradient6375-6"
        x1="50.702839"
@@ -439,15 +108,13 @@
        y2="1011.338"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1.1849336,0,0,0.66623436,3.388291,334.57319)" /><linearGradient
-       id="linearGradient4994"
-       inkscape:collect="always"><stop
+       id="linearGradient4994"><stop
          id="stop4996"
          offset="0"
          style="stop-color:#ffffff;stop-opacity:1" /><stop
          id="stop4998"
          offset="1"
          style="stop-color:#d2f1ff;stop-opacity:1" /></linearGradient><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4902"
        id="linearGradient4238"
        gradientUnits="userSpaceOnUse"
@@ -456,8 +123,7 @@
        y1="1039.059"
        x2="10.632975"
        y2="1051.5835" /><linearGradient
-       id="linearGradient4902"
-       inkscape:collect="always"><stop
+       id="linearGradient4902"><stop
          id="stop4904"
          offset="0"
          style="stop-color:#777777;stop-opacity:0.74901962" /><stop
@@ -467,7 +133,6 @@
          id="stop4906"
          offset="1"
          style="stop-color:#939195;stop-opacity:0.93333334" /></linearGradient><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4461"
        id="linearGradient4467"
        x1="60.069771"
@@ -476,7 +141,6 @@
        y2="997.19556"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(0.99999996,0,0,1.2,-15.999595,-199.27331)" /><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4541"
        id="linearGradient4547"
        x1="41"
@@ -485,7 +149,6 @@
        y2="1008.3622"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1.3158111,0,0,1.3158111,-28.947849,-318.29488)" /><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4541"
        id="linearGradient4547-0"
        x1="41"
@@ -494,7 +157,6 @@
        y2="1008.3622"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(0,1.2632053,-1.2632053,0,1298.6373,956.56996)" /><radialGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4581"
        id="radialGradient4587"
        cx="68.5"
@@ -505,7 +167,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-15.999595,-8.6771508e-4)" /><radialGradient
        gradientTransform="translate(-10.999595,-8.6771508e-4)"
-       inkscape:collect="always"
        xlink:href="#linearGradient4581"
        id="radialGradient4587-5"
        cx="68.5"
@@ -515,7 +176,6 @@
        r="1.5"
        gradientUnits="userSpaceOnUse" /><radialGradient
        gradientTransform="translate(-5.999595,-8.6771508e-4)"
-       inkscape:collect="always"
        xlink:href="#linearGradient4581"
        id="radialGradient4587-0"
        cx="68.5"
@@ -524,16 +184,6 @@
        fy="1004.8622"
        r="1.5"
        gradientUnits="userSpaceOnUse" /><linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4541"
-       id="linearGradient5885"
-       x1="41"
-       y1="1007.8622"
-       x2="60"
-       y2="1008.3622"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0,1,-1,0,1034.3618,967.36133)" /><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient5904"
        id="linearGradient5890"
        gradientUnits="userSpaceOnUse"
@@ -542,7 +192,6 @@
        y1="1007.8622"
        x2="60.03624"
        y2="1007.8358" /><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient5898"
        id="linearGradient5892"
        gradientUnits="userSpaceOnUse"
@@ -551,7 +200,6 @@
        y1="1007.8622"
        x2="59.944244"
        y2="1007.8496" /><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient5517"
        id="linearGradient6406"
        gradientUnits="userSpaceOnUse"
@@ -559,32 +207,27 @@
        y1="1041.0833"
        x2="75.020309"
        y2="1023.2908" /><filter
-       inkscape:collect="always"
        style="color-interpolation-filters:sRGB"
        id="filter4344"
        x="-0.027383926"
        width="1.0547679"
        y="-0.085576576"
        height="1.1711532"><feGaussianBlur
-         inkscape:collect="always"
          stdDeviation="0.57051052"
          id="feGaussianBlur4346" /></filter><linearGradient
-       id="linearGradient5517"
-       inkscape:collect="always"><stop
+       id="linearGradient5517"><stop
          id="stop5519"
          offset="0"
          style="stop-color:#c5c3d4;stop-opacity:0.72941178" /><stop
          id="stop5521"
          offset="1"
          style="stop-color:#c5c3d4;stop-opacity:0.72941178" /></linearGradient><filter
-       inkscape:collect="always"
        style="color-interpolation-filters:sRGB"
        id="filter2728"
        x="-0.063235322"
        width="1.1264706"
        y="-0.11523657"
        height="1.2304731"><feGaussianBlur
-         inkscape:collect="always"
          stdDeviation="0.90744768"
          id="feGaussianBlur2730" /></filter><filter
        height="1.5377248"
@@ -592,61 +235,49 @@
        width="2.2348057"
        x="-0.61603857"
        id="filter8813-5"
-       style="color-interpolation-filters:sRGB"
-       inkscape:collect="always"><feGaussianBlur
+       style="color-interpolation-filters:sRGB"><feGaussianBlur
          id="feGaussianBlur8815-0"
-         stdDeviation="1.1269452"
-         inkscape:collect="always" /></filter><filter
+         stdDeviation="1.1269452" /></filter><filter
        height="1.3538871"
-       y="-0.14670009"
-       width="2.0326143"
+       y="-0.1467001"
+       width="2.0326144"
        x="-0.51861343"
        id="filter8871-4"
-       style="color-interpolation-filters:sRGB"
-       inkscape:collect="always"><feGaussianBlur
+       style="color-interpolation-filters:sRGB"><feGaussianBlur
          id="feGaussianBlur8873-9"
-         stdDeviation="0.53588249"
-         inkscape:collect="always" /></filter><filter
+         stdDeviation="0.53588249" /></filter><filter
        height="1.8002913"
        y="-0.40014564"
        width="1.8323029"
        x="-0.41615145"
        id="filter8835-5"
-       style="color-interpolation-filters:sRGB"
-       inkscape:collect="always"><feGaussianBlur
+       style="color-interpolation-filters:sRGB"><feGaussianBlur
          id="feGaussianBlur8837-4"
-         stdDeviation="0.49751501"
-         inkscape:collect="always" /></filter><filter
-       inkscape:collect="always"
+         stdDeviation="0.49751501" /></filter><filter
        style="color-interpolation-filters:sRGB"
        id="filter2533-6"
        x="-0.6723755"
        width="2.5456241"
        y="-1.0602113"
        height="3.2108596"><feGaussianBlur
-         inkscape:collect="always"
          stdDeviation="0.73536407"
          id="feGaussianBlur2535-0" /></filter><filter
        height="1.387091"
-       y="-0.15474324"
+       y="-0.15474326"
        width="2.0896478"
        x="-0.5477827"
        id="filter8871-1-6"
-       style="color-interpolation-filters:sRGB"
-       inkscape:collect="always"><feGaussianBlur
+       style="color-interpolation-filters:sRGB"><feGaussianBlur
          id="feGaussianBlur8873-8-9"
-         stdDeviation="0.53588249"
-         inkscape:collect="always" /></filter><filter
+         stdDeviation="0.53588249" /></filter><filter
        height="1.4861495"
        y="-0.24307477"
        width="2.0754105"
        x="-0.53770523"
        id="filter8813"
-       style="color-interpolation-filters:sRGB"
-       inkscape:collect="always"><feGaussianBlur
+       style="color-interpolation-filters:sRGB"><feGaussianBlur
          id="feGaussianBlur8815"
-         stdDeviation="1.1269452"
-         inkscape:collect="always" /></filter><linearGradient
+         stdDeviation="1.1269452" /></filter><linearGradient
        gradientUnits="userSpaceOnUse"
        y2="1023.234"
        x2="51.933025"
@@ -654,10 +285,8 @@
        x1="51.658199"
        id="linearGradient8769"
        xlink:href="#linearGradient8767"
-       inkscape:collect="always"
        gradientTransform="matrix(2.7500001,0,0,0.99370101,-129.87501,-991.91286)" /><linearGradient
-       id="linearGradient8767"
-       inkscape:collect="always"><stop
+       id="linearGradient8767"><stop
          id="stop8763"
          offset="0"
          style="stop-color:#6a8ec1;stop-opacity:1" /><stop
@@ -671,10 +300,8 @@
        x1="50"
        id="linearGradient8753"
        xlink:href="#linearGradient8751"
-       inkscape:collect="always"
        gradientTransform="matrix(2.7500001,0,0,0.99370101,-129.87501,-991.91286)" /><linearGradient
-       id="linearGradient8751"
-       inkscape:collect="always"><stop
+       id="linearGradient8751"><stop
          id="stop8747"
          offset="0"
          style="stop-color:#2e5d8f;stop-opacity:1" /><stop
@@ -688,17 +315,14 @@
        x1="57"
        id="linearGradient8761"
        xlink:href="#linearGradient8759"
-       inkscape:collect="always"
        gradientTransform="matrix(1.0999999,0,0,1.1281495,-43.249997,-1129.0318)" /><linearGradient
-       id="linearGradient8759"
-       inkscape:collect="always"><stop
+       id="linearGradient8759"><stop
          id="stop8755"
          offset="0"
          style="stop-color:#d3e0eb;stop-opacity:1" /><stop
          id="stop8757"
          offset="1"
          style="stop-color:#5179b5;stop-opacity:1" /></linearGradient><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient2543"
        id="linearGradient2545"
        x1="18.423391"
@@ -706,7 +330,6 @@
        x2="18.436228"
        y2="30.334658"
        gradientUnits="userSpaceOnUse" /><linearGradient
-       inkscape:collect="always"
        id="linearGradient2543"><stop
          style="stop-color:#4f76b0;stop-opacity:1"
          offset="0"
@@ -724,10 +347,8 @@
        x1="63.98344"
        id="linearGradient8779"
        xlink:href="#linearGradient8777"
-       inkscape:collect="always"
        gradientTransform="matrix(1.3687895,0,0,1.494898,-60.408122,-1504.0798)" /><linearGradient
-       id="linearGradient8777"
-       inkscape:collect="always"><stop
+       id="linearGradient8777"><stop
          id="stop8773"
          offset="0"
          style="stop-color:#fbeaab;stop-opacity:1;" /><stop
@@ -741,10 +362,8 @@
        x1="68.47998"
        id="linearGradient8787"
        xlink:href="#linearGradient8785"
-       inkscape:collect="always"
        gradientTransform="matrix(1.3687895,0,0,1.494898,-60.408122,-1504.0798)" /><linearGradient
-       id="linearGradient8785"
-       inkscape:collect="always"><stop
+       id="linearGradient8785"><stop
          id="stop8781"
          offset="0"
          style="stop-color:#bb8d2d;stop-opacity:1" /><stop
@@ -759,29 +378,23 @@
        width="1.8310951"
        x="-0.41554753"
        id="filter8871"
-       style="color-interpolation-filters:sRGB"
-       inkscape:collect="always"><feGaussianBlur
+       style="color-interpolation-filters:sRGB"><feGaussianBlur
          id="feGaussianBlur8873"
-         stdDeviation="0.53588249"
-         inkscape:collect="always" /></filter><filter
+         stdDeviation="0.53588249" /></filter><filter
        height="1.6025846"
        y="-0.30129232"
        width="1.626688"
        x="-0.313344"
        id="filter8835"
-       style="color-interpolation-filters:sRGB"
-       inkscape:collect="always"><feGaussianBlur
+       style="color-interpolation-filters:sRGB"><feGaussianBlur
          id="feGaussianBlur8837"
-         stdDeviation="0.49751501"
-         inkscape:collect="always" /></filter><filter
-       inkscape:collect="always"
+         stdDeviation="0.49751501" /></filter><filter
        style="color-interpolation-filters:sRGB"
        id="filter2533"
        x="-0.59377657"
        width="2.1875531"
        y="-0.92639431"
        height="2.8527886"><feGaussianBlur
-         inkscape:collect="always"
          stdDeviation="0.73536407"
          id="feGaussianBlur2535" /></filter><filter
        height="1.2365698"
@@ -789,62 +402,17 @@
        width="1.8310951"
        x="-0.41554753"
        id="filter8871-1"
-       style="color-interpolation-filters:sRGB"
-       inkscape:collect="always"><feGaussianBlur
+       style="color-interpolation-filters:sRGB"><feGaussianBlur
          id="feGaussianBlur8873-8"
-         stdDeviation="0.53588249"
-         inkscape:collect="always" /></filter></defs><sodipodi:namedview
-     id="base"
-     pagecolor="#bcbcbc"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="11.625"
-     inkscape:cx="32"
-     inkscape:cy="26.150537"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1728"
-     inkscape:window-height="1051"
-     inkscape:window-x="0"
-     inkscape:window-y="38"
-     inkscape:window-maximized="1"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="true"
-     inkscape:snap-bbox="true"
-     inkscape:bbox-nodes="true"
-     inkscape:showpageshadow="2"
-     inkscape:pagecheckerboard="0"
-     inkscape:deskcolor="#d1d1d1"><inkscape:grid
-       type="xygrid"
-       id="grid4112"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       originx="0"
-       originy="0"
-       spacingy="1"
-       spacingx="1"
-       units="px" /></sodipodi:namedview><metadata
+         stdDeviation="0.53588249" /></filter></defs><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" /></cc:Work></rdf:RDF></metadata><g
-     inkscape:groupmode="layer"
      id="layer2"
-     inkscape:label="Background"
-     style="display:inline"
-     sodipodi:insensitive="true"><path
-       sodipodi:nodetypes="cccc"
-       inkscape:connector-curvature="0"
+     style="display:inline"><path
        id="rect4113-1"
        d="M 75,0 75,66 1e-6,66 C 1e-6,41.2048 50.00969,0 75,0 Z"
        style="display:inline;fill:url(#linearGradient4978);fill-opacity:1;stroke:none" /><path
-       sodipodi:nodetypes="cccc"
-       inkscape:connector-curvature="0"
        id="rect4113-1-0"
        d="M 75,21.0607 75,66 1e-6,66 C 10.625001,47.804 43.509694,25.4357 75,21.0607 Z"
        style="display:inline;opacity:0.40400002;fill:url(#linearGradient4962);fill-opacity:1;stroke:none" /><g
@@ -853,80 +421,53 @@
        transform="matrix(0.27903303,0,0,0.27903303,-14.618136,-107.52874)"><g
          style="fill:#737986;fill-opacity:1;stroke:#595e68;stroke-opacity:1"
          id="g13408-8-2" /></g><path
-       sodipodi:nodetypes="cccc"
-       inkscape:connector-curvature="0"
        id="rect4113-1-7"
        d="M 75,4.0000001e-7 75,66 30.000003,66 C 30.000003,46.1545 47.70944,9.2500004 75,4e-7 Z"
        style="display:inline;opacity:0.18399999;fill:url(#linearGradient4970);fill-opacity:1;stroke:none" /></g><g
-     inkscape:label="Foreground"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-986.3622)"><path
-       sodipodi:nodetypes="cccccc"
-       inkscape:connector-curvature="0"
        id="rect4001-3-4-5"
        d="m 61.725004,1022.8099 21.27431,-0.1009 1.654984,3.7793 -20.678174,12.1198 -29.322882,0.1009 z"
        style="display:inline;opacity:0.63;fill:url(#linearGradient6406);fill-opacity:1;stroke:none;filter:url(#filter4344)"
-       transform="matrix(1.4111948,0,0,0.94753947,-25.395948,53.893899)"
-       inkscape:label="shadow" /><g
+       transform="matrix(1.4111948,0,0,0.94753947,-25.395948,53.893899)" /><g
        id="g8799"
-       inkscape:label="window"
        transform="translate(-15.000815,-1.9999989)"><path
          style="display:inline;fill:url(#linearGradient6375-6);fill-opacity:1;stroke:none"
          d="m 25.000405,1007.361 41,3e-4 c 0,0 -0.06713,15.3717 0,29 h -41 z"
-         id="rect4001-3-4"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" /><path
+         id="rect4001-3-4" /><path
          style="fill:none;stroke:url(#linearGradient4238);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1"
          d="m 24.5,995.86533 c 18.334725,0.11446 42.000815,0 42.000815,0 v 40.99577 H 24.5 Z"
-         id="rect4001-1"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" /><path
+         id="rect4001-1" /><path
          style="display:inline;fill:#ffffff;fill-opacity:1;stroke:none"
          d="m 25.000405,1001.3613 41,10e-5 c 0,0 -0.06713,3.1803 0,5.9999 h -41 z"
-         id="rect4001-3-4-1"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" /><path
+         id="rect4001-3-4-1" /><path
          style="display:inline;fill:url(#linearGradient4467);fill-opacity:1;stroke:none"
          d="m 25.000405,996.36133 41,1e-4 c 0,0 -0.0671,3.1803 0,5.99987 h -41 z"
-         id="rect4001-3-4-1-6"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" /><path
+         id="rect4001-3-4-1-6" /><path
          style="display:inline;fill:url(#radialGradient4587);fill-opacity:1;stroke:none"
          d="m 51.000405,1003.3613 3,10e-5 c 0,0 -0.005,1.5901 0,2.9999 h -3 z"
-         id="rect4001-3-4-1-1-8"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" /><path
-         inkscape:connector-curvature="0"
+         id="rect4001-3-4-1-1-8" /><path
          id="path4539"
          d="M 25.000406,1007.8613 H 50.000817"
          style="fill:none;fill-rule:evenodd;stroke:url(#linearGradient4547);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /><path
-         inkscape:connector-curvature="0"
          id="path4539-4"
          d="m 25.500406,1008.3613 v 24.0009"
          style="display:inline;fill:none;fill-rule:evenodd;stroke:url(#linearGradient4547-0);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /><path
          style="display:inline;fill:url(#radialGradient4587-5);fill-opacity:1;stroke:none"
          d="m 56.000405,1003.3613 3,10e-5 c 0,0 -0.005,1.5901 0,2.9999 h -3 z"
-         id="rect4001-3-4-1-1-8-5"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" /><path
+         id="rect4001-3-4-1-1-8-5" /><path
          style="display:inline;fill:url(#radialGradient4587-0);fill-opacity:1;stroke:none"
          d="m 61.000405,1003.3613 3,10e-5 c 0,0 -0.005,1.5901 0,2.9999 h -3 z"
-         id="rect4001-3-4-1-1-8-3"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" /><path
-         inkscape:connector-curvature="0"
+         id="rect4001-3-4-1-1-8-3" /><path
          id="path4539-6"
          d="m 66.000816,1035.8622 h -40"
          style="fill:none;fill-rule:evenodd;stroke:url(#linearGradient5890);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /><path
-         inkscape:connector-curvature="0"
          id="path4539-4-6"
          d="m 65.500818,1035.3623 v -26.0001"
          style="display:inline;fill:none;fill-rule:evenodd;stroke:url(#linearGradient5892);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /></g><g
        id="g2"
        transform="matrix(1.151737,0,0,1.0520762,2.6621505,1009.4508)"
-       inkscape:label="plug"
        style="display:inline;stroke-width:0.908446"><g
          transform="matrix(1.0729615,0,0,1.0787087,-1.2096914,-0.17204372)"
          id="g2558-4"
@@ -934,34 +475,23 @@
            transform="matrix(1.029538,0,0,1.1281495,-40.181606,-1129.0381)"
            style="fill:#808080;fill-opacity:1;stroke:#808080;stroke-width:0.783521px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter8813-5)"
            d="m 53.577367,1026.9835 -0.152425,-8.8407 0.91455,-1.2194 3.124711,-0.076 0.07621,-0.9908 h 0.91455 l -0.07621,1.9054 -3.048499,1.2194 -0.152425,4.9538 z"
-           id="path8791-1"
-           inkscape:connector-curvature="0" /><path
+           id="path8791-1" /><path
            id="path8722-7-8"
            style="display:inline;opacity:1;fill:#808080;fill-opacity:1;stroke:#808080;stroke-width:0.844414;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="M 3.4999999,23.512598 V 25.5 H 14.5 V 21.525196 H 3.4999999 v 1.987402"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccccc" /><path
-           sodipodi:nodetypes="csssscsscccsssscsscc"
+           d="M 3.4999999,23.512598 V 25.5 H 14.5 V 21.525196 H 3.4999999 v 1.987402" /><path
            id="rect8645-3-9"
            style="display:inline;opacity:1;fill:#808080;fill-opacity:1;stroke:#808080;stroke-width:0.844414;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="M 25.499998,23.781495 25.5,15.413559 C 25.5,13.799403 24.568942,12.5 23.412427,12.5 h -2.424855 c -1.156515,0 -2.483072,1.299403 -2.483072,2.913559 v 1.599039 h -2.264856 c -0.963763,0 -1.739644,0.794104 -1.739644,1.780446 v 1.468512 3.519375 m 10.999998,5.64e-4 2e-6,8.367936 c 0,1.614156 -0.931058,2.913559 -2.087573,2.913559 h -2.424855 c -1.156515,0 -2.483072,-1.299403 -2.483072,-2.913559 V 30.550392 H 16.239644 C 15.275881,30.550392 14.5,29.756288 14.5,28.769946 v -1.468512 -3.519375"
-           inkscape:connector-curvature="0" /><path
-           sodipodi:nodetypes="cc"
-           inkscape:connector-curvature="0"
+           d="M 25.499998,23.781495 25.5,15.413559 C 25.5,13.799403 24.568942,12.5 23.412427,12.5 h -2.424855 c -1.156515,0 -2.483072,1.299403 -2.483072,2.913559 v 1.599039 h -2.264856 c -0.963763,0 -1.739644,0.794104 -1.739644,1.780446 v 1.468512 3.519375 m 10.999998,5.64e-4 2e-6,8.367936 c 0,1.614156 -0.931058,2.913559 -2.087573,2.913559 h -2.424855 c -1.156515,0 -2.483072,-1.299403 -2.483072,-2.913559 V 30.550392 H 16.239644 C 15.275881,30.550392 14.5,29.756288 14.5,28.769946 v -1.468512 -3.519375" /><path
            id="path2537-0"
            d="M 18.51661,16.539741 18.5464,30.705846"
            style="fill:#808080;stroke:#808080;stroke-width:0.844414px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /><path
            id="rect8645-2-5-2"
            style="display:inline;opacity:1;fill:#808080;fill-opacity:1;stroke:#808080;stroke-width:0.844414;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="m 36.091538,26.489769 -10e-7,1.058985 c 0,1.06945 -0.863288,1.955925 -2.164732,1.930363 -1.301445,-0.02541 -1.941636,0 -1.941636,0 v 0.201512 c 0,1.544678 -1.158564,2.787985 -2.597679,2.788284 l -1.648306,2.98e-4 c -1.360345,3e-4 -1.22903,0.546236 -1.22903,-2.989646 V 17.520381 c 0,-3.536032 -0.205068,-2.989797 1.22903,-2.989797 h 1.648306 c 1.439115,0 2.597679,1.243607 2.597679,2.788284 v 0.201513 h 1.941637 c 1.199261,0 2.164732,0.860911 2.164732,1.930361 v 2.554332 z m 0.06454,-6.010119 h 8.461471 l -0.05085,6.010119 h -8.188123"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cczccssssssccsccccccc" /><path
+           d="m 36.091538,26.489769 -10e-7,1.058985 c 0,1.06945 -0.863288,1.955925 -2.164732,1.930363 -1.301445,-0.02541 -1.941636,0 -1.941636,0 v 0.201512 c 0,1.544678 -1.158564,2.787985 -2.597679,2.788284 l -1.648306,2.98e-4 c -1.360345,3e-4 -1.22903,0.546236 -1.22903,-2.989646 V 17.520381 c 0,-3.536032 -0.205068,-2.989797 1.22903,-2.989797 h 1.648306 c 1.439115,0 2.597679,1.243607 2.597679,2.788284 v 0.201513 h 1.941637 c 1.199261,0 2.164732,0.860911 2.164732,1.930361 v 2.554332 z m 0.06454,-6.010119 h 8.461471 l -0.05085,6.010119 h -8.188123" /><path
            transform="matrix(1.445753,0,0,1.3224494,-65.097292,-1327.9481)"
            style="opacity:0.794;fill:#808080;fill-opacity:1;stroke:#808080;stroke-width:0.610687px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter8871-4)"
            d="m 64.018476,1016.5423 -0.152427,10.8222 c 2.375507,-3.3036 3.484206,-4.2052 2.972286,-9.2217 0.305009,-1.654 -1.117834,-1.7529 -2.819859,-1.6005 z"
-           id="path8861-9"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccc" /><ellipse
+           id="path8861-9" /><ellipse
            transform="matrix(1.029538,0,0,1.1281495,-39.470994,-1128.0797)"
            style="opacity:0.828;fill:#808080;fill-opacity:1;stroke:#808080;stroke-width:0.783521;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter8835-5)"
            id="path8817-1"
@@ -972,14 +502,11 @@
            transform="matrix(1.7350569,0,0,1.8824502,-91.814902,-1903.1505)"
            style="opacity:0.862;fill:#808080;fill-opacity:1;stroke:#808080;stroke-width:0.467237px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter2533-6)"
            d="m 70.953811,1023.4014 v -1.8291 l 2.972286,-0.076 z"
-           id="path8875-0"
-           inkscape:connector-curvature="0" /><path
+           id="path8875-0" /><path
            transform="matrix(1.029538,0,0,1.1281495,-39.928294,-1128.6206)"
            style="display:inline;opacity:0.485;fill:#808080;fill-opacity:1;stroke:#808080;stroke-width:0.783521px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter8871-1-6)"
            d="m 53.924652,1016.631 -0.152427,10.8222 c 2.375507,-3.3036 3.484206,-4.2052 2.972286,-9.2217 0.305009,-1.654 -1.117834,-1.7529 -2.819859,-1.6005 z"
-           id="path8861-7-0"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccc" /></g><g
+           id="path8861-7-0" /></g><g
          id="g11331-3-1-1"
          style="display:inline;stroke-width:0.908446"
          transform="matrix(0.92787456,0,0,0.92766861,-283.31685,-391.9053)"><g
@@ -1012,34 +539,23 @@
            transform="matrix(1.029538,0,0,1.1281495,-40.181606,-1129.0381)"
            style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.842937px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter8813)"
            d="m 53.577367,1026.9835 -0.152425,-8.8407 0.91455,-1.2194 3.124711,-0.076 0.07621,-0.9908 h 0.91455 l -0.07621,1.9054 -3.048499,1.2194 -0.152425,4.9538 z"
-           id="path8791"
-           inkscape:connector-curvature="0" /><path
+           id="path8791" /><path
            id="path8722-7"
            style="display:inline;opacity:1;fill:url(#linearGradient8769);fill-opacity:1;stroke:url(#linearGradient8753);stroke-width:0.908446;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="M 3.4999999,23.512598 V 25.5 H 14.5 V 21.525196 H 3.4999999 v 1.987402"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccccc" /><path
-           sodipodi:nodetypes="csssscsscccsssscsscc"
+           d="M 3.4999999,23.512598 V 25.5 H 14.5 V 21.525196 H 3.4999999 v 1.987402" /><path
            id="rect8645-3"
            style="display:inline;opacity:1;fill:url(#linearGradient8761);fill-opacity:1;stroke:#4d73ae;stroke-width:0.908446;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="M 25.499998,23.781495 25.5,15.413559 C 25.5,13.799403 24.568942,12.5 23.412427,12.5 h -2.424855 c -1.156515,0 -2.483072,1.299403 -2.483072,2.913559 v 1.599039 h -2.264856 c -0.963763,0 -1.739644,0.794104 -1.739644,1.780446 v 1.468512 3.519375 m 10.999998,5.64e-4 2e-6,8.367936 c 0,1.614156 -0.931058,2.913559 -2.087573,2.913559 h -2.424855 c -1.156515,0 -2.483072,-1.299403 -2.483072,-2.913559 V 30.550392 H 16.239644 C 15.275881,30.550392 14.5,29.756288 14.5,28.769946 v -1.468512 -3.519375"
-           inkscape:connector-curvature="0" /><path
-           sodipodi:nodetypes="cc"
-           inkscape:connector-curvature="0"
+           d="M 25.499998,23.781495 25.5,15.413559 C 25.5,13.799403 24.568942,12.5 23.412427,12.5 h -2.424855 c -1.156515,0 -2.483072,1.299403 -2.483072,2.913559 v 1.599039 h -2.264856 c -0.963763,0 -1.739644,0.794104 -1.739644,1.780446 v 1.468512 3.519375 m 10.999998,5.64e-4 2e-6,8.367936 c 0,1.614156 -0.931058,2.913559 -2.087573,2.913559 h -2.424855 c -1.156515,0 -2.483072,-1.299403 -2.483072,-2.913559 V 30.550392 H 16.239644 C 15.275881,30.550392 14.5,29.756288 14.5,28.769946 v -1.468512 -3.519375" /><path
            id="path2537"
            d="M 18.51661,16.539741 18.5464,30.705846"
            style="fill:none;stroke:url(#linearGradient2545);stroke-width:0.908446px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /><path
            id="rect8645-2-5"
            style="display:inline;opacity:1;fill:url(#linearGradient8779);fill-opacity:1;stroke:url(#linearGradient8787);stroke-width:0.908446;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="m 36.091538,26.489769 -10e-7,1.058985 c 0,1.06945 -0.863288,1.955925 -2.164732,1.930363 -1.301445,-0.02541 -1.941636,0 -1.941636,0 v 0.201512 c 0,1.544678 -1.158564,2.787985 -2.597679,2.788284 l -1.648306,2.98e-4 c -1.360345,3e-4 -1.22903,0.546236 -1.22903,-2.989646 V 17.520381 c 0,-3.536032 -0.205068,-2.989797 1.22903,-2.989797 h 1.648306 c 1.439115,0 2.597679,1.243607 2.597679,2.788284 v 0.201513 h 1.941637 c 1.199261,0 2.164732,0.860911 2.164732,1.930361 v 2.554332 z m 0.06454,-6.010119 h 8.461471 l -0.05085,6.010119 h -8.188123"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cczccssssssccsccccccc" /><path
+           d="m 36.091538,26.489769 -10e-7,1.058985 c 0,1.06945 -0.863288,1.955925 -2.164732,1.930363 -1.301445,-0.02541 -1.941636,0 -1.941636,0 v 0.201512 c 0,1.544678 -1.158564,2.787985 -2.597679,2.788284 l -1.648306,2.98e-4 c -1.360345,3e-4 -1.22903,0.546236 -1.22903,-2.989646 V 17.520381 c 0,-3.536032 -0.205068,-2.989797 1.22903,-2.989797 h 1.648306 c 1.439115,0 2.597679,1.243607 2.597679,2.788284 v 0.201513 h 1.941637 c 1.199261,0 2.164732,0.860911 2.164732,1.930361 v 2.554332 z m 0.06454,-6.010119 h 8.461471 l -0.05085,6.010119 h -8.188123" /><path
            transform="matrix(1.445753,0,0,1.3224494,-65.097292,-1327.9481)"
            style="opacity:0.794;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.656996px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter8871)"
            d="m 64.018476,1016.5423 -0.152427,10.8222 c 2.375507,-3.3036 3.484206,-4.2052 2.972286,-9.2217 0.305009,-1.654 -1.117834,-1.7529 -2.819859,-1.6005 z"
-           id="path8861"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccc" /><ellipse
+           id="path8861" /><ellipse
            transform="matrix(1.029538,0,0,1.1281495,-39.470994,-1128.0797)"
            style="opacity:0.828;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.842937;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter8835)"
            id="path8817"
@@ -1050,11 +566,8 @@
            transform="matrix(1.7350569,0,0,1.8824502,-91.814902,-1903.1505)"
            style="opacity:0.862;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.502667px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter2533)"
            d="m 70.953811,1023.4014 v -1.8291 l 2.972286,-0.076 z"
-           id="path8875"
-           inkscape:connector-curvature="0" /><path
+           id="path8875" /><path
            transform="matrix(1.029538,0,0,1.1281495,-39.928294,-1128.6206)"
            style="display:inline;opacity:0.485;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.842937px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter8871-1)"
            d="m 53.924652,1016.631 -0.152427,10.8222 c 2.375507,-3.3036 3.484206,-4.2052 2.972286,-9.2217 0.305009,-1.654 -1.117834,-1.7529 -2.819859,-1.6005 z"
-           id="path8861-7"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccc" /></g></g></g></svg>
+           id="path8861-7" /></g></g></g></svg>
diff --git a/org.eclipse.pde.doc.user/guide/images/composite_cs_editor/cheatsheet_composite_obj.svg b/org.eclipse.pde.doc.user/guide/images/composite_cs_editor/cheatsheet_composite_obj.svg
index 4bc51fe6aeb..aafbbc387f3 100644
--- a/org.eclipse.pde.doc.user/guide/images/composite_cs_editor/cheatsheet_composite_obj.svg
+++ b/org.eclipse.pde.doc.user/guide/images/composite_cs_editor/cheatsheet_composite_obj.svg
@@ -1,48 +1,232 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="16" height="16">
-  <defs>
-    <linearGradient id="e">
-      <stop offset="0" stop-color="#b7d2e4" stop-opacity="0"/>
-      <stop offset=".111" stop-color="#bdddf6"/>
-      <stop offset=".911" stop-color="#bdddf5" stop-opacity=".635"/>
-      <stop offset="1" stop-color="#bdddf5" stop-opacity="0"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="16"
+   height="16"
+   version="1.1"
+   id="svg20"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs12">
+    <linearGradient
+       id="e">
+      <stop
+         offset="0"
+         stop-color="#b7d2e4"
+         stop-opacity="0"
+         id="stop1" />
+      <stop
+         offset=".111"
+         stop-color="#bdddf6"
+         id="stop2" />
+      <stop
+         offset=".911"
+         stop-color="#bdddf5"
+         stop-opacity=".635"
+         id="stop3" />
+      <stop
+         offset="1"
+         stop-color="#bdddf5"
+         stop-opacity="0"
+         id="stop4" />
     </linearGradient>
-    <linearGradient id="d">
-      <stop offset="0" stop-color="#3e72a7"/>
-      <stop offset="1" stop-color="#17325d"/>
+    <linearGradient
+       id="d">
+      <stop
+         offset="0"
+         stop-color="#3e72a7"
+         id="stop5" />
+      <stop
+         offset="1"
+         stop-color="#17325d"
+         id="stop6" />
     </linearGradient>
-    <linearGradient id="c">
-      <stop offset="0" stop-color="#2846b3"/>
-      <stop offset="1" stop-color="#92808a"/>
+    <linearGradient
+       id="c">
+      <stop
+         offset="0"
+         stop-color="#2846b3"
+         id="stop7" />
+      <stop
+         offset="1"
+         stop-color="#92808a"
+         id="stop8" />
     </linearGradient>
-    <linearGradient id="b">
-      <stop offset="0" stop-color="#2846b3"/>
-      <stop offset="1" stop-color="#92808a"/>
+    <linearGradient
+       id="b">
+      <stop
+         offset="0"
+         stop-color="#2846b3"
+         id="stop9" />
+      <stop
+         offset="1"
+         stop-color="#92808a"
+         id="stop10" />
     </linearGradient>
-    <linearGradient id="a">
-      <stop offset="0" stop-color="#85c0ed"/>
-      <stop offset="1" stop-color="#dbedfa"/>
+    <linearGradient
+       id="a">
+      <stop
+         offset="0"
+         stop-color="#85c0ed"
+         id="stop11" />
+      <stop
+         offset="1"
+         stop-color="#dbedfa"
+         id="stop12" />
     </linearGradient>
-    <linearGradient xlink:href="#a" id="f" x1="8.707" x2="8.707" y1="1050.595" y2="1038.883" gradientTransform="translate(.032)" gradientUnits="userSpaceOnUse"/>
-    <linearGradient xlink:href="#b" id="g" x1="20.3" x2="20.3" y1="1052.201" y2="1036.755" gradientTransform="translate(-11.87)" gradientUnits="userSpaceOnUse"/>
-    <linearGradient xlink:href="#c" id="h" x1="20.768" x2="20.768" y1="1044.505" y2="1041.648" gradientTransform="translate(-12.074 -.047)" gradientUnits="userSpaceOnUse"/>
-    <linearGradient xlink:href="#d" id="j" x1="3.975" x2="7.023" y1="1036.383" y2="1039.413" gradientUnits="userSpaceOnUse"/>
-    <linearGradient xlink:href="#d" id="k" x1="3.975" x2="7.023" y1="1036.383" y2="1039.413" gradientTransform="translate(2.009)" gradientUnits="userSpaceOnUse"/>
-    <linearGradient xlink:href="#d" id="l" x1="3.975" x2="7.023" y1="1036.383" y2="1039.413" gradientTransform="translate(4.018)" gradientUnits="userSpaceOnUse"/>
-    <linearGradient xlink:href="#d" id="m" x1="3.975" x2="7.023" y1="1036.383" y2="1039.413" gradientTransform="translate(6.004)" gradientUnits="userSpaceOnUse"/>
-    <linearGradient xlink:href="#e" id="i" x1="4.035" x2="12.944" y1="1037.835" y2="1037.835" gradientUnits="userSpaceOnUse"/>
-    <linearGradient xlink:href="#d" id="n" x1="3.975" x2="7.023" y1="1036.383" y2="1039.413" gradientTransform="matrix(-1 0 0 1 16.987 0)" gradientUnits="userSpaceOnUse"/>
+    <linearGradient
+       xlink:href="#a"
+       id="f"
+       x1="8.707"
+       x2="8.707"
+       y1="1050.595"
+       y2="1038.883"
+       gradientTransform="translate(.032)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#b"
+       id="g"
+       x1="20.3"
+       x2="20.3"
+       y1="1052.201"
+       y2="1036.755"
+       gradientTransform="translate(-11.87)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#c"
+       id="h"
+       x1="20.768"
+       x2="20.768"
+       y1="1044.505"
+       y2="1041.648"
+       gradientTransform="translate(-12.074 -.047)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#d"
+       id="j"
+       x1="3.975"
+       x2="7.023"
+       y1="1036.383"
+       y2="1039.413"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#d"
+       id="k"
+       x1="3.975"
+       x2="7.023"
+       y1="1036.383"
+       y2="1039.413"
+       gradientTransform="translate(2.009)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#d"
+       id="l"
+       x1="3.975"
+       x2="7.023"
+       y1="1036.383"
+       y2="1039.413"
+       gradientTransform="translate(4.018)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#d"
+       id="m"
+       x1="3.975"
+       x2="7.023"
+       y1="1036.383"
+       y2="1039.413"
+       gradientTransform="translate(6.004)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#e"
+       id="i"
+       x1="4.035"
+       x2="12.944"
+       y1="1037.835"
+       y2="1037.835"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#d"
+       id="n"
+       x1="3.975"
+       x2="7.023"
+       y1="1036.383"
+       y2="1039.413"
+       gradientTransform="matrix(-1 0 0 1 16.987 0)"
+       gradientUnits="userSpaceOnUse" />
   </defs>
-  <g transform="translate(0 -1036.362)">
-    <rect width="9.975" height="13.006" x="3.536" y="1037.841" fill="url(#f)" stroke="url(#g)" stroke-linejoin="round" rx=".379" ry=".379"/>
-    <rect width="6.037" height="2.012" x="5.47" y="1041.868" fill="#fff" stroke="url(#h)" rx="0" ry="0"/>
-    <path fill="#b7d2e4" fill-rule="evenodd" stroke="url(#i)" d="m 4.0354196,1037.8348 8.9380894,0"/>
-    <g stroke-linecap="round" stroke-linejoin="bevel" stroke-width=".75">
-      <path fill="none" stroke="url(#j)" d="m 4.4642857,1036.8711 2.0535715,2.0536" transform="translate(.126)"/>
-      <path fill="none" stroke="url(#k)" d="m 6.4732143,1036.8711 2.0535715,2.0536" transform="translate(.126)"/>
-      <path fill="none" stroke="url(#l)" d="m 8.4821429,1036.8711 2.0535711,2.0536" transform="translate(.126)"/>
-      <path fill="none" stroke="url(#m)" d="m 10.46875,1036.8711 2.053571,2.0536" transform="translate(.126)"/>
-      <path fill="none" stroke="url(#n)" d="m 12.566964,1036.7148 -0.346775,0.2941" transform="translate(.126)"/>
-      <path fill="#1c3a66" fill-rule="evenodd" stroke="#1b3965" d="m 4.5312497,1038.6791 -0.267857,0.3572" transform="translate(.126)"/>
+  <g
+     transform="translate(0 -1036.362)"
+     id="g20">
+    <rect
+       width="9.975"
+       height="13.006"
+       x="3.536"
+       y="1037.841"
+       fill="url(#f)"
+       stroke="url(#g)"
+       stroke-linejoin="round"
+       rx=".379"
+       ry=".379"
+       id="rect12" />
+    <rect
+       width="6.037"
+       height="2.012"
+       x="5.47"
+       y="1041.868"
+       fill="#fff"
+       stroke="url(#h)"
+       rx="0"
+       ry="0"
+       id="rect13" />
+    <path
+       fill="#b7d2e4"
+       fill-rule="evenodd"
+       stroke="url(#i)"
+       d="m 4.0354196,1037.8348 8.9380894,0"
+       id="path13" />
+    <g
+       stroke-linecap="round"
+       stroke-linejoin="bevel"
+       stroke-width=".75"
+       id="g19">
+      <path
+         fill="none"
+         stroke="url(#j)"
+         d="m 4.4642857,1036.8711 2.0535715,2.0536"
+         transform="translate(.126)"
+         id="path14" />
+      <path
+         fill="none"
+         stroke="url(#k)"
+         d="m 6.4732143,1036.8711 2.0535715,2.0536"
+         transform="translate(.126)"
+         id="path15" />
+      <path
+         fill="none"
+         stroke="url(#l)"
+         d="m 8.4821429,1036.8711 2.0535711,2.0536"
+         transform="translate(.126)"
+         id="path16" />
+      <path
+         fill="none"
+         stroke="url(#m)"
+         d="m 10.46875,1036.8711 2.053571,2.0536"
+         transform="translate(.126)"
+         id="path17" />
+      <path
+         fill="none"
+         stroke="url(#n)"
+         d="m 12.566964,1036.7148 -0.346775,0.2941"
+         transform="translate(.126)"
+         id="path18" />
+      <path
+         fill="#1c3a66"
+         fill-rule="evenodd"
+         stroke="#1b3965"
+         d="m 4.5312497,1038.6791 -0.267857,0.3572"
+         transform="translate(.126)"
+         id="path19" />
     </g>
   </g>
 </svg>
diff --git a/org.eclipse.pde.doc.user/guide/images/composite_cs_editor/cheatsheet_simple_obj.svg b/org.eclipse.pde.doc.user/guide/images/composite_cs_editor/cheatsheet_simple_obj.svg
index a04504e4e48..3cdbac22d6b 100644
--- a/org.eclipse.pde.doc.user/guide/images/composite_cs_editor/cheatsheet_simple_obj.svg
+++ b/org.eclipse.pde.doc.user/guide/images/composite_cs_editor/cheatsheet_simple_obj.svg
@@ -1,35 +1,161 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="16" height="16">
-  <defs>
-    <linearGradient id="c">
-      <stop offset="0" stop-color="#17325d"/>
-      <stop offset=".6" stop-color="#b7d2e4"/>
-      <stop offset="1" stop-color="#3e72a7"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="16"
+   height="16"
+   version="1.1"
+   id="svg14"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs8">
+    <linearGradient
+       id="c">
+      <stop
+         offset="0"
+         stop-color="#17325d"
+         id="stop1" />
+      <stop
+         offset=".6"
+         stop-color="#b7d2e4"
+         id="stop2" />
+      <stop
+         offset="1"
+         stop-color="#3e72a7"
+         id="stop3" />
     </linearGradient>
-    <linearGradient id="b">
-      <stop offset="0" stop-color="#17325d"/>
-      <stop offset=".5" stop-color="#b7d2e4"/>
-      <stop offset="1" stop-color="#3e72a7"/>
+    <linearGradient
+       id="b">
+      <stop
+         offset="0"
+         stop-color="#17325d"
+         id="stop4" />
+      <stop
+         offset=".5"
+         stop-color="#b7d2e4"
+         id="stop5" />
+      <stop
+         offset="1"
+         stop-color="#3e72a7"
+         id="stop6" />
     </linearGradient>
-    <linearGradient id="a">
-      <stop offset="0" stop-color="#7e713d"/>
-      <stop offset="1" stop-color="#b28a30"/>
+    <linearGradient
+       id="a">
+      <stop
+         offset="0"
+         stop-color="#7e713d"
+         id="stop7" />
+      <stop
+         offset="1"
+         stop-color="#b28a30"
+         id="stop8" />
     </linearGradient>
-    <linearGradient xlink:href="#a" id="d" x1="20.3" x2="20.3" y1="1052.201" y2="1036.755" gradientTransform="translate(-11.87)" gradientUnits="userSpaceOnUse"/>
-    <linearGradient xlink:href="#b" id="e" x1="3.975" x2="3.975" y1="1036.383" y2="1039.235" gradientTransform="translate(-.071)" gradientUnits="userSpaceOnUse"/>
-    <linearGradient xlink:href="#b" id="f" x1="3.975" x2="3.975" y1="1036.383" y2="1039.235" gradientTransform="translate(1.83)" gradientUnits="userSpaceOnUse"/>
-    <linearGradient xlink:href="#b" id="g" x1="3.975" x2="3.975" y1="1036.383" y2="1039.235" gradientTransform="translate(3.884)" gradientUnits="userSpaceOnUse"/>
-    <linearGradient xlink:href="#b" id="h" x1="3.975" x2="3.975" y1="1036.383" y2="1039.235" gradientTransform="matrix(.83689 0 0 1.10534 6.64 -109.421)" gradientUnits="userSpaceOnUse"/>
-    <linearGradient xlink:href="#c" id="i" x1="3.975" x2="3.975" y1="1036.963" y2="1038.52" gradientTransform="translate(7.935)" gradientUnits="userSpaceOnUse"/>
+    <linearGradient
+       xlink:href="#a"
+       id="d"
+       x1="20.3"
+       x2="20.3"
+       y1="1052.201"
+       y2="1036.755"
+       gradientTransform="translate(-11.87)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#b"
+       id="e"
+       x1="3.975"
+       x2="3.975"
+       y1="1036.383"
+       y2="1039.235"
+       gradientTransform="translate(-.071)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#b"
+       id="f"
+       x1="3.975"
+       x2="3.975"
+       y1="1036.383"
+       y2="1039.235"
+       gradientTransform="translate(1.83)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#b"
+       id="g"
+       x1="3.975"
+       x2="3.975"
+       y1="1036.383"
+       y2="1039.235"
+       gradientTransform="translate(3.884)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#b"
+       id="h"
+       x1="3.975"
+       x2="3.975"
+       y1="1036.383"
+       y2="1039.235"
+       gradientTransform="matrix(.83689 0 0 1.10534 6.64 -109.421)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#c"
+       id="i"
+       x1="3.975"
+       x2="3.975"
+       y1="1036.963"
+       y2="1038.52"
+       gradientTransform="translate(7.935)"
+       gradientUnits="userSpaceOnUse" />
   </defs>
-  <g transform="translate(0 -1036.362)">
-    <rect width="9.975" height="13.006" x="3.536" y="1037.841" fill="#fff" stroke="url(#d)" stroke-linejoin="round" rx=".379" ry=".379"/>
-    <path fill="#b7d2e4" fill-rule="evenodd" stroke="#fff" d="m 4.0354196,1037.8348 8.9380894,0"/>
-    <g fill="none" stroke-linecap="round" stroke-linejoin="bevel">
-      <path stroke="url(#e)" d="m 4.3932593,1036.8711 0.00271,2.0536" transform="translate(.126)"/>
-      <path stroke="url(#f)" d="M 6.294643,1036.8711 6.25,1038.9247" transform="translate(.126)"/>
-      <path stroke="url(#g)" d="m 8.3482144,1036.8711 -0.044643,2.0536" transform="translate(.126)"/>
-      <path stroke="url(#h)" stroke-width=".962" d="m 10.375824,1036.6737 -0.03736,2.2699" transform="translate(.126)"/>
-      <path stroke="url(#i)" d="m 12.399554,1036.8711 -0.03348,2.0424" transform="translate(.126)"/>
+  <g
+     transform="translate(0 -1036.362)"
+     id="g14">
+    <rect
+       width="9.975"
+       height="13.006"
+       x="3.536"
+       y="1037.841"
+       fill="#fff"
+       stroke="url(#d)"
+       stroke-linejoin="round"
+       rx=".379"
+       ry=".379"
+       id="rect8" />
+    <path
+       fill="#b7d2e4"
+       fill-rule="evenodd"
+       stroke="#fff"
+       d="m 4.0354196,1037.8348 8.9380894,0"
+       id="path8" />
+    <g
+       fill="none"
+       stroke-linecap="round"
+       stroke-linejoin="bevel"
+       id="g13">
+      <path
+         stroke="url(#e)"
+         d="m 4.3932593,1036.8711 0.00271,2.0536"
+         transform="translate(.126)"
+         id="path9" />
+      <path
+         stroke="url(#f)"
+         d="M 6.294643,1036.8711 6.25,1038.9247"
+         transform="translate(.126)"
+         id="path10" />
+      <path
+         stroke="url(#g)"
+         d="m 8.3482144,1036.8711 -0.044643,2.0536"
+         transform="translate(.126)"
+         id="path11" />
+      <path
+         stroke="url(#h)"
+         stroke-width=".962"
+         d="m 10.375824,1036.6737 -0.03736,2.2699"
+         transform="translate(.126)"
+         id="path12" />
+      <path
+         stroke="url(#i)"
+         d="m 12.399554,1036.8711 -0.03348,2.0424"
+         transform="translate(.126)"
+         id="path13" />
     </g>
   </g>
 </svg>
diff --git a/org.eclipse.pde.doc.user/guide/images/composite_cs_editor/cheatsheet_taskgroup_obj.svg b/org.eclipse.pde.doc.user/guide/images/composite_cs_editor/cheatsheet_taskgroup_obj.svg
index 7422c118990..11b750199a2 100644
--- a/org.eclipse.pde.doc.user/guide/images/composite_cs_editor/cheatsheet_taskgroup_obj.svg
+++ b/org.eclipse.pde.doc.user/guide/images/composite_cs_editor/cheatsheet_taskgroup_obj.svg
@@ -1,77 +1,378 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="16" height="16">
-  <defs>
-    <linearGradient id="d">
-      <stop offset="0" stop-color="#afb8cd"/>
-      <stop offset="1" stop-color="#8192b5"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="16"
+   height="16"
+   version="1.1"
+   id="svg32"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs19">
+    <linearGradient
+       id="d">
+      <stop
+         offset="0"
+         stop-color="#afb8cd"
+         id="stop1" />
+      <stop
+         offset="1"
+         stop-color="#8192b5"
+         id="stop2" />
     </linearGradient>
-    <linearGradient id="c">
-      <stop offset="0" stop-color="#acbfd5"/>
-      <stop offset="1" stop-color="#627297"/>
+    <linearGradient
+       id="c">
+      <stop
+         offset="0"
+         stop-color="#acbfd5"
+         id="stop3" />
+      <stop
+         offset="1"
+         stop-color="#627297"
+         id="stop4" />
     </linearGradient>
-    <linearGradient id="b">
-      <stop offset="0" stop-color="#b68e69"/>
-      <stop offset=".942" stop-color="#d5ae7d"/>
-      <stop offset="1" stop-color="#c69863"/>
+    <linearGradient
+       id="b">
+      <stop
+         offset="0"
+         stop-color="#b68e69"
+         id="stop5" />
+      <stop
+         offset=".942"
+         stop-color="#d5ae7d"
+         id="stop6" />
+      <stop
+         offset="1"
+         stop-color="#c69863"
+         id="stop7" />
     </linearGradient>
-    <linearGradient id="a">
-      <stop offset="0" stop-color="#f1c373"/>
-      <stop offset="1" stop-color="#f6e3c9"/>
+    <linearGradient
+       id="a">
+      <stop
+         offset="0"
+         stop-color="#f1c373"
+         id="stop8" />
+      <stop
+         offset="1"
+         stop-color="#f6e3c9"
+         id="stop9" />
     </linearGradient>
-    <linearGradient xlink:href="#a" id="j" x1="-12" x2="-12" y1="1050.995" y2="1038.866" gradientTransform="translate(21.969)" gradientUnits="userSpaceOnUse"/>
-    <linearGradient xlink:href="#b" id="k" x1="-17.313" x2="-17.344" y1="1050.945" y2="1039.084" gradientTransform="translate(21.969)" gradientUnits="userSpaceOnUse"/>
-    <linearGradient xlink:href="#c" id="m" x1="-11.376" x2="-11.376" y1="1036.296" y2="1040.278" gradientTransform="translate(21.969)" gradientUnits="userSpaceOnUse"/>
-    <linearGradient xlink:href="#d" id="l" x1="-12.922" x2="-12.922" y1="1037.323" y2="1040.391" gradientTransform="translate(21.969)" gradientUnits="userSpaceOnUse"/>
-    <linearGradient xlink:href="#e" id="n" x1="9.895" x2="9.895" y1="1039.153" y2="1051.838" gradientTransform="translate(-4 -2)" gradientUnits="userSpaceOnUse"/>
-    <linearGradient xlink:href="#f" id="o" x1="10.545" x2="10.545" y1="1038.578" y2="1052.323" gradientTransform="translate(-4 -2)" gradientUnits="userSpaceOnUse"/>
-    <linearGradient xlink:href="#g" id="r" x1="7.007" x2="14" y1="1047.857" y2="1047.857" gradientTransform="matrix(.72294 0 0 1 -13.972 -4.125)" gradientUnits="userSpaceOnUse"/>
-    <linearGradient xlink:href="#h" id="q" x1="7.007" x2="14" y1="1045.857" y2="1045.857" gradientTransform="matrix(.57547 0 0 1 -12.939 -4.125)" gradientUnits="userSpaceOnUse"/>
-    <linearGradient xlink:href="#i" id="p" x1="7.007" x2="11" y1="1043.857" y2="1043.857" gradientTransform="matrix(.82572 0 0 1 -14.692 -4.125)" gradientUnits="userSpaceOnUse"/>
-    <linearGradient id="h">
-      <stop offset="0" stop-color="#91a5c7"/>
-      <stop offset="1" stop-color="#637aa7"/>
+    <linearGradient
+       xlink:href="#a"
+       id="j"
+       x1="-12"
+       x2="-12"
+       y1="1050.995"
+       y2="1038.866"
+       gradientTransform="translate(21.969)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#b"
+       id="k"
+       x1="-17.313"
+       x2="-17.344"
+       y1="1050.945"
+       y2="1039.084"
+       gradientTransform="translate(21.969)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#c"
+       id="m"
+       x1="-11.376"
+       x2="-11.376"
+       y1="1036.296"
+       y2="1040.278"
+       gradientTransform="translate(21.969)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#d"
+       id="l"
+       x1="-12.922"
+       x2="-12.922"
+       y1="1037.323"
+       y2="1040.391"
+       gradientTransform="translate(21.969)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#e"
+       id="n"
+       x1="9.895"
+       x2="9.895"
+       y1="1039.153"
+       y2="1051.838"
+       gradientTransform="translate(-4 -2)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#f"
+       id="o"
+       x1="10.545"
+       x2="10.545"
+       y1="1038.578"
+       y2="1052.323"
+       gradientTransform="translate(-4 -2)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#g"
+       id="r"
+       x1="7.007"
+       x2="14"
+       y1="1047.857"
+       y2="1047.857"
+       gradientTransform="matrix(.72294 0 0 1 -13.972 -4.125)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#h"
+       id="q"
+       x1="7.007"
+       x2="14"
+       y1="1045.857"
+       y2="1045.857"
+       gradientTransform="matrix(.57547 0 0 1 -12.939 -4.125)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#i"
+       id="p"
+       x1="7.007"
+       x2="11"
+       y1="1043.857"
+       y2="1043.857"
+       gradientTransform="matrix(.82572 0 0 1 -14.692 -4.125)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="h">
+      <stop
+         offset="0"
+         stop-color="#91a5c7"
+         id="stop10" />
+      <stop
+         offset="1"
+         stop-color="#637aa7"
+         id="stop11" />
     </linearGradient>
-    <linearGradient id="i">
-      <stop offset="0" stop-color="#91a5c7"/>
-      <stop offset="1" stop-color="#5e76a3"/>
+    <linearGradient
+       id="i">
+      <stop
+         offset="0"
+         stop-color="#91a5c7"
+         id="stop12" />
+      <stop
+         offset="1"
+         stop-color="#5e76a3"
+         id="stop13" />
     </linearGradient>
-    <linearGradient id="f">
-      <stop offset="0" stop-color="#c7b571"/>
-      <stop offset="1" stop-color="#9a9a8f"/>
+    <linearGradient
+       id="f">
+      <stop
+         offset="0"
+         stop-color="#c7b571"
+         id="stop14" />
+      <stop
+         offset="1"
+         stop-color="#9a9a8f"
+         id="stop15" />
     </linearGradient>
-    <linearGradient id="e">
-      <stop offset="0" stop-color="#f9fafc"/>
-      <stop offset="1" stop-color="#dce7f7"/>
+    <linearGradient
+       id="e">
+      <stop
+         offset="0"
+         stop-color="#f9fafc"
+         id="stop16" />
+      <stop
+         offset="1"
+         stop-color="#dce7f7"
+         id="stop17" />
     </linearGradient>
-    <linearGradient id="g">
-      <stop offset="0" stop-color="#91a5c7"/>
-      <stop offset="1" stop-color="#637aa7"/>
+    <linearGradient
+       id="g">
+      <stop
+         offset="0"
+         stop-color="#91a5c7"
+         id="stop18" />
+      <stop
+         offset="1"
+         stop-color="#637aa7"
+         id="stop19" />
     </linearGradient>
-    <linearGradient xlink:href="#h" id="A" x1="7.007" x2="14" y1="1047.857" y2="1047.857" gradientTransform="matrix(.86147 0 0 1 -18.07 -.957)" gradientUnits="userSpaceOnUse"/>
-    <linearGradient xlink:href="#h" id="z" x1="7.007" x2="14" y1="1045.857" y2="1045.857" gradientTransform="matrix(.857 0 0 1 -18.039 -.957)" gradientUnits="userSpaceOnUse"/>
-    <linearGradient xlink:href="#i" id="y" x1="7.007" x2="11" y1="1043.857" y2="1043.857" gradientTransform="matrix(1.51443 0 0 1 -22.646 -.957)" gradientUnits="userSpaceOnUse"/>
-    <linearGradient xlink:href="#f" id="x" x1="10.545" x2="10.545" y1="1038.578" y2="1052.323" gradientTransform="translate(-1.029 1.918)" gradientUnits="userSpaceOnUse"/>
-    <linearGradient xlink:href="#e" id="w" x1="9.895" x2="9.895" y1="1039.153" y2="1051.838" gradientTransform="translate(-1.029 1.918)" gradientUnits="userSpaceOnUse"/>
-    <linearGradient xlink:href="#c" id="v" x1="-11.376" x2="-11.376" y1="1036.296" y2="1040.278" gradientTransform="translate(21.969)" gradientUnits="userSpaceOnUse"/>
-    <linearGradient xlink:href="#d" id="u" x1="-12.922" x2="-12.922" y1="1037.323" y2="1040.391" gradientTransform="translate(21.969)" gradientUnits="userSpaceOnUse"/>
-    <linearGradient xlink:href="#a" id="s" x1="-12" x2="-12" y1="1050.995" y2="1038.866" gradientTransform="translate(21.969)" gradientUnits="userSpaceOnUse"/>
-    <linearGradient xlink:href="#b" id="t" x1="-17.313" x2="-17.344" y1="1050.945" y2="1039.084" gradientTransform="translate(21.969)" gradientUnits="userSpaceOnUse"/>
+    <linearGradient
+       xlink:href="#h"
+       id="A"
+       x1="7.007"
+       x2="14"
+       y1="1047.857"
+       y2="1047.857"
+       gradientTransform="matrix(.86147 0 0 1 -18.07 -.957)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#h"
+       id="z"
+       x1="7.007"
+       x2="14"
+       y1="1045.857"
+       y2="1045.857"
+       gradientTransform="matrix(.857 0 0 1 -18.039 -.957)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#i"
+       id="y"
+       x1="7.007"
+       x2="11"
+       y1="1043.857"
+       y2="1043.857"
+       gradientTransform="matrix(1.51443 0 0 1 -22.646 -.957)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#f"
+       id="x"
+       x1="10.545"
+       x2="10.545"
+       y1="1038.578"
+       y2="1052.323"
+       gradientTransform="translate(-1.029 1.918)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#e"
+       id="w"
+       x1="9.895"
+       x2="9.895"
+       y1="1039.153"
+       y2="1051.838"
+       gradientTransform="translate(-1.029 1.918)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#c"
+       id="v"
+       x1="-11.376"
+       x2="-11.376"
+       y1="1036.296"
+       y2="1040.278"
+       gradientTransform="translate(21.969)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#d"
+       id="u"
+       x1="-12.922"
+       x2="-12.922"
+       y1="1037.323"
+       y2="1040.391"
+       gradientTransform="translate(21.969)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#a"
+       id="s"
+       x1="-12"
+       x2="-12"
+       y1="1050.995"
+       y2="1038.866"
+       gradientTransform="translate(21.969)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#b"
+       id="t"
+       x1="-17.313"
+       x2="-17.344"
+       y1="1050.945"
+       y2="1039.084"
+       gradientTransform="translate(21.969)"
+       gradientUnits="userSpaceOnUse" />
   </defs>
-  <g transform="translate(0 -1036.362)">
-    <rect width="11.054" height="11.993" x="3.446" y="1038.869" fill="url(#j)" stroke="url(#k)" rx="1.219" ry="1.219"/>
-    <path fill="url(#l)" d="m 4.9843751,1040.3466 1.53125,-1.3672 0.9375,-2.1172 1.5,0 1.4999999,0 0.953125,2.1172 1.546875,1.3672"/>
-    <path fill="url(#m)" d="m 7.3125001,1036.375 c -0.138213,0.043 -0.255616,0.1482 -0.3125,0.2812 l -0.875,2 -0.966084,0.8634 c -0.219449,0.2194 -0.161431,0.3252 -0.190934,0.8384 0.205415,0 0.484943,0 0.746694,-3e-4 l 1.129074,-1.0139 c 0.0516,-0.043 0.0944,-0.097 0.125,-0.1563 l 0.8125,-1.8125 1.1875,0 1.1562499,0 0.8125,1.8125 c 0.0306,0.06 0.0734,0.1133 0.125,0.1563 l 1.173251,1.0325 c 0.113518,0 0.471938,-0.02 0.715999,-0.031 0,-0.2129 0.08262,-0.5753 -0.123815,-0.7817 l -1.015435,-0.9075 -0.90625,-2 c -0.07974,-0.164 -0.255243,-0.2768 -0.4375,-0.2812 l -1.4999999,0 -1.5,0 c -0.05166,-0.01 -0.104595,-0.01 -0.15625,0 z" color="#000" font-family="Sans" font-weight="400" overflow="visible" style="text-indent:0;text-align:start;line-height:normal;text-transform:none;block-progression:tb;marker:none"/>
-    <path fill="url(#n)" d="m 1.4972825,1036.9037 8.1563025,0 0.759173,3.0066 0,6.5483 -8.9154755,0 z" transform="translate(3.159 4.168)"/>
-    <path fill="none" stroke="url(#o)" d="m 1.4972825,1036.9037 8.4908829,0 0.04042,3.0066 0,6.4546 -8.5313047,0 z" transform="translate(3.159 4.168)"/>
-    <path fill="url(#p)" d="M-8.906 1039.227H-2.859V1040.237H-8.906z" transform="matrix(-1 0 0 1 3.159 4.168)"/>
-    <path fill="url(#q)" d="M-8.906 1041.227H-2.882V1042.237H-8.906z" transform="matrix(-1 0 0 1 3.159 4.168)"/>
-    <path fill="url(#r)" d="M-8.906 1043.227H-2.851V1044.237H-8.906z" transform="matrix(-1 0 0 1 3.159 4.168)"/>
-    <rect width="11.054" height="11.993" x="3.446" y="1038.869" fill="url(#s)" stroke="url(#t)" rx="1.219" ry="1.219"/>
-    <path fill="url(#u)" d="m 4.9843751,1040.3466 1.53125,-1.3672 0.9375,-2.1172 1.5,0 1.4999999,0 0.953125,2.1172 1.546875,1.3672"/>
-    <path fill="url(#v)" d="m 7.3125001,1036.375 c -0.138213,0.043 -0.255616,0.1482 -0.3125,0.2812 l -0.875,2 -0.966084,0.8634 c -0.219449,0.2194 -0.161431,0.3252 -0.190934,0.8384 0.205415,0 0.484943,0 0.746694,-3e-4 l 1.129074,-1.0139 c 0.0516,-0.043 0.0944,-0.097 0.125,-0.1563 l 0.8125,-1.8125 1.1875,0 1.1562499,0 0.8125,1.8125 c 0.0306,0.06 0.0734,0.1133 0.125,0.1563 l 1.173251,1.0325 c 0.113518,0 0.471938,-0.02 0.715999,-0.031 0,-0.2129 0.08262,-0.5753 -0.123815,-0.7817 l -1.015435,-0.9075 -0.90625,-2 c -0.07974,-0.164 -0.255243,-0.2768 -0.4375,-0.2812 l -1.4999999,0 -1.5,0 c -0.05166,-0.01 -0.104595,-0.01 -0.15625,0 z" color="#000" font-family="Sans" font-weight="400" overflow="visible" style="line-height:normal;text-indent:0;text-align:start;text-decoration-line:none;text-transform:none;block-progression:tb;marker:none"/>
-    <path fill="url(#w)" d="m 4.4686972,1040.8213 8.8125528,0 0.102923,3.0066 0,6.5483 -8.9154758,0 z"/>
-    <path fill="none" stroke="url(#x)" d="m 4.4686972,1040.8213 9.0221328,0 0.04042,3.0066 0,6.0483 -9.0625534,0 z"/>
-    <path fill="url(#y)" d="M-12.034 1042.394H-5.987V1043.404H-12.034z" transform="scale(-1 1)"/>
-    <path fill="url(#z)" d="M-12.034 1044.394H-6.041V1045.404H-12.034z" transform="scale(-1 1)"/>
-    <path fill="url(#A)" d="M-12.034 1046.394H-6.01V1047.404H-12.034z" transform="scale(-1 1)"/>
+  <g
+     transform="translate(0 -1036.362)"
+     id="g32">
+    <rect
+       width="11.054"
+       height="11.993"
+       x="3.446"
+       y="1038.869"
+       fill="url(#j)"
+       stroke="url(#k)"
+       rx="1.219"
+       ry="1.219"
+       id="rect19" />
+    <path
+       fill="url(#l)"
+       d="m 4.9843751,1040.3466 1.53125,-1.3672 0.9375,-2.1172 1.5,0 1.4999999,0 0.953125,2.1172 1.546875,1.3672"
+       id="path19" />
+    <path
+       fill="url(#m)"
+       d="m 7.3125001,1036.375 c -0.138213,0.043 -0.255616,0.1482 -0.3125,0.2812 l -0.875,2 -0.966084,0.8634 c -0.219449,0.2194 -0.161431,0.3252 -0.190934,0.8384 0.205415,0 0.484943,0 0.746694,-3e-4 l 1.129074,-1.0139 c 0.0516,-0.043 0.0944,-0.097 0.125,-0.1563 l 0.8125,-1.8125 1.1875,0 1.1562499,0 0.8125,1.8125 c 0.0306,0.06 0.0734,0.1133 0.125,0.1563 l 1.173251,1.0325 c 0.113518,0 0.471938,-0.02 0.715999,-0.031 0,-0.2129 0.08262,-0.5753 -0.123815,-0.7817 l -1.015435,-0.9075 -0.90625,-2 c -0.07974,-0.164 -0.255243,-0.2768 -0.4375,-0.2812 l -1.4999999,0 -1.5,0 c -0.05166,-0.01 -0.104595,-0.01 -0.15625,0 z"
+       color="#000"
+       font-family="Sans"
+       font-weight="400"
+       overflow="visible"
+       style="text-indent:0;text-align:start;line-height:normal;text-transform:none;block-progression:tb;marker:none"
+       id="path20" />
+    <path
+       fill="url(#n)"
+       d="m 1.4972825,1036.9037 8.1563025,0 0.759173,3.0066 0,6.5483 -8.9154755,0 z"
+       transform="translate(3.159 4.168)"
+       id="path21" />
+    <path
+       fill="none"
+       stroke="url(#o)"
+       d="m 1.4972825,1036.9037 8.4908829,0 0.04042,3.0066 0,6.4546 -8.5313047,0 z"
+       transform="translate(3.159 4.168)"
+       id="path22" />
+    <path
+       fill="url(#p)"
+       d="M-8.906 1039.227H-2.859V1040.237H-8.906z"
+       transform="matrix(-1 0 0 1 3.159 4.168)"
+       id="path23" />
+    <path
+       fill="url(#q)"
+       d="M-8.906 1041.227H-2.882V1042.237H-8.906z"
+       transform="matrix(-1 0 0 1 3.159 4.168)"
+       id="path24" />
+    <path
+       fill="url(#r)"
+       d="M-8.906 1043.227H-2.851V1044.237H-8.906z"
+       transform="matrix(-1 0 0 1 3.159 4.168)"
+       id="path25" />
+    <rect
+       width="11.054"
+       height="11.993"
+       x="3.446"
+       y="1038.869"
+       fill="url(#s)"
+       stroke="url(#t)"
+       rx="1.219"
+       ry="1.219"
+       id="rect25" />
+    <path
+       fill="url(#u)"
+       d="m 4.9843751,1040.3466 1.53125,-1.3672 0.9375,-2.1172 1.5,0 1.4999999,0 0.953125,2.1172 1.546875,1.3672"
+       id="path26" />
+    <path
+       fill="url(#v)"
+       d="m 7.3125001,1036.375 c -0.138213,0.043 -0.255616,0.1482 -0.3125,0.2812 l -0.875,2 -0.966084,0.8634 c -0.219449,0.2194 -0.161431,0.3252 -0.190934,0.8384 0.205415,0 0.484943,0 0.746694,-3e-4 l 1.129074,-1.0139 c 0.0516,-0.043 0.0944,-0.097 0.125,-0.1563 l 0.8125,-1.8125 1.1875,0 1.1562499,0 0.8125,1.8125 c 0.0306,0.06 0.0734,0.1133 0.125,0.1563 l 1.173251,1.0325 c 0.113518,0 0.471938,-0.02 0.715999,-0.031 0,-0.2129 0.08262,-0.5753 -0.123815,-0.7817 l -1.015435,-0.9075 -0.90625,-2 c -0.07974,-0.164 -0.255243,-0.2768 -0.4375,-0.2812 l -1.4999999,0 -1.5,0 c -0.05166,-0.01 -0.104595,-0.01 -0.15625,0 z"
+       color="#000"
+       font-family="Sans"
+       font-weight="400"
+       overflow="visible"
+       style="line-height:normal;text-indent:0;text-align:start;text-decoration-line:none;text-transform:none;block-progression:tb;marker:none"
+       id="path27" />
+    <path
+       fill="url(#w)"
+       d="m 4.4686972,1040.8213 8.8125528,0 0.102923,3.0066 0,6.5483 -8.9154758,0 z"
+       id="path28" />
+    <path
+       fill="none"
+       stroke="url(#x)"
+       d="m 4.4686972,1040.8213 9.0221328,0 0.04042,3.0066 0,6.0483 -9.0625534,0 z"
+       id="path29" />
+    <path
+       fill="url(#y)"
+       d="M-12.034 1042.394H-5.987V1043.404H-12.034z"
+       transform="scale(-1 1)"
+       id="path30" />
+    <path
+       fill="url(#z)"
+       d="M-12.034 1044.394H-6.041V1045.404H-12.034z"
+       transform="scale(-1 1)"
+       id="path31" />
+    <path
+       fill="url(#A)"
+       d="M-12.034 1046.394H-6.01V1047.404H-12.034z"
+       transform="scale(-1 1)"
+       id="path32" />
   </g>
 </svg>
diff --git a/org.eclipse.pde.doc.user/guide/images/plugin_editor/internal.svg b/org.eclipse.pde.doc.user/guide/images/plugin_editor/internal.svg
index 3ca3cfca9a4..841dedc6b0c 100644
--- a/org.eclipse.pde.doc.user/guide/images/plugin_editor/internal.svg
+++ b/org.eclipse.pde.doc.user/guide/images/plugin_editor/internal.svg
@@ -1,41 +1,253 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="19" height="19">
-  <defs>
-    <linearGradient id="a">
-      <stop offset="0" stop-color="#5f392d"/>
-      <stop offset=".182" stop-color="#9e7058"/>
-      <stop offset=".364" stop-color="#794f40"/>
-      <stop offset=".5" stop-color="#794f40"/>
-      <stop offset=".636" stop-color="#794f40"/>
-      <stop offset=".818" stop-color="#9e7058"/>
-      <stop offset="1" stop-color="#5f392d"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="19"
+   height="19"
+   version="1.1"
+   id="svg20"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs13">
+    <linearGradient
+       id="a">
+      <stop
+         offset="0"
+         stop-color="#5f392d"
+         id="stop1" />
+      <stop
+         offset=".182"
+         stop-color="#9e7058"
+         id="stop2" />
+      <stop
+         offset=".364"
+         stop-color="#794f40"
+         id="stop3" />
+      <stop
+         offset=".5"
+         stop-color="#794f40"
+         id="stop4" />
+      <stop
+         offset=".636"
+         stop-color="#794f40"
+         id="stop5" />
+      <stop
+         offset=".818"
+         stop-color="#9e7058"
+         id="stop6" />
+      <stop
+         offset="1"
+         stop-color="#5f392d"
+         id="stop7" />
     </linearGradient>
-    <linearGradient id="b">
-      <stop offset="0" stop-color="#faefba"/>
-      <stop offset="1" stop-color="#9e6542"/>
+    <linearGradient
+       id="b">
+      <stop
+         offset="0"
+         stop-color="#faefba"
+         id="stop8" />
+      <stop
+         offset="1"
+         stop-color="#9e6542"
+         id="stop9" />
     </linearGradient>
-    <linearGradient id="c">
-      <stop offset="0" stop-color="#c18965"/>
-      <stop offset="1" stop-color="#975c45"/>
+    <linearGradient
+       id="c">
+      <stop
+         offset="0"
+         stop-color="#c18965"
+         id="stop10" />
+      <stop
+         offset="1"
+         stop-color="#975c45"
+         id="stop11" />
     </linearGradient>
-    <linearGradient xlink:href="#a" id="j" x1="355.297" x2="394.719" y1="449.881" y2="449.881" gradientTransform="rotate(90 150.497 23.16) scale(.36489)" gradientUnits="userSpaceOnUse"/>
-    <linearGradient xlink:href="#a" id="k" x1="355.297" x2="394.719" y1="449.881" y2="449.881" gradientTransform="rotate(179.889 73.168 86.829) scale(.36489)" gradientUnits="userSpaceOnUse"/>
-    <linearGradient xlink:href="#c" id="i" x1="366.048" x2="366.048" y1="430.172" y2="466.01" gradientTransform="matrix(.39353 0 0 .39353 -138.098 -167.564)" gradientUnits="userSpaceOnUse"/>
-    <linearGradient id="d">
-      <stop offset="0" stop-color="#e83038"/>
-      <stop offset="1" stop-color="#af131a"/>
+    <linearGradient
+       xlink:href="#a"
+       id="j"
+       x1="355.297"
+       x2="394.719"
+       y1="449.881"
+       y2="449.881"
+       gradientTransform="rotate(90 150.497 23.16) scale(.36489)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#a"
+       id="k"
+       x1="355.297"
+       x2="394.719"
+       y1="449.881"
+       y2="449.881"
+       gradientTransform="rotate(179.889 73.168 86.829) scale(.36489)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#c"
+       id="i"
+       x1="366.048"
+       x2="366.048"
+       y1="430.172"
+       y2="466.01"
+       gradientTransform="matrix(.39353 0 0 .39353 -138.098 -167.564)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="d">
+      <stop
+         offset="0"
+         stop-color="#e83038"
+         id="stop12" />
+      <stop
+         offset="1"
+         stop-color="#af131a"
+         id="stop13" />
     </linearGradient>
-    <linearGradient xlink:href="#d" id="l" x1="8.22" x2="8.22" y1="1043.381" y2="1049.088" gradientTransform="matrix(.60069 0 0 .60073 10.783 -612.95)" gradientUnits="userSpaceOnUse"/>
-    <radialGradient xlink:href="#b" id="g" cx="387.597" cy="442.578" r="6.188" fx="387.597" fy="442.578" gradientTransform="matrix(1.00786 0 0 .8763 -385.933 -376.071)" gradientUnits="userSpaceOnUse"/>
-    <radialGradient xlink:href="#b" id="h" cx="387.597" cy="442.578" r="6.188" fx="387.597" fy="442.578" gradientTransform="matrix(1.00972 0 0 .88376 -379.661 -379.414)" gradientUnits="userSpaceOnUse"/>
-    <radialGradient xlink:href="#b" id="f" cx="387.597" cy="442.578" r="6.188" fx="387.597" fy="442.578" gradientTransform="matrix(1.00786 0 0 .88446 -378.933 -386.73)" gradientUnits="userSpaceOnUse"/>
-    <radialGradient xlink:href="#b" id="e" cx="387.597" cy="442.578" r="6.188" fx="387.597" fy="442.578" gradientTransform="matrix(1.00786 0 0 .88446 -385.933 -386.73)" gradientUnits="userSpaceOnUse"/>
+    <linearGradient
+       xlink:href="#d"
+       id="l"
+       x1="8.22"
+       x2="8.22"
+       y1="1043.381"
+       y2="1049.088"
+       gradientTransform="matrix(.60069 0 0 .60073 10.783 -612.95)"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       xlink:href="#b"
+       id="g"
+       cx="387.597"
+       cy="442.578"
+       r="6.188"
+       fx="387.597"
+       fy="442.578"
+       gradientTransform="matrix(1.00786 0 0 .8763 -385.933 -376.071)"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       xlink:href="#b"
+       id="h"
+       cx="387.597"
+       cy="442.578"
+       r="6.188"
+       fx="387.597"
+       fy="442.578"
+       gradientTransform="matrix(1.00972 0 0 .88376 -379.661 -379.414)"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       xlink:href="#b"
+       id="f"
+       cx="387.597"
+       cy="442.578"
+       r="6.188"
+       fx="387.597"
+       fy="442.578"
+       gradientTransform="matrix(1.00786 0 0 .88446 -378.933 -386.73)"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       xlink:href="#b"
+       id="e"
+       cx="387.597"
+       cy="442.578"
+       r="6.188"
+       fx="387.597"
+       fy="442.578"
+       gradientTransform="matrix(1.00786 0 0 .88446 -385.933 -386.73)"
+       gradientUnits="userSpaceOnUse" />
   </defs>
-  <path fill="url(#e)" stroke="#c37e3b" stroke-linecap="round" stroke-linejoin="round" d="M2.5 2.5H9.5V9.5H2.5z" font-family="Sans" font-size="13.589" font-weight="400" letter-spacing="0" style="line-height:125%" word-spacing="0"/>
-  <path fill="url(#f)" stroke="#c37e3b" stroke-linecap="round" stroke-linejoin="round" d="M9.5 2.5H16.5V9.5H9.5z" font-family="Sans" font-size="13.589" font-weight="400" letter-spacing="0" style="line-height:125%" word-spacing="0"/>
-  <path fill="url(#g)" stroke="#a45d2b" stroke-linecap="round" stroke-linejoin="round" d="M 2.4999998,9.4999969 H 9.5 V 16.499997 H 2.4999998 Z" font-family="Sans" font-size="13.589" font-weight="400" letter-spacing="0" style="line-height:125%" word-spacing="0"/>
-  <path fill="url(#h)" stroke="#a45d2b" stroke-linecap="round" stroke-linejoin="round" d="m 9.487111,9.4403979 h 7.01289 v 7.0596001 h -7.01289 z" font-family="Sans" font-size="13.589" font-weight="400" letter-spacing="0" style="line-height:125%" word-spacing="0"/>
-  <path fill="none" stroke="url(#i)" stroke-linecap="round" stroke-linejoin="round" d="M 2.5,2.5 V 9.4725459 16.499998 H 9.472551 16.5 V 9.4725459 9.4176459 2.5000012 H 9.472551 Z" font-family="Sans" font-size="13.589" font-weight="400" letter-spacing="0" style="line-height:125%" word-spacing="0"/>
-  <path fill="#915323" stroke="url(#j)" d="M 9.5,0.99999765 V 17.999997" font-family="Sans" font-size="13.589" font-weight="400" letter-spacing="0" style="line-height:125%" word-spacing="0"/>
-  <path fill="#915323" stroke="url(#k)" d="M 18,9.4999969 H 1.0000001" font-family="Sans" font-size="13.589" font-weight="400" letter-spacing="0" style="line-height:125%" word-spacing="0"/>
-  <path fill="url(#l)" stroke="#a81d24" d="M12.527 11.5H18.5V17.5H12.527z" color="#000" font-family="Sans" font-size="13.589" font-weight="400" letter-spacing="0" overflow="visible" style="line-height:125%;marker:none" word-spacing="0"/>
+  <path
+     fill="url(#e)"
+     stroke="#c37e3b"
+     stroke-linecap="round"
+     stroke-linejoin="round"
+     d="M2.5 2.5H9.5V9.5H2.5z"
+     font-family="Sans"
+     font-size="13.589"
+     font-weight="400"
+     letter-spacing="0"
+     style="line-height:125%"
+     word-spacing="0"
+     id="path13" />
+  <path
+     fill="url(#f)"
+     stroke="#c37e3b"
+     stroke-linecap="round"
+     stroke-linejoin="round"
+     d="M9.5 2.5H16.5V9.5H9.5z"
+     font-family="Sans"
+     font-size="13.589"
+     font-weight="400"
+     letter-spacing="0"
+     style="line-height:125%"
+     word-spacing="0"
+     id="path14" />
+  <path
+     fill="url(#g)"
+     stroke="#a45d2b"
+     stroke-linecap="round"
+     stroke-linejoin="round"
+     d="M 2.4999998,9.4999969 H 9.5 V 16.499997 H 2.4999998 Z"
+     font-family="Sans"
+     font-size="13.589"
+     font-weight="400"
+     letter-spacing="0"
+     style="line-height:125%"
+     word-spacing="0"
+     id="path15" />
+  <path
+     fill="url(#h)"
+     stroke="#a45d2b"
+     stroke-linecap="round"
+     stroke-linejoin="round"
+     d="m 9.487111,9.4403979 h 7.01289 v 7.0596001 h -7.01289 z"
+     font-family="Sans"
+     font-size="13.589"
+     font-weight="400"
+     letter-spacing="0"
+     style="line-height:125%"
+     word-spacing="0"
+     id="path16" />
+  <path
+     fill="none"
+     stroke="url(#i)"
+     stroke-linecap="round"
+     stroke-linejoin="round"
+     d="M 2.5,2.5 V 9.4725459 16.499998 H 9.472551 16.5 V 9.4725459 9.4176459 2.5000012 H 9.472551 Z"
+     font-family="Sans"
+     font-size="13.589"
+     font-weight="400"
+     letter-spacing="0"
+     style="line-height:125%"
+     word-spacing="0"
+     id="path17" />
+  <path
+     fill="#915323"
+     stroke="url(#j)"
+     d="M 9.5,0.99999765 V 17.999997"
+     font-family="Sans"
+     font-size="13.589"
+     font-weight="400"
+     letter-spacing="0"
+     style="line-height:125%"
+     word-spacing="0"
+     id="path18" />
+  <path
+     fill="#915323"
+     stroke="url(#k)"
+     d="M 18,9.4999969 H 1.0000001"
+     font-family="Sans"
+     font-size="13.589"
+     font-weight="400"
+     letter-spacing="0"
+     style="line-height:125%"
+     word-spacing="0"
+     id="path19" />
+  <path
+     fill="url(#l)"
+     stroke="#a81d24"
+     d="M12.527 11.5H18.5V17.5H12.527z"
+     color="#000"
+     font-family="Sans"
+     font-size="13.589"
+     font-weight="400"
+     letter-spacing="0"
+     overflow="visible"
+     style="line-height:125%;marker:none"
+     word-spacing="0"
+     id="path20" />
 </svg>
diff --git a/org.eclipse.pde.doc.user/guide/images/plugin_editor/public.svg b/org.eclipse.pde.doc.user/guide/images/plugin_editor/public.svg
index d870a873f48..5789dbb5bd0 100644
--- a/org.eclipse.pde.doc.user/guide/images/plugin_editor/public.svg
+++ b/org.eclipse.pde.doc.user/guide/images/plugin_editor/public.svg
@@ -1,35 +1,220 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="19" height="19">
-  <defs>
-    <linearGradient id="a">
-      <stop offset="0" stop-color="#5f392d"/>
-      <stop offset=".182" stop-color="#9e7058"/>
-      <stop offset=".364" stop-color="#794f40"/>
-      <stop offset=".5" stop-color="#794f40"/>
-      <stop offset=".636" stop-color="#794f40"/>
-      <stop offset=".818" stop-color="#9e7058"/>
-      <stop offset="1" stop-color="#5f392d"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="19"
+   height="19"
+   version="1.1"
+   id="svg17"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs11">
+    <linearGradient
+       id="a">
+      <stop
+         offset="0"
+         stop-color="#5f392d"
+         id="stop1" />
+      <stop
+         offset=".182"
+         stop-color="#9e7058"
+         id="stop2" />
+      <stop
+         offset=".364"
+         stop-color="#794f40"
+         id="stop3" />
+      <stop
+         offset=".5"
+         stop-color="#794f40"
+         id="stop4" />
+      <stop
+         offset=".636"
+         stop-color="#794f40"
+         id="stop5" />
+      <stop
+         offset=".818"
+         stop-color="#9e7058"
+         id="stop6" />
+      <stop
+         offset="1"
+         stop-color="#5f392d"
+         id="stop7" />
     </linearGradient>
-    <linearGradient id="b">
-      <stop offset="0" stop-color="#faefba"/>
-      <stop offset="1" stop-color="#9e6542"/>
+    <linearGradient
+       id="b">
+      <stop
+         offset="0"
+         stop-color="#faefba"
+         id="stop8" />
+      <stop
+         offset="1"
+         stop-color="#9e6542"
+         id="stop9" />
     </linearGradient>
-    <linearGradient id="c">
-      <stop offset="0" stop-color="#c18965"/>
-      <stop offset="1" stop-color="#975c45"/>
+    <linearGradient
+       id="c">
+      <stop
+         offset="0"
+         stop-color="#c18965"
+         id="stop10" />
+      <stop
+         offset="1"
+         stop-color="#975c45"
+         id="stop11" />
     </linearGradient>
-    <linearGradient xlink:href="#a" id="i" x1="355.297" x2="394.719" y1="449.881" y2="449.881" gradientTransform="rotate(90 150.497 23.16) scale(.36489)" gradientUnits="userSpaceOnUse"/>
-    <linearGradient xlink:href="#a" id="j" x1="355.297" x2="394.719" y1="449.881" y2="449.881" gradientTransform="rotate(179.889 73.168 86.829) scale(.36489)" gradientUnits="userSpaceOnUse"/>
-    <linearGradient xlink:href="#c" id="h" x1="366.048" x2="366.048" y1="430.172" y2="466.01" gradientTransform="matrix(.39353 0 0 .39353 -138.098 -167.564)" gradientUnits="userSpaceOnUse"/>
-    <radialGradient xlink:href="#b" id="f" cx="387.597" cy="442.578" r="6.188" fx="387.597" fy="442.578" gradientTransform="matrix(1.00786 0 0 .8763 -385.933 -376.071)" gradientUnits="userSpaceOnUse"/>
-    <radialGradient xlink:href="#b" id="g" cx="387.597" cy="442.578" r="6.188" fx="387.597" fy="442.578" gradientTransform="matrix(1.00972 0 0 .88376 -379.661 -379.414)" gradientUnits="userSpaceOnUse"/>
-    <radialGradient xlink:href="#b" id="e" cx="387.597" cy="442.578" r="6.188" fx="387.597" fy="442.578" gradientTransform="matrix(1.00786 0 0 .88446 -378.933 -386.73)" gradientUnits="userSpaceOnUse"/>
-    <radialGradient xlink:href="#b" id="d" cx="387.597" cy="442.578" r="6.188" fx="387.597" fy="442.578" gradientTransform="matrix(1.00786 0 0 .88446 -385.933 -386.73)" gradientUnits="userSpaceOnUse"/>
+    <linearGradient
+       xlink:href="#a"
+       id="i"
+       x1="355.297"
+       x2="394.719"
+       y1="449.881"
+       y2="449.881"
+       gradientTransform="rotate(90 150.497 23.16) scale(.36489)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#a"
+       id="j"
+       x1="355.297"
+       x2="394.719"
+       y1="449.881"
+       y2="449.881"
+       gradientTransform="rotate(179.889 73.168 86.829) scale(.36489)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#c"
+       id="h"
+       x1="366.048"
+       x2="366.048"
+       y1="430.172"
+       y2="466.01"
+       gradientTransform="matrix(.39353 0 0 .39353 -138.098 -167.564)"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       xlink:href="#b"
+       id="f"
+       cx="387.597"
+       cy="442.578"
+       r="6.188"
+       fx="387.597"
+       fy="442.578"
+       gradientTransform="matrix(1.00786 0 0 .8763 -385.933 -376.071)"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       xlink:href="#b"
+       id="g"
+       cx="387.597"
+       cy="442.578"
+       r="6.188"
+       fx="387.597"
+       fy="442.578"
+       gradientTransform="matrix(1.00972 0 0 .88376 -379.661 -379.414)"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       xlink:href="#b"
+       id="e"
+       cx="387.597"
+       cy="442.578"
+       r="6.188"
+       fx="387.597"
+       fy="442.578"
+       gradientTransform="matrix(1.00786 0 0 .88446 -378.933 -386.73)"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       xlink:href="#b"
+       id="d"
+       cx="387.597"
+       cy="442.578"
+       r="6.188"
+       fx="387.597"
+       fy="442.578"
+       gradientTransform="matrix(1.00786 0 0 .88446 -385.933 -386.73)"
+       gradientUnits="userSpaceOnUse" />
   </defs>
-  <path fill="url(#d)" stroke="#c37e3b" stroke-linecap="round" stroke-linejoin="round" d="M2.5 2.5H9.5V9.5H2.5z" font-family="Sans" font-size="13.589" font-weight="400" letter-spacing="0" style="line-height:125%" word-spacing="0"/>
-  <path fill="url(#e)" stroke="#c37e3b" stroke-linecap="round" stroke-linejoin="round" d="M9.5 2.5H16.5V9.5H9.5z" font-family="Sans" font-size="13.589" font-weight="400" letter-spacing="0" style="line-height:125%" word-spacing="0"/>
-  <path fill="url(#f)" stroke="#a45d2b" stroke-linecap="round" stroke-linejoin="round" d="M 2.4999998,9.4999969 H 9.5 V 16.499997 H 2.4999998 Z" font-family="Sans" font-size="13.589" font-weight="400" letter-spacing="0" style="line-height:125%" word-spacing="0"/>
-  <path fill="url(#g)" stroke="#a45d2b" stroke-linecap="round" stroke-linejoin="round" d="m 9.487111,9.4403979 h 7.01289 v 7.0596001 h -7.01289 z" font-family="Sans" font-size="13.589" font-weight="400" letter-spacing="0" style="line-height:125%" word-spacing="0"/>
-  <path fill="none" stroke="url(#h)" stroke-linecap="round" stroke-linejoin="round" d="M 2.5,2.5 V 9.4725459 16.499998 H 9.472551 16.5 V 9.4725459 9.4176459 2.5000012 H 9.472551 Z" font-family="Sans" font-size="13.589" font-weight="400" letter-spacing="0" style="line-height:125%" word-spacing="0"/>
-  <path fill="#915323" stroke="url(#i)" d="M 9.5,0.99999765 V 17.999997" font-family="Sans" font-size="13.589" font-weight="400" letter-spacing="0" style="line-height:125%" word-spacing="0"/>
-  <path fill="#915323" stroke="url(#j)" d="M 18,9.4999969 H 1.0000001" font-family="Sans" font-size="13.589" font-weight="400" letter-spacing="0" style="line-height:125%" word-spacing="0"/>
+  <path
+     fill="url(#d)"
+     stroke="#c37e3b"
+     stroke-linecap="round"
+     stroke-linejoin="round"
+     d="M2.5 2.5H9.5V9.5H2.5z"
+     font-family="Sans"
+     font-size="13.589"
+     font-weight="400"
+     letter-spacing="0"
+     style="line-height:125%"
+     word-spacing="0"
+     id="path11" />
+  <path
+     fill="url(#e)"
+     stroke="#c37e3b"
+     stroke-linecap="round"
+     stroke-linejoin="round"
+     d="M9.5 2.5H16.5V9.5H9.5z"
+     font-family="Sans"
+     font-size="13.589"
+     font-weight="400"
+     letter-spacing="0"
+     style="line-height:125%"
+     word-spacing="0"
+     id="path12" />
+  <path
+     fill="url(#f)"
+     stroke="#a45d2b"
+     stroke-linecap="round"
+     stroke-linejoin="round"
+     d="M 2.4999998,9.4999969 H 9.5 V 16.499997 H 2.4999998 Z"
+     font-family="Sans"
+     font-size="13.589"
+     font-weight="400"
+     letter-spacing="0"
+     style="line-height:125%"
+     word-spacing="0"
+     id="path13" />
+  <path
+     fill="url(#g)"
+     stroke="#a45d2b"
+     stroke-linecap="round"
+     stroke-linejoin="round"
+     d="m 9.487111,9.4403979 h 7.01289 v 7.0596001 h -7.01289 z"
+     font-family="Sans"
+     font-size="13.589"
+     font-weight="400"
+     letter-spacing="0"
+     style="line-height:125%"
+     word-spacing="0"
+     id="path14" />
+  <path
+     fill="none"
+     stroke="url(#h)"
+     stroke-linecap="round"
+     stroke-linejoin="round"
+     d="M 2.5,2.5 V 9.4725459 16.499998 H 9.472551 16.5 V 9.4725459 9.4176459 2.5000012 H 9.472551 Z"
+     font-family="Sans"
+     font-size="13.589"
+     font-weight="400"
+     letter-spacing="0"
+     style="line-height:125%"
+     word-spacing="0"
+     id="path15" />
+  <path
+     fill="#915323"
+     stroke="url(#i)"
+     d="M 9.5,0.99999765 V 17.999997"
+     font-family="Sans"
+     font-size="13.589"
+     font-weight="400"
+     letter-spacing="0"
+     style="line-height:125%"
+     word-spacing="0"
+     id="path16" />
+  <path
+     fill="#915323"
+     stroke="url(#j)"
+     d="M 18,9.4999969 H 1.0000001"
+     font-family="Sans"
+     font-size="13.589"
+     font-weight="400"
+     letter-spacing="0"
+     style="line-height:125%"
+     word-spacing="0"
+     id="path17" />
 </svg>
diff --git a/org.eclipse.pde.doc.user/guide/images/plugin_editor/xfriend.svg b/org.eclipse.pde.doc.user/guide/images/plugin_editor/xfriend.svg
index 170d7737749..0f1589f0e3a 100644
--- a/org.eclipse.pde.doc.user/guide/images/plugin_editor/xfriend.svg
+++ b/org.eclipse.pde.doc.user/guide/images/plugin_editor/xfriend.svg
@@ -1,57 +1,324 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="19" height="19">
-  <defs>
-    <linearGradient id="a">
-      <stop offset="0" stop-color="#5f392d"/>
-      <stop offset=".182" stop-color="#9e7058"/>
-      <stop offset=".364" stop-color="#794f40"/>
-      <stop offset=".5" stop-color="#794f40"/>
-      <stop offset=".636" stop-color="#794f40"/>
-      <stop offset=".818" stop-color="#9e7058"/>
-      <stop offset="1" stop-color="#5f392d"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="19"
+   height="19"
+   version="1.1"
+   id="svg28"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs17">
+    <linearGradient
+       id="a">
+      <stop
+         offset="0"
+         stop-color="#5f392d"
+         id="stop1" />
+      <stop
+         offset=".182"
+         stop-color="#9e7058"
+         id="stop2" />
+      <stop
+         offset=".364"
+         stop-color="#794f40"
+         id="stop3" />
+      <stop
+         offset=".5"
+         stop-color="#794f40"
+         id="stop4" />
+      <stop
+         offset=".636"
+         stop-color="#794f40"
+         id="stop5" />
+      <stop
+         offset=".818"
+         stop-color="#9e7058"
+         id="stop6" />
+      <stop
+         offset="1"
+         stop-color="#5f392d"
+         id="stop7" />
     </linearGradient>
-    <linearGradient id="b">
-      <stop offset="0" stop-color="#faefba"/>
-      <stop offset="1" stop-color="#9e6542"/>
+    <linearGradient
+       id="b">
+      <stop
+         offset="0"
+         stop-color="#faefba"
+         id="stop8" />
+      <stop
+         offset="1"
+         stop-color="#9e6542"
+         id="stop9" />
     </linearGradient>
-    <linearGradient id="c">
-      <stop offset="0" stop-color="#c18965"/>
-      <stop offset="1" stop-color="#975c45"/>
+    <linearGradient
+       id="c">
+      <stop
+         offset="0"
+         stop-color="#c18965"
+         id="stop10" />
+      <stop
+         offset="1"
+         stop-color="#975c45"
+         id="stop11" />
     </linearGradient>
-    <linearGradient xlink:href="#a" id="l" x1="355.297" x2="394.719" y1="449.881" y2="449.881" gradientTransform="rotate(90 150.497 23.16) scale(.36489)" gradientUnits="userSpaceOnUse"/>
-    <linearGradient xlink:href="#a" id="m" x1="355.297" x2="394.719" y1="449.881" y2="449.881" gradientTransform="rotate(179.889 73.168 86.829) scale(.36489)" gradientUnits="userSpaceOnUse"/>
-    <linearGradient xlink:href="#c" id="k" x1="366.048" x2="366.048" y1="430.172" y2="466.01" gradientTransform="matrix(.39353 0 0 .39353 -138.098 -167.564)" gradientUnits="userSpaceOnUse"/>
-    <linearGradient id="d">
-      <stop offset="0" stop-color="#fff"/>
-      <stop offset="1" stop-color="#fff" stop-opacity="0"/>
+    <linearGradient
+       xlink:href="#a"
+       id="l"
+       x1="355.297"
+       x2="394.719"
+       y1="449.881"
+       y2="449.881"
+       gradientTransform="rotate(90 150.497 23.16) scale(.36489)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#a"
+       id="m"
+       x1="355.297"
+       x2="394.719"
+       y1="449.881"
+       y2="449.881"
+       gradientTransform="rotate(179.889 73.168 86.829) scale(.36489)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#c"
+       id="k"
+       x1="366.048"
+       x2="366.048"
+       y1="430.172"
+       y2="466.01"
+       gradientTransform="matrix(.39353 0 0 .39353 -138.098 -167.564)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="d">
+      <stop
+         offset="0"
+         stop-color="#fff"
+         id="stop12" />
+      <stop
+         offset="1"
+         stop-color="#fff"
+         stop-opacity="0"
+         id="stop13" />
     </linearGradient>
-    <linearGradient xlink:href="#d" id="o" x1="13" x2="15.008" y1="1043.362" y2="1043.347" gradientTransform="translate(3.56 -1026.101)" gradientUnits="userSpaceOnUse"/>
-    <linearGradient xlink:href="#d" id="p" x1="14" x2="14" y1="1041.362" y2="1043.347" gradientTransform="translate(3.56 -1026.101)" gradientUnits="userSpaceOnUse"/>
-    <linearGradient id="f">
-      <stop offset="0" stop-color="#e0c576"/>
-      <stop offset="1" stop-color="#9e7916"/>
+    <linearGradient
+       xlink:href="#d"
+       id="o"
+       x1="13"
+       x2="15.008"
+       y1="1043.362"
+       y2="1043.347"
+       gradientTransform="translate(3.56 -1026.101)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#d"
+       id="p"
+       x1="14"
+       x2="14"
+       y1="1041.362"
+       y2="1043.347"
+       gradientTransform="translate(3.56 -1026.101)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="f">
+      <stop
+         offset="0"
+         stop-color="#e0c576"
+         id="stop14" />
+      <stop
+         offset="1"
+         stop-color="#9e7916"
+         id="stop15" />
     </linearGradient>
-    <linearGradient xlink:href="#e" id="r" x1=".938" x2=".938" y1="4.844" y2="7.549" gradientTransform="matrix(2.31999 0 0 2.31999 10.2 1043.185)" gradientUnits="userSpaceOnUse"/>
-    <linearGradient id="e">
-      <stop offset="0" stop-color="#f7f9fb"/>
-      <stop offset="1" stop-color="#ffd680"/>
+    <linearGradient
+       xlink:href="#e"
+       id="r"
+       x1=".938"
+       x2=".938"
+       y1="4.844"
+       y2="7.549"
+       gradientTransform="matrix(2.31999 0 0 2.31999 10.2 1043.185)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="e">
+      <stop
+         offset="0"
+         stop-color="#f7f9fb"
+         id="stop16" />
+      <stop
+         offset="1"
+         stop-color="#ffd680"
+         id="stop17" />
     </linearGradient>
-    <linearGradient xlink:href="#d" id="n" x1="12" x2="12" y1="1043.362" y2="1045.347" gradientTransform="matrix(1 0 0 .58745 3.56 -596.278)" gradientUnits="userSpaceOnUse"/>
-    <radialGradient xlink:href="#b" id="i" cx="387.597" cy="442.578" r="6.188" fx="387.597" fy="442.578" gradientTransform="matrix(1.00786 0 0 .8763 -385.933 -376.071)" gradientUnits="userSpaceOnUse"/>
-    <radialGradient xlink:href="#b" id="j" cx="387.597" cy="442.578" r="6.188" fx="387.597" fy="442.578" gradientTransform="matrix(1.00972 0 0 .88376 -379.661 -379.414)" gradientUnits="userSpaceOnUse"/>
-    <radialGradient xlink:href="#b" id="h" cx="387.597" cy="442.578" r="6.188" fx="387.597" fy="442.578" gradientTransform="matrix(1.00786 0 0 .88446 -378.933 -386.73)" gradientUnits="userSpaceOnUse"/>
-    <radialGradient xlink:href="#b" id="g" cx="387.597" cy="442.578" r="6.188" fx="387.597" fy="442.578" gradientTransform="matrix(1.00786 0 0 .88446 -385.933 -386.73)" gradientUnits="userSpaceOnUse"/>
-    <radialGradient xlink:href="#f" id="q" cx="-757.205" cy="-738.838" r="3.48" fx="-757.205" fy="-738.838" gradientTransform="matrix(1.85082 0 0 1.77506 644.25 572.636)" gradientUnits="userSpaceOnUse"/>
+    <linearGradient
+       xlink:href="#d"
+       id="n"
+       x1="12"
+       x2="12"
+       y1="1043.362"
+       y2="1045.347"
+       gradientTransform="matrix(1 0 0 .58745 3.56 -596.278)"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       xlink:href="#b"
+       id="i"
+       cx="387.597"
+       cy="442.578"
+       r="6.188"
+       fx="387.597"
+       fy="442.578"
+       gradientTransform="matrix(1.00786 0 0 .8763 -385.933 -376.071)"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       xlink:href="#b"
+       id="j"
+       cx="387.597"
+       cy="442.578"
+       r="6.188"
+       fx="387.597"
+       fy="442.578"
+       gradientTransform="matrix(1.00972 0 0 .88376 -379.661 -379.414)"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       xlink:href="#b"
+       id="h"
+       cx="387.597"
+       cy="442.578"
+       r="6.188"
+       fx="387.597"
+       fy="442.578"
+       gradientTransform="matrix(1.00786 0 0 .88446 -378.933 -386.73)"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       xlink:href="#b"
+       id="g"
+       cx="387.597"
+       cy="442.578"
+       r="6.188"
+       fx="387.597"
+       fy="442.578"
+       gradientTransform="matrix(1.00786 0 0 .88446 -385.933 -386.73)"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       xlink:href="#f"
+       id="q"
+       cx="-757.205"
+       cy="-738.838"
+       r="3.48"
+       fx="-757.205"
+       fy="-738.838"
+       gradientTransform="matrix(1.85082 0 0 1.77506 644.25 572.636)"
+       gradientUnits="userSpaceOnUse" />
   </defs>
-  <path fill="url(#g)" stroke="#c37e3b" stroke-linecap="round" stroke-linejoin="round" d="M2.5 2.5H9.5V9.5H2.5z" font-family="Sans" font-size="13.589" font-weight="400" letter-spacing="0" style="line-height:125%" word-spacing="0"/>
-  <path fill="url(#h)" stroke="#c37e3b" stroke-linecap="round" stroke-linejoin="round" d="M9.5 2.5H16.5V9.5H9.5z" font-family="Sans" font-size="13.589" font-weight="400" letter-spacing="0" style="line-height:125%" word-spacing="0"/>
-  <path fill="url(#i)" stroke="#a45d2b" stroke-linecap="round" stroke-linejoin="round" d="M 2.4999998,9.4999969 H 9.5 V 16.499997 H 2.4999998 Z" font-family="Sans" font-size="13.589" font-weight="400" letter-spacing="0" style="line-height:125%" word-spacing="0"/>
-  <path fill="url(#j)" stroke="#a45d2b" stroke-linecap="round" stroke-linejoin="round" d="m 9.487111,9.4403979 h 7.01289 v 7.0596001 h -7.01289 z" font-family="Sans" font-size="13.589" font-weight="400" letter-spacing="0" style="line-height:125%" word-spacing="0"/>
-  <path fill="none" stroke="url(#k)" stroke-linecap="round" stroke-linejoin="round" d="M 2.5,2.5 V 9.4725459 16.499998 H 9.472551 16.5 V 9.4725459 9.4176459 2.5000012 H 9.472551 Z" font-family="Sans" font-size="13.589" font-weight="400" letter-spacing="0" style="line-height:125%" word-spacing="0"/>
-  <path fill="#915323" stroke="url(#l)" d="M 9.5,0.99999765 V 17.999997" font-family="Sans" font-size="13.589" font-weight="400" letter-spacing="0" style="line-height:125%" word-spacing="0"/>
-  <path fill="#915323" stroke="url(#m)" d="M 18,9.4999969 H 1.0000001" font-family="Sans" font-size="13.589" font-weight="400" letter-spacing="0" style="line-height:125%" word-spacing="0"/>
-  <path fill="url(#n)" d="m 13.567217,17.8078 h 4 v -0.5874 l -0.476562,-0.2846 h -2.03125 z"/>
-  <path fill="url(#o)" d="m 17.090655,15.7609 v 2 l 0.476562,0.4844 v -2 z"/>
-  <path fill="url(#p)" d="m 17.563312,15.7609 h -0.472657 l 0.476563,0.4844 h -0.0039 z"/>
-  <path fill="url(#q)" stroke="#a27d18" stroke-width="1.032" d="M-758.823-740.411H-754.24V-735.957H-758.823z" transform="rotate(-135 -215.097 -521.452)"/>
-  <path fill="url(#r)" d="m 12.471186,1054.309 h 1.001133 v 1.946 h 1.986639 v 1.0167 h -1.986639 v 2.043 h -1.001133 v -2.043 h -1.98664 v -1.0167 h 1.98664 z" transform="translate(1.529 -1042.272)"/>
+  <path
+     fill="url(#g)"
+     stroke="#c37e3b"
+     stroke-linecap="round"
+     stroke-linejoin="round"
+     d="M2.5 2.5H9.5V9.5H2.5z"
+     font-family="Sans"
+     font-size="13.589"
+     font-weight="400"
+     letter-spacing="0"
+     style="line-height:125%"
+     word-spacing="0"
+     id="path17" />
+  <path
+     fill="url(#h)"
+     stroke="#c37e3b"
+     stroke-linecap="round"
+     stroke-linejoin="round"
+     d="M9.5 2.5H16.5V9.5H9.5z"
+     font-family="Sans"
+     font-size="13.589"
+     font-weight="400"
+     letter-spacing="0"
+     style="line-height:125%"
+     word-spacing="0"
+     id="path18" />
+  <path
+     fill="url(#i)"
+     stroke="#a45d2b"
+     stroke-linecap="round"
+     stroke-linejoin="round"
+     d="M 2.4999998,9.4999969 H 9.5 V 16.499997 H 2.4999998 Z"
+     font-family="Sans"
+     font-size="13.589"
+     font-weight="400"
+     letter-spacing="0"
+     style="line-height:125%"
+     word-spacing="0"
+     id="path19" />
+  <path
+     fill="url(#j)"
+     stroke="#a45d2b"
+     stroke-linecap="round"
+     stroke-linejoin="round"
+     d="m 9.487111,9.4403979 h 7.01289 v 7.0596001 h -7.01289 z"
+     font-family="Sans"
+     font-size="13.589"
+     font-weight="400"
+     letter-spacing="0"
+     style="line-height:125%"
+     word-spacing="0"
+     id="path20" />
+  <path
+     fill="none"
+     stroke="url(#k)"
+     stroke-linecap="round"
+     stroke-linejoin="round"
+     d="M 2.5,2.5 V 9.4725459 16.499998 H 9.472551 16.5 V 9.4725459 9.4176459 2.5000012 H 9.472551 Z"
+     font-family="Sans"
+     font-size="13.589"
+     font-weight="400"
+     letter-spacing="0"
+     style="line-height:125%"
+     word-spacing="0"
+     id="path21" />
+  <path
+     fill="#915323"
+     stroke="url(#l)"
+     d="M 9.5,0.99999765 V 17.999997"
+     font-family="Sans"
+     font-size="13.589"
+     font-weight="400"
+     letter-spacing="0"
+     style="line-height:125%"
+     word-spacing="0"
+     id="path22" />
+  <path
+     fill="#915323"
+     stroke="url(#m)"
+     d="M 18,9.4999969 H 1.0000001"
+     font-family="Sans"
+     font-size="13.589"
+     font-weight="400"
+     letter-spacing="0"
+     style="line-height:125%"
+     word-spacing="0"
+     id="path23" />
+  <path
+     fill="url(#n)"
+     d="m 13.567217,17.8078 h 4 v -0.5874 l -0.476562,-0.2846 h -2.03125 z"
+     id="path24" />
+  <path
+     fill="url(#o)"
+     d="m 17.090655,15.7609 v 2 l 0.476562,0.4844 v -2 z"
+     id="path25" />
+  <path
+     fill="url(#p)"
+     d="m 17.563312,15.7609 h -0.472657 l 0.476563,0.4844 h -0.0039 z"
+     id="path26" />
+  <path
+     fill="url(#q)"
+     stroke="#a27d18"
+     stroke-width="1.032"
+     d="M-758.823-740.411H-754.24V-735.957H-758.823z"
+     transform="rotate(-135 -215.097 -521.452)"
+     id="path27" />
+  <path
+     fill="url(#r)"
+     d="m 12.471186,1054.309 h 1.001133 v 1.946 h 1.986639 v 1.0167 h -1.986639 v 2.043 h -1.001133 v -2.043 h -1.98664 v -1.0167 h 1.98664 z"
+     transform="translate(1.529 -1042.272)"
+     id="path28" />
 </svg>
diff --git a/org.eclipse.pde.doc.user/guide/images/schema_editor/att_class_obj.svg b/org.eclipse.pde.doc.user/guide/images/schema_editor/att_class_obj.svg
index 1ed2c29376c..bd0580e4e4f 100644
--- a/org.eclipse.pde.doc.user/guide/images/schema_editor/att_class_obj.svg
+++ b/org.eclipse.pde.doc.user/guide/images/schema_editor/att_class_obj.svg
@@ -1,23 +1,114 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="16" height="16">
-  <defs>
-    <linearGradient xlink:href="#a" id="b" x1="388.637" x2="388.637" y1="478.188" y2="462.115" gradientUnits="userSpaceOnUse"/>
-    <linearGradient id="a">
-      <stop offset="0" stop-color="#4f9e55"/>
-      <stop offset=".5" stop-color="#418a4d"/>
-      <stop offset="1" stop-color="#91c168"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="16"
+   height="16"
+   version="1.1"
+   id="svg6"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs3">
+    <linearGradient
+       xlink:href="#a"
+       id="b"
+       x1="388.637"
+       x2="388.637"
+       y1="478.188"
+       y2="462.115"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="a">
+      <stop
+         offset="0"
+         stop-color="#4f9e55"
+         id="stop1" />
+      <stop
+         offset=".5"
+         stop-color="#418a4d"
+         id="stop2" />
+      <stop
+         offset="1"
+         stop-color="#91c168"
+         id="stop3" />
     </linearGradient>
   </defs>
-  <g fill="#fff" letter-spacing="0" word-spacing="0">
-    <g font-family="Sans" font-size="13.589" font-weight="400">
-      <g style="line-height:125%" transform="matrix(.83447 0 0 .82678 12.816 -851.71)">
-        <circle cx="388.125" cy="468.237" r="8.959" fill="url(#b)" stroke="#14733c" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.754" transform="matrix(.66884 0 0 .6714 -267.183 722.47)"/>
+  <g
+     fill="#fff"
+     letter-spacing="0"
+     word-spacing="0"
+     id="g5">
+    <g
+       font-family="Sans"
+       font-size="13.589"
+       font-weight="400"
+       id="g4">
+      <g
+         style="line-height:125%"
+         transform="matrix(.83447 0 0 .82678 12.816 -851.71)"
+         id="g3">
+        <circle
+           cx="388.125"
+           cy="468.237"
+           r="8.959"
+           fill="url(#b)"
+           stroke="#14733c"
+           stroke-linecap="round"
+           stroke-linejoin="round"
+           stroke-width="1.754"
+           transform="matrix(.66884 0 0 .6714 -267.183 722.47)"
+           id="circle3" />
       </g>
     </g>
-    <path d="m 9.9582435,1043.873 c -0.068736,-0.4207 -0.2258257,-0.7375 -0.4712765,-0.9505 -0.2405524,-0.2129 -0.5547364,-0.3192 -0.9425527,-0.3192 -0.5154625,0 -0.927829,0.185 -1.2371006,0.5551 -0.3043689,0.3648 -0.4565517,0.6031 -0.4565489,1.4648 -2.8e-6,0.958 0.1546346,1.3845 0.4639127,1.7799 0.3141807,0.3954 0.7339108,0.593 1.2591915,0.593 0.3927255,0 0.7142731,-0.114 0.9646439,-0.3422 0.2503599,-0.2332 0.4270885,-0.6309 0.5301861,-1.1937 l 2.032379,-0.017 c -0.211101,0.9629 -0.616102,2.0653 -1.215009,2.557 -0.598921,0.4917 -1.401562,0.7374 -2.407928,0.7374 -1.1438303,0 -2.0569271,-0.3724 -2.7392935,-1.1176 -0.6774613,-0.7449 -1.0161905,-1.5264 -1.0161905,-2.8443 0,-1.333 0.3411837,-1.9946 1.0235539,-2.7344 0.6823664,-0.7452 1.6052818,-1.1177 2.7687486,-1.1177 0.9523657,0 1.7083715,0.2129 2.2680175,0.6387 0.564543,0.4205 1.032045,1.4081 1.277509,2.2745 z" font-family="Arial" font-size="15.569" font-weight="700" style="line-height:125%" transform="matrix(.83447 0 0 .82678 -.643 -858.336)"/>
+    <path
+       d="m 9.9582435,1043.873 c -0.068736,-0.4207 -0.2258257,-0.7375 -0.4712765,-0.9505 -0.2405524,-0.2129 -0.5547364,-0.3192 -0.9425527,-0.3192 -0.5154625,0 -0.927829,0.185 -1.2371006,0.5551 -0.3043689,0.3648 -0.4565517,0.6031 -0.4565489,1.4648 -2.8e-6,0.958 0.1546346,1.3845 0.4639127,1.7799 0.3141807,0.3954 0.7339108,0.593 1.2591915,0.593 0.3927255,0 0.7142731,-0.114 0.9646439,-0.3422 0.2503599,-0.2332 0.4270885,-0.6309 0.5301861,-1.1937 l 2.032379,-0.017 c -0.211101,0.9629 -0.616102,2.0653 -1.215009,2.557 -0.598921,0.4917 -1.401562,0.7374 -2.407928,0.7374 -1.1438303,0 -2.0569271,-0.3724 -2.7392935,-1.1176 -0.6774613,-0.7449 -1.0161905,-1.5264 -1.0161905,-2.8443 0,-1.333 0.3411837,-1.9946 1.0235539,-2.7344 0.6823664,-0.7452 1.6052818,-1.1177 2.7687486,-1.1177 0.9523657,0 1.7083715,0.2129 2.2680175,0.6387 0.564543,0.4205 1.032045,1.4081 1.277509,2.2745 z"
+       font-family="Arial"
+       font-size="15.569"
+       font-weight="700"
+       style="line-height:125%"
+       transform="matrix(.83447 0 0 .82678 -.643 -858.336)"
+       id="path4" />
   </g>
-  <g fill="#387838" stroke="#266923" stroke-width=".278" font-family="Serif" font-size="8.992" font-weight="400" letter-spacing="0" style="line-height:125%;text-align:start" transform="matrix(.99875 0 0 1.12866 -10.527 -1117.466)" word-spacing="0">
-    <circle cx="20.544" cy="1044.742" r="4.489" fill="#fff" stroke-linecap="round" stroke-linejoin="round" stroke-width="1" font-family="Sans" font-size="13.589" style="line-height:125%" transform="matrix(1.00125 0 0 .886 .972 73.295)"/>
-    <path fill="none" stroke="#fff" stroke-linecap="round" stroke-width="1" d="m 24.43155,1046.9864 a 4.4886336,4.4886336 0 0 1 -1.642954,1.6429" font-family="Sans" font-size="13.589" style="line-height:125%" transform="matrix(1.00125 0 0 .886 .972 73.295)"/>
-    <path fill="#266923" stroke-width=".277" d="m 22.620507,999.74158 0,-0.98021 -1.040788,0 c -0.401091,0 -0.699714,0.0857 -0.895868,0.25704 -0.196155,0.17135 -0.294232,0.43419 -0.294232,0.78852 0,0.32237 0.09954,0.57797 0.298623,0.76677 0.199082,0.1887 0.468428,0.2831 0.808038,0.2831 0.336682,0 0.607492,-0.1031 0.812429,-0.3093 0.207865,-0.2062 0.311798,-0.4748 0.311798,-0.80592 z m 0.808037,-1.43764 -0.01946,1.97066 1.6957,1.5699 -0.444853,0.3635 -1.601857,-1.6986 -0.459711,0.2744 c -0.244962,0.1855 -0.362864,0.285 -0.597079,0.3867 -0.234214,0.1017 -0.507951,0.1525 -0.821211,0.1525 -0.518199,0 -0.929537,-0.1365 -1.234015,-0.4095 -0.304478,-0.2731 -0.456717,-0.6419 -0.456717,-1.10657 0,-0.47921 0.174196,-0.85097 0.522589,-1.11526 0.348394,-0.26429 0.840243,-0.39644 1.475548,-0.39644 l 1.13301,0 0,-0.31802 c 0,-0.35143 -0.108324,-0.62298 -0.324973,-0.81467 -0.213719,-0.19459 -0.51527,-0.29188 -0.904651,-0.29188 -0.322044,0 -0.578215,0.0726 -0.768514,0.21782 -0.190299,0.14521 -0.308869,0.36013 -0.355712,0.64476 l -0.417193,0 0,-0.93664 c 0.281057,-0.11908 0.55333,-0.20766 0.816821,-0.26575 0.266418,-0.061 0.525517,-0.0915 0.777297,-0.0915 0.647015,0 1.138864,0.15974 1.475547,0.47921 0.33961,0.31657 0.509415,0.77836 0.509415,1.38537 z"/>
+  <g
+     fill="#387838"
+     stroke="#266923"
+     stroke-width=".278"
+     font-family="Serif"
+     font-size="8.992"
+     font-weight="400"
+     letter-spacing="0"
+     style="line-height:125%;text-align:start"
+     transform="matrix(.99875 0 0 1.12866 -10.527 -1117.466)"
+     word-spacing="0"
+     id="g6">
+    <circle
+       cx="20.544"
+       cy="1044.742"
+       r="4.489"
+       fill="#fff"
+       stroke-linecap="round"
+       stroke-linejoin="round"
+       stroke-width="1"
+       font-family="Sans"
+       font-size="13.589"
+       style="line-height:125%"
+       transform="matrix(1.00125 0 0 .886 .972 73.295)"
+       id="circle5" />
+    <path
+       fill="none"
+       stroke="#fff"
+       stroke-linecap="round"
+       stroke-width="1"
+       d="m 24.43155,1046.9864 a 4.4886336,4.4886336 0 0 1 -1.642954,1.6429"
+       font-family="Sans"
+       font-size="13.589"
+       style="line-height:125%"
+       transform="matrix(1.00125 0 0 .886 .972 73.295)"
+       id="path5" />
+    <path
+       fill="#266923"
+       stroke-width=".277"
+       d="m 22.620507,999.74158 0,-0.98021 -1.040788,0 c -0.401091,0 -0.699714,0.0857 -0.895868,0.25704 -0.196155,0.17135 -0.294232,0.43419 -0.294232,0.78852 0,0.32237 0.09954,0.57797 0.298623,0.76677 0.199082,0.1887 0.468428,0.2831 0.808038,0.2831 0.336682,0 0.607492,-0.1031 0.812429,-0.3093 0.207865,-0.2062 0.311798,-0.4748 0.311798,-0.80592 z m 0.808037,-1.43764 -0.01946,1.97066 1.6957,1.5699 -0.444853,0.3635 -1.601857,-1.6986 -0.459711,0.2744 c -0.244962,0.1855 -0.362864,0.285 -0.597079,0.3867 -0.234214,0.1017 -0.507951,0.1525 -0.821211,0.1525 -0.518199,0 -0.929537,-0.1365 -1.234015,-0.4095 -0.304478,-0.2731 -0.456717,-0.6419 -0.456717,-1.10657 0,-0.47921 0.174196,-0.85097 0.522589,-1.11526 0.348394,-0.26429 0.840243,-0.39644 1.475548,-0.39644 l 1.13301,0 0,-0.31802 c 0,-0.35143 -0.108324,-0.62298 -0.324973,-0.81467 -0.213719,-0.19459 -0.51527,-0.29188 -0.904651,-0.29188 -0.322044,0 -0.578215,0.0726 -0.768514,0.21782 -0.190299,0.14521 -0.308869,0.36013 -0.355712,0.64476 l -0.417193,0 0,-0.93664 c 0.281057,-0.11908 0.55333,-0.20766 0.816821,-0.26575 0.266418,-0.061 0.525517,-0.0915 0.777297,-0.0915 0.647015,0 1.138864,0.15974 1.475547,0.47921 0.33961,0.31657 0.509415,0.77836 0.509415,1.38537 z"
+       id="path6" />
   </g>
 </svg>
diff --git a/org.eclipse.pde.doc.user/guide/images/schema_editor/att_file_obj.svg b/org.eclipse.pde.doc.user/guide/images/schema_editor/att_file_obj.svg
index ff50a99639d..ff76696d6a6 100644
--- a/org.eclipse.pde.doc.user/guide/images/schema_editor/att_file_obj.svg
+++ b/org.eclipse.pde.doc.user/guide/images/schema_editor/att_file_obj.svg
@@ -1,29 +1,144 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="16" height="16">
-  <defs>
-    <linearGradient xlink:href="#a" id="f" x1="10.545" x2="10.545" y1="1038.578" y2="1052.323" gradientTransform="matrix(1.08485 0 0 1.08485 4.132 -91.792)" gradientUnits="userSpaceOnUse"/>
-    <linearGradient id="a">
-      <stop offset="0" stop-color="#b4903d"/>
-      <stop offset="1" stop-color="#7b744f"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="16"
+   height="16"
+   version="1.1"
+   id="svg11"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs6">
+    <linearGradient
+       xlink:href="#a"
+       id="f"
+       x1="10.545"
+       x2="10.545"
+       y1="1038.578"
+       y2="1052.323"
+       gradientTransform="matrix(1.08485 0 0 1.08485 4.132 -91.792)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="a">
+      <stop
+         offset="0"
+         stop-color="#b4903d"
+         id="stop1" />
+      <stop
+         offset="1"
+         stop-color="#7b744f"
+         id="stop2" />
     </linearGradient>
-    <linearGradient xlink:href="#b" id="e" x1="7.999" x2="9.987" y1="1042.231" y2="1040.33" gradientTransform="matrix(.98485 0 0 1.00575 6.73 -9.655)" gradientUnits="userSpaceOnUse"/>
-    <linearGradient id="b">
-      <stop offset="0" stop-color="#e0c88f"/>
-      <stop offset="1" stop-color="#d5b269"/>
+    <linearGradient
+       xlink:href="#b"
+       id="e"
+       x1="7.999"
+       x2="9.987"
+       y1="1042.231"
+       y2="1040.33"
+       gradientTransform="matrix(.98485 0 0 1.00575 6.73 -9.655)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="b">
+      <stop
+         offset="0"
+         stop-color="#e0c88f"
+         id="stop3" />
+      <stop
+         offset="1"
+         stop-color="#d5b269"
+         id="stop4" />
     </linearGradient>
-    <linearGradient xlink:href="#c" id="d" x1="9.895" x2="9.895" y1="1039.153" y2="1051.838" gradientTransform="matrix(1.08485 0 0 1.08485 4.132 -91.792)" gradientUnits="userSpaceOnUse"/>
-    <linearGradient id="c">
-      <stop offset="0" stop-color="#f9fafc"/>
-      <stop offset="1" stop-color="#dce7f7"/>
+    <linearGradient
+       xlink:href="#c"
+       id="d"
+       x1="9.895"
+       x2="9.895"
+       y1="1039.153"
+       y2="1051.838"
+       gradientTransform="matrix(1.08485 0 0 1.08485 4.132 -91.792)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="c">
+      <stop
+         offset="0"
+         stop-color="#f9fafc"
+         id="stop5" />
+      <stop
+         offset="1"
+         stop-color="#dce7f7"
+         id="stop6" />
     </linearGradient>
   </defs>
-  <g font-weight="400" letter-spacing="0" word-spacing="0">
-    <path fill="url(#d)" d="m 10.095588,1035.2628 5.291937,-0.062 3.321871,3.2617 0,7.7367 -8.613808,0.062 z" font-family="AustralianFlyingCorpsStencil" font-size="11.052" style="line-height:125%;text-align:start" transform="translate(-9.556 -1034.742)"/>
-    <path fill="url(#e)" d="m 14.584943,1034.7608 0,3.9337 3.917218,0 z" font-family="AustralianFlyingCorpsStencil" font-size="11.052" style="line-height:125%;text-align:start" transform="translate(-9.556 -1034.742)"/>
-    <path fill="none" stroke="url(#f)" stroke-width="1.085" d="m 10.095588,1035.2628 4.791937,0 3.321871,3.2617 0,7.7367 -8.113808,0 z" font-family="AustralianFlyingCorpsStencil" font-size="11.052" style="line-height:125%;text-align:start" transform="translate(-9.556 -1034.742)"/>
-    <g fill="#387838" stroke="#266923" stroke-width=".278" font-family="Serif" font-size="8.992" style="line-height:125%;text-align:start" transform="matrix(.99875 0 0 1.12866 -10.527 -1117.466)">
-      <circle cx="20.544" cy="1044.742" r="4.489" fill="#fff" stroke-linecap="round" stroke-linejoin="round" stroke-width="1" font-family="Sans" font-size="13.589" style="line-height:125%" transform="matrix(1.00125 0 0 .886 .972 73.295)"/>
-      <path fill="none" stroke="#fff" stroke-linecap="round" stroke-width="1" d="m 24.43155,1046.9864 a 4.4886336,4.4886336 0 0 1 -1.642954,1.6429" font-family="Sans" font-size="13.589" style="line-height:125%" transform="matrix(1.00125 0 0 .886 .972 73.295)"/>
-      <path fill="#266923" stroke-width=".277" d="m 22.620507,999.74158 0,-0.98021 -1.040788,0 c -0.401091,0 -0.699714,0.0857 -0.895868,0.25704 -0.196155,0.17135 -0.294232,0.43419 -0.294232,0.78852 0,0.32237 0.09954,0.57797 0.298623,0.76677 0.199082,0.1887 0.468428,0.2831 0.808038,0.2831 0.336682,0 0.607492,-0.1031 0.812429,-0.3093 0.207865,-0.2062 0.311798,-0.4748 0.311798,-0.80592 z m 0.808037,-1.43764 -0.01946,1.97066 1.6957,1.5699 -0.444853,0.3635 -1.601857,-1.6986 -0.459711,0.2744 c -0.244962,0.1855 -0.362864,0.285 -0.597079,0.3867 -0.234214,0.1017 -0.507951,0.1525 -0.821211,0.1525 -0.518199,0 -0.929537,-0.1365 -1.234015,-0.4095 -0.304478,-0.2731 -0.456717,-0.6419 -0.456717,-1.10657 0,-0.47921 0.174196,-0.85097 0.522589,-1.11526 0.348394,-0.26429 0.840243,-0.39644 1.475548,-0.39644 l 1.13301,0 0,-0.31802 c 0,-0.35143 -0.108324,-0.62298 -0.324973,-0.81467 -0.213719,-0.19459 -0.51527,-0.29188 -0.904651,-0.29188 -0.322044,0 -0.578215,0.0726 -0.768514,0.21782 -0.190299,0.14521 -0.308869,0.36013 -0.355712,0.64476 l -0.417193,0 0,-0.93664 c 0.281057,-0.11908 0.55333,-0.20766 0.816821,-0.26575 0.266418,-0.061 0.525517,-0.0915 0.777297,-0.0915 0.647015,0 1.138864,0.15974 1.475547,0.47921 0.33961,0.31657 0.509415,0.77836 0.509415,1.38537 z"/>
+  <g
+     font-weight="400"
+     letter-spacing="0"
+     word-spacing="0"
+     id="g11">
+    <path
+       fill="url(#d)"
+       d="m 10.095588,1035.2628 5.291937,-0.062 3.321871,3.2617 0,7.7367 -8.613808,0.062 z"
+       font-family="AustralianFlyingCorpsStencil"
+       font-size="11.052"
+       style="line-height:125%;text-align:start"
+       transform="translate(-9.556 -1034.742)"
+       id="path6" />
+    <path
+       fill="url(#e)"
+       d="m 14.584943,1034.7608 0,3.9337 3.917218,0 z"
+       font-family="AustralianFlyingCorpsStencil"
+       font-size="11.052"
+       style="line-height:125%;text-align:start"
+       transform="translate(-9.556 -1034.742)"
+       id="path7" />
+    <path
+       fill="none"
+       stroke="url(#f)"
+       stroke-width="1.085"
+       d="m 10.095588,1035.2628 4.791937,0 3.321871,3.2617 0,7.7367 -8.113808,0 z"
+       font-family="AustralianFlyingCorpsStencil"
+       font-size="11.052"
+       style="line-height:125%;text-align:start"
+       transform="translate(-9.556 -1034.742)"
+       id="path8" />
+    <g
+       fill="#387838"
+       stroke="#266923"
+       stroke-width=".278"
+       font-family="Serif"
+       font-size="8.992"
+       style="line-height:125%;text-align:start"
+       transform="matrix(.99875 0 0 1.12866 -10.527 -1117.466)"
+       id="g10">
+      <circle
+         cx="20.544"
+         cy="1044.742"
+         r="4.489"
+         fill="#fff"
+         stroke-linecap="round"
+         stroke-linejoin="round"
+         stroke-width="1"
+         font-family="Sans"
+         font-size="13.589"
+         style="line-height:125%"
+         transform="matrix(1.00125 0 0 .886 .972 73.295)"
+         id="circle8" />
+      <path
+         fill="none"
+         stroke="#fff"
+         stroke-linecap="round"
+         stroke-width="1"
+         d="m 24.43155,1046.9864 a 4.4886336,4.4886336 0 0 1 -1.642954,1.6429"
+         font-family="Sans"
+         font-size="13.589"
+         style="line-height:125%"
+         transform="matrix(1.00125 0 0 .886 .972 73.295)"
+         id="path9" />
+      <path
+         fill="#266923"
+         stroke-width=".277"
+         d="m 22.620507,999.74158 0,-0.98021 -1.040788,0 c -0.401091,0 -0.699714,0.0857 -0.895868,0.25704 -0.196155,0.17135 -0.294232,0.43419 -0.294232,0.78852 0,0.32237 0.09954,0.57797 0.298623,0.76677 0.199082,0.1887 0.468428,0.2831 0.808038,0.2831 0.336682,0 0.607492,-0.1031 0.812429,-0.3093 0.207865,-0.2062 0.311798,-0.4748 0.311798,-0.80592 z m 0.808037,-1.43764 -0.01946,1.97066 1.6957,1.5699 -0.444853,0.3635 -1.601857,-1.6986 -0.459711,0.2744 c -0.244962,0.1855 -0.362864,0.285 -0.597079,0.3867 -0.234214,0.1017 -0.507951,0.1525 -0.821211,0.1525 -0.518199,0 -0.929537,-0.1365 -1.234015,-0.4095 -0.304478,-0.2731 -0.456717,-0.6419 -0.456717,-1.10657 0,-0.47921 0.174196,-0.85097 0.522589,-1.11526 0.348394,-0.26429 0.840243,-0.39644 1.475548,-0.39644 l 1.13301,0 0,-0.31802 c 0,-0.35143 -0.108324,-0.62298 -0.324973,-0.81467 -0.213719,-0.19459 -0.51527,-0.29188 -0.904651,-0.29188 -0.322044,0 -0.578215,0.0726 -0.768514,0.21782 -0.190299,0.14521 -0.308869,0.36013 -0.355712,0.64476 l -0.417193,0 0,-0.93664 c 0.281057,-0.11908 0.55333,-0.20766 0.816821,-0.26575 0.266418,-0.061 0.525517,-0.0915 0.777297,-0.0915 0.647015,0 1.138864,0.15974 1.475547,0.47921 0.33961,0.31657 0.509415,0.77836 0.509415,1.38537 z"
+         id="path10" />
     </g>
   </g>
 </svg>
diff --git a/org.eclipse.pde.doc.user/guide/images/schema_editor/att_impl_obj.svg b/org.eclipse.pde.doc.user/guide/images/schema_editor/att_impl_obj.svg
index 50e6243ee1b..ee9ba3c9375 100644
--- a/org.eclipse.pde.doc.user/guide/images/schema_editor/att_impl_obj.svg
+++ b/org.eclipse.pde.doc.user/guide/images/schema_editor/att_impl_obj.svg
@@ -1,15 +1,80 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="16" height="16">
-  <defs>
-    <linearGradient xlink:href="#a" id="b" x1="0" x2="8" y1="13.5" y2="13.5" gradientTransform="translate(9.588 1023.742)" gradientUnits="userSpaceOnUse"/>
-    <linearGradient id="a">
-      <stop offset="0" stop-color="#4d607b"/>
-      <stop offset="1" stop-color="#2c4a6c"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="16"
+   height="16"
+   version="1.1"
+   id="svg4"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs2">
+    <linearGradient
+       xlink:href="#a"
+       id="b"
+       x1="0"
+       x2="8"
+       y1="13.5"
+       y2="13.5"
+       gradientTransform="translate(9.588 1023.742)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="a">
+      <stop
+         offset="0"
+         stop-color="#4d607b"
+         id="stop1" />
+      <stop
+         offset="1"
+         stop-color="#2c4a6c"
+         id="stop2" />
     </linearGradient>
   </defs>
-  <g fill="#387838" stroke="#266923" stroke-width=".278" font-family="Serif" font-size="8.992" font-weight="400" letter-spacing="0" style="line-height:125%;text-align:start" transform="matrix(.99875 0 0 1.12866 -10.527 -1117.466)" word-spacing="0">
-    <circle cx="20.544" cy="1044.742" r="4.489" fill="#fff" stroke-linecap="round" stroke-linejoin="round" stroke-width="1" font-family="Sans" font-size="13.589" style="line-height:125%" transform="matrix(1.00125 0 0 .886 .972 73.295)"/>
-    <path fill="none" stroke="#fff" stroke-linecap="round" stroke-width="1" d="m 24.43155,1046.9864 a 4.4886336,4.4886336 0 0 1 -1.642954,1.6429" font-family="Sans" font-size="13.589" style="line-height:125%" transform="matrix(1.00125 0 0 .886 .972 73.295)"/>
-    <path fill="#266923" stroke-width=".277" d="m 22.620507,999.74158 0,-0.98021 -1.040788,0 c -0.401091,0 -0.699714,0.0857 -0.895868,0.25704 -0.196155,0.17135 -0.294232,0.43419 -0.294232,0.78852 0,0.32237 0.09954,0.57797 0.298623,0.76677 0.199082,0.1887 0.468428,0.2831 0.808038,0.2831 0.336682,0 0.607492,-0.1031 0.812429,-0.3093 0.207865,-0.2062 0.311798,-0.4748 0.311798,-0.80592 z m 0.808037,-1.43764 -0.01946,1.97066 1.6957,1.5699 -0.444853,0.3635 -1.601857,-1.6986 -0.459711,0.2744 c -0.244962,0.1855 -0.362864,0.285 -0.597079,0.3867 -0.234214,0.1017 -0.507951,0.1525 -0.821211,0.1525 -0.518199,0 -0.929537,-0.1365 -1.234015,-0.4095 -0.304478,-0.2731 -0.456717,-0.6419 -0.456717,-1.10657 0,-0.47921 0.174196,-0.85097 0.522589,-1.11526 0.348394,-0.26429 0.840243,-0.39644 1.475548,-0.39644 l 1.13301,0 0,-0.31802 c 0,-0.35143 -0.108324,-0.62298 -0.324973,-0.81467 -0.213719,-0.19459 -0.51527,-0.29188 -0.904651,-0.29188 -0.322044,0 -0.578215,0.0726 -0.768514,0.21782 -0.190299,0.14521 -0.308869,0.36013 -0.355712,0.64476 l -0.417193,0 0,-0.93664 c 0.281057,-0.11908 0.55333,-0.20766 0.816821,-0.26575 0.266418,-0.061 0.525517,-0.0915 0.777297,-0.0915 0.647015,0 1.138864,0.15974 1.475547,0.47921 0.33961,0.31657 0.509415,0.77836 0.509415,1.38537 z"/>
+  <g
+     fill="#387838"
+     stroke="#266923"
+     stroke-width=".278"
+     font-family="Serif"
+     font-size="8.992"
+     font-weight="400"
+     letter-spacing="0"
+     style="line-height:125%;text-align:start"
+     transform="matrix(.99875 0 0 1.12866 -10.527 -1117.466)"
+     word-spacing="0"
+     id="g3">
+    <circle
+       cx="20.544"
+       cy="1044.742"
+       r="4.489"
+       fill="#fff"
+       stroke-linecap="round"
+       stroke-linejoin="round"
+       stroke-width="1"
+       font-family="Sans"
+       font-size="13.589"
+       style="line-height:125%"
+       transform="matrix(1.00125 0 0 .886 .972 73.295)"
+       id="circle2" />
+    <path
+       fill="none"
+       stroke="#fff"
+       stroke-linecap="round"
+       stroke-width="1"
+       d="m 24.43155,1046.9864 a 4.4886336,4.4886336 0 0 1 -1.642954,1.6429"
+       font-family="Sans"
+       font-size="13.589"
+       style="line-height:125%"
+       transform="matrix(1.00125 0 0 .886 .972 73.295)"
+       id="path2" />
+    <path
+       fill="#266923"
+       stroke-width=".277"
+       d="m 22.620507,999.74158 0,-0.98021 -1.040788,0 c -0.401091,0 -0.699714,0.0857 -0.895868,0.25704 -0.196155,0.17135 -0.294232,0.43419 -0.294232,0.78852 0,0.32237 0.09954,0.57797 0.298623,0.76677 0.199082,0.1887 0.468428,0.2831 0.808038,0.2831 0.336682,0 0.607492,-0.1031 0.812429,-0.3093 0.207865,-0.2062 0.311798,-0.4748 0.311798,-0.80592 z m 0.808037,-1.43764 -0.01946,1.97066 1.6957,1.5699 -0.444853,0.3635 -1.601857,-1.6986 -0.459711,0.2744 c -0.244962,0.1855 -0.362864,0.285 -0.597079,0.3867 -0.234214,0.1017 -0.507951,0.1525 -0.821211,0.1525 -0.518199,0 -0.929537,-0.1365 -1.234015,-0.4095 -0.304478,-0.2731 -0.456717,-0.6419 -0.456717,-1.10657 0,-0.47921 0.174196,-0.85097 0.522589,-1.11526 0.348394,-0.26429 0.840243,-0.39644 1.475548,-0.39644 l 1.13301,0 0,-0.31802 c 0,-0.35143 -0.108324,-0.62298 -0.324973,-0.81467 -0.213719,-0.19459 -0.51527,-0.29188 -0.904651,-0.29188 -0.322044,0 -0.578215,0.0726 -0.768514,0.21782 -0.190299,0.14521 -0.308869,0.36013 -0.355712,0.64476 l -0.417193,0 0,-0.93664 c 0.281057,-0.11908 0.55333,-0.20766 0.816821,-0.26575 0.266418,-0.061 0.525517,-0.0915 0.777297,-0.0915 0.647015,0 1.138864,0.15974 1.475547,0.47921 0.33961,0.31657 0.509415,0.77836 0.509415,1.38537 z"
+       id="path3" />
   </g>
-  <path fill="url(#b)" d="m 9.5876528,1036.7417 0,1 5.0000012,0 0,2 2.999893,-2.5 -2.999893,-2.5 0,2 z" transform="translate(-9.556 -1034.742)"/>
+  <path
+     fill="url(#b)"
+     d="m 9.5876528,1036.7417 0,1 5.0000012,0 0,2 2.999893,-2.5 -2.999893,-2.5 0,2 z"
+     transform="translate(-9.556 -1034.742)"
+     id="path4" />
 </svg>
diff --git a/org.eclipse.pde.doc.user/guide/images/schema_editor/att_req_obj.svg b/org.eclipse.pde.doc.user/guide/images/schema_editor/att_req_obj.svg
index 4ed80a54667..e92be626ead 100644
--- a/org.eclipse.pde.doc.user/guide/images/schema_editor/att_req_obj.svg
+++ b/org.eclipse.pde.doc.user/guide/images/schema_editor/att_req_obj.svg
@@ -1,17 +1,90 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="16" height="16">
-  <defs>
-    <linearGradient xlink:href="#a" id="b" x1="8.315" x2="8.315" y1="1040.4" y2="1039.34" gradientTransform="translate(-5.889)" gradientUnits="userSpaceOnUse"/>
-    <linearGradient id="a">
-      <stop offset="0" stop-color="#fdae35"/>
-      <stop offset="1" stop-color="#fef0db"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="16"
+   height="16"
+   version="1.1"
+   id="svg4"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs2">
+    <linearGradient
+       xlink:href="#a"
+       id="b"
+       x1="8.315"
+       x2="8.315"
+       y1="1040.4"
+       y2="1039.34"
+       gradientTransform="translate(-5.889)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="a">
+      <stop
+         offset="0"
+         stop-color="#fdae35"
+         id="stop1" />
+      <stop
+         offset="1"
+         stop-color="#fef0db"
+         id="stop2" />
     </linearGradient>
   </defs>
-  <g transform="translate(0 -1036.362)">
-    <g fill="#387838" stroke="#266923" stroke-width=".278" font-family="Serif" font-size="8.992" font-weight="400" letter-spacing="0" style="line-height:125%;text-align:start" transform="matrix(.99875 0 0 1.12866 -10.527 -81.104)" word-spacing="0">
-      <circle cx="20.544" cy="1044.742" r="4.489" fill="#fff" stroke-linecap="round" stroke-linejoin="round" stroke-width="1" font-family="Sans" font-size="13.589" style="line-height:125%" transform="matrix(1.00125 0 0 .886 .972 73.295)"/>
-      <path fill="none" stroke="#fff" stroke-linecap="round" stroke-width="1" d="m 24.43155,1046.9864 a 4.4886336,4.4886336 0 0 1 -1.642954,1.6429" font-family="Sans" font-size="13.589" style="line-height:125%" transform="matrix(1.00125 0 0 .886 .972 73.295)"/>
-      <path fill="#266923" stroke-width=".277" d="m 22.620507,999.74158 0,-0.98021 -1.040788,0 c -0.401091,0 -0.699714,0.0857 -0.895868,0.25704 -0.196155,0.17135 -0.294232,0.43419 -0.294232,0.78852 0,0.32237 0.09954,0.57797 0.298623,0.76677 0.199082,0.1887 0.468428,0.2831 0.808038,0.2831 0.336682,0 0.607492,-0.1031 0.812429,-0.3093 0.207865,-0.2062 0.311798,-0.4748 0.311798,-0.80592 z m 0.808037,-1.43764 -0.01946,1.97066 1.6957,1.5699 -0.444853,0.3635 -1.601857,-1.6986 -0.459711,0.2744 c -0.244962,0.1855 -0.362864,0.285 -0.597079,0.3867 -0.234214,0.1017 -0.507951,0.1525 -0.821211,0.1525 -0.518199,0 -0.929537,-0.1365 -1.234015,-0.4095 -0.304478,-0.2731 -0.456717,-0.6419 -0.456717,-1.10657 0,-0.47921 0.174196,-0.85097 0.522589,-1.11526 0.348394,-0.26429 0.840243,-0.39644 1.475548,-0.39644 l 1.13301,0 0,-0.31802 c 0,-0.35143 -0.108324,-0.62298 -0.324973,-0.81467 -0.213719,-0.19459 -0.51527,-0.29188 -0.904651,-0.29188 -0.322044,0 -0.578215,0.0726 -0.768514,0.21782 -0.190299,0.14521 -0.308869,0.36013 -0.355712,0.64476 l -0.417193,0 0,-0.93664 c 0.281057,-0.11908 0.55333,-0.20766 0.816821,-0.26575 0.266418,-0.061 0.525517,-0.0915 0.777297,-0.0915 0.647015,0 1.138864,0.15974 1.475547,0.47921 0.33961,0.31657 0.509415,0.77836 0.509415,1.38537 z"/>
+  <g
+     transform="translate(0 -1036.362)"
+     id="g4">
+    <g
+       fill="#387838"
+       stroke="#266923"
+       stroke-width=".278"
+       font-family="Serif"
+       font-size="8.992"
+       font-weight="400"
+       letter-spacing="0"
+       style="line-height:125%;text-align:start"
+       transform="matrix(.99875 0 0 1.12866 -10.527 -81.104)"
+       word-spacing="0"
+       id="g3">
+      <circle
+         cx="20.544"
+         cy="1044.742"
+         r="4.489"
+         fill="#fff"
+         stroke-linecap="round"
+         stroke-linejoin="round"
+         stroke-width="1"
+         font-family="Sans"
+         font-size="13.589"
+         style="line-height:125%"
+         transform="matrix(1.00125 0 0 .886 .972 73.295)"
+         id="circle2" />
+      <path
+         fill="none"
+         stroke="#fff"
+         stroke-linecap="round"
+         stroke-width="1"
+         d="m 24.43155,1046.9864 a 4.4886336,4.4886336 0 0 1 -1.642954,1.6429"
+         font-family="Sans"
+         font-size="13.589"
+         style="line-height:125%"
+         transform="matrix(1.00125 0 0 .886 .972 73.295)"
+         id="path2" />
+      <path
+         fill="#266923"
+         stroke-width=".277"
+         d="m 22.620507,999.74158 0,-0.98021 -1.040788,0 c -0.401091,0 -0.699714,0.0857 -0.895868,0.25704 -0.196155,0.17135 -0.294232,0.43419 -0.294232,0.78852 0,0.32237 0.09954,0.57797 0.298623,0.76677 0.199082,0.1887 0.468428,0.2831 0.808038,0.2831 0.336682,0 0.607492,-0.1031 0.812429,-0.3093 0.207865,-0.2062 0.311798,-0.4748 0.311798,-0.80592 z m 0.808037,-1.43764 -0.01946,1.97066 1.6957,1.5699 -0.444853,0.3635 -1.601857,-1.6986 -0.459711,0.2744 c -0.244962,0.1855 -0.362864,0.285 -0.597079,0.3867 -0.234214,0.1017 -0.507951,0.1525 -0.821211,0.1525 -0.518199,0 -0.929537,-0.1365 -1.234015,-0.4095 -0.304478,-0.2731 -0.456717,-0.6419 -0.456717,-1.10657 0,-0.47921 0.174196,-0.85097 0.522589,-1.11526 0.348394,-0.26429 0.840243,-0.39644 1.475548,-0.39644 l 1.13301,0 0,-0.31802 c 0,-0.35143 -0.108324,-0.62298 -0.324973,-0.81467 -0.213719,-0.19459 -0.51527,-0.29188 -0.904651,-0.29188 -0.322044,0 -0.578215,0.0726 -0.768514,0.21782 -0.190299,0.14521 -0.308869,0.36013 -0.355712,0.64476 l -0.417193,0 0,-0.93664 c 0.281057,-0.11908 0.55333,-0.20766 0.816821,-0.26575 0.266418,-0.061 0.525517,-0.0915 0.777297,-0.0915 0.647015,0 1.138864,0.15974 1.475547,0.47921 0.33961,0.31657 0.509415,0.77836 0.509415,1.38537 z"
+         id="path3" />
     </g>
-    <rect width="3.984" height="3.984" x=".505" y="1037.878" fill="url(#b)" stroke="#8d602e" opacity=".997" rx=".91" ry=".91"/>
+    <rect
+       width="3.984"
+       height="3.984"
+       x=".505"
+       y="1037.878"
+       fill="url(#b)"
+       stroke="#8d602e"
+       opacity=".997"
+       rx=".91"
+       ry=".91"
+       id="rect3" />
   </g>
 </svg>
diff --git a/org.eclipse.pde.doc.user/guide/images/schema_editor/choice_sc_obj.svg b/org.eclipse.pde.doc.user/guide/images/schema_editor/choice_sc_obj.svg
index 999a64acc00..de3900da8f8 100644
--- a/org.eclipse.pde.doc.user/guide/images/schema_editor/choice_sc_obj.svg
+++ b/org.eclipse.pde.doc.user/guide/images/schema_editor/choice_sc_obj.svg
@@ -1,31 +1,146 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="16" height="16">
-  <defs>
-    <linearGradient id="c">
-      <stop offset="0" stop-color="#5c7aaa"/>
-      <stop offset="1" stop-color="#aebdd5"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="16"
+   height="16"
+   version="1.1"
+   id="svg9"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs6">
+    <linearGradient
+       id="c">
+      <stop
+         offset="0"
+         stop-color="#5c7aaa"
+         id="stop1" />
+      <stop
+         offset="1"
+         stop-color="#aebdd5"
+         id="stop2" />
     </linearGradient>
-    <linearGradient id="a">
-      <stop offset="0" stop-color="#81737c"/>
-      <stop offset="1" stop-color="#a79aa4"/>
+    <linearGradient
+       id="a">
+      <stop
+         offset="0"
+         stop-color="#81737c"
+         id="stop3" />
+      <stop
+         offset="1"
+         stop-color="#a79aa4"
+         id="stop4" />
     </linearGradient>
-    <linearGradient xlink:href="#a" id="g" x1="18.494" x2="18.494" y1="1044.57" y2="1042.195" gradientTransform="translate(10.334 6.724)" gradientUnits="userSpaceOnUse"/>
-    <linearGradient id="b">
-      <stop offset="0" stop-color="#346692"/>
-      <stop offset="1" stop-color="#4395c1"/>
+    <linearGradient
+       xlink:href="#a"
+       id="g"
+       x1="18.494"
+       x2="18.494"
+       y1="1044.57"
+       y2="1042.195"
+       gradientTransform="translate(10.334 6.724)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="b">
+      <stop
+         offset="0"
+         stop-color="#346692"
+         id="stop5" />
+      <stop
+         offset="1"
+         stop-color="#4395c1"
+         id="stop6" />
     </linearGradient>
-    <linearGradient xlink:href="#b" id="h" x1="18.494" x2="18.494" y1="1044.57" y2="1042.195" gradientTransform="translate(12.294 11.675)" gradientUnits="userSpaceOnUse"/>
-    <linearGradient xlink:href="#a" id="i" x1="18.494" x2="18.494" y1="1044.57" y2="1042.195" gradientTransform="translate(10.326 16.703)" gradientUnits="userSpaceOnUse"/>
-    <linearGradient xlink:href="#c" id="d" x1="10.529" x2="25.577" y1="1043.21" y2="1043.21" gradientUnits="userSpaceOnUse"/>
-    <linearGradient xlink:href="#c" id="e" x1="10.529" x2="25.577" y1="1043.21" y2="1043.21" gradientUnits="userSpaceOnUse"/>
-    <linearGradient xlink:href="#c" id="f" x1="10.529" x2="25.577" y1="1043.21" y2="1043.21" gradientUnits="userSpaceOnUse"/>
+    <linearGradient
+       xlink:href="#b"
+       id="h"
+       x1="18.494"
+       x2="18.494"
+       y1="1044.57"
+       y2="1042.195"
+       gradientTransform="translate(12.294 11.675)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#a"
+       id="i"
+       x1="18.494"
+       x2="18.494"
+       y1="1044.57"
+       y2="1042.195"
+       gradientTransform="translate(10.326 16.703)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#c"
+       id="d"
+       x1="10.529"
+       x2="25.577"
+       y1="1043.21"
+       y2="1043.21"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#c"
+       id="e"
+       x1="10.529"
+       x2="25.577"
+       y1="1043.21"
+       y2="1043.21"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#c"
+       id="f"
+       x1="10.529"
+       x2="25.577"
+       y1="1043.21"
+       y2="1043.21"
+       gradientUnits="userSpaceOnUse" />
   </defs>
-  <g fill="none" stroke="url(#d)" transform="translate(-9.575 -1034.742)">
-    <path stroke="url(#e)" stroke-width="1.016" d="m 10.528622,1043.2507 15.048117,0"/>
-    <path stroke="url(#f)" d="m 22.993851,1041.7103 0,-3.5 -9.937501,0 0,10.0001 10.062501,0 0,-3.5626"/>
+  <g
+     fill="none"
+     stroke="url(#d)"
+     transform="translate(-9.575 -1034.742)"
+     id="g7">
+    <path
+       stroke="url(#e)"
+       stroke-width="1.016"
+       d="m 10.528622,1043.2507 15.048117,0"
+       id="path6" />
+    <path
+       stroke="url(#f)"
+       d="m 22.993851,1041.7103 0,-3.5 -9.937501,0 0,10.0001 10.062501,0 0,-3.5626"
+       id="path7" />
   </g>
-  <g transform="translate(-20.207 -1046.497)">
-    <rect width="2" height="1.969" x="27.718" y="1049.013" fill="#e7e1c4" stroke="url(#g)" rx="0" ry="0"/>
-    <rect width="2" height="1.969" x="29.679" y="1053.964" fill="#89bedb" stroke="url(#h)" rx="0" ry="0"/>
-    <rect width="2" height="1.969" x="27.711" y="1058.991" fill="#e7e1c4" stroke="url(#i)" rx="0" ry="0"/>
+  <g
+     transform="translate(-20.207 -1046.497)"
+     id="g9">
+    <rect
+       width="2"
+       height="1.969"
+       x="27.718"
+       y="1049.013"
+       fill="#e7e1c4"
+       stroke="url(#g)"
+       rx="0"
+       ry="0"
+       id="rect7" />
+    <rect
+       width="2"
+       height="1.969"
+       x="29.679"
+       y="1053.964"
+       fill="#89bedb"
+       stroke="url(#h)"
+       rx="0"
+       ry="0"
+       id="rect8" />
+    <rect
+       width="2"
+       height="1.969"
+       x="27.711"
+       y="1058.991"
+       fill="#e7e1c4"
+       stroke="url(#i)"
+       rx="0"
+       ry="0"
+       id="rect9" />
   </g>
 </svg>
diff --git a/org.eclipse.pde.doc.user/guide/images/schema_editor/elref_sc_obj.svg b/org.eclipse.pde.doc.user/guide/images/schema_editor/elref_sc_obj.svg
index 60352991570..9881f58c0e0 100644
--- a/org.eclipse.pde.doc.user/guide/images/schema_editor/elref_sc_obj.svg
+++ b/org.eclipse.pde.doc.user/guide/images/schema_editor/elref_sc_obj.svg
@@ -1,36 +1,169 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="16" height="16">
-  <defs>
-    <linearGradient id="e">
-      <stop offset="0" stop-color="#2269a4"/>
-      <stop offset="1" stop-color="#6a9ac2"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="16"
+   height="16"
+   version="1.1"
+   id="svg16"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs10">
+    <linearGradient
+       id="e">
+      <stop
+         offset="0"
+         stop-color="#2269a4"
+         id="stop1" />
+      <stop
+         offset="1"
+         stop-color="#6a9ac2"
+         id="stop2" />
     </linearGradient>
-    <linearGradient id="c">
-      <stop offset="0" stop-color="#ebf9ff"/>
-      <stop offset="1" stop-color="#fcffff"/>
+    <linearGradient
+       id="c">
+      <stop
+         offset="0"
+         stop-color="#ebf9ff"
+         id="stop3" />
+      <stop
+         offset="1"
+         stop-color="#fcffff"
+         id="stop4" />
     </linearGradient>
-    <linearGradient xlink:href="#a" id="h" x1="-12" x2="-15" y1="1047.362" y2="1047.362" gradientTransform="matrix(1 0 0 .74375 18 264.168)" gradientUnits="userSpaceOnUse"/>
-    <linearGradient id="a">
-      <stop offset="0" stop-color="#fff" stop-opacity="0"/>
-      <stop offset="1" stop-color="#c3e9ff"/>
+    <linearGradient
+       xlink:href="#a"
+       id="h"
+       x1="-12"
+       x2="-15"
+       y1="1047.362"
+       y2="1047.362"
+       gradientTransform="matrix(1 0 0 .74375 18 264.168)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="a">
+      <stop
+         offset="0"
+         stop-color="#fff"
+         stop-opacity="0"
+         id="stop5" />
+      <stop
+         offset="1"
+         stop-color="#c3e9ff"
+         id="stop6" />
     </linearGradient>
-    <linearGradient xlink:href="#b" id="i" x1="-11" x2="-11" y1="1042.362" y2="1045.362" gradientTransform="matrix(.8 0 0 1 15 -3)" gradientUnits="userSpaceOnUse"/>
-    <linearGradient id="b">
-      <stop offset="0" stop-color="#c3e9ff"/>
-      <stop offset="1" stop-color="#fff" stop-opacity="0"/>
+    <linearGradient
+       xlink:href="#b"
+       id="i"
+       x1="-11"
+       x2="-11"
+       y1="1042.362"
+       y2="1045.362"
+       gradientTransform="matrix(.8 0 0 1 15 -3)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="b">
+      <stop
+         offset="0"
+         stop-color="#c3e9ff"
+         id="stop7" />
+      <stop
+         offset="1"
+         stop-color="#fff"
+         stop-opacity="0"
+         id="stop8" />
     </linearGradient>
-    <linearGradient xlink:href="#c" id="g" x1="28" x2="28" y1="1039.362" y2="1049.362" gradientTransform="translate(-20)" gradientUnits="userSpaceOnUse"/>
-    <linearGradient xlink:href="#d" id="j" x1="27.221" x2="32.662" y1="11.072" y2="15.713" gradientTransform="translate(-25.192 1037.892)" gradientUnits="userSpaceOnUse"/>
-    <linearGradient id="d">
-      <stop offset="0" stop-color="#17325d"/>
-      <stop offset="1" stop-color="#9daeca"/>
+    <linearGradient
+       xlink:href="#c"
+       id="g"
+       x1="28"
+       x2="28"
+       y1="1039.362"
+       y2="1049.362"
+       gradientTransform="translate(-20)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#d"
+       id="j"
+       x1="27.221"
+       x2="32.662"
+       y1="11.072"
+       y2="15.713"
+       gradientTransform="translate(-25.192 1037.892)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="d">
+      <stop
+         offset="0"
+         stop-color="#17325d"
+         id="stop9" />
+      <stop
+         offset="1"
+         stop-color="#9daeca"
+         id="stop10" />
     </linearGradient>
-    <linearGradient xlink:href="#e" id="f" x1="6.938" x2="6.938" y1="1048.393" y2="1038.393" gradientUnits="userSpaceOnUse"/>
+    <linearGradient
+       xlink:href="#e"
+       id="f"
+       x1="6.938"
+       x2="6.938"
+       y1="1048.393"
+       y2="1038.393"
+       gradientUnits="userSpaceOnUse" />
   </defs>
-  <path fill="url(#f)" d="m 2,1038.3622 0.03125,10.0156 9.90625,0 -0.03125,-10.0156 z m 1,1 7.90625,0 0.03125,8.0156 -7.90625,0 z" color="#000" font-family="Sans" font-weight="400" overflow="visible" style="line-height:normal;text-indent:0;text-align:start;text-decoration-line:none;text-transform:none;block-progression:tb;marker:none" transform="translate(4.063 -1038.393)"/>
-  <path fill="url(#g)" d="m 3,1039.3622 7.96875,0 0.03125,7.4375 -7.96875,0 z" color="#000" font-family="Sans" font-weight="400" overflow="visible" style="line-height:normal;text-indent:0;text-align:start;text-decoration-line:none;text-transform:none;block-progression:tb;marker:none" transform="translate(4.063 -1038.393)"/>
-  <path fill="url(#h)" d="m 5,1040.9122 0,5.95 -2,0 0,-7.4375 z" transform="matrix(-.99219 0 0 -1.06875 17.977 1119.803)"/>
-  <path fill="url(#i)" d="m 4.6,1041.3622 6.4,0 0,-2 -8,0 z" transform="matrix(-.99219 0 0 -1.06875 17.977 1119.803)"/>
-  <path fill="#113d95" d="m 7.5330622,1133.6321 q -0.4789633,0 -0.7629997,0.4734 -0.2784671,0.4734 -0.3063138,1.3868 l 1.9715469,0 q 0,-0.4344 -0.050124,-0.7797 -0.050124,-0.3453 -0.1615109,-0.5848 -0.1058175,-0.2395 -0.2784671,-0.3676 -0.1670802,-0.1281 -0.4121313,-0.1281 z m 0.1058175,5.6307 q -0.7240144,0 -1.2809485,-0.2117 -0.5513648,-0.2116 -0.9245107,-0.6126 -0.3731459,-0.401 -0.5625035,-0.9802 -0.1893576,-0.5848 -0.1893576,-1.3311 0,-0.802 0.1893576,-1.409 0.1893576,-0.6071 0.5513648,-1.0136 0.3620072,-0.4066 0.8855253,-0.6071 0.5290875,-0.2061 1.2029778,-0.2061 0.6181969,0 1.1138683,0.1782 0.4956714,0.1727 0.8409706,0.518 0.3452992,0.3453 0.5290874,0.8577 0.1837888,0.5124 0.1837888,1.1918 l 0,0.5848 -3.7370287,0 q 0.016708,0.5736 0.1225255,0.9858 0.1113868,0.4121 0.3007445,0.6794 0.1949269,0.2674 0.4678247,0.3954 0.278467,0.1281 0.6349049,0.1281 0.2951751,0 0.5457955,-0.067 0.2506203,-0.072 0.4511166,-0.1949 0.2060657,-0.1281 0.3564379,-0.2952 0.1559416,-0.1726 0.2561897,-0.3676 0.3063138,0.1671 0.3063138,0.557 0,0.245 -0.1336642,0.4678 -0.1336642,0.2172 -0.4121313,0.3843 -0.2784671,0.1671 -0.701737,0.2673 -0.4177006,0.1003 -0.9969122,0.1003 z" font-family="Droid Serif" font-size="11.406" font-weight="700" letter-spacing="0" style="line-height:125%" transform="matrix(.96722 0 0 .94702 3.837 -1070.9)" word-spacing="0"/>
-  <path fill="#fff" stroke="url(#j)" d="M.111 1046.884H6.142V1052.836H.111z" color="#000" overflow="visible" style="marker:none" transform="rotate(90 522.98 531.387)"/>
-  <path fill="#17325d" d="m 6.5825306,1052.7505 -0.689928,0.7034 -3.1702308,-3.1333 -1.121382,1.0476 -0.00373,-3.0017 3.0026559,-0 -1.0871113,1.2442 z" transform="rotate(90 522.98 531.387)"/>
+  <path
+     fill="url(#f)"
+     d="m 2,1038.3622 0.03125,10.0156 9.90625,0 -0.03125,-10.0156 z m 1,1 7.90625,0 0.03125,8.0156 -7.90625,0 z"
+     color="#000"
+     font-family="Sans"
+     font-weight="400"
+     overflow="visible"
+     style="line-height:normal;text-indent:0;text-align:start;text-decoration-line:none;text-transform:none;block-progression:tb;marker:none"
+     transform="translate(4.063 -1038.393)"
+     id="path10" />
+  <path
+     fill="url(#g)"
+     d="m 3,1039.3622 7.96875,0 0.03125,7.4375 -7.96875,0 z"
+     color="#000"
+     font-family="Sans"
+     font-weight="400"
+     overflow="visible"
+     style="line-height:normal;text-indent:0;text-align:start;text-decoration-line:none;text-transform:none;block-progression:tb;marker:none"
+     transform="translate(4.063 -1038.393)"
+     id="path11" />
+  <path
+     fill="url(#h)"
+     d="m 5,1040.9122 0,5.95 -2,0 0,-7.4375 z"
+     transform="matrix(-.99219 0 0 -1.06875 17.977 1119.803)"
+     id="path12" />
+  <path
+     fill="url(#i)"
+     d="m 4.6,1041.3622 6.4,0 0,-2 -8,0 z"
+     transform="matrix(-.99219 0 0 -1.06875 17.977 1119.803)"
+     id="path13" />
+  <path
+     fill="#113d95"
+     d="m 7.5330622,1133.6321 q -0.4789633,0 -0.7629997,0.4734 -0.2784671,0.4734 -0.3063138,1.3868 l 1.9715469,0 q 0,-0.4344 -0.050124,-0.7797 -0.050124,-0.3453 -0.1615109,-0.5848 -0.1058175,-0.2395 -0.2784671,-0.3676 -0.1670802,-0.1281 -0.4121313,-0.1281 z m 0.1058175,5.6307 q -0.7240144,0 -1.2809485,-0.2117 -0.5513648,-0.2116 -0.9245107,-0.6126 -0.3731459,-0.401 -0.5625035,-0.9802 -0.1893576,-0.5848 -0.1893576,-1.3311 0,-0.802 0.1893576,-1.409 0.1893576,-0.6071 0.5513648,-1.0136 0.3620072,-0.4066 0.8855253,-0.6071 0.5290875,-0.2061 1.2029778,-0.2061 0.6181969,0 1.1138683,0.1782 0.4956714,0.1727 0.8409706,0.518 0.3452992,0.3453 0.5290874,0.8577 0.1837888,0.5124 0.1837888,1.1918 l 0,0.5848 -3.7370287,0 q 0.016708,0.5736 0.1225255,0.9858 0.1113868,0.4121 0.3007445,0.6794 0.1949269,0.2674 0.4678247,0.3954 0.278467,0.1281 0.6349049,0.1281 0.2951751,0 0.5457955,-0.067 0.2506203,-0.072 0.4511166,-0.1949 0.2060657,-0.1281 0.3564379,-0.2952 0.1559416,-0.1726 0.2561897,-0.3676 0.3063138,0.1671 0.3063138,0.557 0,0.245 -0.1336642,0.4678 -0.1336642,0.2172 -0.4121313,0.3843 -0.2784671,0.1671 -0.701737,0.2673 -0.4177006,0.1003 -0.9969122,0.1003 z"
+     font-family="Droid Serif"
+     font-size="11.406"
+     font-weight="700"
+     letter-spacing="0"
+     style="line-height:125%"
+     transform="matrix(.96722 0 0 .94702 3.837 -1070.9)"
+     word-spacing="0"
+     id="path14" />
+  <path
+     fill="#fff"
+     stroke="url(#j)"
+     d="M.111 1046.884H6.142V1052.836H.111z"
+     color="#000"
+     overflow="visible"
+     style="marker:none"
+     transform="rotate(90 522.98 531.387)"
+     id="path15" />
+  <path
+     fill="#17325d"
+     d="m 6.5825306,1052.7505 -0.689928,0.7034 -3.1702308,-3.1333 -1.121382,1.0476 -0.00373,-3.0017 3.0026559,-0 -1.0871113,1.2442 z"
+     transform="rotate(90 522.98 531.387)"
+     id="path16" />
 </svg>
diff --git a/org.eclipse.pde.doc.user/guide/images/schema_editor/gel_sc_obj.svg b/org.eclipse.pde.doc.user/guide/images/schema_editor/gel_sc_obj.svg
index da7c40a08a5..6508575cb95 100644
--- a/org.eclipse.pde.doc.user/guide/images/schema_editor/gel_sc_obj.svg
+++ b/org.eclipse.pde.doc.user/guide/images/schema_editor/gel_sc_obj.svg
@@ -1,66 +1,297 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="16" height="16">
-  <defs>
-    <linearGradient id="i">
-      <stop offset="0" stop-color="#6a9ac2"/>
-      <stop offset="1" stop-color="#1c65a2"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="16"
+   height="16"
+   version="1.1"
+   id="svg29"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs23">
+    <linearGradient
+       id="i">
+      <stop
+         offset="0"
+         stop-color="#6a9ac2"
+         id="stop1" />
+      <stop
+         offset="1"
+         stop-color="#1c65a2"
+         id="stop2" />
     </linearGradient>
-    <linearGradient id="d">
-      <stop offset="0" stop-color="#6fd9ff"/>
-      <stop offset=".5" stop-color="#55add0"/>
-      <stop offset="1" stop-color="#4364a7"/>
+    <linearGradient
+       id="d">
+      <stop
+         offset="0"
+         stop-color="#6fd9ff"
+         id="stop3" />
+      <stop
+         offset=".5"
+         stop-color="#55add0"
+         id="stop4" />
+      <stop
+         offset="1"
+         stop-color="#4364a7"
+         id="stop5" />
     </linearGradient>
-    <linearGradient id="c">
-      <stop offset="0" stop-color="#4f4d70"/>
-      <stop offset="1" stop-color="#4fa8ca"/>
+    <linearGradient
+       id="c">
+      <stop
+         offset="0"
+         stop-color="#4f4d70"
+         id="stop6" />
+      <stop
+         offset="1"
+         stop-color="#4fa8ca"
+         id="stop7" />
     </linearGradient>
-    <linearGradient id="b">
-      <stop offset="0" stop-color="#fff"/>
-      <stop offset="1" stop-color="#fff" stop-opacity="0"/>
+    <linearGradient
+       id="b">
+      <stop
+         offset="0"
+         stop-color="#fff"
+         id="stop8" />
+      <stop
+         offset="1"
+         stop-color="#fff"
+         stop-opacity="0"
+         id="stop9" />
     </linearGradient>
-    <linearGradient id="a">
-      <stop offset="0" stop-color="#fffcf2"/>
-      <stop offset=".351" stop-color="#adc977"/>
-      <stop offset=".712" stop-color="#7f9f3f"/>
-      <stop offset="1" stop-color="#77775c"/>
+    <linearGradient
+       id="a">
+      <stop
+         offset="0"
+         stop-color="#fffcf2"
+         id="stop10" />
+      <stop
+         offset=".351"
+         stop-color="#adc977"
+         id="stop11" />
+      <stop
+         offset=".712"
+         stop-color="#7f9f3f"
+         id="stop12" />
+      <stop
+         offset="1"
+         stop-color="#77775c"
+         id="stop13" />
     </linearGradient>
-    <linearGradient xlink:href="#a" id="l" x1="9.379" x2="14.06" y1="7.274" y2="12.666" gradientTransform="matrix(1.44507 0 0 1.44507 -8.185 1029.688)" gradientUnits="userSpaceOnUse"/>
-    <linearGradient xlink:href="#c" id="m" x1="-686.462" x2="-1030.487" y1="672.22" y2="328.196" gradientUnits="userSpaceOnUse"/>
-    <linearGradient id="e">
-      <stop offset="0" stop-color="#fffcf2"/>
-      <stop offset=".351" stop-color="#adc977"/>
-      <stop offset=".712" stop-color="#7f9f3f"/>
-      <stop offset="1" stop-color="#77775c"/>
+    <linearGradient
+       xlink:href="#a"
+       id="l"
+       x1="9.379"
+       x2="14.06"
+       y1="7.274"
+       y2="12.666"
+       gradientTransform="matrix(1.44507 0 0 1.44507 -8.185 1029.688)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#c"
+       id="m"
+       x1="-686.462"
+       x2="-1030.487"
+       y1="672.22"
+       y2="328.196"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="e">
+      <stop
+         offset="0"
+         stop-color="#fffcf2"
+         id="stop14" />
+      <stop
+         offset=".351"
+         stop-color="#adc977"
+         id="stop15" />
+      <stop
+         offset=".712"
+         stop-color="#7f9f3f"
+         id="stop16" />
+      <stop
+         offset="1"
+         stop-color="#77775c"
+         id="stop17" />
     </linearGradient>
-    <linearGradient xlink:href="#e" id="k" x1="9.379" x2="14.06" y1="7.274" y2="12.666" gradientTransform="matrix(1.44507 0 0 1.44507 -8.185 1029.938)" gradientUnits="userSpaceOnUse"/>
-    <linearGradient xlink:href="#f" id="p" x1="28" x2="28" y1="1039.362" y2="1049.362" gradientTransform="translate(-20)" gradientUnits="userSpaceOnUse"/>
-    <linearGradient id="f">
-      <stop offset="0" stop-color="#ebf9ff"/>
-      <stop offset="1" stop-color="#fcffff"/>
+    <linearGradient
+       xlink:href="#e"
+       id="k"
+       x1="9.379"
+       x2="14.06"
+       y1="7.274"
+       y2="12.666"
+       gradientTransform="matrix(1.44507 0 0 1.44507 -8.185 1029.938)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#f"
+       id="p"
+       x1="28"
+       x2="28"
+       y1="1039.362"
+       y2="1049.362"
+       gradientTransform="translate(-20)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="f">
+      <stop
+         offset="0"
+         stop-color="#ebf9ff"
+         id="stop18" />
+      <stop
+         offset="1"
+         stop-color="#fcffff"
+         id="stop19" />
     </linearGradient>
-    <linearGradient xlink:href="#g" id="q" x1="-12" x2="-15" y1="1047.362" y2="1047.362" gradientTransform="matrix(1 0 0 .74375 18 264.168)" gradientUnits="userSpaceOnUse"/>
-    <linearGradient id="g">
-      <stop offset="0" stop-color="#fff" stop-opacity="0"/>
-      <stop offset="1" stop-color="#c3e9ff"/>
+    <linearGradient
+       xlink:href="#g"
+       id="q"
+       x1="-12"
+       x2="-15"
+       y1="1047.362"
+       y2="1047.362"
+       gradientTransform="matrix(1 0 0 .74375 18 264.168)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="g">
+      <stop
+         offset="0"
+         stop-color="#fff"
+         stop-opacity="0"
+         id="stop20" />
+      <stop
+         offset="1"
+         stop-color="#c3e9ff"
+         id="stop21" />
     </linearGradient>
-    <linearGradient xlink:href="#h" id="r" x1="-11" x2="-11" y1="1042.362" y2="1045.362" gradientTransform="matrix(.8 0 0 1 15 -3)" gradientUnits="userSpaceOnUse"/>
-    <linearGradient id="h">
-      <stop offset="0" stop-color="#c3e9ff"/>
-      <stop offset="1" stop-color="#fff" stop-opacity="0"/>
+    <linearGradient
+       xlink:href="#h"
+       id="r"
+       x1="-11"
+       x2="-11"
+       y1="1042.362"
+       y2="1045.362"
+       gradientTransform="matrix(.8 0 0 1 15 -3)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="h">
+      <stop
+         offset="0"
+         stop-color="#c3e9ff"
+         id="stop22" />
+      <stop
+         offset="1"
+         stop-color="#fff"
+         stop-opacity="0"
+         id="stop23" />
     </linearGradient>
-    <linearGradient xlink:href="#i" id="o" x1="6.875" x2="6.875" y1="1038.565" y2="1048.19" gradientUnits="userSpaceOnUse"/>
-    <radialGradient xlink:href="#b" id="n" cx="-992.81" cy="395.316" r="232.857" fx="-992.81" fy="395.316" gradientTransform="matrix(.79448 -.50276 .39212 .61965 -359.051 -348.782)" gradientUnits="userSpaceOnUse"/>
-    <radialGradient xlink:href="#d" id="j" cx="-1001.449" cy="450.007" r="232.857" fx="-1001.449" fy="450.007" gradientTransform="matrix(1.48827 -.45366 .40308 1.32235 321.815 -605.721)" gradientUnits="userSpaceOnUse"/>
+    <linearGradient
+       xlink:href="#i"
+       id="o"
+       x1="6.875"
+       x2="6.875"
+       y1="1038.565"
+       y2="1048.19"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       xlink:href="#b"
+       id="n"
+       cx="-992.81"
+       cy="395.316"
+       r="232.857"
+       fx="-992.81"
+       fy="395.316"
+       gradientTransform="matrix(.79448 -.50276 .39212 .61965 -359.051 -348.782)"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       xlink:href="#d"
+       id="j"
+       cx="-1001.449"
+       cy="450.007"
+       r="232.857"
+       fx="-1001.449"
+       fy="450.007"
+       gradientTransform="matrix(1.48827 -.45366 .40308 1.32235 321.815 -605.721)"
+       gradientUnits="userSpaceOnUse" />
   </defs>
-  <g transform="matrix(.84175 0 0 .84685 -1.59 -875.363)">
-    <circle cx="-902.857" cy="526.648" r="232.857" fill="url(#j)" transform="translate(31.109 1031.644) scale(.0251)"/>
-    <path fill="url(#k)" stroke="#767554" stroke-linecap="round" stroke-linejoin="round" stroke-width=".5" d="m 9.066013,1039.3313 c -0.08358,-10e-5 -0.146685,0.025 0,0.045 0.101849,0.014 -0.05818,0.061 0.09032,0.045 0.07519,-0.065 -0.01658,-0.09 -0.09032,-0.09 z m -1.806342,0.045 c -0.08085,0.016 -0.146193,0.071 -0.225793,0.09 0.167199,-0.042 0.324172,-0.063 0.496744,-0.09 -0.08865,0.014 -0.183662,-0.017 -0.270951,0 z m 0.722537,0 c -0.100838,0.019 -0.125577,0.038 0,0.045 0.08577,-0.039 0.08961,-0.048 0.135475,-0.045 -0.05026,0 -0.09312,-0.014 -0.135475,0 z m 1.625708,0 c -0.0091,-8e-4 -0.03685,0.046 -0.04516,0.045 -0.01605,0.03 -0.129334,0.049 0.04516,0.045 0.0048,0.019 0.01431,0.067 0.04516,0.045 0.01156,-0.019 0.01983,-0.077 0.04516,-0.09 -0.03183,0 -0.05829,-0.039 -0.09032,-0.045 z m -1.128964,0.045 c -0.02416,6e-4 -0.03418,0.051 -0.04516,0.09 -0.09662,-0.065 -0.29735,-0.055 -0.361269,-0.045 -0.05552,0.027 -0.05,0.055 0.135476,0.045 0.103958,0 -0.01496,0.032 -0.09032,0.045 0.02251,0 0.01773,10e-4 0.09032,0 0.09883,0 0.621851,-0.055 0.31611,-0.09 0.02353,-0.04 -0.02653,-0.045 -0.04516,-0.045 z m 0.722537,0 c -0.01127,0.014 0.02183,0.048 0.135475,0.045 0.03143,-0.042 0.03666,-0.046 0,-0.045 -0.03753,5e-4 -0.12416,-0.014 -0.135475,0 z m -0.451586,0.045 c -0.01501,6e-4 8e-5,0.039 0,0.045 0,0 0.04516,0 0.04516,0 0,0 -0.04516,-0.045 -0.04516,-0.045 z m 0.04516,0.045 c -0.04631,0.014 -0.04368,0.033 0.09032,0.045 -0.03234,0 -0.123857,0.062 0.04516,0.045 0.132571,-0.04 0.176165,-0.1373 0.04516,-0.1358 -0.01358,10e-5 -0.02783,0.043 -0.04516,0.045 0.01672,0.017 -0.08916,-0.014 -0.135476,0 z m 1.128964,-0.045 c -0.01387,0.017 -0.03883,0.027 -0.04516,0.045 -0.009,0.026 0.01026,0.077 0,0.09 -0.0072,0 -0.03152,0 -0.04516,0 -0.05439,-3e-4 -0.162088,0.014 -0.180634,0 -0.153773,-0.014 -0.07519,0.025 -0.04516,0.045 0.138264,0.014 0.297103,0.08 0.31611,0.09 0.136704,0.014 0.03662,-0.1584 0.270951,-0.09 -0.0059,-0.024 0.0011,-0.039 0.04516,-0.045 -0.105129,-0.035 -0.208457,-0.1069 -0.316109,-0.1358 z m -0.722537,0.045 c 0.01559,0.014 0.002,0.033 0.04516,0.045 0.06509,-0.037 0.0069,-0.045 -0.04516,-0.045 z m -1.625708,0.045 c -0.253349,0.1142 -0.426184,0.1817 -0.406427,0.271 0.180027,-0.019 0.371333,-0.1717 0.587061,-0.1807 0.223903,-0.075 -0.05272,-0.085 -0.180634,-0.09 z m 1.445074,0.045 c -0.0409,0.016 -0.01728,0.074 0.09032,0.09 0.02965,-0.053 -0.0091,-0.091 -0.04516,-0.09 -0.01504,2e-4 -0.03153,0 -0.04516,0 z m -0.677379,0.045 c -0.04481,0 -0.05671,0.036 0,0.09 0.172461,-0.032 0.0655,-0.091 0,-0.09 z m 0.31611,0.045 c -0.137831,0.038 0.04928,0.025 -0.09032,0.09 -0.207472,-0.068 -0.03163,0.1658 0,0.1807 0.04266,0 0.131011,-0.088 0.180635,-0.1359 -0.03626,-0.026 0.01566,-0.071 0.04516,-0.09 3.77e-4,-0.014 -0.01069,-0.04 -0.04516,-0.045 -0.0196,0 -0.06061,9e-4 -0.09032,0 z m 1.716025,0 c -0.004,0 -0.01945,0.029 0,0.045 0.07818,0.033 0.02507,0.035 0.04516,0.045 0.03601,0.071 0.313666,0.1649 0.180634,0.1359 0.135678,0.027 0.416206,0.3372 0.361268,0.2257 0.04163,0.069 0.111546,0.3245 0.09032,0.2258 0.0104,0 0.09364,0.062 0.09032,0.09 0.07303,0.017 0.09192,0.066 0.09032,0.09 0.01387,0 0.03951,0.059 0,0.045 0,0 -0.04516,0 -0.04516,0 0.0066,0 -0.0061,0.043 0,0.045 0.123612,0.045 0.0056,0.1286 0.04516,0.1359 -0.04496,4e-4 -0.04601,0.036 -0.04516,0.045 0.0078,0 -0.0058,0.042 0,0.045 0.01988,0 -0.03053,0.046 0.09032,0.045 -0.02273,-9e-4 -0.102253,0.014 -0.135475,0 0.01098,0 0.0066,0.027 0.04516,0.045 -0.05684,0.014 -0.08789,0.068 -0.09032,0.09 0.156122,-0.053 0.09485,0.022 0.04516,0.045 0.04858,0 0.08897,0.019 0.09032,0.045 0.01497,0 0.03866,0.033 0,0.045 -0.0022,0 0.004,0.039 0,0.045 0.0072,0 -0.0046,0.041 0,0.045 -0.08747,0.03 -0.03464,0.1041 0,0.1359 -0.002,7e-4 0.0424,0.014 0.04516,0 -0.0084,0.09 0.04516,0.2208 0.04516,0.1806 0.08871,0.084 0.176136,0.1171 0.180634,0.09 0.02958,0 0.141039,0.071 0.135476,0.09 0.04514,0.014 0.07444,0 0.04516,-0.045 0.0042,-0.02 -0.0097,-0.055 0,-0.09 0.01272,-0.048 0.01607,-0.066 0,-0.045 -0.04244,-0.038 0.08587,-0.075 0.04516,-0.09 0.04006,-0.039 0.02247,-0.3081 0.04516,-0.1806 0.124681,-0.045 0.167427,0.042 0.180635,-0.045 3.52e-4,0.069 0.06373,0.014 0.09032,0 0.0064,0 0.04063,0 0.04516,0 0.03445,-0.027 -0.01487,-0.1848 0.04516,-0.1359 0.07386,0.1171 0.333387,0.12 0.406427,0.045 -0.06679,-0.035 -0.100563,-0.071 -0.135476,-0.09 -0.05608,-0.02 -0.07516,-0.078 -0.09032,-0.09 0.0149,0 0.03384,0.029 0.09032,0.045 0.02376,0.022 0.03107,-0.014 0.04516,0 -0.04337,-0.059 -0.08394,-0.1445 -0.09032,-0.1358 -0.04805,-0.045 -0.05874,-0.053 -0.04516,-0.045 -0.07471,-0.052 -0.0069,-0.071 0.09032,0 -0.503631,-0.4665 -1.072016,-0.862 -1.716025,-1.1289 -0.03867,0 -0.236008,-0.039 -0.31611,-0.045 z m -2.619196,0.045 c -0.05805,0.035 -0.103164,0.066 -0.180634,0.09 0.08266,0 -0.436024,0.1185 0.04516,0.09 -0.06329,0.036 -0.540547,0.059 -0.180634,0.1806 -0.12825,0.2039 0.586882,-0.068 0.406427,0 0.06181,-0.017 0.09822,0.091 0.225793,0.09 0.162503,-0.03 0.129551,-0.1228 0.09032,-0.1358 0.0322,-0.02 0.06892,-0.048 0.09032,-0.045 -0.05185,-0.059 -0.08393,-0.087 0,-0.1806 -0.05951,0.04 -0.194185,0.088 -0.180634,0 0.0082,-0.059 0.01776,-0.1739 -0.04516,-0.09 -0.09198,0.024 -0.17661,0.014 -0.225793,0 -0.0104,0 -0.04373,0 -0.04516,0 z m 1.535391,0.09 c -0.107831,0.033 -0.344638,0.2215 -0.09032,0.271 -0.04356,-0.014 -0.07185,0 -0.09032,0 0.04418,0.037 0.112152,0.1069 0.09032,0.09 0.04681,0.014 0.147535,0.032 0.225793,0.045 0.105317,0.019 0.193436,0.033 0.135476,0.045 0.130201,0.058 0.05777,-0.1893 0.135475,0.045 0.128077,0.02 0.27517,0.1141 0.135476,0.1358 -0.0069,10e-5 -0.01567,0.081 0,0.045 0.0402,0.062 0.150499,0.1579 0.135476,0.09 0.08315,0.065 -0.110548,0.1569 -0.180635,0.1806 0.0177,0.059 -0.03884,0.1113 -0.09032,0.1359 0.06264,-0.014 0.246448,0.246 0.180635,0.1806 -0.02867,0.014 -0.02299,0.022 0,0.045 -0.0098,0 0.02185,0.061 0.04516,0.045 0.097426,0.065 0.245697,0.1257 0.270951,0.1358 0.01,-0.036 -0.04431,-0.1257 -0.09032,-0.1806 0.01185,0 0.02392,-0.014 0.04516,0 0.04767,0.014 0.146999,0.027 0.135476,0.09 0.04169,-0.036 -0.0049,-0.1807 0,-0.1807 -0.1151,-0.1611 -0.108568,-0.098 -0.135476,-0.2257 -0.02711,-0.023 0.167583,-0.014 0.135476,0 0.02048,0.032 0.0404,0.062 0.04516,0.09 -0.01575,0 0.140056,-0.068 0.135475,0.045 0.03637,-0.023 0.03461,-0.061 0.04516,-0.09 0.168702,0 -0.05389,-0.052 0,-0.045 0.01402,-0.1011 -0.11841,-0.053 -0.09032,-0.1358 -0.04477,-0.051 -0.130837,-0.1156 -0.09032,-0.045 -0.01753,0 -0.07007,-0.058 -0.09032,-0.09 0.0078,-0.02 -0.0017,-0.058 0.135476,-0.045 -0.05561,-0.017 -0.08386,-0.032 -0.09032,-0.045 0.01798,-0.016 0.03208,-0.055 -0.09032,-0.045 -0.0299,-0.03 0.01838,-0.038 0.04516,-0.045 -6.12e-4,-0.014 -0.01171,-0.02 -0.04516,-0.045 -0.109146,0.048 -0.0098,-0.017 -0.04516,-0.045 -0.02155,0.014 -0.04663,0.014 -0.04516,0 0.09383,-0.043 0.01718,-0.1055 -0.04516,-0.09 0.02032,-0.019 -0.02958,-0.066 -0.090317,-0.045 -0.106357,-0.024 0.01585,0 -0.09032,-0.09 -0.01676,-0.038 -0.01501,-0.09 -0.04516,-0.09 -0.05507,2e-4 -0.07881,0.043 -0.09032,0.045 -0.01653,-0.046 -0.0349,-0.062 -0.04516,-0.045 0.0046,-0.056 -0.03548,-0.1055 -0.180634,-0.045 -0.07579,0.02 -0.05127,0.1577 -0.09032,0.09 -0.0397,-0.032 -0.06827,-0.027 -0.09032,0 -0.02205,0.028 -0.02562,0.071 0,0.09 -0.08386,0.017 -0.04658,-0.035 0,-0.09 0.06987,-0.084 0.144175,-0.1831 0.04516,-0.1806 -0.02027,4e-4 -0.04897,-0.014 -0.09032,0 z m -2.528879,0.09 c -0.04168,0.016 -0.138857,0.061 -0.225793,0.09 -0.08448,0.02 -0.177462,0.014 -0.135476,0 -0.03442,-0.014 -0.225251,0.104 -0.31611,-0.045 -0.15475,0.014 -0.22998,0 -0.316109,0 -0.01172,0 -0.03348,0 -0.04516,0 -0.51809,0.2744 -0.988949,0.6277 -1.399916,1.0387 -0.05146,0.048 -0.09312,0.1229 -0.135475,0.1807 -0.06051,0.084 -0.07162,0.1445 0,0.09 -0.08021,0.088 -0.106752,0.2593 0.04516,0.1358 -0.127771,0.1948 -0.324817,0.3604 -0.451586,0.4968 0.207116,-0.1689 0.390662,-0.3587 0.587061,-0.5419 0.01575,-0.084 0.1341,-0.1329 0.225793,-0.1806 -0.09124,0.084 -0.180188,0.2231 -0.09032,0.1358 0.0882,-0.035 0.212553,-0.1668 0.270951,-0.2257 -0.0011,0 0.04432,0 0.04516,0 0.01399,-4e-4 0.02171,0 0,0.045 0.04249,0.014 0.1853,0.077 0.225793,0.09 0.04562,-0.023 0.147873,0.085 0.135476,0.1358 0.0124,-0.014 0.03244,-0.022 0.04516,-0.09 0.0099,-0.039 -0.03141,0.2057 0,0.1807 -0.01275,0.029 -0.0353,0.061 -0.04516,0.09 0,0 -0.04516,0.045 -0.04516,0.045 -0.0081,0.019 -0.0064,0.039 0,0.045 0,0 0.04516,-0.045 0.04516,-0.045 -0.0034,0.014 -0.0015,0.035 0,0.045 -0.005,5e-4 -0.02389,0.059 0,0.045 0.0046,0 0.03764,-4e-4 0.04516,0 -0.02653,0.027 -0.01638,0.036 0,0.045 0.01488,0.014 5.5e-5,0.041 -0.04516,0.09 -0.01454,0.014 0.02371,0.025 0,0.045 -0.02886,0.095 0.01342,0.1359 0.04516,0.1359 -0.01798,0.079 -0.01867,0.1579 0,0.1806 -0.0415,0.059 -0.07669,0.1416 -0.04516,0.09 0.07378,-0.014 0.0011,0.1257 -0.04516,0.1806 0.02834,-0.014 0.07674,-0.026 0.180634,-0.09 -0.0082,0.025 0.123813,0.082 0.04516,0.1359 0.03263,0.051 0.02895,0.1286 0,0.1806 -0.01908,0.033 -0.0424,0.038 -0.04516,0.045 -0.05049,-0.2244 -0.182126,0.3601 -0.180634,0.2257 -0.09281,0.2171 -0.184077,0.401 -0.225793,0.6322 -0.08139,0.1739 -0.02076,0.4711 0.04516,0.4065 0.04001,0.1529 0.01708,0.3703 0.180634,0.4064 0.155322,0.152 0.10817,0.4311 0.270952,0.5871 0.02048,0.12 -0.128768,0.1931 0.04516,0.2258 0.113208,0.2501 0.133117,0.4109 0.270951,0.3612 -0.09169,-0.1055 -0.25631,-0.5183 -0.225793,-0.4966 -0.07931,-0.1287 -0.173621,-0.4827 0,-0.3613 0.07233,0.1521 0.132911,0.363 0.270952,0.4967 0.0043,0.1563 0.22556,0.3085 0.270951,0.5419 -0.03782,0.1572 0.02529,0.2692 0.180634,0.3612 0.218358,0.061 0.436111,0.2914 0.677379,0.1807 0.156357,-0.027 0.289166,0.3063 0.496744,0.2709 0.229001,0.023 0.220627,0.081 0.361268,0.271 -0.01156,0.1828 0.112181,-0.048 0.135476,0.1806 0.07209,-0.014 0.307461,0.062 0.361268,0.09 0.008,-0.1884 0.269413,-0.1286 0.225793,0.045 0.0747,0.1574 0.06241,0.3712 -0.09032,0.4967 -0.101184,0.04 -0.200609,0.2345 -0.225793,0.3161 0.227877,-0.024 0.131112,0.3285 0.04516,0.3613 0.205709,0.1171 0.276077,0.371 0.406427,0.5419 0.08621,0.1857 0.388537,0.1857 0.496745,0.3613 0.02814,0.2003 -0.01387,0.35 0,0.5419 -0.08689,0.1501 0.0177,0.3206 -0.04516,0.4516 -0.07473,0.1185 -0.115361,0.3503 0.04516,0.3612 -0.0084,0.039 -0.07266,0.092 -0.09032,0.1359 -0.0056,0.014 0,0.037 0,0.045 -0.112398,0 -0.08498,0.022 -0.04516,0.045 0,0 0.04516,0.045 0.04516,0.045 0.01329,5e-4 0.02896,0.014 0.04516,0 0.01402,0.014 -0.01,0.038 0,0.045 0.136082,-0.014 0.273318,-0.022 0.406427,-0.045 -0.182325,-0.026 0.237626,-0.1416 0,-0.1807 0.0987,-0.026 0.0774,-0.091 0.180634,-0.1358 0.0084,-0.042 0.196108,-0.2228 0.361268,-0.2257 0.411132,-0.071 -0.203677,-0.3353 0.180634,-0.2259 0.116964,0.065 0.29323,-0.1387 0.361268,-0.2257 -0.05939,0.1585 0.281741,-0.3464 0.270952,-0.3613 0.152708,-0.1141 0.609512,-0.2704 0.451585,-0.2709 0.207422,-0.1445 0.281629,-0.4255 0.31611,-0.6775 0.174726,-0.1458 0.295933,-0.4276 0.31611,-0.4967 -0.03568,-0.1242 -0.504442,-0.2372 -0.361268,-0.2258 -0.09757,-0.046 -0.233604,-0.068 -0.270952,0 -0.0094,-0.091 -0.304507,-0.12 -0.225792,-0.09 -0.04999,0.036 -0.06761,0.019 -0.09032,0.045 -0.08046,0.091 -0.03829,0.1402 -0.135475,0.045 0.07592,-0.014 0.116516,-0.022 0.135475,-0.045 0.02843,-0.035 0.0011,-0.084 -0.04516,-0.09 -0.0077,6e-4 -0.04117,0 -0.04516,0 -0.0056,0 -0.0429,0 -0.04516,0 -0.03051,0.014 -0.06114,0.051 -0.09032,0.09 -0.08452,-0.025 -0.05975,-0.4036 0.09032,-0.3162 -0.04208,-0.1644 -0.180697,-0.2458 -0.361269,-0.2709 -0.226956,0.053 -0.267778,-0.088 -0.406428,-0.2258 -0.12468,0.029 -0.226532,-0.1741 -0.225792,-0.1806 -0.170932,0.1199 -0.602057,-0.014 -0.677378,-0.045 -0.07045,0 -0.113251,0.051 -0.09032,0.1806 -0.206379,0.081 0.108481,-0.3398 -0.09032,-0.2257 -0.128959,0.162 -0.280423,0.02 -0.31611,0.2257 -0.133785,0.2002 -0.09785,0.082 -0.31611,0 -0.251648,0.1373 -0.45284,-0.023 -0.406427,-0.1806 0.05422,-0.1344 -0.01026,-0.3454 0,-0.3613 -0.06094,-0.014 -0.195335,-0.087 -0.361269,-0.045 -0.246457,0.08 0.06764,-0.1517 0,-0.2258 -0.01619,-0.075 -0.120895,-0.3133 0.04516,-0.3161 -0.247612,-0.039 -0.264447,0.1746 -0.361268,0.3161 -0.0863,-0.074 -0.302964,0.075 -0.406427,-0.09 -0.179455,-0.1674 -0.16357,-0.4262 -0.09032,-0.6322 0.0687,-0.079 -0.0041,-0.3479 0.180634,-0.3613 0.172498,-0.097 0.118395,-0.1272 0.361268,-0.09 0.05499,0.014 0.126242,-0.1012 0.225793,0 0.0094,-0.1448 0.439329,-0.085 0.31611,-0.09 0.08587,0.1098 0.246796,0.014 0.270952,0.2259 -0.01344,0.075 0.142137,0.2426 0.180634,0.316 0.169985,-0.2103 -0.187016,-0.5442 0.09032,-0.7225 0.159459,-0.107 0.428687,-0.2989 0.406427,-0.3161 0.01301,0 0.026,-0.042 0.04516,-0.045 -0.01344,-0.014 -0.01026,-0.03 -0.04516,-0.045 0.08519,-0.064 0.01448,-0.2354 0,-0.2709 0.0055,0 0.101155,-0.1952 0.09032,0.045 0.03461,0.2464 0.06759,-0.1026 0.09032,-0.1807 0.0452,-0.03 0.08222,-0.074 0.135475,-0.1358 0.0077,-0.014 0.03254,0 0.04516,0 0.04512,-0.043 0.102095,-0.1084 0.180635,-0.09 0.166978,-0.014 0.07412,-0.014 0.09032,-0.1806 0.113308,-0.133 0.258747,-0.1768 0.31611,-0.1807 -0.0461,-0.072 0.156313,-0.014 0.225792,-0.045 -0.07598,0.039 -0.223603,0.1755 -0.04516,0.2259 0.03367,-0.1416 0.343512,-0.1402 0.31611,-0.2259 -0.0039,-0.014 -0.02468,0.019 -0.04516,0 -0.210821,0.091 -0.329963,-0.2102 -0.270952,-0.2257 -0.212243,-0.046 0.384506,-0.1315 0,-0.1806 -0.317741,0.091 -0.597593,0.3519 -0.225793,0 0.177503,-0.055 0.196233,-0.2214 0.406428,-0.1358 0.136068,0.02 0.347227,0.1156 0.451585,-0.045 0.104349,0.029 0.233393,-0.082 0.180635,-0.1359 0.05896,-0.08 -0.02912,-0.1657 -0.04516,-0.1358 -0.01055,-0.074 -0.115635,-0.035 -0.180634,0 0.0053,-0.014 -0.01857,-0.025 0,-0.045 0.05017,-0.03 0.248185,-0.045 0.04516,-0.1359 -0.06626,0.025 -0.157196,-0.052 -0.09032,-0.045 -0.132657,-0.084 -0.07231,-0.2902 -0.09032,-0.2258 0.04756,-0.069 0.08129,-0.1875 0,-0.1358 -0.116054,0.016 0.0048,-0.069 -0.09032,-0.1806 -0.0026,-0.03 -0.03958,-0.036 -0.04516,-0.045 -0.02613,0.046 -0.09116,0.1199 -0.09032,0.09 -0.0039,0.071 -0.174478,0.1098 -0.180634,0.09 -0.07276,0.03 0.034436,-0.071 -0.135476,-0.09 -0.01477,-0.026 -0.01754,-0.1055 -0.04516,-0.1359 0.15668,0.065 0.206565,-0.1513 0.04516,-0.1358 -0.05439,-0.042 -0.357893,-0.1402 -0.225793,-0.1807 -0.200677,-0.1069 -0.247223,-0.014 -0.31611,0.1359 0.06246,0 -0.06841,0.1228 0,0.1358 -0.09434,0.1315 -0.02214,0.3989 0,0.4516 -0.0052,0.1041 -0.239914,0.361 -0.316109,0.2257 -0.04092,0.1041 -0.103554,0.3613 -0.04516,0.271 0.03178,0.1185 -0.08633,0.03 -0.135476,0.045 -0.119681,-0.1 -0.109262,-0.2182 -0.04516,-0.4065 -0.03478,-0.1704 -0.223877,-0.029 -0.31611,-0.2257 -0.07438,-0.097 -0.278593,-0.1869 -0.361269,-0.1807 0.0474,-0.2799 -0.188827,-0.027 -0.09032,-0.2258 0.03785,-0.1539 0.16659,-0.2857 0.270952,-0.3613 0.07663,-0.055 0.137267,-0.014 0.09032,-0.1358 0.182851,0.1758 0.08571,-0.023 0.09032,-0.045 0.168566,0.097 0.129536,-0.09 0.270951,0 0.06816,-0.014 0.115606,-0.027 0.135476,-0.045 0.03516,-0.033 -0.0032,-0.098 -0.04516,-0.1359 0.178419,0.092 0.196885,-0.2188 0.31611,-0.09 0.0051,0 0.02697,-0.042 0.04516,0 0.17381,0.029 0.142296,-0.2815 0.180634,-0.1806 0.01484,0 -0.0064,-0.043 0,-0.045 -0.03571,-0.032 -0.07068,-0.065 -0.09032,-0.09 -0.06392,0.051 -0.170448,0.1286 -0.225793,0.1806 -0.03445,0.017 -0.054,0.058 -0.04516,0.045 -0.08305,-0.014 0.07733,-0.3585 -0.09032,-0.2257 -0.03918,0.032 -0.06835,0.045 -0.09032,0.045 -0.0104,-0.035 -0.009,-0.1127 0.04516,-0.1358 -0.11984,-0.059 0.102268,-0.061 0,-0.2259 -0.06704,-0.068 -0.211871,0.1629 -0.180634,0.09 -0.20411,0.072 0.216982,0.151 -0.04516,0.1806 0.186072,0.035 -0.11247,0.2885 -0.135476,0.1807 -0.09621,0.092 0.08105,-0.2178 0,-0.1359 -0.02632,0 -0.09958,0 -0.135476,0 -0.0012,0 -0.02827,0.02 0,0.045 0.0055,0.038 -0.330384,-0.037 -0.406427,-0.045 -0.05374,-0.052 -0.06724,-0.093 -0.135475,-0.09 -0.124204,0 -0.150668,0.1496 -0.180634,0.1807 -0.111517,0.1214 -0.13773,-0.097 -0.04516,-0.09 -0.134609,-0.023 -0.225598,-0.061 -0.270952,-0.09 -0.0033,-0.017 -0.02208,-0.075 -0.04516,-0.09 -0.114594,-0.1513 -0.229456,-0.2437 -0.31611,-0.1358 -0.159354,0.1621 -0.08913,-0.049 -0.135475,-0.045 -0.0085,5e-4 -0.02415,-0.019 -0.04516,0 z m 1.716025,0.3613 0.04516,0 c 0.08851,0.022 0.01697,-0.1791 -0.04516,-0.1807 -0.01011,-2e-4 -0.03498,0.035 -0.04516,0.045 -0.11364,0.051 -0.160962,0.023 0,0.09 l 0.04516,0.045 z m 0.361269,0.5419 c -0.0079,0.014 -0.0117,0.072 0,0.045 0.0048,0.035 0.08076,0.1112 0.09032,0.09 0.15424,-0.195 0.164664,0.046 0.31611,0 -0.03415,-0.04 -0.227202,-0.261 -0.225793,-0.271 -0.05786,-3e-4 -0.156921,0.1055 -0.180634,0.1359 z m 1.399914,2.3933 c 0.0016,0.014 0.01286,0 0.04516,0 0.02961,-0.048 0.103626,0.014 0.04516,-0.1358 -0.0038,0.014 -0.09519,0.098 -0.09032,0.1358 z m -5.102916,-0.7676 c 0.02219,0.046 0.01172,0.1141 0,0.09 0.06356,0.033 0.08657,0.1257 0.180634,0.09 0.02836,-0.081 -0.112878,-0.1272 -0.180634,-0.1807 z m 4.651331,-1.9419 c -0.06072,-10e-5 -0.231662,0.094 -0.04516,0.09 0.06634,-0.065 0.07481,-0.09 0.04516,-0.09 z m 1.309598,0.09 c -0.05374,-2e-4 -0.06829,0.1402 0.09032,0.1358 -0.04105,-0.09 -0.06407,-0.1358 -0.09032,-0.1358 z m 1.535391,0.9484 c 0.02032,0.016 0.02788,0.074 0.04516,0.09 -0.03007,-0.041 -0.02595,-0.091 -0.04516,-0.09 z m 0.04516,0.09 c 0.07977,0.068 -0.03724,0.1199 0.135475,0.1806 l 0.04516,0.045 c 0.104508,0.014 0.05055,-0.1823 0.04516,-0.2257 -0.08876,-0.014 -0.177523,0.071 -0.180634,0 -0.01127,-0.019 -0.03513,0.014 -0.04516,0 z m -3.612685,0.1806 c -0.02996,0 -0.110215,0.1185 0,0.09 0.03486,-0.04 0.01272,-0.091 0,-0.09 z m -0.316109,0.4064 c -0.04649,4e-4 -0.0422,0.065 0.09032,0.045 -0.01562,-0.035 -0.07069,-0.045 -0.09032,-0.045 z m 4.922282,0.3162 c 0.02285,0.065 0.03779,0.117 0.09032,0.2257 0.01546,0 0.02498,0.026 0.04516,0.045 -0.04052,-0.092 -0.09033,-0.1807 -0.135475,-0.271 z m -0.180634,0.045 c -0.0026,0.088 0.04016,0.2547 0.09032,0.3612 0.0082,0.017 -0.0074,0.03 0,0.045 -0.0045,6e-4 -0.01373,0.049 0,0.045 0.003,0 0.04264,0 0.04516,0 -0.04351,0.1471 0.05649,0.1713 0,0.2259 0.201321,0.042 0.08532,-0.2345 0.04516,-0.3162 -0.05098,-0.1669 -0.167239,-0.3111 -0.180635,-0.3613 z m -3.386892,0.1358 c -0.05487,10e-5 -0.03402,0.081 0.180634,0.1358 -0.05527,-0.082 -0.140591,-0.1358 -0.180634,-0.1358 z m 0.541903,0 c -0.04708,0.08 -0.09808,0.1676 -0.180635,0.1806 -0.05662,0.074 0.103049,0.181 0.270952,0.1359 -0.0013,0.042 -0.06347,0.117 0.09032,0.045 0.01597,-0.038 -0.0059,-0.046 0,-0.045 0,0 0.04516,0.045 0.04516,0.045 0.0055,0.04 0.01156,0.097 0.04516,0.09 0.121487,-0.1185 -0.04139,-0.094 -0.04516,-0.1359 -0.0013,-0.014 0.0012,-0.055 0.04516,-0.09 -0.145799,0.081 -0.211123,-0.059 -0.09032,-0.09 -0.19025,-0.016 -0.02279,-0.03 -0.09032,-0.09 -0.103309,0.062 -0.115679,0.014 -0.09032,-0.045 z m 2.79983,0.09 c -0.01468,9e-4 -0.03501,0.014 -0.04516,0.045 -0.01171,0.058 0.02377,0.2852 0.04516,0.2259 0.01494,0.014 0.01387,0.062 0.04516,0.045 0.141545,-0.022 0.02559,-0.3205 -0.04516,-0.316 z m 0.406427,0.1358 c 0.01685,0.1416 -0.002,0.3213 0,0.3613 -0.05686,0.077 -0.144873,0.1199 -0.180634,0.1358 0.07341,0.08 -0.01626,0.3265 0.04516,0.4064 -0.122759,-0.016 -0.140562,0.2322 -0.135475,0.3162 -0.01455,0.2338 0.150043,0.3205 0.180634,0.316 0.165256,0 0.194273,-0.4905 0.180634,-0.3613 0.02171,-0.2263 0.177348,-0.2855 0.225793,0 -0.07153,-0.4133 -0.162611,-0.7953 -0.31611,-1.1741 z m 0,1.5354 c -0.07381,0.019 -0.108785,0.056 -0.04516,0.09 -0.155097,-0.022 -0.26964,0.6838 -0.270952,0.5419 -0.174871,0.1601 -0.273942,0.3996 -0.31611,0.6322 0.09247,0.1928 0.04996,0.7639 0,0.6775 0.04069,0.117 0.14247,0.4104 0.135476,0.2709 0.05247,0.159 0.220336,0.3128 0.361268,0.1359 0.196646,-0.1599 0.3696,-0.1979 0.225793,0.1358 0.200782,-0.5907 0.361269,-1.193 0.361269,-1.8516 0,-0.063 -0.04318,-0.1185 -0.04516,-0.1806 -0.126574,-0.1431 -0.353445,-0.4402 -0.180634,-0.4516 -0.06779,-0.02 -0.151984,-0.019 -0.225793,0 z m -5.735136,1.1291 c -0.07149,-6e-4 -0.109219,0.043 -0.180635,0.089 -0.04014,0.049 0.02093,0.055 0.09032,0.045 0,0 0.04516,0 0.04516,0 0.04747,-0.014 0.08867,-0.036 0.09032,-0.045 0.009,0.014 0.613981,0.2571 0.361269,0.1807 0.02809,0.02 0.04955,0.032 0.04516,0.045 0.0053,0.014 0.03601,0.049 0.180634,0.045 0.208289,-0.065 -0.190365,-0.1866 -0.180634,-0.1807 -0.01957,-0.014 -0.02504,-0.035 -0.04516,-0.045 -0.02554,-0.038 -0.03158,-0.045 -0.04516,-0.045 -0.105924,-0.053 -0.248041,-0.089 -0.361268,-0.089 z m -5.148076,0.089 c -0.01985,0 -0.05147,0.056 0,0.09 0.0185,-0.063 0.01358,-0.091 0,-0.09 z m 6.006088,0.2258 c -0.03209,5e-4 -0.05499,0.033 -0.04516,0.045 0.02298,0.016 -0.01,0.033 0,0.045 -0.0094,-2e-4 -0.01896,0.059 0,0.045 -0.02114,0 -0.02792,0.043 -0.04516,0.045 0.12221,-0.067 0.110953,0.078 0.180635,0.045 0.02858,-0.095 0.375135,-0.032 0.270951,-0.1359 -0.02182,-0.051 -0.264998,-0.092 -0.361268,-0.09 z m 0.587062,0.1358 c -0.05835,0 -0.187045,0.1171 0,0.09 0.01783,-0.039 0.02464,-0.091 0,-0.09 z m -1.083806,0.045 c 0.0097,0.014 0.01912,0.032 0.04516,0.045 l 0.04516,0 c 0.172535,-0.016 -0.01402,-0.046 -0.09032,-0.045 z m -1.219281,1.6257 c -0.0163,0 -0.0011,0.1185 0.04516,0.09 -0.0078,-0.061 -0.03802,-0.09 -0.04516,-0.09 z"/>
-    <path fill="url(#l)" d="m 9.066013,1039.0813 c -0.08358,-10e-5 -0.146685,0.025 0,0.045 0.101849,0.014 -0.05818,0.061 0.09032,0.045 0.07519,-0.065 -0.01658,-0.09 -0.09032,-0.09 z m -1.806342,0.045 c -0.08085,0.016 -0.146193,0.071 -0.225793,0.09 0.167199,-0.042 0.324172,-0.063 0.496744,-0.09 -0.08865,0.014 -0.183662,-0.017 -0.270951,0 z m 0.722537,0 c -0.100838,0.019 -0.125577,0.038 0,0.045 0.08577,-0.039 0.08961,-0.048 0.135475,-0.045 -0.05026,0 -0.09312,-0.014 -0.135475,0 z m 1.625708,0 c -0.0091,-8e-4 -0.03685,0.046 -0.04516,0.045 -0.01605,0.03 -0.129334,0.049 0.04516,0.045 0.0048,0.019 0.01431,0.067 0.04516,0.045 0.01156,-0.019 0.01983,-0.077 0.04516,-0.09 -0.03183,0 -0.05829,-0.039 -0.09032,-0.045 z m -1.128964,0.045 c -0.02416,6e-4 -0.03418,0.051 -0.04516,0.09 -0.09662,-0.065 -0.29735,-0.055 -0.361269,-0.045 -0.05552,0.027 -0.05,0.055 0.135476,0.045 0.103958,0 -0.01496,0.032 -0.09032,0.045 0.02251,0 0.01773,10e-4 0.09032,0 0.09883,0 0.621851,-0.055 0.31611,-0.09 0.02353,-0.04 -0.02653,-0.045 -0.04516,-0.045 z m 0.722537,0 c -0.01127,0.014 0.02183,0.048 0.135475,0.045 0.03143,-0.042 0.03666,-0.046 0,-0.045 -0.03753,5e-4 -0.12416,-0.014 -0.135475,0 z m -0.451586,0.045 c -0.01501,6e-4 8e-5,0.039 0,0.045 0,0 0.04516,0 0.04516,0 0,0 -0.04516,-0.045 -0.04516,-0.045 z m 0.04516,0.045 c -0.04631,0.014 -0.04368,0.033 0.09032,0.045 -0.03234,0 -0.123857,0.062 0.04516,0.045 0.132571,-0.04 0.176165,-0.1373 0.04516,-0.1358 -0.01358,10e-5 -0.02783,0.043 -0.04516,0.045 0.01672,0.017 -0.08916,-0.014 -0.135476,0 z m 1.128964,-0.045 c -0.01387,0.017 -0.03883,0.027 -0.04516,0.045 -0.009,0.026 0.01026,0.077 0,0.09 -0.0072,0 -0.03152,0 -0.04516,0 -0.05439,-3e-4 -0.162088,0.014 -0.180634,0 -0.153773,-0.014 -0.07519,0.025 -0.04516,0.045 0.138264,0.014 0.297103,0.08 0.31611,0.09 0.136704,0.014 0.03662,-0.1584 0.270951,-0.09 -0.0059,-0.024 0.0011,-0.039 0.04516,-0.045 -0.105129,-0.035 -0.208457,-0.1069 -0.316109,-0.1358 z m -0.722537,0.045 c 0.01559,0.014 0.002,0.033 0.04516,0.045 0.06509,-0.037 0.0069,-0.045 -0.04516,-0.045 z m -1.625708,0.045 c -0.253349,0.1142 -0.426184,0.1817 -0.406427,0.271 0.180027,-0.019 0.371333,-0.1717 0.587061,-0.1807 0.223903,-0.075 -0.05272,-0.085 -0.180634,-0.09 z m 1.445074,0.045 c -0.0409,0.016 -0.01728,0.074 0.09032,0.09 0.02965,-0.053 -0.0091,-0.091 -0.04516,-0.09 -0.01504,2e-4 -0.03153,0 -0.04516,0 z m -0.677379,0.045 c -0.04481,0 -0.05671,0.036 0,0.09 0.172461,-0.032 0.0655,-0.091 0,-0.09 z m 0.31611,0.045 c -0.137831,0.038 0.04928,0.025 -0.09032,0.09 -0.207472,-0.068 -0.03163,0.1658 0,0.1807 0.04266,0 0.131011,-0.088 0.180635,-0.1359 -0.03626,-0.026 0.01566,-0.071 0.04516,-0.09 3.77e-4,-0.014 -0.01069,-0.04 -0.04516,-0.045 -0.0196,0 -0.06061,9e-4 -0.09032,0 z m 1.716025,0 c -0.004,0 -0.01945,0.029 0,0.045 0.07818,0.033 0.02507,0.035 0.04516,0.045 0.03601,0.071 0.313666,0.1649 0.180634,0.1359 0.135678,0.027 0.416206,0.3372 0.361268,0.2257 0.04163,0.069 0.111546,0.3245 0.09032,0.2258 0.0104,0 0.09364,0.062 0.09032,0.09 0.07303,0.017 0.09192,0.066 0.09032,0.09 0.01387,0 0.03951,0.059 0,0.045 0,0 -0.04516,0 -0.04516,0 0.0066,0 -0.0061,0.043 0,0.045 0.123612,0.045 0.0056,0.1286 0.04516,0.1359 -0.04496,4e-4 -0.04601,0.036 -0.04516,0.045 0.0078,0 -0.0058,0.042 0,0.045 0.01988,0 -0.03053,0.046 0.09032,0.045 -0.02273,-9e-4 -0.102253,0.014 -0.135475,0 0.01098,0 0.0066,0.027 0.04516,0.045 -0.05684,0.014 -0.08789,0.068 -0.09032,0.09 0.156122,-0.053 0.09485,0.022 0.04516,0.045 0.04858,0 0.08897,0.019 0.09032,0.045 0.01497,0 0.03866,0.033 0,0.045 -0.0022,0 0.004,0.039 0,0.045 0.0072,0 -0.0046,0.041 0,0.045 -0.08747,0.03 -0.03464,0.1041 0,0.1359 -0.002,7e-4 0.0424,0.014 0.04516,0 -0.0084,0.09 0.04516,0.2208 0.04516,0.1806 0.08871,0.084 0.176136,0.1171 0.180634,0.09 0.02958,0 0.141039,0.071 0.135476,0.09 0.04514,0.014 0.07444,0 0.04516,-0.045 0.0042,-0.02 -0.0097,-0.055 0,-0.09 0.01272,-0.048 0.01607,-0.066 0,-0.045 -0.04244,-0.038 0.08587,-0.075 0.04516,-0.09 0.04006,-0.039 0.02247,-0.3081 0.04516,-0.1806 0.124681,-0.045 0.167427,0.042 0.180635,-0.045 3.52e-4,0.069 0.06373,0.014 0.09032,0 0.0064,0 0.04063,0 0.04516,0 0.03445,-0.027 -0.01487,-0.1848 0.04516,-0.1359 0.07386,0.1171 0.333387,0.12 0.406427,0.045 -0.06679,-0.035 -0.100563,-0.071 -0.135476,-0.09 -0.05608,-0.02 -0.07516,-0.078 -0.09032,-0.09 0.0149,0 0.03384,0.029 0.09032,0.045 0.02376,0.022 0.03107,-0.014 0.04516,0 -0.04337,-0.059 -0.08394,-0.1445 -0.09032,-0.1358 -0.04805,-0.045 -0.05874,-0.053 -0.04516,-0.045 -0.07471,-0.052 -0.0069,-0.071 0.09032,0 -0.503631,-0.4665 -1.072016,-0.862 -1.716025,-1.1289 -0.03867,0 -0.236008,-0.039 -0.31611,-0.045 z m -2.619196,0.045 c -0.05805,0.035 -0.103164,0.066 -0.180634,0.09 0.08266,0 -0.436024,0.1185 0.04516,0.09 -0.06329,0.036 -0.540547,0.059 -0.180634,0.1806 -0.12825,0.2039 0.586882,-0.068 0.406427,0 0.06181,-0.017 0.09822,0.091 0.225793,0.09 0.162503,-0.03 0.129551,-0.1228 0.09032,-0.1358 0.0322,-0.02 0.06892,-0.048 0.09032,-0.045 -0.05185,-0.059 -0.08393,-0.087 0,-0.1806 -0.05951,0.04 -0.194185,0.088 -0.180634,0 0.0082,-0.059 0.01776,-0.1739 -0.04516,-0.09 -0.09198,0.024 -0.17661,0.014 -0.225793,0 -0.0104,0 -0.04373,0 -0.04516,0 z m 1.535391,0.09 c -0.107831,0.033 -0.344638,0.2215 -0.09032,0.271 -0.04356,-0.014 -0.07185,-10e-4 -0.09032,0 0.04418,0.037 0.112152,0.1069 0.09032,0.09 0.04681,0.014 0.147535,0.032 0.225793,0.045 0.105317,0.019 0.193436,0.033 0.135476,0.045 0.130201,0.058 0.05777,-0.1893 0.135475,0.045 0.128077,0.02 0.27517,0.1141 0.135476,0.1358 -0.0069,10e-5 -0.01567,0.081 0,0.045 0.0402,0.062 0.150499,0.1579 0.135476,0.09 0.08315,0.065 -0.110548,0.1569 -0.180635,0.1806 0.0177,0.059 -0.03884,0.1113 -0.09032,0.1359 0.06264,-0.014 0.246448,0.246 0.180635,0.1806 -0.02867,0.014 -0.02299,0.022 0,0.045 -0.0098,0 0.02185,0.061 0.04516,0.045 0.097426,0.065 0.245697,0.1257 0.270951,0.1358 0.01,-0.036 -0.04431,-0.1257 -0.09032,-0.1806 0.01185,0 0.02392,-0.014 0.04516,0 0.04767,0.014 0.146999,0.027 0.135476,0.09 0.04169,-0.036 -0.0049,-0.1807 0,-0.1807 -0.1151,-0.1611 -0.108568,-0.098 -0.135476,-0.2257 -0.02711,-0.023 0.167583,-0.014 0.135476,0 0.02048,0.032 0.0404,0.062 0.04516,0.09 -0.01575,0 0.140056,-0.068 0.135475,0.045 0.03637,-0.023 0.03461,-0.061 0.04516,-0.09 0.168702,0 -0.05389,-0.052 0,-0.045 0.01402,-0.1011 -0.11841,-0.053 -0.09032,-0.1358 -0.04477,-0.051 -0.130837,-0.1156 -0.09032,-0.045 -0.01753,0 -0.07007,-0.058 -0.09032,-0.09 0.0078,-0.02 -0.0017,-0.058 0.135476,-0.045 -0.05561,-0.017 -0.08386,-0.032 -0.09032,-0.045 0.01798,-0.016 0.03208,-0.055 -0.09032,-0.045 -0.0299,-0.03 0.01838,-0.038 0.04516,-0.045 -6.12e-4,-0.014 -0.01171,-0.02 -0.04516,-0.045 -0.109146,0.048 -0.0098,-0.017 -0.04516,-0.045 -0.02155,0.014 -0.04663,0.014 -0.04516,0 0.09383,-0.043 0.01718,-0.1055 -0.04516,-0.09 0.02032,-0.019 -0.02958,-0.066 -0.090317,-0.045 -0.106357,-0.024 0.01585,0 -0.09032,-0.09 -0.01676,-0.038 -0.01501,-0.09 -0.04516,-0.09 -0.05507,2e-4 -0.07881,0.043 -0.09032,0.045 -0.01653,-0.046 -0.0349,-0.062 -0.04516,-0.045 0.0046,-0.056 -0.03548,-0.1055 -0.180634,-0.045 -0.07579,0.02 -0.05127,0.1577 -0.09032,0.09 -0.0397,-0.032 -0.06827,-0.027 -0.09032,0 -0.02205,0.028 -0.02562,0.071 0,0.09 -0.08386,0.017 -0.04658,-0.035 0,-0.09 0.06987,-0.084 0.144175,-0.1831 0.04516,-0.1806 -0.02027,4e-4 -0.04897,-0.014 -0.09032,0 z m -2.528879,0.09 c -0.04168,0.016 -0.138857,0.061 -0.225793,0.09 -0.08448,0.02 -0.177462,0.014 -0.135476,0 -0.03442,-0.014 -0.225251,0.104 -0.31611,-0.045 -0.15475,0.014 -0.22998,0 -0.316109,0 -0.01172,0 -0.03348,0 -0.04516,0 -0.51809,0.2744 -0.988949,0.6277 -1.399916,1.0387 -0.05146,0.048 -0.09312,0.1229 -0.135475,0.1807 -0.06051,0.084 -0.07162,0.1445 0,0.09 -0.08021,0.088 -0.106752,0.2593 0.04516,0.1358 -0.127771,0.1948 -0.324817,0.3604 -0.451586,0.4968 0.207116,-0.1689 0.390662,-0.3587 0.587061,-0.5419 0.01575,-0.084 0.1341,-0.1329 0.225793,-0.1806 -0.09124,0.084 -0.180188,0.2231 -0.09032,0.1358 0.0882,-0.035 0.212553,-0.1668 0.270951,-0.2257 -0.0011,0 0.04432,0 0.04516,0 0.01399,-4e-4 0.02171,0 0,0.045 0.04249,0.014 0.1853,0.077 0.225793,0.09 0.04562,-0.023 0.147873,0.085 0.135476,0.1358 0.0124,-0.014 0.03244,-0.022 0.04516,-0.09 0.0099,-0.039 -0.03141,0.2057 0,0.1807 -0.01275,0.029 -0.0353,0.061 -0.04516,0.09 0,0 -0.04516,0.045 -0.04516,0.045 -0.0081,0.019 -0.0064,0.039 0,0.045 0,0 0.04516,-0.045 0.04516,-0.045 -0.0034,0.014 -0.0015,0.035 0,0.045 -0.005,5e-4 -0.02389,0.059 0,0.045 0.0046,0 0.03764,-4e-4 0.04516,0 -0.02653,0.027 -0.01638,0.036 0,0.045 0.01488,0.014 5.5e-5,0.041 -0.04516,0.09 -0.01454,0.014 0.02371,0.025 0,0.045 -0.02886,0.095 0.01342,0.1359 0.04516,0.1359 -0.01798,0.079 -0.01867,0.1579 0,0.1806 -0.0415,0.059 -0.07669,0.1416 -0.04516,0.09 0.07378,-0.014 0.0011,0.1257 -0.04516,0.1806 0.02834,-0.014 0.07674,-0.026 0.180634,-0.09 -0.0082,0.025 0.123813,0.082 0.04516,0.1359 0.03263,0.051 0.02895,0.1286 0,0.1806 -0.01908,0.033 -0.0424,0.038 -0.04516,0.045 -0.05049,-0.2244 -0.182126,0.3601 -0.180634,0.2257 -0.09281,0.2171 -0.184077,0.401 -0.225793,0.6322 -0.08139,0.1739 -0.02076,0.4711 0.04516,0.4065 0.04001,0.1529 0.01708,0.3703 0.180634,0.4064 0.155322,0.152 0.10817,0.4311 0.270952,0.5871 0.02048,0.12 -0.128768,0.1931 0.04516,0.2258 0.113208,0.2501 0.133117,0.4109 0.270951,0.3612 -0.09169,-0.1055 -0.25631,-0.5183 -0.225793,-0.4966 -0.07931,-0.1287 -0.173621,-0.4827 0,-0.3613 0.07233,0.1521 0.132911,0.363 0.270952,0.4967 0.0043,0.1563 0.22556,0.3085 0.270951,0.5419 -0.03782,0.1572 0.02529,0.2692 0.180634,0.3612 0.218358,0.061 0.436111,0.2914 0.677379,0.1807 0.156357,-0.027 0.289166,0.3063 0.496744,0.2709 0.229001,0.023 0.220627,0.081 0.361268,0.271 -0.01156,0.1828 0.112181,-0.048 0.135476,0.1806 0.07209,-0.014 0.307461,0.062 0.361268,0.09 0.008,-0.1884 0.269413,-0.1286 0.225793,0.045 0.0747,0.1574 0.06241,0.3712 -0.09032,0.4967 -0.101184,0.04 -0.200609,0.2345 -0.225793,0.3161 0.227877,-0.024 0.131112,0.3285 0.04516,0.3613 0.205709,0.1171 0.276077,0.371 0.406427,0.5419 0.08621,0.1857 0.388537,0.1857 0.496745,0.3613 0.02814,0.2003 -0.01387,0.35 0,0.5419 -0.08689,0.1501 0.0177,0.3206 -0.04516,0.4516 -0.07473,0.1185 -0.115361,0.3503 0.04516,0.3612 -0.0084,0.039 -0.07266,0.092 -0.09032,0.1359 -0.0056,0.014 0,0.037 0,0.045 -0.112398,0 -0.08498,0.022 -0.04516,0.045 0,0 0.04516,0.045 0.04516,0.045 0.01329,5e-4 0.02896,0.014 0.04516,0 0.01402,0.014 -0.01,0.038 0,0.045 0.136082,-0.014 0.273318,-0.022 0.406427,-0.045 -0.182325,-0.026 0.237626,-0.1416 0,-0.1807 0.0987,-0.026 0.0774,-0.091 0.180634,-0.1358 0.0084,-0.042 0.196108,-0.2228 0.361268,-0.2257 0.411132,-0.071 -0.203677,-0.3353 0.180634,-0.2259 0.116964,0.065 0.29323,-0.1387 0.361268,-0.2257 -0.05939,0.1585 0.281741,-0.3464 0.270952,-0.3613 0.152708,-0.1141 0.609512,-0.2704 0.451585,-0.2709 0.207422,-0.1445 0.281629,-0.4255 0.31611,-0.6775 0.174726,-0.1458 0.295933,-0.4276 0.31611,-0.4967 -0.03568,-0.1242 -0.504442,-0.2372 -0.361268,-0.2258 -0.09757,-0.046 -0.233604,-0.068 -0.270952,0 -0.0094,-0.091 -0.304507,-0.12 -0.225792,-0.09 -0.04999,0.036 -0.06761,0.019 -0.09032,0.045 -0.08046,0.091 -0.03829,0.1402 -0.135475,0.045 0.07592,-0.014 0.116516,-0.022 0.135475,-0.045 0.02843,-0.035 0.0011,-0.084 -0.04516,-0.09 -0.0077,6e-4 -0.04117,0 -0.04516,0 -0.0056,0 -0.0429,0 -0.04516,0 -0.03051,0.014 -0.06114,0.051 -0.09032,0.09 -0.08452,-0.025 -0.05975,-0.4036 0.09032,-0.3162 -0.04208,-0.1644 -0.180697,-0.2458 -0.361269,-0.2709 -0.226956,0.053 -0.267778,-0.088 -0.406428,-0.2258 -0.12468,0.029 -0.226532,-0.1741 -0.225792,-0.1806 -0.170932,0.1199 -0.602057,-0.014 -0.677378,-0.045 -0.07045,0 -0.113251,0.051 -0.09032,0.1806 -0.206379,0.081 0.108481,-0.3398 -0.09032,-0.2257 -0.128959,0.162 -0.280423,0.02 -0.31611,0.2257 -0.133785,0.2002 -0.09785,0.082 -0.31611,0 -0.251648,0.1373 -0.45284,-0.023 -0.406427,-0.1806 0.05422,-0.1344 -0.01026,-0.3454 0,-0.3613 -0.06094,-0.014 -0.195335,-0.087 -0.361269,-0.045 -0.246457,0.08 0.06764,-0.1517 0,-0.2258 -0.01619,-0.075 -0.120895,-0.3133 0.04516,-0.3161 -0.247612,-0.039 -0.264447,0.1746 -0.361268,0.3161 -0.0863,-0.074 -0.302964,0.075 -0.406427,-0.09 -0.179455,-0.1674 -0.16357,-0.4262 -0.09032,-0.6322 0.0687,-0.079 -0.0041,-0.3479 0.180634,-0.3613 0.172498,-0.097 0.118395,-0.1272 0.361268,-0.09 0.05499,0.014 0.126242,-0.1012 0.225793,0 0.0094,-0.1448 0.439329,-0.085 0.31611,-0.09 0.08587,0.1098 0.246796,0.014 0.270952,0.2259 -0.01344,0.075 0.142137,0.2426 0.180634,0.316 0.169985,-0.2103 -0.187016,-0.5442 0.09032,-0.7225 0.159459,-0.107 0.428687,-0.2989 0.406427,-0.3161 0.01301,0 0.026,-0.042 0.04516,-0.045 -0.01344,-0.014 -0.01026,-0.03 -0.04516,-0.045 0.08519,-0.064 0.01448,-0.2354 0,-0.2709 0.0055,0 0.101155,-0.1952 0.09032,0.045 0.03461,0.2464 0.06759,-0.1026 0.09032,-0.1807 0.0452,-0.03 0.08222,-0.074 0.135475,-0.1358 0.0077,-0.014 0.03254,0 0.04516,0 0.04512,-0.043 0.102095,-0.1084 0.180635,-0.09 0.166978,-0.014 0.07412,-0.014 0.09032,-0.1806 0.113308,-0.133 0.258747,-0.1768 0.31611,-0.1807 -0.0461,-0.072 0.156313,-0.014 0.225792,-0.045 -0.07598,0.039 -0.223603,0.1755 -0.04516,0.2259 0.03367,-0.1416 0.343512,-0.1402 0.31611,-0.2259 -0.0039,-0.014 -0.02468,0.019 -0.04516,0 -0.210821,0.091 -0.329963,-0.2102 -0.270952,-0.2257 -0.212243,-0.046 0.384506,-0.1315 0,-0.1806 -0.317741,0.091 -0.597593,0.3519 -0.225793,0 0.177503,-0.055 0.196233,-0.2214 0.406428,-0.1358 0.136068,0.02 0.347227,0.1156 0.451585,-0.045 0.104349,0.029 0.233393,-0.082 0.180635,-0.1359 0.05896,-0.08 -0.02912,-0.1657 -0.04516,-0.1358 -0.01055,-0.074 -0.115635,-0.035 -0.180634,0 0.0053,-0.014 -0.01857,-0.025 0,-0.045 0.05017,-0.03 0.248185,-0.045 0.04516,-0.1359 -0.06626,0.025 -0.157196,-0.052 -0.09032,-0.045 -0.132657,-0.084 -0.07231,-0.2902 -0.09032,-0.2258 0.04756,-0.069 0.08129,-0.1875 0,-0.1358 -0.116054,0.016 0.0048,-0.069 -0.09032,-0.1806 -0.0026,-0.03 -0.03958,-0.036 -0.04516,-0.045 -0.02613,0.046 -0.09116,0.1199 -0.09032,0.09 -0.0039,0.071 -0.174478,0.1098 -0.180634,0.09 -0.07276,0.03 0.034436,-0.071 -0.135476,-0.09 -0.01477,-0.026 -0.01754,-0.1055 -0.04516,-0.1359 0.15668,0.065 0.206565,-0.1513 0.04516,-0.1358 -0.05439,-0.042 -0.357893,-0.1402 -0.225793,-0.1807 -0.200677,-0.1069 -0.247223,-0.014 -0.31611,0.1359 0.06246,0 -0.06841,0.1228 0,0.1358 -0.09434,0.1315 -0.02214,0.3989 0,0.4516 -0.0052,0.1041 -0.239914,0.361 -0.316109,0.2257 -0.04092,0.1041 -0.103554,0.3613 -0.04516,0.271 0.03178,0.1185 -0.08633,0.03 -0.135476,0.045 -0.119681,-0.1 -0.109262,-0.2182 -0.04516,-0.4065 -0.03478,-0.1704 -0.223877,-0.029 -0.31611,-0.2257 -0.07438,-0.097 -0.278593,-0.1869 -0.361269,-0.1807 0.0474,-0.2799 -0.188827,-0.027 -0.09032,-0.2258 0.03785,-0.1539 0.16659,-0.2857 0.270952,-0.3613 0.07663,-0.055 0.137267,-0.014 0.09032,-0.1358 0.182851,0.1758 0.08571,-0.023 0.09032,-0.045 0.168566,0.097 0.129536,-0.09 0.270951,0 0.06816,-0.014 0.115606,-0.027 0.135476,-0.045 0.03516,-0.033 -0.0032,-0.098 -0.04516,-0.1359 0.178419,0.092 0.196885,-0.2188 0.31611,-0.09 0.0051,0 0.02697,-0.042 0.04516,0 0.17381,0.029 0.142296,-0.2815 0.180634,-0.1806 0.01484,0 -0.0064,-0.043 0,-0.045 -0.03571,-0.032 -0.07068,-0.065 -0.09032,-0.09 -0.06392,0.051 -0.170448,0.1286 -0.225793,0.1806 -0.03445,0.017 -0.054,0.058 -0.04516,0.045 -0.08305,-0.014 0.07733,-0.3585 -0.09032,-0.2257 -0.03918,0.032 -0.06835,0.045 -0.09032,0.045 -0.0104,-0.035 -0.009,-0.1127 0.04516,-0.1358 -0.11984,-0.059 0.102268,-0.061 0,-0.2259 -0.06704,-0.068 -0.211871,0.1629 -0.180634,0.09 -0.20411,0.072 0.216982,0.151 -0.04516,0.1806 0.186072,0.035 -0.11247,0.2885 -0.135476,0.1807 -0.09621,0.092 0.08105,-0.2178 0,-0.1359 -0.02632,0 -0.09958,0 -0.135476,0 -0.0012,0 -0.02827,0.02 0,0.045 0.0055,0.038 -0.330384,-0.037 -0.406427,-0.045 -0.05374,-0.052 -0.06724,-0.093 -0.135475,-0.09 -0.124204,0 -0.150668,0.1496 -0.180634,0.1807 -0.111517,0.1214 -0.13773,-0.097 -0.04516,-0.09 -0.134609,-0.023 -0.225598,-0.061 -0.270952,-0.09 -0.0033,-0.017 -0.02208,-0.075 -0.04516,-0.09 -0.114594,-0.1513 -0.229456,-0.2437 -0.31611,-0.1358 -0.159354,0.1621 -0.08913,-0.049 -0.135475,-0.045 -0.0085,5e-4 -0.02415,-0.019 -0.04516,0 z m 1.716025,0.3613 0.04516,0 c 0.08851,0.022 0.01697,-0.1791 -0.04516,-0.1807 -0.01011,-2e-4 -0.03498,0.035 -0.04516,0.045 -0.11364,0.051 -0.160962,0.023 0,0.09 l 0.04516,0.045 z m 0.361269,0.5419 c -0.0079,0.014 -0.0117,0.072 0,0.045 0.0048,0.035 0.08076,0.1112 0.09032,0.09 0.15424,-0.195 0.164664,0.046 0.31611,0 -0.03415,-0.04 -0.227202,-0.261 -0.225793,-0.271 -0.05786,-3e-4 -0.156921,0.1055 -0.180634,0.1359 z m 1.399914,2.3933 c 0.0016,0.014 0.01286,0 0.04516,0 0.02961,-0.048 0.103626,0.014 0.04516,-0.1358 -0.0038,0.014 -0.09519,0.098 -0.09032,0.1358 z m -5.102916,-0.7676 c 0.02219,0.046 0.01172,0.1141 0,0.09 0.06356,0.033 0.08657,0.1257 0.180634,0.09 0.02836,-0.081 -0.112878,-0.1272 -0.180634,-0.1807 z m 4.651331,-1.9419 c -0.06072,-10e-5 -0.231662,0.094 -0.04516,0.09 0.06634,-0.065 0.07481,-0.09 0.04516,-0.09 z m 1.309598,0.09 c -0.05374,-2e-4 -0.06829,0.1402 0.09032,0.1358 -0.04105,-0.09 -0.06407,-0.1358 -0.09032,-0.1358 z m 1.535391,0.9484 c 0.02032,0.016 0.02788,0.074 0.04516,0.09 -0.03007,-0.041 -0.02595,-0.091 -0.04516,-0.09 z m 0.04516,0.09 c 0.07977,0.068 -0.03724,0.1199 0.135475,0.1806 l 0.04516,0.045 c 0.104508,0.014 0.05055,-0.1823 0.04516,-0.2257 -0.08876,-0.014 -0.177523,0.071 -0.180634,0 -0.01127,-0.019 -0.03513,0.014 -0.04516,0 z m -3.612685,0.1806 c -0.02996,0 -0.110215,0.1185 0,0.09 0.03486,-0.04 0.01272,-0.091 0,-0.09 z m -0.316109,0.4064 c -0.04649,4e-4 -0.0422,0.065 0.09032,0.045 -0.01562,-0.035 -0.07069,-0.045 -0.09032,-0.045 z m 4.922282,0.3162 c 0.02285,0.065 0.03779,0.117 0.09032,0.2257 0.01546,0 0.02498,0.026 0.04516,0.045 -0.04052,-0.092 -0.09033,-0.1807 -0.135475,-0.271 z m -0.180634,0.045 c -0.0026,0.088 0.04016,0.2547 0.09032,0.3612 0.0082,0.017 -0.0074,0.03 0,0.045 -0.0045,6e-4 -0.01373,0.049 0,0.045 0.003,0 0.04264,0 0.04516,0 -0.04351,0.1471 0.05649,0.1713 0,0.2259 0.201321,0.042 0.08532,-0.2345 0.04516,-0.3162 -0.05098,-0.1669 -0.167239,-0.3111 -0.180635,-0.3613 z m -3.386892,0.1358 c -0.05487,10e-5 -0.03402,0.081 0.180634,0.1358 -0.05527,-0.082 -0.140591,-0.1358 -0.180634,-0.1358 z m 0.541903,0 c -0.04708,0.08 -0.09808,0.1676 -0.180635,0.1806 -0.05662,0.074 0.103049,0.181 0.270952,0.1359 -0.0013,0.042 -0.06347,0.117 0.09032,0.045 0.01597,-0.038 -0.0059,-0.046 0,-0.045 0,0 0.04516,0.045 0.04516,0.045 0.0055,0.04 0.01156,0.097 0.04516,0.09 0.121487,-0.1185 -0.04139,-0.094 -0.04516,-0.1359 -0.0013,-0.014 0.0012,-0.055 0.04516,-0.09 -0.145799,0.081 -0.211123,-0.059 -0.09032,-0.09 -0.19025,-0.016 -0.02279,-0.03 -0.09032,-0.09 -0.103309,0.062 -0.115679,0.014 -0.09032,-0.045 z m 2.79983,0.09 c -0.01468,9e-4 -0.03501,0.014 -0.04516,0.045 -0.01171,0.058 0.02377,0.2852 0.04516,0.2259 0.01494,0.014 0.01387,0.062 0.04516,0.045 0.141545,-0.022 0.02559,-0.3205 -0.04516,-0.316 z m 0.406427,0.1358 c 0.01685,0.1416 -0.002,0.3213 0,0.3613 -0.05686,0.077 -0.144873,0.1199 -0.180634,0.1358 0.07341,0.08 -0.01626,0.3265 0.04516,0.4064 -0.122759,-0.016 -0.140562,0.2322 -0.135475,0.3162 -0.01455,0.2338 0.150043,0.3205 0.180634,0.316 0.165256,0 0.194273,-0.4905 0.180634,-0.3613 0.02171,-0.2263 0.177348,-0.2855 0.225793,0 -0.07153,-0.4133 -0.162611,-0.7953 -0.31611,-1.1741 z m 0,1.5354 c -0.07381,0.019 -0.108785,0.056 -0.04516,0.09 -0.155097,-0.022 -0.26964,0.6838 -0.270952,0.5419 -0.174871,0.1601 -0.273942,0.3996 -0.31611,0.6322 0.09247,0.1928 0.04996,0.7639 0,0.6775 0.04069,0.117 0.14247,0.4104 0.135476,0.2709 0.05247,0.159 0.220336,0.3128 0.361268,0.1359 0.196646,-0.1599 0.3696,-0.1979 0.225793,0.1358 0.200782,-0.5907 0.361269,-1.193 0.361269,-1.8516 0,-0.063 -0.04318,-0.1185 -0.04516,-0.1806 -0.126574,-0.1431 -0.353445,-0.4402 -0.180634,-0.4516 -0.06779,-0.02 -0.151984,-0.019 -0.225793,0 z m -5.735136,1.1291 c -0.07149,-6e-4 -0.109219,0.043 -0.180635,0.089 -0.04014,0.049 0.02093,0.055 0.09032,0.045 0,0 0.04516,0 0.04516,0 0.04747,-0.014 0.08867,-0.036 0.09032,-0.045 0.009,0.014 0.613981,0.2571 0.361269,0.1807 0.02809,0.02 0.04955,0.032 0.04516,0.045 0.0053,0.014 0.03601,0.049 0.180634,0.045 0.208289,-0.065 -0.190365,-0.1866 -0.180634,-0.1807 -0.01957,-0.014 -0.02504,-0.035 -0.04516,-0.045 -0.02554,-0.038 -0.03158,-0.045 -0.04516,-0.045 -0.105924,-0.053 -0.248041,-0.089 -0.361268,-0.089 z m -5.148076,0.089 c -0.01985,0 -0.05147,0.056 0,0.09 0.0185,-0.063 0.01358,-0.091 0,-0.09 z m 6.006088,0.2258 c -0.03209,5e-4 -0.05499,0.033 -0.04516,0.045 0.02298,0.016 -0.01,0.033 0,0.045 -0.0094,-2e-4 -0.01896,0.059 0,0.045 -0.02114,0 -0.02792,0.043 -0.04516,0.045 0.12221,-0.067 0.110953,0.078 0.180635,0.045 0.02858,-0.095 0.375135,-0.032 0.270951,-0.1359 -0.02182,-0.051 -0.264998,-0.092 -0.361268,-0.09 z m 0.587062,0.1358 c -0.05835,0 -0.187045,0.1171 0,0.09 0.01783,-0.039 0.02464,-0.091 0,-0.09 z m -1.083806,0.045 c 0.0097,0.014 0.01912,0.032 0.04516,0.045 l 0.04516,0 c 0.172535,-0.016 -0.01402,-0.046 -0.09032,-0.045 z m -1.219281,1.6257 c -0.0163,0 -0.0011,0.1185 0.04516,0.09 -0.0078,-0.061 -0.03802,-0.09 -0.04516,-0.09 z"/>
-    <circle cx="-902.857" cy="526.648" r="232.857" fill="none" stroke="url(#m)" stroke-width="28.785" transform="matrix(.02626 0 0 .02626 32.158 1031.032)"/>
-    <circle cx="-902.857" cy="526.648" r="232.857" fill="url(#n)" opacity=".17" transform="translate(31.109 1031.644) scale(.0251)"/>
+  <g
+     transform="matrix(.84175 0 0 .84685 -1.59 -875.363)"
+     id="g25">
+    <circle
+       cx="-902.857"
+       cy="526.648"
+       r="232.857"
+       fill="url(#j)"
+       transform="translate(31.109 1031.644) scale(.0251)"
+       id="circle23" />
+    <path
+       fill="url(#k)"
+       stroke="#767554"
+       stroke-linecap="round"
+       stroke-linejoin="round"
+       stroke-width=".5"
+       d="m 9.066013,1039.3313 c -0.08358,-10e-5 -0.146685,0.025 0,0.045 0.101849,0.014 -0.05818,0.061 0.09032,0.045 0.07519,-0.065 -0.01658,-0.09 -0.09032,-0.09 z m -1.806342,0.045 c -0.08085,0.016 -0.146193,0.071 -0.225793,0.09 0.167199,-0.042 0.324172,-0.063 0.496744,-0.09 -0.08865,0.014 -0.183662,-0.017 -0.270951,0 z m 0.722537,0 c -0.100838,0.019 -0.125577,0.038 0,0.045 0.08577,-0.039 0.08961,-0.048 0.135475,-0.045 -0.05026,0 -0.09312,-0.014 -0.135475,0 z m 1.625708,0 c -0.0091,-8e-4 -0.03685,0.046 -0.04516,0.045 -0.01605,0.03 -0.129334,0.049 0.04516,0.045 0.0048,0.019 0.01431,0.067 0.04516,0.045 0.01156,-0.019 0.01983,-0.077 0.04516,-0.09 -0.03183,0 -0.05829,-0.039 -0.09032,-0.045 z m -1.128964,0.045 c -0.02416,6e-4 -0.03418,0.051 -0.04516,0.09 -0.09662,-0.065 -0.29735,-0.055 -0.361269,-0.045 -0.05552,0.027 -0.05,0.055 0.135476,0.045 0.103958,0 -0.01496,0.032 -0.09032,0.045 0.02251,0 0.01773,10e-4 0.09032,0 0.09883,0 0.621851,-0.055 0.31611,-0.09 0.02353,-0.04 -0.02653,-0.045 -0.04516,-0.045 z m 0.722537,0 c -0.01127,0.014 0.02183,0.048 0.135475,0.045 0.03143,-0.042 0.03666,-0.046 0,-0.045 -0.03753,5e-4 -0.12416,-0.014 -0.135475,0 z m -0.451586,0.045 c -0.01501,6e-4 8e-5,0.039 0,0.045 0,0 0.04516,0 0.04516,0 0,0 -0.04516,-0.045 -0.04516,-0.045 z m 0.04516,0.045 c -0.04631,0.014 -0.04368,0.033 0.09032,0.045 -0.03234,0 -0.123857,0.062 0.04516,0.045 0.132571,-0.04 0.176165,-0.1373 0.04516,-0.1358 -0.01358,10e-5 -0.02783,0.043 -0.04516,0.045 0.01672,0.017 -0.08916,-0.014 -0.135476,0 z m 1.128964,-0.045 c -0.01387,0.017 -0.03883,0.027 -0.04516,0.045 -0.009,0.026 0.01026,0.077 0,0.09 -0.0072,0 -0.03152,0 -0.04516,0 -0.05439,-3e-4 -0.162088,0.014 -0.180634,0 -0.153773,-0.014 -0.07519,0.025 -0.04516,0.045 0.138264,0.014 0.297103,0.08 0.31611,0.09 0.136704,0.014 0.03662,-0.1584 0.270951,-0.09 -0.0059,-0.024 0.0011,-0.039 0.04516,-0.045 -0.105129,-0.035 -0.208457,-0.1069 -0.316109,-0.1358 z m -0.722537,0.045 c 0.01559,0.014 0.002,0.033 0.04516,0.045 0.06509,-0.037 0.0069,-0.045 -0.04516,-0.045 z m -1.625708,0.045 c -0.253349,0.1142 -0.426184,0.1817 -0.406427,0.271 0.180027,-0.019 0.371333,-0.1717 0.587061,-0.1807 0.223903,-0.075 -0.05272,-0.085 -0.180634,-0.09 z m 1.445074,0.045 c -0.0409,0.016 -0.01728,0.074 0.09032,0.09 0.02965,-0.053 -0.0091,-0.091 -0.04516,-0.09 -0.01504,2e-4 -0.03153,0 -0.04516,0 z m -0.677379,0.045 c -0.04481,0 -0.05671,0.036 0,0.09 0.172461,-0.032 0.0655,-0.091 0,-0.09 z m 0.31611,0.045 c -0.137831,0.038 0.04928,0.025 -0.09032,0.09 -0.207472,-0.068 -0.03163,0.1658 0,0.1807 0.04266,0 0.131011,-0.088 0.180635,-0.1359 -0.03626,-0.026 0.01566,-0.071 0.04516,-0.09 3.77e-4,-0.014 -0.01069,-0.04 -0.04516,-0.045 -0.0196,0 -0.06061,9e-4 -0.09032,0 z m 1.716025,0 c -0.004,0 -0.01945,0.029 0,0.045 0.07818,0.033 0.02507,0.035 0.04516,0.045 0.03601,0.071 0.313666,0.1649 0.180634,0.1359 0.135678,0.027 0.416206,0.3372 0.361268,0.2257 0.04163,0.069 0.111546,0.3245 0.09032,0.2258 0.0104,0 0.09364,0.062 0.09032,0.09 0.07303,0.017 0.09192,0.066 0.09032,0.09 0.01387,0 0.03951,0.059 0,0.045 0,0 -0.04516,0 -0.04516,0 0.0066,0 -0.0061,0.043 0,0.045 0.123612,0.045 0.0056,0.1286 0.04516,0.1359 -0.04496,4e-4 -0.04601,0.036 -0.04516,0.045 0.0078,0 -0.0058,0.042 0,0.045 0.01988,0 -0.03053,0.046 0.09032,0.045 -0.02273,-9e-4 -0.102253,0.014 -0.135475,0 0.01098,0 0.0066,0.027 0.04516,0.045 -0.05684,0.014 -0.08789,0.068 -0.09032,0.09 0.156122,-0.053 0.09485,0.022 0.04516,0.045 0.04858,0 0.08897,0.019 0.09032,0.045 0.01497,0 0.03866,0.033 0,0.045 -0.0022,0 0.004,0.039 0,0.045 0.0072,0 -0.0046,0.041 0,0.045 -0.08747,0.03 -0.03464,0.1041 0,0.1359 -0.002,7e-4 0.0424,0.014 0.04516,0 -0.0084,0.09 0.04516,0.2208 0.04516,0.1806 0.08871,0.084 0.176136,0.1171 0.180634,0.09 0.02958,0 0.141039,0.071 0.135476,0.09 0.04514,0.014 0.07444,0 0.04516,-0.045 0.0042,-0.02 -0.0097,-0.055 0,-0.09 0.01272,-0.048 0.01607,-0.066 0,-0.045 -0.04244,-0.038 0.08587,-0.075 0.04516,-0.09 0.04006,-0.039 0.02247,-0.3081 0.04516,-0.1806 0.124681,-0.045 0.167427,0.042 0.180635,-0.045 3.52e-4,0.069 0.06373,0.014 0.09032,0 0.0064,0 0.04063,0 0.04516,0 0.03445,-0.027 -0.01487,-0.1848 0.04516,-0.1359 0.07386,0.1171 0.333387,0.12 0.406427,0.045 -0.06679,-0.035 -0.100563,-0.071 -0.135476,-0.09 -0.05608,-0.02 -0.07516,-0.078 -0.09032,-0.09 0.0149,0 0.03384,0.029 0.09032,0.045 0.02376,0.022 0.03107,-0.014 0.04516,0 -0.04337,-0.059 -0.08394,-0.1445 -0.09032,-0.1358 -0.04805,-0.045 -0.05874,-0.053 -0.04516,-0.045 -0.07471,-0.052 -0.0069,-0.071 0.09032,0 -0.503631,-0.4665 -1.072016,-0.862 -1.716025,-1.1289 -0.03867,0 -0.236008,-0.039 -0.31611,-0.045 z m -2.619196,0.045 c -0.05805,0.035 -0.103164,0.066 -0.180634,0.09 0.08266,0 -0.436024,0.1185 0.04516,0.09 -0.06329,0.036 -0.540547,0.059 -0.180634,0.1806 -0.12825,0.2039 0.586882,-0.068 0.406427,0 0.06181,-0.017 0.09822,0.091 0.225793,0.09 0.162503,-0.03 0.129551,-0.1228 0.09032,-0.1358 0.0322,-0.02 0.06892,-0.048 0.09032,-0.045 -0.05185,-0.059 -0.08393,-0.087 0,-0.1806 -0.05951,0.04 -0.194185,0.088 -0.180634,0 0.0082,-0.059 0.01776,-0.1739 -0.04516,-0.09 -0.09198,0.024 -0.17661,0.014 -0.225793,0 -0.0104,0 -0.04373,0 -0.04516,0 z m 1.535391,0.09 c -0.107831,0.033 -0.344638,0.2215 -0.09032,0.271 -0.04356,-0.014 -0.07185,0 -0.09032,0 0.04418,0.037 0.112152,0.1069 0.09032,0.09 0.04681,0.014 0.147535,0.032 0.225793,0.045 0.105317,0.019 0.193436,0.033 0.135476,0.045 0.130201,0.058 0.05777,-0.1893 0.135475,0.045 0.128077,0.02 0.27517,0.1141 0.135476,0.1358 -0.0069,10e-5 -0.01567,0.081 0,0.045 0.0402,0.062 0.150499,0.1579 0.135476,0.09 0.08315,0.065 -0.110548,0.1569 -0.180635,0.1806 0.0177,0.059 -0.03884,0.1113 -0.09032,0.1359 0.06264,-0.014 0.246448,0.246 0.180635,0.1806 -0.02867,0.014 -0.02299,0.022 0,0.045 -0.0098,0 0.02185,0.061 0.04516,0.045 0.097426,0.065 0.245697,0.1257 0.270951,0.1358 0.01,-0.036 -0.04431,-0.1257 -0.09032,-0.1806 0.01185,0 0.02392,-0.014 0.04516,0 0.04767,0.014 0.146999,0.027 0.135476,0.09 0.04169,-0.036 -0.0049,-0.1807 0,-0.1807 -0.1151,-0.1611 -0.108568,-0.098 -0.135476,-0.2257 -0.02711,-0.023 0.167583,-0.014 0.135476,0 0.02048,0.032 0.0404,0.062 0.04516,0.09 -0.01575,0 0.140056,-0.068 0.135475,0.045 0.03637,-0.023 0.03461,-0.061 0.04516,-0.09 0.168702,0 -0.05389,-0.052 0,-0.045 0.01402,-0.1011 -0.11841,-0.053 -0.09032,-0.1358 -0.04477,-0.051 -0.130837,-0.1156 -0.09032,-0.045 -0.01753,0 -0.07007,-0.058 -0.09032,-0.09 0.0078,-0.02 -0.0017,-0.058 0.135476,-0.045 -0.05561,-0.017 -0.08386,-0.032 -0.09032,-0.045 0.01798,-0.016 0.03208,-0.055 -0.09032,-0.045 -0.0299,-0.03 0.01838,-0.038 0.04516,-0.045 -6.12e-4,-0.014 -0.01171,-0.02 -0.04516,-0.045 -0.109146,0.048 -0.0098,-0.017 -0.04516,-0.045 -0.02155,0.014 -0.04663,0.014 -0.04516,0 0.09383,-0.043 0.01718,-0.1055 -0.04516,-0.09 0.02032,-0.019 -0.02958,-0.066 -0.090317,-0.045 -0.106357,-0.024 0.01585,0 -0.09032,-0.09 -0.01676,-0.038 -0.01501,-0.09 -0.04516,-0.09 -0.05507,2e-4 -0.07881,0.043 -0.09032,0.045 -0.01653,-0.046 -0.0349,-0.062 -0.04516,-0.045 0.0046,-0.056 -0.03548,-0.1055 -0.180634,-0.045 -0.07579,0.02 -0.05127,0.1577 -0.09032,0.09 -0.0397,-0.032 -0.06827,-0.027 -0.09032,0 -0.02205,0.028 -0.02562,0.071 0,0.09 -0.08386,0.017 -0.04658,-0.035 0,-0.09 0.06987,-0.084 0.144175,-0.1831 0.04516,-0.1806 -0.02027,4e-4 -0.04897,-0.014 -0.09032,0 z m -2.528879,0.09 c -0.04168,0.016 -0.138857,0.061 -0.225793,0.09 -0.08448,0.02 -0.177462,0.014 -0.135476,0 -0.03442,-0.014 -0.225251,0.104 -0.31611,-0.045 -0.15475,0.014 -0.22998,0 -0.316109,0 -0.01172,0 -0.03348,0 -0.04516,0 -0.51809,0.2744 -0.988949,0.6277 -1.399916,1.0387 -0.05146,0.048 -0.09312,0.1229 -0.135475,0.1807 -0.06051,0.084 -0.07162,0.1445 0,0.09 -0.08021,0.088 -0.106752,0.2593 0.04516,0.1358 -0.127771,0.1948 -0.324817,0.3604 -0.451586,0.4968 0.207116,-0.1689 0.390662,-0.3587 0.587061,-0.5419 0.01575,-0.084 0.1341,-0.1329 0.225793,-0.1806 -0.09124,0.084 -0.180188,0.2231 -0.09032,0.1358 0.0882,-0.035 0.212553,-0.1668 0.270951,-0.2257 -0.0011,0 0.04432,0 0.04516,0 0.01399,-4e-4 0.02171,0 0,0.045 0.04249,0.014 0.1853,0.077 0.225793,0.09 0.04562,-0.023 0.147873,0.085 0.135476,0.1358 0.0124,-0.014 0.03244,-0.022 0.04516,-0.09 0.0099,-0.039 -0.03141,0.2057 0,0.1807 -0.01275,0.029 -0.0353,0.061 -0.04516,0.09 0,0 -0.04516,0.045 -0.04516,0.045 -0.0081,0.019 -0.0064,0.039 0,0.045 0,0 0.04516,-0.045 0.04516,-0.045 -0.0034,0.014 -0.0015,0.035 0,0.045 -0.005,5e-4 -0.02389,0.059 0,0.045 0.0046,0 0.03764,-4e-4 0.04516,0 -0.02653,0.027 -0.01638,0.036 0,0.045 0.01488,0.014 5.5e-5,0.041 -0.04516,0.09 -0.01454,0.014 0.02371,0.025 0,0.045 -0.02886,0.095 0.01342,0.1359 0.04516,0.1359 -0.01798,0.079 -0.01867,0.1579 0,0.1806 -0.0415,0.059 -0.07669,0.1416 -0.04516,0.09 0.07378,-0.014 0.0011,0.1257 -0.04516,0.1806 0.02834,-0.014 0.07674,-0.026 0.180634,-0.09 -0.0082,0.025 0.123813,0.082 0.04516,0.1359 0.03263,0.051 0.02895,0.1286 0,0.1806 -0.01908,0.033 -0.0424,0.038 -0.04516,0.045 -0.05049,-0.2244 -0.182126,0.3601 -0.180634,0.2257 -0.09281,0.2171 -0.184077,0.401 -0.225793,0.6322 -0.08139,0.1739 -0.02076,0.4711 0.04516,0.4065 0.04001,0.1529 0.01708,0.3703 0.180634,0.4064 0.155322,0.152 0.10817,0.4311 0.270952,0.5871 0.02048,0.12 -0.128768,0.1931 0.04516,0.2258 0.113208,0.2501 0.133117,0.4109 0.270951,0.3612 -0.09169,-0.1055 -0.25631,-0.5183 -0.225793,-0.4966 -0.07931,-0.1287 -0.173621,-0.4827 0,-0.3613 0.07233,0.1521 0.132911,0.363 0.270952,0.4967 0.0043,0.1563 0.22556,0.3085 0.270951,0.5419 -0.03782,0.1572 0.02529,0.2692 0.180634,0.3612 0.218358,0.061 0.436111,0.2914 0.677379,0.1807 0.156357,-0.027 0.289166,0.3063 0.496744,0.2709 0.229001,0.023 0.220627,0.081 0.361268,0.271 -0.01156,0.1828 0.112181,-0.048 0.135476,0.1806 0.07209,-0.014 0.307461,0.062 0.361268,0.09 0.008,-0.1884 0.269413,-0.1286 0.225793,0.045 0.0747,0.1574 0.06241,0.3712 -0.09032,0.4967 -0.101184,0.04 -0.200609,0.2345 -0.225793,0.3161 0.227877,-0.024 0.131112,0.3285 0.04516,0.3613 0.205709,0.1171 0.276077,0.371 0.406427,0.5419 0.08621,0.1857 0.388537,0.1857 0.496745,0.3613 0.02814,0.2003 -0.01387,0.35 0,0.5419 -0.08689,0.1501 0.0177,0.3206 -0.04516,0.4516 -0.07473,0.1185 -0.115361,0.3503 0.04516,0.3612 -0.0084,0.039 -0.07266,0.092 -0.09032,0.1359 -0.0056,0.014 0,0.037 0,0.045 -0.112398,0 -0.08498,0.022 -0.04516,0.045 0,0 0.04516,0.045 0.04516,0.045 0.01329,5e-4 0.02896,0.014 0.04516,0 0.01402,0.014 -0.01,0.038 0,0.045 0.136082,-0.014 0.273318,-0.022 0.406427,-0.045 -0.182325,-0.026 0.237626,-0.1416 0,-0.1807 0.0987,-0.026 0.0774,-0.091 0.180634,-0.1358 0.0084,-0.042 0.196108,-0.2228 0.361268,-0.2257 0.411132,-0.071 -0.203677,-0.3353 0.180634,-0.2259 0.116964,0.065 0.29323,-0.1387 0.361268,-0.2257 -0.05939,0.1585 0.281741,-0.3464 0.270952,-0.3613 0.152708,-0.1141 0.609512,-0.2704 0.451585,-0.2709 0.207422,-0.1445 0.281629,-0.4255 0.31611,-0.6775 0.174726,-0.1458 0.295933,-0.4276 0.31611,-0.4967 -0.03568,-0.1242 -0.504442,-0.2372 -0.361268,-0.2258 -0.09757,-0.046 -0.233604,-0.068 -0.270952,0 -0.0094,-0.091 -0.304507,-0.12 -0.225792,-0.09 -0.04999,0.036 -0.06761,0.019 -0.09032,0.045 -0.08046,0.091 -0.03829,0.1402 -0.135475,0.045 0.07592,-0.014 0.116516,-0.022 0.135475,-0.045 0.02843,-0.035 0.0011,-0.084 -0.04516,-0.09 -0.0077,6e-4 -0.04117,0 -0.04516,0 -0.0056,0 -0.0429,0 -0.04516,0 -0.03051,0.014 -0.06114,0.051 -0.09032,0.09 -0.08452,-0.025 -0.05975,-0.4036 0.09032,-0.3162 -0.04208,-0.1644 -0.180697,-0.2458 -0.361269,-0.2709 -0.226956,0.053 -0.267778,-0.088 -0.406428,-0.2258 -0.12468,0.029 -0.226532,-0.1741 -0.225792,-0.1806 -0.170932,0.1199 -0.602057,-0.014 -0.677378,-0.045 -0.07045,0 -0.113251,0.051 -0.09032,0.1806 -0.206379,0.081 0.108481,-0.3398 -0.09032,-0.2257 -0.128959,0.162 -0.280423,0.02 -0.31611,0.2257 -0.133785,0.2002 -0.09785,0.082 -0.31611,0 -0.251648,0.1373 -0.45284,-0.023 -0.406427,-0.1806 0.05422,-0.1344 -0.01026,-0.3454 0,-0.3613 -0.06094,-0.014 -0.195335,-0.087 -0.361269,-0.045 -0.246457,0.08 0.06764,-0.1517 0,-0.2258 -0.01619,-0.075 -0.120895,-0.3133 0.04516,-0.3161 -0.247612,-0.039 -0.264447,0.1746 -0.361268,0.3161 -0.0863,-0.074 -0.302964,0.075 -0.406427,-0.09 -0.179455,-0.1674 -0.16357,-0.4262 -0.09032,-0.6322 0.0687,-0.079 -0.0041,-0.3479 0.180634,-0.3613 0.172498,-0.097 0.118395,-0.1272 0.361268,-0.09 0.05499,0.014 0.126242,-0.1012 0.225793,0 0.0094,-0.1448 0.439329,-0.085 0.31611,-0.09 0.08587,0.1098 0.246796,0.014 0.270952,0.2259 -0.01344,0.075 0.142137,0.2426 0.180634,0.316 0.169985,-0.2103 -0.187016,-0.5442 0.09032,-0.7225 0.159459,-0.107 0.428687,-0.2989 0.406427,-0.3161 0.01301,0 0.026,-0.042 0.04516,-0.045 -0.01344,-0.014 -0.01026,-0.03 -0.04516,-0.045 0.08519,-0.064 0.01448,-0.2354 0,-0.2709 0.0055,0 0.101155,-0.1952 0.09032,0.045 0.03461,0.2464 0.06759,-0.1026 0.09032,-0.1807 0.0452,-0.03 0.08222,-0.074 0.135475,-0.1358 0.0077,-0.014 0.03254,0 0.04516,0 0.04512,-0.043 0.102095,-0.1084 0.180635,-0.09 0.166978,-0.014 0.07412,-0.014 0.09032,-0.1806 0.113308,-0.133 0.258747,-0.1768 0.31611,-0.1807 -0.0461,-0.072 0.156313,-0.014 0.225792,-0.045 -0.07598,0.039 -0.223603,0.1755 -0.04516,0.2259 0.03367,-0.1416 0.343512,-0.1402 0.31611,-0.2259 -0.0039,-0.014 -0.02468,0.019 -0.04516,0 -0.210821,0.091 -0.329963,-0.2102 -0.270952,-0.2257 -0.212243,-0.046 0.384506,-0.1315 0,-0.1806 -0.317741,0.091 -0.597593,0.3519 -0.225793,0 0.177503,-0.055 0.196233,-0.2214 0.406428,-0.1358 0.136068,0.02 0.347227,0.1156 0.451585,-0.045 0.104349,0.029 0.233393,-0.082 0.180635,-0.1359 0.05896,-0.08 -0.02912,-0.1657 -0.04516,-0.1358 -0.01055,-0.074 -0.115635,-0.035 -0.180634,0 0.0053,-0.014 -0.01857,-0.025 0,-0.045 0.05017,-0.03 0.248185,-0.045 0.04516,-0.1359 -0.06626,0.025 -0.157196,-0.052 -0.09032,-0.045 -0.132657,-0.084 -0.07231,-0.2902 -0.09032,-0.2258 0.04756,-0.069 0.08129,-0.1875 0,-0.1358 -0.116054,0.016 0.0048,-0.069 -0.09032,-0.1806 -0.0026,-0.03 -0.03958,-0.036 -0.04516,-0.045 -0.02613,0.046 -0.09116,0.1199 -0.09032,0.09 -0.0039,0.071 -0.174478,0.1098 -0.180634,0.09 -0.07276,0.03 0.034436,-0.071 -0.135476,-0.09 -0.01477,-0.026 -0.01754,-0.1055 -0.04516,-0.1359 0.15668,0.065 0.206565,-0.1513 0.04516,-0.1358 -0.05439,-0.042 -0.357893,-0.1402 -0.225793,-0.1807 -0.200677,-0.1069 -0.247223,-0.014 -0.31611,0.1359 0.06246,0 -0.06841,0.1228 0,0.1358 -0.09434,0.1315 -0.02214,0.3989 0,0.4516 -0.0052,0.1041 -0.239914,0.361 -0.316109,0.2257 -0.04092,0.1041 -0.103554,0.3613 -0.04516,0.271 0.03178,0.1185 -0.08633,0.03 -0.135476,0.045 -0.119681,-0.1 -0.109262,-0.2182 -0.04516,-0.4065 -0.03478,-0.1704 -0.223877,-0.029 -0.31611,-0.2257 -0.07438,-0.097 -0.278593,-0.1869 -0.361269,-0.1807 0.0474,-0.2799 -0.188827,-0.027 -0.09032,-0.2258 0.03785,-0.1539 0.16659,-0.2857 0.270952,-0.3613 0.07663,-0.055 0.137267,-0.014 0.09032,-0.1358 0.182851,0.1758 0.08571,-0.023 0.09032,-0.045 0.168566,0.097 0.129536,-0.09 0.270951,0 0.06816,-0.014 0.115606,-0.027 0.135476,-0.045 0.03516,-0.033 -0.0032,-0.098 -0.04516,-0.1359 0.178419,0.092 0.196885,-0.2188 0.31611,-0.09 0.0051,0 0.02697,-0.042 0.04516,0 0.17381,0.029 0.142296,-0.2815 0.180634,-0.1806 0.01484,0 -0.0064,-0.043 0,-0.045 -0.03571,-0.032 -0.07068,-0.065 -0.09032,-0.09 -0.06392,0.051 -0.170448,0.1286 -0.225793,0.1806 -0.03445,0.017 -0.054,0.058 -0.04516,0.045 -0.08305,-0.014 0.07733,-0.3585 -0.09032,-0.2257 -0.03918,0.032 -0.06835,0.045 -0.09032,0.045 -0.0104,-0.035 -0.009,-0.1127 0.04516,-0.1358 -0.11984,-0.059 0.102268,-0.061 0,-0.2259 -0.06704,-0.068 -0.211871,0.1629 -0.180634,0.09 -0.20411,0.072 0.216982,0.151 -0.04516,0.1806 0.186072,0.035 -0.11247,0.2885 -0.135476,0.1807 -0.09621,0.092 0.08105,-0.2178 0,-0.1359 -0.02632,0 -0.09958,0 -0.135476,0 -0.0012,0 -0.02827,0.02 0,0.045 0.0055,0.038 -0.330384,-0.037 -0.406427,-0.045 -0.05374,-0.052 -0.06724,-0.093 -0.135475,-0.09 -0.124204,0 -0.150668,0.1496 -0.180634,0.1807 -0.111517,0.1214 -0.13773,-0.097 -0.04516,-0.09 -0.134609,-0.023 -0.225598,-0.061 -0.270952,-0.09 -0.0033,-0.017 -0.02208,-0.075 -0.04516,-0.09 -0.114594,-0.1513 -0.229456,-0.2437 -0.31611,-0.1358 -0.159354,0.1621 -0.08913,-0.049 -0.135475,-0.045 -0.0085,5e-4 -0.02415,-0.019 -0.04516,0 z m 1.716025,0.3613 0.04516,0 c 0.08851,0.022 0.01697,-0.1791 -0.04516,-0.1807 -0.01011,-2e-4 -0.03498,0.035 -0.04516,0.045 -0.11364,0.051 -0.160962,0.023 0,0.09 l 0.04516,0.045 z m 0.361269,0.5419 c -0.0079,0.014 -0.0117,0.072 0,0.045 0.0048,0.035 0.08076,0.1112 0.09032,0.09 0.15424,-0.195 0.164664,0.046 0.31611,0 -0.03415,-0.04 -0.227202,-0.261 -0.225793,-0.271 -0.05786,-3e-4 -0.156921,0.1055 -0.180634,0.1359 z m 1.399914,2.3933 c 0.0016,0.014 0.01286,0 0.04516,0 0.02961,-0.048 0.103626,0.014 0.04516,-0.1358 -0.0038,0.014 -0.09519,0.098 -0.09032,0.1358 z m -5.102916,-0.7676 c 0.02219,0.046 0.01172,0.1141 0,0.09 0.06356,0.033 0.08657,0.1257 0.180634,0.09 0.02836,-0.081 -0.112878,-0.1272 -0.180634,-0.1807 z m 4.651331,-1.9419 c -0.06072,-10e-5 -0.231662,0.094 -0.04516,0.09 0.06634,-0.065 0.07481,-0.09 0.04516,-0.09 z m 1.309598,0.09 c -0.05374,-2e-4 -0.06829,0.1402 0.09032,0.1358 -0.04105,-0.09 -0.06407,-0.1358 -0.09032,-0.1358 z m 1.535391,0.9484 c 0.02032,0.016 0.02788,0.074 0.04516,0.09 -0.03007,-0.041 -0.02595,-0.091 -0.04516,-0.09 z m 0.04516,0.09 c 0.07977,0.068 -0.03724,0.1199 0.135475,0.1806 l 0.04516,0.045 c 0.104508,0.014 0.05055,-0.1823 0.04516,-0.2257 -0.08876,-0.014 -0.177523,0.071 -0.180634,0 -0.01127,-0.019 -0.03513,0.014 -0.04516,0 z m -3.612685,0.1806 c -0.02996,0 -0.110215,0.1185 0,0.09 0.03486,-0.04 0.01272,-0.091 0,-0.09 z m -0.316109,0.4064 c -0.04649,4e-4 -0.0422,0.065 0.09032,0.045 -0.01562,-0.035 -0.07069,-0.045 -0.09032,-0.045 z m 4.922282,0.3162 c 0.02285,0.065 0.03779,0.117 0.09032,0.2257 0.01546,0 0.02498,0.026 0.04516,0.045 -0.04052,-0.092 -0.09033,-0.1807 -0.135475,-0.271 z m -0.180634,0.045 c -0.0026,0.088 0.04016,0.2547 0.09032,0.3612 0.0082,0.017 -0.0074,0.03 0,0.045 -0.0045,6e-4 -0.01373,0.049 0,0.045 0.003,0 0.04264,0 0.04516,0 -0.04351,0.1471 0.05649,0.1713 0,0.2259 0.201321,0.042 0.08532,-0.2345 0.04516,-0.3162 -0.05098,-0.1669 -0.167239,-0.3111 -0.180635,-0.3613 z m -3.386892,0.1358 c -0.05487,10e-5 -0.03402,0.081 0.180634,0.1358 -0.05527,-0.082 -0.140591,-0.1358 -0.180634,-0.1358 z m 0.541903,0 c -0.04708,0.08 -0.09808,0.1676 -0.180635,0.1806 -0.05662,0.074 0.103049,0.181 0.270952,0.1359 -0.0013,0.042 -0.06347,0.117 0.09032,0.045 0.01597,-0.038 -0.0059,-0.046 0,-0.045 0,0 0.04516,0.045 0.04516,0.045 0.0055,0.04 0.01156,0.097 0.04516,0.09 0.121487,-0.1185 -0.04139,-0.094 -0.04516,-0.1359 -0.0013,-0.014 0.0012,-0.055 0.04516,-0.09 -0.145799,0.081 -0.211123,-0.059 -0.09032,-0.09 -0.19025,-0.016 -0.02279,-0.03 -0.09032,-0.09 -0.103309,0.062 -0.115679,0.014 -0.09032,-0.045 z m 2.79983,0.09 c -0.01468,9e-4 -0.03501,0.014 -0.04516,0.045 -0.01171,0.058 0.02377,0.2852 0.04516,0.2259 0.01494,0.014 0.01387,0.062 0.04516,0.045 0.141545,-0.022 0.02559,-0.3205 -0.04516,-0.316 z m 0.406427,0.1358 c 0.01685,0.1416 -0.002,0.3213 0,0.3613 -0.05686,0.077 -0.144873,0.1199 -0.180634,0.1358 0.07341,0.08 -0.01626,0.3265 0.04516,0.4064 -0.122759,-0.016 -0.140562,0.2322 -0.135475,0.3162 -0.01455,0.2338 0.150043,0.3205 0.180634,0.316 0.165256,0 0.194273,-0.4905 0.180634,-0.3613 0.02171,-0.2263 0.177348,-0.2855 0.225793,0 -0.07153,-0.4133 -0.162611,-0.7953 -0.31611,-1.1741 z m 0,1.5354 c -0.07381,0.019 -0.108785,0.056 -0.04516,0.09 -0.155097,-0.022 -0.26964,0.6838 -0.270952,0.5419 -0.174871,0.1601 -0.273942,0.3996 -0.31611,0.6322 0.09247,0.1928 0.04996,0.7639 0,0.6775 0.04069,0.117 0.14247,0.4104 0.135476,0.2709 0.05247,0.159 0.220336,0.3128 0.361268,0.1359 0.196646,-0.1599 0.3696,-0.1979 0.225793,0.1358 0.200782,-0.5907 0.361269,-1.193 0.361269,-1.8516 0,-0.063 -0.04318,-0.1185 -0.04516,-0.1806 -0.126574,-0.1431 -0.353445,-0.4402 -0.180634,-0.4516 -0.06779,-0.02 -0.151984,-0.019 -0.225793,0 z m -5.735136,1.1291 c -0.07149,-6e-4 -0.109219,0.043 -0.180635,0.089 -0.04014,0.049 0.02093,0.055 0.09032,0.045 0,0 0.04516,0 0.04516,0 0.04747,-0.014 0.08867,-0.036 0.09032,-0.045 0.009,0.014 0.613981,0.2571 0.361269,0.1807 0.02809,0.02 0.04955,0.032 0.04516,0.045 0.0053,0.014 0.03601,0.049 0.180634,0.045 0.208289,-0.065 -0.190365,-0.1866 -0.180634,-0.1807 -0.01957,-0.014 -0.02504,-0.035 -0.04516,-0.045 -0.02554,-0.038 -0.03158,-0.045 -0.04516,-0.045 -0.105924,-0.053 -0.248041,-0.089 -0.361268,-0.089 z m -5.148076,0.089 c -0.01985,0 -0.05147,0.056 0,0.09 0.0185,-0.063 0.01358,-0.091 0,-0.09 z m 6.006088,0.2258 c -0.03209,5e-4 -0.05499,0.033 -0.04516,0.045 0.02298,0.016 -0.01,0.033 0,0.045 -0.0094,-2e-4 -0.01896,0.059 0,0.045 -0.02114,0 -0.02792,0.043 -0.04516,0.045 0.12221,-0.067 0.110953,0.078 0.180635,0.045 0.02858,-0.095 0.375135,-0.032 0.270951,-0.1359 -0.02182,-0.051 -0.264998,-0.092 -0.361268,-0.09 z m 0.587062,0.1358 c -0.05835,0 -0.187045,0.1171 0,0.09 0.01783,-0.039 0.02464,-0.091 0,-0.09 z m -1.083806,0.045 c 0.0097,0.014 0.01912,0.032 0.04516,0.045 l 0.04516,0 c 0.172535,-0.016 -0.01402,-0.046 -0.09032,-0.045 z m -1.219281,1.6257 c -0.0163,0 -0.0011,0.1185 0.04516,0.09 -0.0078,-0.061 -0.03802,-0.09 -0.04516,-0.09 z"
+       id="path23" />
+    <path
+       fill="url(#l)"
+       d="m 9.066013,1039.0813 c -0.08358,-10e-5 -0.146685,0.025 0,0.045 0.101849,0.014 -0.05818,0.061 0.09032,0.045 0.07519,-0.065 -0.01658,-0.09 -0.09032,-0.09 z m -1.806342,0.045 c -0.08085,0.016 -0.146193,0.071 -0.225793,0.09 0.167199,-0.042 0.324172,-0.063 0.496744,-0.09 -0.08865,0.014 -0.183662,-0.017 -0.270951,0 z m 0.722537,0 c -0.100838,0.019 -0.125577,0.038 0,0.045 0.08577,-0.039 0.08961,-0.048 0.135475,-0.045 -0.05026,0 -0.09312,-0.014 -0.135475,0 z m 1.625708,0 c -0.0091,-8e-4 -0.03685,0.046 -0.04516,0.045 -0.01605,0.03 -0.129334,0.049 0.04516,0.045 0.0048,0.019 0.01431,0.067 0.04516,0.045 0.01156,-0.019 0.01983,-0.077 0.04516,-0.09 -0.03183,0 -0.05829,-0.039 -0.09032,-0.045 z m -1.128964,0.045 c -0.02416,6e-4 -0.03418,0.051 -0.04516,0.09 -0.09662,-0.065 -0.29735,-0.055 -0.361269,-0.045 -0.05552,0.027 -0.05,0.055 0.135476,0.045 0.103958,0 -0.01496,0.032 -0.09032,0.045 0.02251,0 0.01773,10e-4 0.09032,0 0.09883,0 0.621851,-0.055 0.31611,-0.09 0.02353,-0.04 -0.02653,-0.045 -0.04516,-0.045 z m 0.722537,0 c -0.01127,0.014 0.02183,0.048 0.135475,0.045 0.03143,-0.042 0.03666,-0.046 0,-0.045 -0.03753,5e-4 -0.12416,-0.014 -0.135475,0 z m -0.451586,0.045 c -0.01501,6e-4 8e-5,0.039 0,0.045 0,0 0.04516,0 0.04516,0 0,0 -0.04516,-0.045 -0.04516,-0.045 z m 0.04516,0.045 c -0.04631,0.014 -0.04368,0.033 0.09032,0.045 -0.03234,0 -0.123857,0.062 0.04516,0.045 0.132571,-0.04 0.176165,-0.1373 0.04516,-0.1358 -0.01358,10e-5 -0.02783,0.043 -0.04516,0.045 0.01672,0.017 -0.08916,-0.014 -0.135476,0 z m 1.128964,-0.045 c -0.01387,0.017 -0.03883,0.027 -0.04516,0.045 -0.009,0.026 0.01026,0.077 0,0.09 -0.0072,0 -0.03152,0 -0.04516,0 -0.05439,-3e-4 -0.162088,0.014 -0.180634,0 -0.153773,-0.014 -0.07519,0.025 -0.04516,0.045 0.138264,0.014 0.297103,0.08 0.31611,0.09 0.136704,0.014 0.03662,-0.1584 0.270951,-0.09 -0.0059,-0.024 0.0011,-0.039 0.04516,-0.045 -0.105129,-0.035 -0.208457,-0.1069 -0.316109,-0.1358 z m -0.722537,0.045 c 0.01559,0.014 0.002,0.033 0.04516,0.045 0.06509,-0.037 0.0069,-0.045 -0.04516,-0.045 z m -1.625708,0.045 c -0.253349,0.1142 -0.426184,0.1817 -0.406427,0.271 0.180027,-0.019 0.371333,-0.1717 0.587061,-0.1807 0.223903,-0.075 -0.05272,-0.085 -0.180634,-0.09 z m 1.445074,0.045 c -0.0409,0.016 -0.01728,0.074 0.09032,0.09 0.02965,-0.053 -0.0091,-0.091 -0.04516,-0.09 -0.01504,2e-4 -0.03153,0 -0.04516,0 z m -0.677379,0.045 c -0.04481,0 -0.05671,0.036 0,0.09 0.172461,-0.032 0.0655,-0.091 0,-0.09 z m 0.31611,0.045 c -0.137831,0.038 0.04928,0.025 -0.09032,0.09 -0.207472,-0.068 -0.03163,0.1658 0,0.1807 0.04266,0 0.131011,-0.088 0.180635,-0.1359 -0.03626,-0.026 0.01566,-0.071 0.04516,-0.09 3.77e-4,-0.014 -0.01069,-0.04 -0.04516,-0.045 -0.0196,0 -0.06061,9e-4 -0.09032,0 z m 1.716025,0 c -0.004,0 -0.01945,0.029 0,0.045 0.07818,0.033 0.02507,0.035 0.04516,0.045 0.03601,0.071 0.313666,0.1649 0.180634,0.1359 0.135678,0.027 0.416206,0.3372 0.361268,0.2257 0.04163,0.069 0.111546,0.3245 0.09032,0.2258 0.0104,0 0.09364,0.062 0.09032,0.09 0.07303,0.017 0.09192,0.066 0.09032,0.09 0.01387,0 0.03951,0.059 0,0.045 0,0 -0.04516,0 -0.04516,0 0.0066,0 -0.0061,0.043 0,0.045 0.123612,0.045 0.0056,0.1286 0.04516,0.1359 -0.04496,4e-4 -0.04601,0.036 -0.04516,0.045 0.0078,0 -0.0058,0.042 0,0.045 0.01988,0 -0.03053,0.046 0.09032,0.045 -0.02273,-9e-4 -0.102253,0.014 -0.135475,0 0.01098,0 0.0066,0.027 0.04516,0.045 -0.05684,0.014 -0.08789,0.068 -0.09032,0.09 0.156122,-0.053 0.09485,0.022 0.04516,0.045 0.04858,0 0.08897,0.019 0.09032,0.045 0.01497,0 0.03866,0.033 0,0.045 -0.0022,0 0.004,0.039 0,0.045 0.0072,0 -0.0046,0.041 0,0.045 -0.08747,0.03 -0.03464,0.1041 0,0.1359 -0.002,7e-4 0.0424,0.014 0.04516,0 -0.0084,0.09 0.04516,0.2208 0.04516,0.1806 0.08871,0.084 0.176136,0.1171 0.180634,0.09 0.02958,0 0.141039,0.071 0.135476,0.09 0.04514,0.014 0.07444,0 0.04516,-0.045 0.0042,-0.02 -0.0097,-0.055 0,-0.09 0.01272,-0.048 0.01607,-0.066 0,-0.045 -0.04244,-0.038 0.08587,-0.075 0.04516,-0.09 0.04006,-0.039 0.02247,-0.3081 0.04516,-0.1806 0.124681,-0.045 0.167427,0.042 0.180635,-0.045 3.52e-4,0.069 0.06373,0.014 0.09032,0 0.0064,0 0.04063,0 0.04516,0 0.03445,-0.027 -0.01487,-0.1848 0.04516,-0.1359 0.07386,0.1171 0.333387,0.12 0.406427,0.045 -0.06679,-0.035 -0.100563,-0.071 -0.135476,-0.09 -0.05608,-0.02 -0.07516,-0.078 -0.09032,-0.09 0.0149,0 0.03384,0.029 0.09032,0.045 0.02376,0.022 0.03107,-0.014 0.04516,0 -0.04337,-0.059 -0.08394,-0.1445 -0.09032,-0.1358 -0.04805,-0.045 -0.05874,-0.053 -0.04516,-0.045 -0.07471,-0.052 -0.0069,-0.071 0.09032,0 -0.503631,-0.4665 -1.072016,-0.862 -1.716025,-1.1289 -0.03867,0 -0.236008,-0.039 -0.31611,-0.045 z m -2.619196,0.045 c -0.05805,0.035 -0.103164,0.066 -0.180634,0.09 0.08266,0 -0.436024,0.1185 0.04516,0.09 -0.06329,0.036 -0.540547,0.059 -0.180634,0.1806 -0.12825,0.2039 0.586882,-0.068 0.406427,0 0.06181,-0.017 0.09822,0.091 0.225793,0.09 0.162503,-0.03 0.129551,-0.1228 0.09032,-0.1358 0.0322,-0.02 0.06892,-0.048 0.09032,-0.045 -0.05185,-0.059 -0.08393,-0.087 0,-0.1806 -0.05951,0.04 -0.194185,0.088 -0.180634,0 0.0082,-0.059 0.01776,-0.1739 -0.04516,-0.09 -0.09198,0.024 -0.17661,0.014 -0.225793,0 -0.0104,0 -0.04373,0 -0.04516,0 z m 1.535391,0.09 c -0.107831,0.033 -0.344638,0.2215 -0.09032,0.271 -0.04356,-0.014 -0.07185,-10e-4 -0.09032,0 0.04418,0.037 0.112152,0.1069 0.09032,0.09 0.04681,0.014 0.147535,0.032 0.225793,0.045 0.105317,0.019 0.193436,0.033 0.135476,0.045 0.130201,0.058 0.05777,-0.1893 0.135475,0.045 0.128077,0.02 0.27517,0.1141 0.135476,0.1358 -0.0069,10e-5 -0.01567,0.081 0,0.045 0.0402,0.062 0.150499,0.1579 0.135476,0.09 0.08315,0.065 -0.110548,0.1569 -0.180635,0.1806 0.0177,0.059 -0.03884,0.1113 -0.09032,0.1359 0.06264,-0.014 0.246448,0.246 0.180635,0.1806 -0.02867,0.014 -0.02299,0.022 0,0.045 -0.0098,0 0.02185,0.061 0.04516,0.045 0.097426,0.065 0.245697,0.1257 0.270951,0.1358 0.01,-0.036 -0.04431,-0.1257 -0.09032,-0.1806 0.01185,0 0.02392,-0.014 0.04516,0 0.04767,0.014 0.146999,0.027 0.135476,0.09 0.04169,-0.036 -0.0049,-0.1807 0,-0.1807 -0.1151,-0.1611 -0.108568,-0.098 -0.135476,-0.2257 -0.02711,-0.023 0.167583,-0.014 0.135476,0 0.02048,0.032 0.0404,0.062 0.04516,0.09 -0.01575,0 0.140056,-0.068 0.135475,0.045 0.03637,-0.023 0.03461,-0.061 0.04516,-0.09 0.168702,0 -0.05389,-0.052 0,-0.045 0.01402,-0.1011 -0.11841,-0.053 -0.09032,-0.1358 -0.04477,-0.051 -0.130837,-0.1156 -0.09032,-0.045 -0.01753,0 -0.07007,-0.058 -0.09032,-0.09 0.0078,-0.02 -0.0017,-0.058 0.135476,-0.045 -0.05561,-0.017 -0.08386,-0.032 -0.09032,-0.045 0.01798,-0.016 0.03208,-0.055 -0.09032,-0.045 -0.0299,-0.03 0.01838,-0.038 0.04516,-0.045 -6.12e-4,-0.014 -0.01171,-0.02 -0.04516,-0.045 -0.109146,0.048 -0.0098,-0.017 -0.04516,-0.045 -0.02155,0.014 -0.04663,0.014 -0.04516,0 0.09383,-0.043 0.01718,-0.1055 -0.04516,-0.09 0.02032,-0.019 -0.02958,-0.066 -0.090317,-0.045 -0.106357,-0.024 0.01585,0 -0.09032,-0.09 -0.01676,-0.038 -0.01501,-0.09 -0.04516,-0.09 -0.05507,2e-4 -0.07881,0.043 -0.09032,0.045 -0.01653,-0.046 -0.0349,-0.062 -0.04516,-0.045 0.0046,-0.056 -0.03548,-0.1055 -0.180634,-0.045 -0.07579,0.02 -0.05127,0.1577 -0.09032,0.09 -0.0397,-0.032 -0.06827,-0.027 -0.09032,0 -0.02205,0.028 -0.02562,0.071 0,0.09 -0.08386,0.017 -0.04658,-0.035 0,-0.09 0.06987,-0.084 0.144175,-0.1831 0.04516,-0.1806 -0.02027,4e-4 -0.04897,-0.014 -0.09032,0 z m -2.528879,0.09 c -0.04168,0.016 -0.138857,0.061 -0.225793,0.09 -0.08448,0.02 -0.177462,0.014 -0.135476,0 -0.03442,-0.014 -0.225251,0.104 -0.31611,-0.045 -0.15475,0.014 -0.22998,0 -0.316109,0 -0.01172,0 -0.03348,0 -0.04516,0 -0.51809,0.2744 -0.988949,0.6277 -1.399916,1.0387 -0.05146,0.048 -0.09312,0.1229 -0.135475,0.1807 -0.06051,0.084 -0.07162,0.1445 0,0.09 -0.08021,0.088 -0.106752,0.2593 0.04516,0.1358 -0.127771,0.1948 -0.324817,0.3604 -0.451586,0.4968 0.207116,-0.1689 0.390662,-0.3587 0.587061,-0.5419 0.01575,-0.084 0.1341,-0.1329 0.225793,-0.1806 -0.09124,0.084 -0.180188,0.2231 -0.09032,0.1358 0.0882,-0.035 0.212553,-0.1668 0.270951,-0.2257 -0.0011,0 0.04432,0 0.04516,0 0.01399,-4e-4 0.02171,0 0,0.045 0.04249,0.014 0.1853,0.077 0.225793,0.09 0.04562,-0.023 0.147873,0.085 0.135476,0.1358 0.0124,-0.014 0.03244,-0.022 0.04516,-0.09 0.0099,-0.039 -0.03141,0.2057 0,0.1807 -0.01275,0.029 -0.0353,0.061 -0.04516,0.09 0,0 -0.04516,0.045 -0.04516,0.045 -0.0081,0.019 -0.0064,0.039 0,0.045 0,0 0.04516,-0.045 0.04516,-0.045 -0.0034,0.014 -0.0015,0.035 0,0.045 -0.005,5e-4 -0.02389,0.059 0,0.045 0.0046,0 0.03764,-4e-4 0.04516,0 -0.02653,0.027 -0.01638,0.036 0,0.045 0.01488,0.014 5.5e-5,0.041 -0.04516,0.09 -0.01454,0.014 0.02371,0.025 0,0.045 -0.02886,0.095 0.01342,0.1359 0.04516,0.1359 -0.01798,0.079 -0.01867,0.1579 0,0.1806 -0.0415,0.059 -0.07669,0.1416 -0.04516,0.09 0.07378,-0.014 0.0011,0.1257 -0.04516,0.1806 0.02834,-0.014 0.07674,-0.026 0.180634,-0.09 -0.0082,0.025 0.123813,0.082 0.04516,0.1359 0.03263,0.051 0.02895,0.1286 0,0.1806 -0.01908,0.033 -0.0424,0.038 -0.04516,0.045 -0.05049,-0.2244 -0.182126,0.3601 -0.180634,0.2257 -0.09281,0.2171 -0.184077,0.401 -0.225793,0.6322 -0.08139,0.1739 -0.02076,0.4711 0.04516,0.4065 0.04001,0.1529 0.01708,0.3703 0.180634,0.4064 0.155322,0.152 0.10817,0.4311 0.270952,0.5871 0.02048,0.12 -0.128768,0.1931 0.04516,0.2258 0.113208,0.2501 0.133117,0.4109 0.270951,0.3612 -0.09169,-0.1055 -0.25631,-0.5183 -0.225793,-0.4966 -0.07931,-0.1287 -0.173621,-0.4827 0,-0.3613 0.07233,0.1521 0.132911,0.363 0.270952,0.4967 0.0043,0.1563 0.22556,0.3085 0.270951,0.5419 -0.03782,0.1572 0.02529,0.2692 0.180634,0.3612 0.218358,0.061 0.436111,0.2914 0.677379,0.1807 0.156357,-0.027 0.289166,0.3063 0.496744,0.2709 0.229001,0.023 0.220627,0.081 0.361268,0.271 -0.01156,0.1828 0.112181,-0.048 0.135476,0.1806 0.07209,-0.014 0.307461,0.062 0.361268,0.09 0.008,-0.1884 0.269413,-0.1286 0.225793,0.045 0.0747,0.1574 0.06241,0.3712 -0.09032,0.4967 -0.101184,0.04 -0.200609,0.2345 -0.225793,0.3161 0.227877,-0.024 0.131112,0.3285 0.04516,0.3613 0.205709,0.1171 0.276077,0.371 0.406427,0.5419 0.08621,0.1857 0.388537,0.1857 0.496745,0.3613 0.02814,0.2003 -0.01387,0.35 0,0.5419 -0.08689,0.1501 0.0177,0.3206 -0.04516,0.4516 -0.07473,0.1185 -0.115361,0.3503 0.04516,0.3612 -0.0084,0.039 -0.07266,0.092 -0.09032,0.1359 -0.0056,0.014 0,0.037 0,0.045 -0.112398,0 -0.08498,0.022 -0.04516,0.045 0,0 0.04516,0.045 0.04516,0.045 0.01329,5e-4 0.02896,0.014 0.04516,0 0.01402,0.014 -0.01,0.038 0,0.045 0.136082,-0.014 0.273318,-0.022 0.406427,-0.045 -0.182325,-0.026 0.237626,-0.1416 0,-0.1807 0.0987,-0.026 0.0774,-0.091 0.180634,-0.1358 0.0084,-0.042 0.196108,-0.2228 0.361268,-0.2257 0.411132,-0.071 -0.203677,-0.3353 0.180634,-0.2259 0.116964,0.065 0.29323,-0.1387 0.361268,-0.2257 -0.05939,0.1585 0.281741,-0.3464 0.270952,-0.3613 0.152708,-0.1141 0.609512,-0.2704 0.451585,-0.2709 0.207422,-0.1445 0.281629,-0.4255 0.31611,-0.6775 0.174726,-0.1458 0.295933,-0.4276 0.31611,-0.4967 -0.03568,-0.1242 -0.504442,-0.2372 -0.361268,-0.2258 -0.09757,-0.046 -0.233604,-0.068 -0.270952,0 -0.0094,-0.091 -0.304507,-0.12 -0.225792,-0.09 -0.04999,0.036 -0.06761,0.019 -0.09032,0.045 -0.08046,0.091 -0.03829,0.1402 -0.135475,0.045 0.07592,-0.014 0.116516,-0.022 0.135475,-0.045 0.02843,-0.035 0.0011,-0.084 -0.04516,-0.09 -0.0077,6e-4 -0.04117,0 -0.04516,0 -0.0056,0 -0.0429,0 -0.04516,0 -0.03051,0.014 -0.06114,0.051 -0.09032,0.09 -0.08452,-0.025 -0.05975,-0.4036 0.09032,-0.3162 -0.04208,-0.1644 -0.180697,-0.2458 -0.361269,-0.2709 -0.226956,0.053 -0.267778,-0.088 -0.406428,-0.2258 -0.12468,0.029 -0.226532,-0.1741 -0.225792,-0.1806 -0.170932,0.1199 -0.602057,-0.014 -0.677378,-0.045 -0.07045,0 -0.113251,0.051 -0.09032,0.1806 -0.206379,0.081 0.108481,-0.3398 -0.09032,-0.2257 -0.128959,0.162 -0.280423,0.02 -0.31611,0.2257 -0.133785,0.2002 -0.09785,0.082 -0.31611,0 -0.251648,0.1373 -0.45284,-0.023 -0.406427,-0.1806 0.05422,-0.1344 -0.01026,-0.3454 0,-0.3613 -0.06094,-0.014 -0.195335,-0.087 -0.361269,-0.045 -0.246457,0.08 0.06764,-0.1517 0,-0.2258 -0.01619,-0.075 -0.120895,-0.3133 0.04516,-0.3161 -0.247612,-0.039 -0.264447,0.1746 -0.361268,0.3161 -0.0863,-0.074 -0.302964,0.075 -0.406427,-0.09 -0.179455,-0.1674 -0.16357,-0.4262 -0.09032,-0.6322 0.0687,-0.079 -0.0041,-0.3479 0.180634,-0.3613 0.172498,-0.097 0.118395,-0.1272 0.361268,-0.09 0.05499,0.014 0.126242,-0.1012 0.225793,0 0.0094,-0.1448 0.439329,-0.085 0.31611,-0.09 0.08587,0.1098 0.246796,0.014 0.270952,0.2259 -0.01344,0.075 0.142137,0.2426 0.180634,0.316 0.169985,-0.2103 -0.187016,-0.5442 0.09032,-0.7225 0.159459,-0.107 0.428687,-0.2989 0.406427,-0.3161 0.01301,0 0.026,-0.042 0.04516,-0.045 -0.01344,-0.014 -0.01026,-0.03 -0.04516,-0.045 0.08519,-0.064 0.01448,-0.2354 0,-0.2709 0.0055,0 0.101155,-0.1952 0.09032,0.045 0.03461,0.2464 0.06759,-0.1026 0.09032,-0.1807 0.0452,-0.03 0.08222,-0.074 0.135475,-0.1358 0.0077,-0.014 0.03254,0 0.04516,0 0.04512,-0.043 0.102095,-0.1084 0.180635,-0.09 0.166978,-0.014 0.07412,-0.014 0.09032,-0.1806 0.113308,-0.133 0.258747,-0.1768 0.31611,-0.1807 -0.0461,-0.072 0.156313,-0.014 0.225792,-0.045 -0.07598,0.039 -0.223603,0.1755 -0.04516,0.2259 0.03367,-0.1416 0.343512,-0.1402 0.31611,-0.2259 -0.0039,-0.014 -0.02468,0.019 -0.04516,0 -0.210821,0.091 -0.329963,-0.2102 -0.270952,-0.2257 -0.212243,-0.046 0.384506,-0.1315 0,-0.1806 -0.317741,0.091 -0.597593,0.3519 -0.225793,0 0.177503,-0.055 0.196233,-0.2214 0.406428,-0.1358 0.136068,0.02 0.347227,0.1156 0.451585,-0.045 0.104349,0.029 0.233393,-0.082 0.180635,-0.1359 0.05896,-0.08 -0.02912,-0.1657 -0.04516,-0.1358 -0.01055,-0.074 -0.115635,-0.035 -0.180634,0 0.0053,-0.014 -0.01857,-0.025 0,-0.045 0.05017,-0.03 0.248185,-0.045 0.04516,-0.1359 -0.06626,0.025 -0.157196,-0.052 -0.09032,-0.045 -0.132657,-0.084 -0.07231,-0.2902 -0.09032,-0.2258 0.04756,-0.069 0.08129,-0.1875 0,-0.1358 -0.116054,0.016 0.0048,-0.069 -0.09032,-0.1806 -0.0026,-0.03 -0.03958,-0.036 -0.04516,-0.045 -0.02613,0.046 -0.09116,0.1199 -0.09032,0.09 -0.0039,0.071 -0.174478,0.1098 -0.180634,0.09 -0.07276,0.03 0.034436,-0.071 -0.135476,-0.09 -0.01477,-0.026 -0.01754,-0.1055 -0.04516,-0.1359 0.15668,0.065 0.206565,-0.1513 0.04516,-0.1358 -0.05439,-0.042 -0.357893,-0.1402 -0.225793,-0.1807 -0.200677,-0.1069 -0.247223,-0.014 -0.31611,0.1359 0.06246,0 -0.06841,0.1228 0,0.1358 -0.09434,0.1315 -0.02214,0.3989 0,0.4516 -0.0052,0.1041 -0.239914,0.361 -0.316109,0.2257 -0.04092,0.1041 -0.103554,0.3613 -0.04516,0.271 0.03178,0.1185 -0.08633,0.03 -0.135476,0.045 -0.119681,-0.1 -0.109262,-0.2182 -0.04516,-0.4065 -0.03478,-0.1704 -0.223877,-0.029 -0.31611,-0.2257 -0.07438,-0.097 -0.278593,-0.1869 -0.361269,-0.1807 0.0474,-0.2799 -0.188827,-0.027 -0.09032,-0.2258 0.03785,-0.1539 0.16659,-0.2857 0.270952,-0.3613 0.07663,-0.055 0.137267,-0.014 0.09032,-0.1358 0.182851,0.1758 0.08571,-0.023 0.09032,-0.045 0.168566,0.097 0.129536,-0.09 0.270951,0 0.06816,-0.014 0.115606,-0.027 0.135476,-0.045 0.03516,-0.033 -0.0032,-0.098 -0.04516,-0.1359 0.178419,0.092 0.196885,-0.2188 0.31611,-0.09 0.0051,0 0.02697,-0.042 0.04516,0 0.17381,0.029 0.142296,-0.2815 0.180634,-0.1806 0.01484,0 -0.0064,-0.043 0,-0.045 -0.03571,-0.032 -0.07068,-0.065 -0.09032,-0.09 -0.06392,0.051 -0.170448,0.1286 -0.225793,0.1806 -0.03445,0.017 -0.054,0.058 -0.04516,0.045 -0.08305,-0.014 0.07733,-0.3585 -0.09032,-0.2257 -0.03918,0.032 -0.06835,0.045 -0.09032,0.045 -0.0104,-0.035 -0.009,-0.1127 0.04516,-0.1358 -0.11984,-0.059 0.102268,-0.061 0,-0.2259 -0.06704,-0.068 -0.211871,0.1629 -0.180634,0.09 -0.20411,0.072 0.216982,0.151 -0.04516,0.1806 0.186072,0.035 -0.11247,0.2885 -0.135476,0.1807 -0.09621,0.092 0.08105,-0.2178 0,-0.1359 -0.02632,0 -0.09958,0 -0.135476,0 -0.0012,0 -0.02827,0.02 0,0.045 0.0055,0.038 -0.330384,-0.037 -0.406427,-0.045 -0.05374,-0.052 -0.06724,-0.093 -0.135475,-0.09 -0.124204,0 -0.150668,0.1496 -0.180634,0.1807 -0.111517,0.1214 -0.13773,-0.097 -0.04516,-0.09 -0.134609,-0.023 -0.225598,-0.061 -0.270952,-0.09 -0.0033,-0.017 -0.02208,-0.075 -0.04516,-0.09 -0.114594,-0.1513 -0.229456,-0.2437 -0.31611,-0.1358 -0.159354,0.1621 -0.08913,-0.049 -0.135475,-0.045 -0.0085,5e-4 -0.02415,-0.019 -0.04516,0 z m 1.716025,0.3613 0.04516,0 c 0.08851,0.022 0.01697,-0.1791 -0.04516,-0.1807 -0.01011,-2e-4 -0.03498,0.035 -0.04516,0.045 -0.11364,0.051 -0.160962,0.023 0,0.09 l 0.04516,0.045 z m 0.361269,0.5419 c -0.0079,0.014 -0.0117,0.072 0,0.045 0.0048,0.035 0.08076,0.1112 0.09032,0.09 0.15424,-0.195 0.164664,0.046 0.31611,0 -0.03415,-0.04 -0.227202,-0.261 -0.225793,-0.271 -0.05786,-3e-4 -0.156921,0.1055 -0.180634,0.1359 z m 1.399914,2.3933 c 0.0016,0.014 0.01286,0 0.04516,0 0.02961,-0.048 0.103626,0.014 0.04516,-0.1358 -0.0038,0.014 -0.09519,0.098 -0.09032,0.1358 z m -5.102916,-0.7676 c 0.02219,0.046 0.01172,0.1141 0,0.09 0.06356,0.033 0.08657,0.1257 0.180634,0.09 0.02836,-0.081 -0.112878,-0.1272 -0.180634,-0.1807 z m 4.651331,-1.9419 c -0.06072,-10e-5 -0.231662,0.094 -0.04516,0.09 0.06634,-0.065 0.07481,-0.09 0.04516,-0.09 z m 1.309598,0.09 c -0.05374,-2e-4 -0.06829,0.1402 0.09032,0.1358 -0.04105,-0.09 -0.06407,-0.1358 -0.09032,-0.1358 z m 1.535391,0.9484 c 0.02032,0.016 0.02788,0.074 0.04516,0.09 -0.03007,-0.041 -0.02595,-0.091 -0.04516,-0.09 z m 0.04516,0.09 c 0.07977,0.068 -0.03724,0.1199 0.135475,0.1806 l 0.04516,0.045 c 0.104508,0.014 0.05055,-0.1823 0.04516,-0.2257 -0.08876,-0.014 -0.177523,0.071 -0.180634,0 -0.01127,-0.019 -0.03513,0.014 -0.04516,0 z m -3.612685,0.1806 c -0.02996,0 -0.110215,0.1185 0,0.09 0.03486,-0.04 0.01272,-0.091 0,-0.09 z m -0.316109,0.4064 c -0.04649,4e-4 -0.0422,0.065 0.09032,0.045 -0.01562,-0.035 -0.07069,-0.045 -0.09032,-0.045 z m 4.922282,0.3162 c 0.02285,0.065 0.03779,0.117 0.09032,0.2257 0.01546,0 0.02498,0.026 0.04516,0.045 -0.04052,-0.092 -0.09033,-0.1807 -0.135475,-0.271 z m -0.180634,0.045 c -0.0026,0.088 0.04016,0.2547 0.09032,0.3612 0.0082,0.017 -0.0074,0.03 0,0.045 -0.0045,6e-4 -0.01373,0.049 0,0.045 0.003,0 0.04264,0 0.04516,0 -0.04351,0.1471 0.05649,0.1713 0,0.2259 0.201321,0.042 0.08532,-0.2345 0.04516,-0.3162 -0.05098,-0.1669 -0.167239,-0.3111 -0.180635,-0.3613 z m -3.386892,0.1358 c -0.05487,10e-5 -0.03402,0.081 0.180634,0.1358 -0.05527,-0.082 -0.140591,-0.1358 -0.180634,-0.1358 z m 0.541903,0 c -0.04708,0.08 -0.09808,0.1676 -0.180635,0.1806 -0.05662,0.074 0.103049,0.181 0.270952,0.1359 -0.0013,0.042 -0.06347,0.117 0.09032,0.045 0.01597,-0.038 -0.0059,-0.046 0,-0.045 0,0 0.04516,0.045 0.04516,0.045 0.0055,0.04 0.01156,0.097 0.04516,0.09 0.121487,-0.1185 -0.04139,-0.094 -0.04516,-0.1359 -0.0013,-0.014 0.0012,-0.055 0.04516,-0.09 -0.145799,0.081 -0.211123,-0.059 -0.09032,-0.09 -0.19025,-0.016 -0.02279,-0.03 -0.09032,-0.09 -0.103309,0.062 -0.115679,0.014 -0.09032,-0.045 z m 2.79983,0.09 c -0.01468,9e-4 -0.03501,0.014 -0.04516,0.045 -0.01171,0.058 0.02377,0.2852 0.04516,0.2259 0.01494,0.014 0.01387,0.062 0.04516,0.045 0.141545,-0.022 0.02559,-0.3205 -0.04516,-0.316 z m 0.406427,0.1358 c 0.01685,0.1416 -0.002,0.3213 0,0.3613 -0.05686,0.077 -0.144873,0.1199 -0.180634,0.1358 0.07341,0.08 -0.01626,0.3265 0.04516,0.4064 -0.122759,-0.016 -0.140562,0.2322 -0.135475,0.3162 -0.01455,0.2338 0.150043,0.3205 0.180634,0.316 0.165256,0 0.194273,-0.4905 0.180634,-0.3613 0.02171,-0.2263 0.177348,-0.2855 0.225793,0 -0.07153,-0.4133 -0.162611,-0.7953 -0.31611,-1.1741 z m 0,1.5354 c -0.07381,0.019 -0.108785,0.056 -0.04516,0.09 -0.155097,-0.022 -0.26964,0.6838 -0.270952,0.5419 -0.174871,0.1601 -0.273942,0.3996 -0.31611,0.6322 0.09247,0.1928 0.04996,0.7639 0,0.6775 0.04069,0.117 0.14247,0.4104 0.135476,0.2709 0.05247,0.159 0.220336,0.3128 0.361268,0.1359 0.196646,-0.1599 0.3696,-0.1979 0.225793,0.1358 0.200782,-0.5907 0.361269,-1.193 0.361269,-1.8516 0,-0.063 -0.04318,-0.1185 -0.04516,-0.1806 -0.126574,-0.1431 -0.353445,-0.4402 -0.180634,-0.4516 -0.06779,-0.02 -0.151984,-0.019 -0.225793,0 z m -5.735136,1.1291 c -0.07149,-6e-4 -0.109219,0.043 -0.180635,0.089 -0.04014,0.049 0.02093,0.055 0.09032,0.045 0,0 0.04516,0 0.04516,0 0.04747,-0.014 0.08867,-0.036 0.09032,-0.045 0.009,0.014 0.613981,0.2571 0.361269,0.1807 0.02809,0.02 0.04955,0.032 0.04516,0.045 0.0053,0.014 0.03601,0.049 0.180634,0.045 0.208289,-0.065 -0.190365,-0.1866 -0.180634,-0.1807 -0.01957,-0.014 -0.02504,-0.035 -0.04516,-0.045 -0.02554,-0.038 -0.03158,-0.045 -0.04516,-0.045 -0.105924,-0.053 -0.248041,-0.089 -0.361268,-0.089 z m -5.148076,0.089 c -0.01985,0 -0.05147,0.056 0,0.09 0.0185,-0.063 0.01358,-0.091 0,-0.09 z m 6.006088,0.2258 c -0.03209,5e-4 -0.05499,0.033 -0.04516,0.045 0.02298,0.016 -0.01,0.033 0,0.045 -0.0094,-2e-4 -0.01896,0.059 0,0.045 -0.02114,0 -0.02792,0.043 -0.04516,0.045 0.12221,-0.067 0.110953,0.078 0.180635,0.045 0.02858,-0.095 0.375135,-0.032 0.270951,-0.1359 -0.02182,-0.051 -0.264998,-0.092 -0.361268,-0.09 z m 0.587062,0.1358 c -0.05835,0 -0.187045,0.1171 0,0.09 0.01783,-0.039 0.02464,-0.091 0,-0.09 z m -1.083806,0.045 c 0.0097,0.014 0.01912,0.032 0.04516,0.045 l 0.04516,0 c 0.172535,-0.016 -0.01402,-0.046 -0.09032,-0.045 z m -1.219281,1.6257 c -0.0163,0 -0.0011,0.1185 0.04516,0.09 -0.0078,-0.061 -0.03802,-0.09 -0.04516,-0.09 z"
+       id="path24" />
+    <circle
+       cx="-902.857"
+       cy="526.648"
+       r="232.857"
+       fill="none"
+       stroke="url(#m)"
+       stroke-width="28.785"
+       transform="matrix(.02626 0 0 .02626 32.158 1031.032)"
+       id="circle24" />
+    <circle
+       cx="-902.857"
+       cy="526.648"
+       r="232.857"
+       fill="url(#n)"
+       opacity=".17"
+       transform="translate(31.109 1031.644) scale(.0251)"
+       id="circle25" />
   </g>
-  <path fill="url(#o)" d="m 2,1038.3622 0.03125,10.0313 9.90625,0 -0.03125,-10.0313 z m 1,1 7.90625,0 0.03125,8.0313 -7.90625,0 z" color="#000" font-family="Sans" font-weight="400" overflow="visible" style="line-height:normal;text-indent:0;text-align:start;text-decoration-line:none;text-transform:none;block-progression:tb;marker:none" transform="translate(4.063 -1038.393)"/>
-  <path fill="url(#p)" d="m 3,1039.3622 7.96875,0 0.03125,8.0313 -7.96875,0 z" color="#000" font-family="Sans" font-weight="400" overflow="visible" style="line-height:normal;text-indent:0;text-align:start;text-decoration-line:none;text-transform:none;block-progression:tb;marker:none" transform="translate(4.063 -1038.393)"/>
-  <path fill="url(#q)" d="m 5,1040.9122 0,6.5125 -2,0 0,-8 z" transform="rotate(180 9.016 524.197)"/>
-  <path fill="url(#r)" d="m 4.6,1041.3622 6.4,0 0,-2 -8,0 z" transform="rotate(180 9.016 524.197)"/>
-  <path fill="#113d95" d="m 7.5330622,1133.6321 q -0.4789633,0 -0.7629997,0.4734 -0.2784671,0.4734 -0.3063138,1.3868 l 1.9715469,0 q 0,-0.4344 -0.050124,-0.7797 -0.050124,-0.3453 -0.1615109,-0.5848 -0.1058175,-0.2395 -0.2784671,-0.3676 -0.1670802,-0.1281 -0.4121313,-0.1281 z m 0.1058175,5.6307 q -0.7240144,0 -1.2809485,-0.2117 -0.5513648,-0.2116 -0.9245107,-0.6126 -0.3731459,-0.401 -0.5625035,-0.9802 -0.1893576,-0.5848 -0.1893576,-1.3311 0,-0.802 0.1893576,-1.409 0.1893576,-0.6071 0.5513648,-1.0136 0.3620072,-0.4066 0.8855253,-0.6071 0.5290875,-0.2061 1.2029778,-0.2061 0.6181969,0 1.1138683,0.1782 0.4956714,0.1727 0.8409706,0.518 0.3452992,0.3453 0.5290874,0.8577 0.1837888,0.5124 0.1837888,1.1918 l 0,0.5848 -3.7370287,0 q 0.016708,0.5736 0.1225255,0.9858 0.1113868,0.4121 0.3007445,0.6794 0.1949269,0.2674 0.4678247,0.3954 0.278467,0.1281 0.6349049,0.1281 0.2951751,0 0.5457955,-0.067 0.2506203,-0.072 0.4511166,-0.1949 0.2060657,-0.1281 0.3564379,-0.2952 0.1559416,-0.1726 0.2561897,-0.3676 0.3063138,0.1671 0.3063138,0.557 0,0.245 -0.1336642,0.4678 -0.1336642,0.2172 -0.4121313,0.3843 -0.2784671,0.1671 -0.701737,0.2673 -0.4177006,0.1003 -0.9969122,0.1003 z" font-family="Droid Serif" font-size="11.406" font-weight="700" letter-spacing="0" style="line-height:125%" transform="matrix(.94407 0 0 .9438 3.946 -1067.176)" word-spacing="0"/>
+  <path
+     fill="url(#o)"
+     d="m 2,1038.3622 0.03125,10.0313 9.90625,0 -0.03125,-10.0313 z m 1,1 7.90625,0 0.03125,8.0313 -7.90625,0 z"
+     color="#000"
+     font-family="Sans"
+     font-weight="400"
+     overflow="visible"
+     style="line-height:normal;text-indent:0;text-align:start;text-decoration-line:none;text-transform:none;block-progression:tb;marker:none"
+     transform="translate(4.063 -1038.393)"
+     id="path25" />
+  <path
+     fill="url(#p)"
+     d="m 3,1039.3622 7.96875,0 0.03125,8.0313 -7.96875,0 z"
+     color="#000"
+     font-family="Sans"
+     font-weight="400"
+     overflow="visible"
+     style="line-height:normal;text-indent:0;text-align:start;text-decoration-line:none;text-transform:none;block-progression:tb;marker:none"
+     transform="translate(4.063 -1038.393)"
+     id="path26" />
+  <path
+     fill="url(#q)"
+     d="m 5,1040.9122 0,6.5125 -2,0 0,-8 z"
+     transform="rotate(180 9.016 524.197)"
+     id="path27" />
+  <path
+     fill="url(#r)"
+     d="m 4.6,1041.3622 6.4,0 0,-2 -8,0 z"
+     transform="rotate(180 9.016 524.197)"
+     id="path28" />
+  <path
+     fill="#113d95"
+     d="m 7.5330622,1133.6321 q -0.4789633,0 -0.7629997,0.4734 -0.2784671,0.4734 -0.3063138,1.3868 l 1.9715469,0 q 0,-0.4344 -0.050124,-0.7797 -0.050124,-0.3453 -0.1615109,-0.5848 -0.1058175,-0.2395 -0.2784671,-0.3676 -0.1670802,-0.1281 -0.4121313,-0.1281 z m 0.1058175,5.6307 q -0.7240144,0 -1.2809485,-0.2117 -0.5513648,-0.2116 -0.9245107,-0.6126 -0.3731459,-0.401 -0.5625035,-0.9802 -0.1893576,-0.5848 -0.1893576,-1.3311 0,-0.802 0.1893576,-1.409 0.1893576,-0.6071 0.5513648,-1.0136 0.3620072,-0.4066 0.8855253,-0.6071 0.5290875,-0.2061 1.2029778,-0.2061 0.6181969,0 1.1138683,0.1782 0.4956714,0.1727 0.8409706,0.518 0.3452992,0.3453 0.5290874,0.8577 0.1837888,0.5124 0.1837888,1.1918 l 0,0.5848 -3.7370287,0 q 0.016708,0.5736 0.1225255,0.9858 0.1113868,0.4121 0.3007445,0.6794 0.1949269,0.2674 0.4678247,0.3954 0.278467,0.1281 0.6349049,0.1281 0.2951751,0 0.5457955,-0.067 0.2506203,-0.072 0.4511166,-0.1949 0.2060657,-0.1281 0.3564379,-0.2952 0.1559416,-0.1726 0.2561897,-0.3676 0.3063138,0.1671 0.3063138,0.557 0,0.245 -0.1336642,0.4678 -0.1336642,0.2172 -0.4121313,0.3843 -0.2784671,0.1671 -0.701737,0.2673 -0.4177006,0.1003 -0.9969122,0.1003 z"
+     font-family="Droid Serif"
+     font-size="11.406"
+     font-weight="700"
+     letter-spacing="0"
+     style="line-height:125%"
+     transform="matrix(.94407 0 0 .9438 3.946 -1067.176)"
+     word-spacing="0"
+     id="path29" />
 </svg>
diff --git a/org.eclipse.pde.doc.user/guide/images/schema_editor/seq_sc_obj.svg b/org.eclipse.pde.doc.user/guide/images/schema_editor/seq_sc_obj.svg
index df670c330b6..522598d3315 100644
--- a/org.eclipse.pde.doc.user/guide/images/schema_editor/seq_sc_obj.svg
+++ b/org.eclipse.pde.doc.user/guide/images/schema_editor/seq_sc_obj.svg
@@ -1,17 +1,90 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="16" height="16">
-  <defs>
-    <linearGradient xlink:href="#a" id="b" x1="18.494" x2="18.494" y1="1044.57" y2="1042.195" gradientTransform="translate(12.646 12.332)" gradientUnits="userSpaceOnUse"/>
-    <linearGradient id="a">
-      <stop offset="0" stop-color="#346692"/>
-      <stop offset="1" stop-color="#4395c1"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="16"
+   height="16"
+   version="1.1"
+   id="svg4"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs2">
+    <linearGradient
+       xlink:href="#a"
+       id="b"
+       x1="18.494"
+       x2="18.494"
+       y1="1044.57"
+       y2="1042.195"
+       gradientTransform="translate(12.646 12.332)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="a">
+      <stop
+         offset="0"
+         stop-color="#346692"
+         id="stop1" />
+      <stop
+         offset="1"
+         stop-color="#4395c1"
+         id="stop2" />
     </linearGradient>
-    <linearGradient xlink:href="#a" id="c" x1="18.494" x2="18.494" y1="1044.57" y2="1042.195" gradientTransform="translate(.671 12.338)" gradientUnits="userSpaceOnUse"/>
-    <linearGradient xlink:href="#a" id="d" x1="18.494" x2="18.494" y1="1044.57" y2="1042.195" gradientTransform="translate(6.656 12.329)" gradientUnits="userSpaceOnUse"/>
+    <linearGradient
+       xlink:href="#a"
+       id="c"
+       x1="18.494"
+       x2="18.494"
+       y1="1044.57"
+       y2="1042.195"
+       gradientTransform="translate(.671 12.338)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#a"
+       id="d"
+       x1="18.494"
+       x2="18.494"
+       y1="1044.57"
+       y2="1042.195"
+       gradientTransform="translate(6.656 12.329)"
+       gradientUnits="userSpaceOnUse" />
   </defs>
-  <g transform="translate(-16.539 -1047.116)">
-    <path fill="none" stroke="#5c7aaa" d="m 20.030369,1055.6472 9.943689,0"/>
-    <rect width="2" height="1.969" x="30.031" y="1054.62" fill="#89bedb" stroke="url(#b)" rx="0" ry="0"/>
-    <rect width="2" height="1.969" x="18.056" y="1054.627" fill="#89bedb" stroke="url(#c)" rx="0" ry="0"/>
-    <rect width="2" height="1.969" x="24.04" y="1054.617" fill="#89bedb" stroke="url(#d)" rx="0" ry="0"/>
+  <g
+     transform="translate(-16.539 -1047.116)"
+     id="g4">
+    <path
+       fill="none"
+       stroke="#5c7aaa"
+       d="m 20.030369,1055.6472 9.943689,0"
+       id="path2" />
+    <rect
+       width="2"
+       height="1.969"
+       x="30.031"
+       y="1054.62"
+       fill="#89bedb"
+       stroke="url(#b)"
+       rx="0"
+       ry="0"
+       id="rect2" />
+    <rect
+       width="2"
+       height="1.969"
+       x="18.056"
+       y="1054.627"
+       fill="#89bedb"
+       stroke="url(#c)"
+       rx="0"
+       ry="0"
+       id="rect3" />
+    <rect
+       width="2"
+       height="1.969"
+       x="24.04"
+       y="1054.617"
+       fill="#89bedb"
+       stroke="url(#d)"
+       rx="0"
+       ry="0"
+       id="rect4" />
   </g>
 </svg>
diff --git a/org.eclipse.pde.doc.user/guide/images/simple_cs_editor/cheatsheet_intro_obj.svg b/org.eclipse.pde.doc.user/guide/images/simple_cs_editor/cheatsheet_intro_obj.svg
index 075c6e4b3f2..de144605140 100644
--- a/org.eclipse.pde.doc.user/guide/images/simple_cs_editor/cheatsheet_intro_obj.svg
+++ b/org.eclipse.pde.doc.user/guide/images/simple_cs_editor/cheatsheet_intro_obj.svg
@@ -1,65 +1,310 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="16" height="16">
-  <defs>
-    <linearGradient id="c">
-      <stop offset="0" stop-color="#fce9a0"/>
-      <stop offset="1" stop-color="#fce9a0" stop-opacity="0"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="16"
+   height="16"
+   version="1.1"
+   id="svg32"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs12">
+    <linearGradient
+       id="c">
+      <stop
+         offset="0"
+         stop-color="#fce9a0"
+         id="stop1" />
+      <stop
+         offset="1"
+         stop-color="#fce9a0"
+         stop-opacity="0"
+         id="stop2" />
     </linearGradient>
-    <linearGradient id="b">
-      <stop offset="0" stop-color="#a098c8"/>
-      <stop offset="1" stop-color="#6155a0"/>
+    <linearGradient
+       id="b">
+      <stop
+         offset="0"
+         stop-color="#a098c8"
+         id="stop3" />
+      <stop
+         offset="1"
+         stop-color="#6155a0"
+         id="stop4" />
     </linearGradient>
-    <linearGradient id="a">
-      <stop offset="0" stop-color="#7e713d"/>
-      <stop offset="1" stop-color="#b28a30"/>
+    <linearGradient
+       id="a">
+      <stop
+         offset="0"
+         stop-color="#7e713d"
+         id="stop5" />
+      <stop
+         offset="1"
+         stop-color="#b28a30"
+         id="stop6" />
     </linearGradient>
-    <linearGradient xlink:href="#a" id="f" x1="20.3" x2="20.3" y1="1052.201" y2="1036.755" gradientTransform="translate(-11.87)" gradientUnits="userSpaceOnUse"/>
-    <linearGradient xlink:href="#a" id="h" x1="20.3" x2="20.3" y1="1052.107" y2="1045.562" gradientTransform="translate(-11.87)" gradientUnits="userSpaceOnUse"/>
-    <linearGradient xlink:href="#b" id="i" x1="5.051" x2="11.964" y1="1046.885" y2="1046.885" gradientTransform="matrix(1.01453 0 0 1.17023 -.13 -178.227)" gradientUnits="userSpaceOnUse"/>
-    <linearGradient xlink:href="#b" id="j" x1="5.051" x2="11.964" y1="1046.885" y2="1046.885" gradientTransform="matrix(.7304 0 0 1.17023 1.306 -176.24)" gradientUnits="userSpaceOnUse"/>
-    <linearGradient xlink:href="#c" id="g" x1="6.214" x2="6.214" y1="1048.651" y2="1044.674" gradientUnits="userSpaceOnUse"/>
-    <linearGradient xlink:href="#d" id="k" x1="3.975" x2="3.975" y1="1036.383" y2="1039.235" gradientTransform="translate(-.071)" gradientUnits="userSpaceOnUse"/>
-    <linearGradient id="d">
-      <stop offset="0" stop-color="#17325d"/>
-      <stop offset=".5" stop-color="#b7d2e4"/>
-      <stop offset="1" stop-color="#3e72a7"/>
+    <linearGradient
+       xlink:href="#a"
+       id="f"
+       x1="20.3"
+       x2="20.3"
+       y1="1052.201"
+       y2="1036.755"
+       gradientTransform="translate(-11.87)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#a"
+       id="h"
+       x1="20.3"
+       x2="20.3"
+       y1="1052.107"
+       y2="1045.562"
+       gradientTransform="translate(-11.87)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#b"
+       id="i"
+       x1="5.051"
+       x2="11.964"
+       y1="1046.885"
+       y2="1046.885"
+       gradientTransform="matrix(1.01453 0 0 1.17023 -.13 -178.227)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#b"
+       id="j"
+       x1="5.051"
+       x2="11.964"
+       y1="1046.885"
+       y2="1046.885"
+       gradientTransform="matrix(.7304 0 0 1.17023 1.306 -176.24)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#c"
+       id="g"
+       x1="6.214"
+       x2="6.214"
+       y1="1048.651"
+       y2="1044.674"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#d"
+       id="k"
+       x1="3.975"
+       x2="3.975"
+       y1="1036.383"
+       y2="1039.235"
+       gradientTransform="translate(-.071)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="d">
+      <stop
+         offset="0"
+         stop-color="#17325d"
+         id="stop7" />
+      <stop
+         offset=".5"
+         stop-color="#b7d2e4"
+         id="stop8" />
+      <stop
+         offset="1"
+         stop-color="#3e72a7"
+         id="stop9" />
     </linearGradient>
-    <linearGradient xlink:href="#d" id="l" x1="3.975" x2="3.975" y1="1036.383" y2="1039.235" gradientTransform="translate(1.93 -.056)" gradientUnits="userSpaceOnUse"/>
-    <linearGradient xlink:href="#d" id="m" x1="3.975" x2="3.975" y1="1036.383" y2="1039.235" gradientTransform="translate(3.884)" gradientUnits="userSpaceOnUse"/>
-    <linearGradient xlink:href="#d" id="n" x1="3.975" x2="3.975" y1="1036.383" y2="1039.235" gradientTransform="matrix(.83689 0 0 1.10534 6.64 -109.421)" gradientUnits="userSpaceOnUse"/>
-    <linearGradient xlink:href="#e" id="o" x1="3.975" x2="3.975" y1="1036.963" y2="1038.52" gradientTransform="translate(7.935)" gradientUnits="userSpaceOnUse"/>
-    <linearGradient id="e">
-      <stop offset="0" stop-color="#17325d"/>
-      <stop offset=".6" stop-color="#b7d2e4"/>
-      <stop offset="1" stop-color="#3e72a7"/>
+    <linearGradient
+       xlink:href="#d"
+       id="l"
+       x1="3.975"
+       x2="3.975"
+       y1="1036.383"
+       y2="1039.235"
+       gradientTransform="translate(1.93 -.056)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#d"
+       id="m"
+       x1="3.975"
+       x2="3.975"
+       y1="1036.383"
+       y2="1039.235"
+       gradientTransform="translate(3.884)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#d"
+       id="n"
+       x1="3.975"
+       x2="3.975"
+       y1="1036.383"
+       y2="1039.235"
+       gradientTransform="matrix(.83689 0 0 1.10534 6.64 -109.421)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#e"
+       id="o"
+       x1="3.975"
+       x2="3.975"
+       y1="1036.963"
+       y2="1038.52"
+       gradientTransform="translate(7.935)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="e">
+      <stop
+         offset="0"
+         stop-color="#17325d"
+         id="stop10" />
+      <stop
+         offset=".6"
+         stop-color="#b7d2e4"
+         id="stop11" />
+      <stop
+         offset="1"
+         stop-color="#3e72a7"
+         id="stop12" />
     </linearGradient>
   </defs>
-  <g transform="translate(0 -1036.362)">
-    <rect width="9.975" height="13.006" x="3.536" y="1037.841" fill="#fff" stroke="url(#f)" stroke-linejoin="round" rx=".379" ry=".379"/>
-    <g transform="translate(0 -6.945)">
-      <rect width="9.975" height="6.994" x="3.536" y="1044.813" fill="url(#g)" stroke="url(#h)" stroke-linejoin="round" rx=".379" ry=".379"/>
-      <g transform="translate(0 .96)">
-        <rect width="7.014" height=".997" x="4.995" y="1046.37" fill="url(#i)" rx=".384" ry=".443"/>
-        <rect width="5.049" height=".997" x="4.995" y="1048.356" fill="url(#j)" rx=".277" ry=".443"/>
+  <g
+     transform="translate(0 -1036.362)"
+     id="g32">
+    <rect
+       width="9.975"
+       height="13.006"
+       x="3.536"
+       y="1037.841"
+       fill="#fff"
+       stroke="url(#f)"
+       stroke-linejoin="round"
+       rx=".379"
+       ry=".379"
+       id="rect12" />
+    <g
+       transform="translate(0 -6.945)"
+       id="g16">
+      <rect
+         width="9.975"
+         height="6.994"
+         x="3.536"
+         y="1044.813"
+         fill="url(#g)"
+         stroke="url(#h)"
+         stroke-linejoin="round"
+         rx=".379"
+         ry=".379"
+         id="rect13" />
+      <g
+         transform="translate(0 .96)"
+         id="g15">
+        <rect
+           width="7.014"
+           height=".997"
+           x="4.995"
+           y="1046.37"
+           fill="url(#i)"
+           rx=".384"
+           ry=".443"
+           id="rect14" />
+        <rect
+           width="5.049"
+           height=".997"
+           x="4.995"
+           y="1048.356"
+           fill="url(#j)"
+           rx=".277"
+           ry=".443"
+           id="rect15" />
       </g>
     </g>
-    <path fill="#fff" d="M4.978 1036.38H12.232V1037.362H4.978z"/>
-    <path fill="#b7d2e4" fill-rule="evenodd" stroke="#fff" d="m 4.0354196,1037.8348 8.9380894,0"/>
-    <g fill="none" stroke-linecap="round" stroke-linejoin="bevel">
-      <path stroke="url(#k)" d="m 4.3932593,1036.8711 0.00271,2.0536" transform="translate(.126)"/>
-      <path stroke="url(#l)" d="m 6.3950894,1036.8153 0.00271,2.0694" transform="translate(.126)"/>
-      <path stroke="url(#m)" d="m 8.3482144,1036.8711 0.050059,1.8484" transform="translate(.126)"/>
-      <path stroke="url(#n)" stroke-width=".962" d="m 10.375824,1036.8315 -0.03736,1.9858" transform="translate(.126)"/>
-      <path stroke="url(#o)" d="m 12.399554,1036.8711 -0.03348,2.0424" transform="translate(.126)"/>
+    <path
+       fill="#fff"
+       d="M4.978 1036.38H12.232V1037.362H4.978z"
+       id="path16" />
+    <path
+       fill="#b7d2e4"
+       fill-rule="evenodd"
+       stroke="#fff"
+       d="m 4.0354196,1037.8348 8.9380894,0"
+       id="path17" />
+    <g
+       fill="none"
+       stroke-linecap="round"
+       stroke-linejoin="bevel"
+       id="g22">
+      <path
+         stroke="url(#k)"
+         d="m 4.3932593,1036.8711 0.00271,2.0536"
+         transform="translate(.126)"
+         id="path18" />
+      <path
+         stroke="url(#l)"
+         d="m 6.3950894,1036.8153 0.00271,2.0694"
+         transform="translate(.126)"
+         id="path19" />
+      <path
+         stroke="url(#m)"
+         d="m 8.3482144,1036.8711 0.050059,1.8484"
+         transform="translate(.126)"
+         id="path20" />
+      <path
+         stroke="url(#n)"
+         stroke-width=".962"
+         d="m 10.375824,1036.8315 -0.03736,1.9858"
+         transform="translate(.126)"
+         id="path21" />
+      <path
+         stroke="url(#o)"
+         d="m 12.399554,1036.8711 -0.03348,2.0424"
+         transform="translate(.126)"
+         id="path22" />
     </g>
-    <path fill="#213c65" d="M3.927 1036.173H4.923V1037.175H3.927z" transform="translate(.081 .187)"/>
-    <path fill="#3e72a7" d="M3.927 1038.177H4.923V1039.179H3.927z" transform="translate(.081 .187)"/>
-    <path fill="#213c65" d="M5.929 1036.173H6.925V1037.175H5.929z" transform="translate(.081 .187)"/>
-    <path fill="#3e72a7" d="M5.929 1038.177H6.925V1039.179H5.929z" transform="translate(.081 .187)"/>
-    <path fill="#213c65" d="M7.926 1036.173H8.922V1037.175H7.926z" transform="translate(.081 .187)"/>
-    <path fill="#3e72a7" d="M7.926 1038.177H8.922V1039.179H7.926z" transform="translate(.081 .187)"/>
-    <path fill="#213c65" d="M9.934 1036.173H10.93V1037.175H9.934z" transform="translate(.081 .187)"/>
-    <path fill="#3e72a7" d="M9.934 1038.177H10.93V1039.179H9.934z" transform="translate(.081 .187)"/>
-    <path fill="#213c65" d="M11.919 1036.173H12.915V1037.175H11.919z" transform="translate(.081 .187)"/>
-    <path fill="#3e72a7" d="M11.919 1038.177H12.915V1039.179H11.919z" transform="translate(.081 .187)"/>
+    <path
+       fill="#213c65"
+       d="M3.927 1036.173H4.923V1037.175H3.927z"
+       transform="translate(.081 .187)"
+       id="path23" />
+    <path
+       fill="#3e72a7"
+       d="M3.927 1038.177H4.923V1039.179H3.927z"
+       transform="translate(.081 .187)"
+       id="path24" />
+    <path
+       fill="#213c65"
+       d="M5.929 1036.173H6.925V1037.175H5.929z"
+       transform="translate(.081 .187)"
+       id="path25" />
+    <path
+       fill="#3e72a7"
+       d="M5.929 1038.177H6.925V1039.179H5.929z"
+       transform="translate(.081 .187)"
+       id="path26" />
+    <path
+       fill="#213c65"
+       d="M7.926 1036.173H8.922V1037.175H7.926z"
+       transform="translate(.081 .187)"
+       id="path27" />
+    <path
+       fill="#3e72a7"
+       d="M7.926 1038.177H8.922V1039.179H7.926z"
+       transform="translate(.081 .187)"
+       id="path28" />
+    <path
+       fill="#213c65"
+       d="M9.934 1036.173H10.93V1037.175H9.934z"
+       transform="translate(.081 .187)"
+       id="path29" />
+    <path
+       fill="#3e72a7"
+       d="M9.934 1038.177H10.93V1039.179H9.934z"
+       transform="translate(.081 .187)"
+       id="path30" />
+    <path
+       fill="#213c65"
+       d="M11.919 1036.173H12.915V1037.175H11.919z"
+       transform="translate(.081 .187)"
+       id="path31" />
+    <path
+       fill="#3e72a7"
+       d="M11.919 1038.177H12.915V1039.179H11.919z"
+       transform="translate(.081 .187)"
+       id="path32" />
   </g>
 </svg>
diff --git a/org.eclipse.pde.doc.user/guide/images/simple_cs_editor/cheatsheet_item_obj.svg b/org.eclipse.pde.doc.user/guide/images/simple_cs_editor/cheatsheet_item_obj.svg
index 4fdd3569c9e..316b5654fa9 100644
--- a/org.eclipse.pde.doc.user/guide/images/simple_cs_editor/cheatsheet_item_obj.svg
+++ b/org.eclipse.pde.doc.user/guide/images/simple_cs_editor/cheatsheet_item_obj.svg
@@ -1,53 +1,255 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="16" height="16">
-  <defs>
-    <linearGradient id="e">
-      <stop offset="0" stop-color="#1e5484"/>
-      <stop offset="1" stop-color="#4a80a9"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="16"
+   height="16"
+   version="1.1"
+   id="svg21"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs12">
+    <linearGradient
+       id="e">
+      <stop
+         offset="0"
+         stop-color="#1e5484"
+         id="stop1" />
+      <stop
+         offset="1"
+         stop-color="#4a80a9"
+         id="stop2" />
     </linearGradient>
-    <linearGradient id="d">
-      <stop offset="0" stop-color="#a098c8"/>
-      <stop offset="1" stop-color="#6155a0"/>
+    <linearGradient
+       id="d">
+      <stop
+         offset="0"
+         stop-color="#a098c8"
+         id="stop3" />
+      <stop
+         offset="1"
+         stop-color="#6155a0"
+         id="stop4" />
     </linearGradient>
-    <linearGradient id="c">
-      <stop offset="0" stop-color="#17325d"/>
-      <stop offset=".6" stop-color="#b7d2e4"/>
-      <stop offset="1" stop-color="#3e72a7"/>
+    <linearGradient
+       id="c">
+      <stop
+         offset="0"
+         stop-color="#17325d"
+         id="stop5" />
+      <stop
+         offset=".6"
+         stop-color="#b7d2e4"
+         id="stop6" />
+      <stop
+         offset="1"
+         stop-color="#3e72a7"
+         id="stop7" />
     </linearGradient>
-    <linearGradient id="b">
-      <stop offset="0" stop-color="#17325d"/>
-      <stop offset=".5" stop-color="#b7d2e4"/>
-      <stop offset="1" stop-color="#3e72a7"/>
+    <linearGradient
+       id="b">
+      <stop
+         offset="0"
+         stop-color="#17325d"
+         id="stop8" />
+      <stop
+         offset=".5"
+         stop-color="#b7d2e4"
+         id="stop9" />
+      <stop
+         offset="1"
+         stop-color="#3e72a7"
+         id="stop10" />
     </linearGradient>
-    <linearGradient id="a">
-      <stop offset="0" stop-color="#7e713d"/>
-      <stop offset="1" stop-color="#b28a30"/>
+    <linearGradient
+       id="a">
+      <stop
+         offset="0"
+         stop-color="#7e713d"
+         id="stop11" />
+      <stop
+         offset="1"
+         stop-color="#b28a30"
+         id="stop12" />
     </linearGradient>
-    <linearGradient xlink:href="#a" id="f" x1="20.3" x2="20.3" y1="1052.201" y2="1036.755" gradientTransform="translate(-11.87)" gradientUnits="userSpaceOnUse"/>
-    <linearGradient xlink:href="#b" id="k" x1="3.975" x2="3.975" y1="1036.383" y2="1039.235" gradientTransform="translate(-.071)" gradientUnits="userSpaceOnUse"/>
-    <linearGradient xlink:href="#b" id="l" x1="3.975" x2="3.975" y1="1036.383" y2="1039.235" gradientTransform="translate(1.83)" gradientUnits="userSpaceOnUse"/>
-    <linearGradient xlink:href="#b" id="m" x1="3.975" x2="3.975" y1="1036.383" y2="1039.235" gradientTransform="translate(3.884)" gradientUnits="userSpaceOnUse"/>
-    <linearGradient xlink:href="#b" id="n" x1="3.975" x2="3.975" y1="1036.383" y2="1039.235" gradientTransform="matrix(.83689 0 0 1.10534 6.64 -109.421)" gradientUnits="userSpaceOnUse"/>
-    <linearGradient xlink:href="#c" id="o" x1="3.975" x2="3.975" y1="1036.963" y2="1038.52" gradientTransform="translate(7.935)" gradientUnits="userSpaceOnUse"/>
-    <linearGradient xlink:href="#d" id="g" x1="5.051" x2="11.964" y1="1046.885" y2="1046.885" gradientTransform="matrix(1.01453 0 0 1.17023 -.13 -178.227)" gradientUnits="userSpaceOnUse"/>
-    <linearGradient xlink:href="#d" id="h" x1="5.051" x2="11.964" y1="1046.885" y2="1046.885" gradientTransform="matrix(.7304 0 0 1.17023 1.306 -174.321)" gradientUnits="userSpaceOnUse"/>
-    <linearGradient xlink:href="#d" id="i" x1="5.051" x2="11.964" y1="1046.885" y2="1046.885" gradientTransform="matrix(1.01453 0 0 1.17023 -.13 -176.263)" gradientUnits="userSpaceOnUse"/>
-    <linearGradient xlink:href="#e" id="j" x1="-9.911" x2="-9.911" y1="1037.945" y2="1033.169" gradientTransform="translate(12.41 11.205)" gradientUnits="userSpaceOnUse"/>
+    <linearGradient
+       xlink:href="#a"
+       id="f"
+       x1="20.3"
+       x2="20.3"
+       y1="1052.201"
+       y2="1036.755"
+       gradientTransform="translate(-11.87)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#b"
+       id="k"
+       x1="3.975"
+       x2="3.975"
+       y1="1036.383"
+       y2="1039.235"
+       gradientTransform="translate(-.071)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#b"
+       id="l"
+       x1="3.975"
+       x2="3.975"
+       y1="1036.383"
+       y2="1039.235"
+       gradientTransform="translate(1.83)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#b"
+       id="m"
+       x1="3.975"
+       x2="3.975"
+       y1="1036.383"
+       y2="1039.235"
+       gradientTransform="translate(3.884)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#b"
+       id="n"
+       x1="3.975"
+       x2="3.975"
+       y1="1036.383"
+       y2="1039.235"
+       gradientTransform="matrix(.83689 0 0 1.10534 6.64 -109.421)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#c"
+       id="o"
+       x1="3.975"
+       x2="3.975"
+       y1="1036.963"
+       y2="1038.52"
+       gradientTransform="translate(7.935)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#d"
+       id="g"
+       x1="5.051"
+       x2="11.964"
+       y1="1046.885"
+       y2="1046.885"
+       gradientTransform="matrix(1.01453 0 0 1.17023 -.13 -178.227)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#d"
+       id="h"
+       x1="5.051"
+       x2="11.964"
+       y1="1046.885"
+       y2="1046.885"
+       gradientTransform="matrix(.7304 0 0 1.17023 1.306 -174.321)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#d"
+       id="i"
+       x1="5.051"
+       x2="11.964"
+       y1="1046.885"
+       y2="1046.885"
+       gradientTransform="matrix(1.01453 0 0 1.17023 -.13 -176.263)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#e"
+       id="j"
+       x1="-9.911"
+       x2="-9.911"
+       y1="1037.945"
+       y2="1033.169"
+       gradientTransform="translate(12.41 11.205)"
+       gradientUnits="userSpaceOnUse" />
   </defs>
-  <g transform="translate(0 -1036.362)">
-    <rect width="9.975" height="13.006" x="3.536" y="1037.841" fill="#fff" stroke="url(#f)" stroke-linejoin="round" rx=".379" ry=".379"/>
-    <path fill="#b7d2e4" fill-rule="evenodd" stroke="#fff" d="m 4.0354196,1037.8348 8.9380894,0"/>
-    <g transform="translate(0 -3.976)">
-      <rect width="5.005" height=".997" x="7.004" y="1046.37" fill="url(#g)" rx=".384" ry=".443"/>
-      <rect width="3.085" height=".997" x="6.959" y="1050.276" fill="url(#h)" rx=".277" ry=".443"/>
-      <rect width="5.005" height=".997" x="7.004" y="1048.334" fill="url(#i)" rx=".384" ry=".443"/>
-      <path fill="url(#j)" fill-rule="evenodd" d="m 2.0089282,1044.3293 0,5 1.495536,0 2.9799108,-2.4889 -2.9799108,-2.5111 z"/>
+  <g
+     transform="translate(0 -1036.362)"
+     id="g21">
+    <rect
+       width="9.975"
+       height="13.006"
+       x="3.536"
+       y="1037.841"
+       fill="#fff"
+       stroke="url(#f)"
+       stroke-linejoin="round"
+       rx=".379"
+       ry=".379"
+       id="rect12" />
+    <path
+       fill="#b7d2e4"
+       fill-rule="evenodd"
+       stroke="#fff"
+       d="m 4.0354196,1037.8348 8.9380894,0"
+       id="path12" />
+    <g
+       transform="translate(0 -3.976)"
+       id="g15">
+      <rect
+         width="5.005"
+         height=".997"
+         x="7.004"
+         y="1046.37"
+         fill="url(#g)"
+         rx=".384"
+         ry=".443"
+         id="rect13" />
+      <rect
+         width="3.085"
+         height=".997"
+         x="6.959"
+         y="1050.276"
+         fill="url(#h)"
+         rx=".277"
+         ry=".443"
+         id="rect14" />
+      <rect
+         width="5.005"
+         height=".997"
+         x="7.004"
+         y="1048.334"
+         fill="url(#i)"
+         rx=".384"
+         ry=".443"
+         id="rect15" />
+      <path
+         fill="url(#j)"
+         fill-rule="evenodd"
+         d="m 2.0089282,1044.3293 0,5 1.495536,0 2.9799108,-2.4889 -2.9799108,-2.5111 z"
+         id="path15" />
     </g>
-    <g fill="none" stroke-linecap="round" stroke-linejoin="bevel">
-      <path stroke="url(#k)" d="m 4.3932593,1036.8711 0.00271,2.0536" transform="translate(.126)"/>
-      <path stroke="url(#l)" d="M 6.294643,1036.8711 6.25,1038.9247" transform="translate(.126)"/>
-      <path stroke="url(#m)" d="m 8.3482144,1036.8711 -0.044643,2.0536" transform="translate(.126)"/>
-      <path stroke="url(#n)" stroke-width=".962" d="m 10.375824,1036.6737 -0.03736,2.2699" transform="translate(.126)"/>
-      <path stroke="url(#o)" d="m 12.399554,1036.8711 -0.03348,2.0424" transform="translate(.126)"/>
+    <g
+       fill="none"
+       stroke-linecap="round"
+       stroke-linejoin="bevel"
+       id="g20">
+      <path
+         stroke="url(#k)"
+         d="m 4.3932593,1036.8711 0.00271,2.0536"
+         transform="translate(.126)"
+         id="path16" />
+      <path
+         stroke="url(#l)"
+         d="M 6.294643,1036.8711 6.25,1038.9247"
+         transform="translate(.126)"
+         id="path17" />
+      <path
+         stroke="url(#m)"
+         d="m 8.3482144,1036.8711 -0.044643,2.0536"
+         transform="translate(.126)"
+         id="path18" />
+      <path
+         stroke="url(#n)"
+         stroke-width=".962"
+         d="m 10.375824,1036.6737 -0.03736,2.2699"
+         transform="translate(.126)"
+         id="path19" />
+      <path
+         stroke="url(#o)"
+         d="m 12.399554,1036.8711 -0.03348,2.0424"
+         transform="translate(.126)"
+         id="path20" />
     </g>
   </g>
 </svg>
diff --git a/org.eclipse.pde.doc.user/guide/images/simple_cs_editor/cheatsheet_simple_obj.svg b/org.eclipse.pde.doc.user/guide/images/simple_cs_editor/cheatsheet_simple_obj.svg
index a04504e4e48..3cdbac22d6b 100644
--- a/org.eclipse.pde.doc.user/guide/images/simple_cs_editor/cheatsheet_simple_obj.svg
+++ b/org.eclipse.pde.doc.user/guide/images/simple_cs_editor/cheatsheet_simple_obj.svg
@@ -1,35 +1,161 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="16" height="16">
-  <defs>
-    <linearGradient id="c">
-      <stop offset="0" stop-color="#17325d"/>
-      <stop offset=".6" stop-color="#b7d2e4"/>
-      <stop offset="1" stop-color="#3e72a7"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="16"
+   height="16"
+   version="1.1"
+   id="svg14"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs8">
+    <linearGradient
+       id="c">
+      <stop
+         offset="0"
+         stop-color="#17325d"
+         id="stop1" />
+      <stop
+         offset=".6"
+         stop-color="#b7d2e4"
+         id="stop2" />
+      <stop
+         offset="1"
+         stop-color="#3e72a7"
+         id="stop3" />
     </linearGradient>
-    <linearGradient id="b">
-      <stop offset="0" stop-color="#17325d"/>
-      <stop offset=".5" stop-color="#b7d2e4"/>
-      <stop offset="1" stop-color="#3e72a7"/>
+    <linearGradient
+       id="b">
+      <stop
+         offset="0"
+         stop-color="#17325d"
+         id="stop4" />
+      <stop
+         offset=".5"
+         stop-color="#b7d2e4"
+         id="stop5" />
+      <stop
+         offset="1"
+         stop-color="#3e72a7"
+         id="stop6" />
     </linearGradient>
-    <linearGradient id="a">
-      <stop offset="0" stop-color="#7e713d"/>
-      <stop offset="1" stop-color="#b28a30"/>
+    <linearGradient
+       id="a">
+      <stop
+         offset="0"
+         stop-color="#7e713d"
+         id="stop7" />
+      <stop
+         offset="1"
+         stop-color="#b28a30"
+         id="stop8" />
     </linearGradient>
-    <linearGradient xlink:href="#a" id="d" x1="20.3" x2="20.3" y1="1052.201" y2="1036.755" gradientTransform="translate(-11.87)" gradientUnits="userSpaceOnUse"/>
-    <linearGradient xlink:href="#b" id="e" x1="3.975" x2="3.975" y1="1036.383" y2="1039.235" gradientTransform="translate(-.071)" gradientUnits="userSpaceOnUse"/>
-    <linearGradient xlink:href="#b" id="f" x1="3.975" x2="3.975" y1="1036.383" y2="1039.235" gradientTransform="translate(1.83)" gradientUnits="userSpaceOnUse"/>
-    <linearGradient xlink:href="#b" id="g" x1="3.975" x2="3.975" y1="1036.383" y2="1039.235" gradientTransform="translate(3.884)" gradientUnits="userSpaceOnUse"/>
-    <linearGradient xlink:href="#b" id="h" x1="3.975" x2="3.975" y1="1036.383" y2="1039.235" gradientTransform="matrix(.83689 0 0 1.10534 6.64 -109.421)" gradientUnits="userSpaceOnUse"/>
-    <linearGradient xlink:href="#c" id="i" x1="3.975" x2="3.975" y1="1036.963" y2="1038.52" gradientTransform="translate(7.935)" gradientUnits="userSpaceOnUse"/>
+    <linearGradient
+       xlink:href="#a"
+       id="d"
+       x1="20.3"
+       x2="20.3"
+       y1="1052.201"
+       y2="1036.755"
+       gradientTransform="translate(-11.87)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#b"
+       id="e"
+       x1="3.975"
+       x2="3.975"
+       y1="1036.383"
+       y2="1039.235"
+       gradientTransform="translate(-.071)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#b"
+       id="f"
+       x1="3.975"
+       x2="3.975"
+       y1="1036.383"
+       y2="1039.235"
+       gradientTransform="translate(1.83)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#b"
+       id="g"
+       x1="3.975"
+       x2="3.975"
+       y1="1036.383"
+       y2="1039.235"
+       gradientTransform="translate(3.884)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#b"
+       id="h"
+       x1="3.975"
+       x2="3.975"
+       y1="1036.383"
+       y2="1039.235"
+       gradientTransform="matrix(.83689 0 0 1.10534 6.64 -109.421)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#c"
+       id="i"
+       x1="3.975"
+       x2="3.975"
+       y1="1036.963"
+       y2="1038.52"
+       gradientTransform="translate(7.935)"
+       gradientUnits="userSpaceOnUse" />
   </defs>
-  <g transform="translate(0 -1036.362)">
-    <rect width="9.975" height="13.006" x="3.536" y="1037.841" fill="#fff" stroke="url(#d)" stroke-linejoin="round" rx=".379" ry=".379"/>
-    <path fill="#b7d2e4" fill-rule="evenodd" stroke="#fff" d="m 4.0354196,1037.8348 8.9380894,0"/>
-    <g fill="none" stroke-linecap="round" stroke-linejoin="bevel">
-      <path stroke="url(#e)" d="m 4.3932593,1036.8711 0.00271,2.0536" transform="translate(.126)"/>
-      <path stroke="url(#f)" d="M 6.294643,1036.8711 6.25,1038.9247" transform="translate(.126)"/>
-      <path stroke="url(#g)" d="m 8.3482144,1036.8711 -0.044643,2.0536" transform="translate(.126)"/>
-      <path stroke="url(#h)" stroke-width=".962" d="m 10.375824,1036.6737 -0.03736,2.2699" transform="translate(.126)"/>
-      <path stroke="url(#i)" d="m 12.399554,1036.8711 -0.03348,2.0424" transform="translate(.126)"/>
+  <g
+     transform="translate(0 -1036.362)"
+     id="g14">
+    <rect
+       width="9.975"
+       height="13.006"
+       x="3.536"
+       y="1037.841"
+       fill="#fff"
+       stroke="url(#d)"
+       stroke-linejoin="round"
+       rx=".379"
+       ry=".379"
+       id="rect8" />
+    <path
+       fill="#b7d2e4"
+       fill-rule="evenodd"
+       stroke="#fff"
+       d="m 4.0354196,1037.8348 8.9380894,0"
+       id="path8" />
+    <g
+       fill="none"
+       stroke-linecap="round"
+       stroke-linejoin="bevel"
+       id="g13">
+      <path
+         stroke="url(#e)"
+         d="m 4.3932593,1036.8711 0.00271,2.0536"
+         transform="translate(.126)"
+         id="path9" />
+      <path
+         stroke="url(#f)"
+         d="M 6.294643,1036.8711 6.25,1038.9247"
+         transform="translate(.126)"
+         id="path10" />
+      <path
+         stroke="url(#g)"
+         d="m 8.3482144,1036.8711 -0.044643,2.0536"
+         transform="translate(.126)"
+         id="path11" />
+      <path
+         stroke="url(#h)"
+         stroke-width=".962"
+         d="m 10.375824,1036.6737 -0.03736,2.2699"
+         transform="translate(.126)"
+         id="path12" />
+      <path
+         stroke="url(#i)"
+         d="m 12.399554,1036.8711 -0.03348,2.0424"
+         transform="translate(.126)"
+         id="path13" />
     </g>
   </g>
 </svg>
diff --git a/org.eclipse.pde.doc.user/guide/images/simple_cs_editor/cheatsheet_subitem_obj.svg b/org.eclipse.pde.doc.user/guide/images/simple_cs_editor/cheatsheet_subitem_obj.svg
index f46f5aa3826..7e936032987 100644
--- a/org.eclipse.pde.doc.user/guide/images/simple_cs_editor/cheatsheet_subitem_obj.svg
+++ b/org.eclipse.pde.doc.user/guide/images/simple_cs_editor/cheatsheet_subitem_obj.svg
@@ -1,67 +1,305 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="16" height="16">
-  <defs>
-    <linearGradient id="g">
-      <stop offset="0" stop-color="#d1cde4"/>
-      <stop offset="1" stop-color="#6155a0"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="16"
+   height="16"
+   version="1.1"
+   id="svg26"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs18">
+    <linearGradient
+       id="g">
+      <stop
+         offset="0"
+         stop-color="#d1cde4"
+         id="stop1" />
+      <stop
+         offset="1"
+         stop-color="#6155a0"
+         id="stop2" />
     </linearGradient>
-    <linearGradient id="f">
-      <stop offset="0" stop-color="#d7d4e7"/>
-      <stop offset="1" stop-color="#6155a0"/>
+    <linearGradient
+       id="f">
+      <stop
+         offset="0"
+         stop-color="#d7d4e7"
+         id="stop3" />
+      <stop
+         offset="1"
+         stop-color="#6155a0"
+         id="stop4" />
     </linearGradient>
-    <linearGradient id="c">
-      <stop offset="0" stop-color="#17325d"/>
-      <stop offset=".6" stop-color="#b7d2e4"/>
-      <stop offset="1" stop-color="#3e72a7"/>
+    <linearGradient
+       id="c">
+      <stop
+         offset="0"
+         stop-color="#17325d"
+         id="stop5" />
+      <stop
+         offset=".6"
+         stop-color="#b7d2e4"
+         id="stop6" />
+      <stop
+         offset="1"
+         stop-color="#3e72a7"
+         id="stop7" />
     </linearGradient>
-    <linearGradient id="b">
-      <stop offset="0" stop-color="#17325d"/>
-      <stop offset=".5" stop-color="#b7d2e4"/>
-      <stop offset="1" stop-color="#3e72a7"/>
+    <linearGradient
+       id="b">
+      <stop
+         offset="0"
+         stop-color="#17325d"
+         id="stop8" />
+      <stop
+         offset=".5"
+         stop-color="#b7d2e4"
+         id="stop9" />
+      <stop
+         offset="1"
+         stop-color="#3e72a7"
+         id="stop10" />
     </linearGradient>
-    <linearGradient id="a">
-      <stop offset="0" stop-color="#7e713d"/>
-      <stop offset="1" stop-color="#b28a30"/>
+    <linearGradient
+       id="a">
+      <stop
+         offset="0"
+         stop-color="#7e713d"
+         id="stop11" />
+      <stop
+         offset="1"
+         stop-color="#b28a30"
+         id="stop12" />
     </linearGradient>
-    <linearGradient xlink:href="#a" id="i" x1="20.3" x2="20.3" y1="1052.201" y2="1036.755" gradientTransform="translate(-9.864)" gradientUnits="userSpaceOnUse"/>
-    <linearGradient xlink:href="#b" id="j" x1="3.975" x2="3.975" y1="1036.383" y2="1039.235" gradientTransform="translate(-.071)" gradientUnits="userSpaceOnUse"/>
-    <linearGradient xlink:href="#b" id="k" x1="3.975" x2="3.975" y1="1036.383" y2="1039.235" gradientTransform="translate(1.83)" gradientUnits="userSpaceOnUse"/>
-    <linearGradient xlink:href="#b" id="l" x1="3.975" x2="3.975" y1="1036.383" y2="1039.235" gradientTransform="translate(3.884)" gradientUnits="userSpaceOnUse"/>
-    <linearGradient xlink:href="#b" id="m" x1="3.975" x2="3.975" y1="1036.383" y2="1039.235" gradientTransform="matrix(.83689 0 0 1.10534 6.64 -109.421)" gradientUnits="userSpaceOnUse"/>
-    <linearGradient xlink:href="#c" id="n" x1="3.975" x2="3.975" y1="1036.963" y2="1038.52" gradientTransform="translate(7.935)" gradientUnits="userSpaceOnUse"/>
-    <linearGradient id="d">
-      <stop offset="0" stop-color="#f9cd5f"/>
-      <stop offset="1" stop-color="#ffebb7"/>
+    <linearGradient
+       xlink:href="#a"
+       id="i"
+       x1="20.3"
+       x2="20.3"
+       y1="1052.201"
+       y2="1036.755"
+       gradientTransform="translate(-9.864)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#b"
+       id="j"
+       x1="3.975"
+       x2="3.975"
+       y1="1036.383"
+       y2="1039.235"
+       gradientTransform="translate(-.071)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#b"
+       id="k"
+       x1="3.975"
+       x2="3.975"
+       y1="1036.383"
+       y2="1039.235"
+       gradientTransform="translate(1.83)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#b"
+       id="l"
+       x1="3.975"
+       x2="3.975"
+       y1="1036.383"
+       y2="1039.235"
+       gradientTransform="translate(3.884)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#b"
+       id="m"
+       x1="3.975"
+       x2="3.975"
+       y1="1036.383"
+       y2="1039.235"
+       gradientTransform="matrix(.83689 0 0 1.10534 6.64 -109.421)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#c"
+       id="n"
+       x1="3.975"
+       x2="3.975"
+       y1="1036.963"
+       y2="1038.52"
+       gradientTransform="translate(7.935)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="d">
+      <stop
+         offset="0"
+         stop-color="#f9cd5f"
+         id="stop13" />
+      <stop
+         offset="1"
+         stop-color="#ffebb7"
+         id="stop14" />
     </linearGradient>
-    <linearGradient id="e">
-      <stop offset="0" stop-color="#ad7212"/>
-      <stop offset="1" stop-color="#875f1e"/>
+    <linearGradient
+       id="e">
+      <stop
+         offset="0"
+         stop-color="#ad7212"
+         id="stop15" />
+      <stop
+         offset="1"
+         stop-color="#875f1e"
+         id="stop16" />
     </linearGradient>
-    <linearGradient xlink:href="#d" id="r" x1="22.931" x2="22.931" y1="1039.698" y2="1041.736" gradientTransform="translate(-.066)" gradientUnits="userSpaceOnUse"/>
-    <linearGradient xlink:href="#e" id="s" x1="22.931" x2="22.931" y1="1039.698" y2="1041.736" gradientTransform="translate(-.066)" gradientUnits="userSpaceOnUse"/>
-    <linearGradient xlink:href="#f" id="o" x1="6.921" x2="11.964" y1="1046.885" y2="1046.885" gradientTransform="matrix(1.01453 0 0 1.17023 1.995 -182.231)" gradientUnits="userSpaceOnUse"/>
-    <linearGradient id="h">
-      <stop offset="0" stop-color="#c8c3df"/>
-      <stop offset="1" stop-color="#6155a0"/>
+    <linearGradient
+       xlink:href="#d"
+       id="r"
+       x1="22.931"
+       x2="22.931"
+       y1="1039.698"
+       y2="1041.736"
+       gradientTransform="translate(-.066)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#e"
+       id="s"
+       x1="22.931"
+       x2="22.931"
+       y1="1039.698"
+       y2="1041.736"
+       gradientTransform="translate(-.066)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#f"
+       id="o"
+       x1="6.921"
+       x2="11.964"
+       y1="1046.885"
+       y2="1046.885"
+       gradientTransform="matrix(1.01453 0 0 1.17023 1.995 -182.231)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="h">
+      <stop
+         offset="0"
+         stop-color="#c8c3df"
+         id="stop17" />
+      <stop
+         offset="1"
+         stop-color="#6155a0"
+         id="stop18" />
     </linearGradient>
-    <linearGradient xlink:href="#g" id="q" x1="7.229" x2="11.964" y1="1046.885" y2="1046.885" gradientTransform="matrix(1.01453 0 0 1.17023 1.995 -180.267)" gradientUnits="userSpaceOnUse"/>
-    <linearGradient xlink:href="#h" id="p" x1="7.129" x2="11.964" y1="1046.885" y2="1046.885" gradientTransform="matrix(.7304 0 0 1.17023 3.43 -178.325)" gradientUnits="userSpaceOnUse"/>
+    <linearGradient
+       xlink:href="#g"
+       id="q"
+       x1="7.229"
+       x2="11.964"
+       y1="1046.885"
+       y2="1046.885"
+       gradientTransform="matrix(1.01453 0 0 1.17023 1.995 -180.267)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#h"
+       id="p"
+       x1="7.129"
+       x2="11.964"
+       y1="1046.885"
+       y2="1046.885"
+       gradientTransform="matrix(.7304 0 0 1.17023 3.43 -178.325)"
+       gradientUnits="userSpaceOnUse" />
   </defs>
-  <g transform="translate(0 -1036.362)">
-    <rect width="9.975" height="13.006" x="5.541" y="1037.841" fill="#fff" stroke="url(#i)" stroke-linejoin="round" rx=".379" ry=".379"/>
-    <path fill="#b7d2e4" fill-rule="evenodd" stroke="#fff" d="m 6.0410627,1037.8348 8.9380893,0"/>
-    <g fill="none" stroke-linecap="round" stroke-linejoin="bevel">
-      <path stroke="url(#j)" d="m 4.3932593,1036.8711 0.00271,2.0536" transform="translate(2.132)"/>
-      <path stroke="url(#k)" d="M 6.294643,1036.8711 6.25,1038.9247" transform="translate(2.132)"/>
-      <path stroke="url(#l)" d="m 8.3482144,1036.8711 -0.044643,2.0536" transform="translate(2.132)"/>
-      <path stroke="url(#m)" stroke-width=".962" d="m 10.375824,1036.6737 -0.03736,2.2699" transform="translate(2.132)"/>
-      <path stroke="url(#n)" d="m 12.399554,1036.8711 -0.03348,2.0424" transform="translate(2.132)"/>
+  <g
+     transform="translate(0 -1036.362)"
+     id="g26">
+    <rect
+       width="9.975"
+       height="13.006"
+       x="5.541"
+       y="1037.841"
+       fill="#fff"
+       stroke="url(#i)"
+       stroke-linejoin="round"
+       rx=".379"
+       ry=".379"
+       id="rect18" />
+    <path
+       fill="#b7d2e4"
+       fill-rule="evenodd"
+       stroke="#fff"
+       d="m 6.0410627,1037.8348 8.9380893,0"
+       id="path18" />
+    <g
+       fill="none"
+       stroke-linecap="round"
+       stroke-linejoin="bevel"
+       id="g23">
+      <path
+         stroke="url(#j)"
+         d="m 4.3932593,1036.8711 0.00271,2.0536"
+         transform="translate(2.132)"
+         id="path19" />
+      <path
+         stroke="url(#k)"
+         d="M 6.294643,1036.8711 6.25,1038.9247"
+         transform="translate(2.132)"
+         id="path20" />
+      <path
+         stroke="url(#l)"
+         d="m 8.3482144,1036.8711 -0.044643,2.0536"
+         transform="translate(2.132)"
+         id="path21" />
+      <path
+         stroke="url(#m)"
+         stroke-width=".962"
+         d="m 10.375824,1036.6737 -0.03736,2.2699"
+         transform="translate(2.132)"
+         id="path22" />
+      <path
+         stroke="url(#n)"
+         d="m 12.399554,1036.8711 -0.03348,2.0424"
+         transform="translate(2.132)"
+         id="path23" />
     </g>
-    <g transform="translate(-.156 .022)">
-      <rect width="4.067" height=".997" x="10.065" y="1042.366" fill="url(#o)" rx=".384" ry=".443"/>
-      <rect width="3.085" height=".997" x="9.083" y="1046.273" fill="url(#p)" rx=".277" ry=".443"/>
-      <rect width="3.956" height=".997" x="10.177" y="1044.33" fill="url(#q)" rx=".384" ry=".443"/>
+    <g
+       transform="translate(-.156 .022)"
+       id="g25">
+      <rect
+         width="4.067"
+         height=".997"
+         x="10.065"
+         y="1042.366"
+         fill="url(#o)"
+         rx=".384"
+         ry=".443"
+         id="rect23" />
+      <rect
+         width="3.085"
+         height=".997"
+         x="9.083"
+         y="1046.273"
+         fill="url(#p)"
+         rx=".277"
+         ry=".443"
+         id="rect24" />
+      <rect
+         width="3.956"
+         height=".997"
+         x="10.177"
+         y="1044.33"
+         fill="url(#q)"
+         rx=".384"
+         ry=".443"
+         id="rect25" />
     </g>
-    <path fill="url(#r)" stroke="url(#s)" stroke-linejoin="round" d="m 23.31999,1039.3249 0,-1.591 c 0,0 -0.154679,-0.8397 -1.171145,-0.044 -1.016466,0.7955 -2.209709,2.0772 -2.386486,2.4307 -0.176776,0.3536 -0.928077,0.9723 0.08839,1.9446 1.016466,0.9722 2.121321,1.9887 2.121321,1.9887 0,0 0.404271,0.3812 0.799458,0.5707 0.37782,0.1811 0.548464,0.1871 0.548464,-0.4827 l 0,-1.812 c 1.366404,-0.063 1.926219,0.3446 2.238719,0.6884 0.3125,0.3437 0.8125,1.9687 1.21875,2.0937 0.40625,0.125 0.625,-2.1875 0.625,-2.625 0,-0.4375 -0.09375,-1.3125 -0.71875,-1.9687 -0.625,-0.6563 -1.006571,-0.9555 -1.53125,-1.0998 -0.535453,-0.1295 -1.287796,-0.095 -1.832471,-0.094 z" transform="rotate(180 14.425 1042.664)"/>
-    <path fill="#fff" d="m 22.84983,1043.0173 0,0.627 c 0,0 0.101474,0.3948 -0.202948,0.2554 -0.304423,-0.1393 -0.892974,-0.6966 -0.953858,-0.8127 -0.06088,-0.1161 -0.977287,-0.8258 -0.835223,-1.0581 0.142064,-0.2322 1.958178,-0.047 1.958178,-0.047 z" opacity=".857" transform="rotate(180 14.425 1042.664)"/>
+    <path
+       fill="url(#r)"
+       stroke="url(#s)"
+       stroke-linejoin="round"
+       d="m 23.31999,1039.3249 0,-1.591 c 0,0 -0.154679,-0.8397 -1.171145,-0.044 -1.016466,0.7955 -2.209709,2.0772 -2.386486,2.4307 -0.176776,0.3536 -0.928077,0.9723 0.08839,1.9446 1.016466,0.9722 2.121321,1.9887 2.121321,1.9887 0,0 0.404271,0.3812 0.799458,0.5707 0.37782,0.1811 0.548464,0.1871 0.548464,-0.4827 l 0,-1.812 c 1.366404,-0.063 1.926219,0.3446 2.238719,0.6884 0.3125,0.3437 0.8125,1.9687 1.21875,2.0937 0.40625,0.125 0.625,-2.1875 0.625,-2.625 0,-0.4375 -0.09375,-1.3125 -0.71875,-1.9687 -0.625,-0.6563 -1.006571,-0.9555 -1.53125,-1.0998 -0.535453,-0.1295 -1.287796,-0.095 -1.832471,-0.094 z"
+       transform="rotate(180 14.425 1042.664)"
+       id="path25" />
+    <path
+       fill="#fff"
+       d="m 22.84983,1043.0173 0,0.627 c 0,0 0.101474,0.3948 -0.202948,0.2554 -0.304423,-0.1393 -0.892974,-0.6966 -0.953858,-0.8127 -0.06088,-0.1161 -0.977287,-0.8258 -0.835223,-1.0581 0.142064,-0.2322 1.958178,-0.047 1.958178,-0.047 z"
+       opacity=".857"
+       transform="rotate(180 14.425 1042.664)"
+       id="path26" />
   </g>
 </svg>
diff --git a/org.eclipse.pde.doc.user/guide/images/toc_editor/toc_anchor_obj.svg b/org.eclipse.pde.doc.user/guide/images/toc_editor/toc_anchor_obj.svg
index cdad8298f11..5fb36088ecc 100644
--- a/org.eclipse.pde.doc.user/guide/images/toc_editor/toc_anchor_obj.svg
+++ b/org.eclipse.pde.doc.user/guide/images/toc_editor/toc_anchor_obj.svg
@@ -1,14 +1,52 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="16" height="16">
-  <defs>
-    <radialGradient xlink:href="#a" id="b" cx="19.032" cy="8.273" r="4.097" fx="19.032" fy="8.273" gradientTransform="matrix(1.10248 -.00578 .00898 1.71446 -13.025 1030.674)" gradientUnits="userSpaceOnUse"/>
-    <linearGradient id="a">
-      <stop offset="0" stop-color="#496e95"/>
-      <stop offset=".677" stop-color="#497098"/>
-      <stop offset="1" stop-color="#3a5877"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="16"
+   height="16"
+   version="1.1"
+   id="svg4"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs3">
+    <radialGradient
+       xlink:href="#a"
+       id="b"
+       cx="19.032"
+       cy="8.273"
+       r="4.097"
+       fx="19.032"
+       fy="8.273"
+       gradientTransform="matrix(1.10248 -.00578 .00898 1.71446 -13.025 1030.674)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="a">
+      <stop
+         offset="0"
+         stop-color="#496e95"
+         id="stop1" />
+      <stop
+         offset=".677"
+         stop-color="#497098"
+         id="stop2" />
+      <stop
+         offset="1"
+         stop-color="#3a5877"
+         id="stop3" />
     </linearGradient>
   </defs>
-  <g fill-rule="evenodd">
-    <path fill="url(#b)" d="m 7.0410165,1038.3661 0,2.0117 -3.027344,0 0,0.9844 3.027344,0 0,6.3476 c 0,0 -1.2091643,-0.7226 -1.5892893,-1.1288 -0.380125,-0.4063 -0.632812,-1.9375 -0.632812,-1.9375 l -0.828125,-0.3125 c 0,0 0.033267,2.4687 0.318359,3.25 0.285094,0.7812 2.9525703,2.8437 2.9525703,2.8437 l 0.740234,0.5235 0.800781,-0.5235 c 0,0 2.6031365,-2.0625 2.8882315,-2.8437 0.285094,-0.7813 0.316406,-3.25 0.316406,-3.25 l -0.794922,0.3125 c 0,0 -0.252686,1.5976 -0.632812,2.0039 -0.380127,0.4062 -1.5542465,1.0624 -1.5542465,1.0624 l 0,-6.3476 2.9882805,0 0,-0.9844 -2.9882805,0 0,-2.0117 -0.75586,0 -0.472656,0 z" transform="translate(0 -1036.362)"/>
-    <path fill="#01467a" d="m 7.0410165,1049.3664 c 0,0 -1.2091643,-1.0976 -1.5892893,-1.5038 -0.380125,-0.4063 -0.976562,-1.8437 -0.976562,-1.8437 l -0.484375,-1.6879 c 0,0 0.033267,2.4687 0.318359,3.25 0.285094,0.7812 2.9525703,2.8437 2.9525703,2.8437 l 0.740234,0.5235 0.800781,-0.5235 c 0,0 2.6031365,-2.0625 2.8882315,-2.8437 0.285094,-0.7813 0.316406,-3.25 0.316406,-3.25 l -0.513672,1.7035 c 0,0 -0.533936,1.4882 -0.914062,1.8945 -0.380127,0.4062 -1.5542465,1.4374 -1.5542465,1.4374 z" transform="translate(0 -1036.362)"/>
+  <g
+     fill-rule="evenodd"
+     id="g4">
+    <path
+       fill="url(#b)"
+       d="m 7.0410165,1038.3661 0,2.0117 -3.027344,0 0,0.9844 3.027344,0 0,6.3476 c 0,0 -1.2091643,-0.7226 -1.5892893,-1.1288 -0.380125,-0.4063 -0.632812,-1.9375 -0.632812,-1.9375 l -0.828125,-0.3125 c 0,0 0.033267,2.4687 0.318359,3.25 0.285094,0.7812 2.9525703,2.8437 2.9525703,2.8437 l 0.740234,0.5235 0.800781,-0.5235 c 0,0 2.6031365,-2.0625 2.8882315,-2.8437 0.285094,-0.7813 0.316406,-3.25 0.316406,-3.25 l -0.794922,0.3125 c 0,0 -0.252686,1.5976 -0.632812,2.0039 -0.380127,0.4062 -1.5542465,1.0624 -1.5542465,1.0624 l 0,-6.3476 2.9882805,0 0,-0.9844 -2.9882805,0 0,-2.0117 -0.75586,0 -0.472656,0 z"
+       transform="translate(0 -1036.362)"
+       id="path3" />
+    <path
+       fill="#01467a"
+       d="m 7.0410165,1049.3664 c 0,0 -1.2091643,-1.0976 -1.5892893,-1.5038 -0.380125,-0.4063 -0.976562,-1.8437 -0.976562,-1.8437 l -0.484375,-1.6879 c 0,0 0.033267,2.4687 0.318359,3.25 0.285094,0.7812 2.9525703,2.8437 2.9525703,2.8437 l 0.740234,0.5235 0.800781,-0.5235 c 0,0 2.6031365,-2.0625 2.8882315,-2.8437 0.285094,-0.7813 0.316406,-3.25 0.316406,-3.25 l -0.513672,1.7035 c 0,0 -0.533936,1.4882 -0.914062,1.8945 -0.380127,0.4062 -1.5542465,1.4374 -1.5542465,1.4374 z"
+       transform="translate(0 -1036.362)"
+       id="path4" />
   </g>
 </svg>
diff --git a/org.eclipse.pde.doc.user/guide/images/toc_editor/toc_link_obj.svg b/org.eclipse.pde.doc.user/guide/images/toc_editor/toc_link_obj.svg
index 7e0bb978a6a..259871c249e 100644
--- a/org.eclipse.pde.doc.user/guide/images/toc_editor/toc_link_obj.svg
+++ b/org.eclipse.pde.doc.user/guide/images/toc_editor/toc_link_obj.svg
@@ -1,24 +1,105 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="16" height="16">
-  <defs>
-    <linearGradient id="c">
-      <stop offset="0" stop-color="#b9cad4"/>
-      <stop offset="1" stop-color="#fff" stop-opacity="0"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="16"
+   height="16"
+   version="1.1"
+   id="svg10"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs6">
+    <linearGradient
+       id="c">
+      <stop
+         offset="0"
+         stop-color="#b9cad4"
+         id="stop1" />
+      <stop
+         offset="1"
+         stop-color="#fff"
+         stop-opacity="0"
+         id="stop2" />
     </linearGradient>
-    <linearGradient id="b">
-      <stop offset="0" stop-color="#998f6a"/>
-      <stop offset="1" stop-color="#7d827c"/>
+    <linearGradient
+       id="b">
+      <stop
+         offset="0"
+         stop-color="#998f6a"
+         id="stop3" />
+      <stop
+         offset="1"
+         stop-color="#7d827c"
+         id="stop4" />
     </linearGradient>
-    <linearGradient id="a">
-      <stop offset="0" stop-color="#267fe3"/>
-      <stop offset="1" stop-color="#80b4ef"/>
+    <linearGradient
+       id="a">
+      <stop
+         offset="0"
+         stop-color="#267fe3"
+         id="stop5" />
+      <stop
+         offset="1"
+         stop-color="#80b4ef"
+         id="stop6" />
     </linearGradient>
-    <linearGradient xlink:href="#a" id="e" x1="16.798" x2="17.847" y1="1047.219" y2="1045.608" gradientUnits="userSpaceOnUse"/>
-    <linearGradient xlink:href="#b" id="d" x1="18.834" x2="25.201" y1="1038.91" y2="1045.91" gradientUnits="userSpaceOnUse"/>
-    <linearGradient xlink:href="#c" id="f" x1="25.594" x2="26.562" y1="1046.628" y2="1048.503" gradientUnits="userSpaceOnUse"/>
+    <linearGradient
+       xlink:href="#a"
+       id="e"
+       x1="16.798"
+       x2="17.847"
+       y1="1047.219"
+       y2="1045.608"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#b"
+       id="d"
+       x1="18.834"
+       x2="25.201"
+       y1="1038.91"
+       y2="1045.91"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#c"
+       id="f"
+       x1="25.594"
+       x2="26.562"
+       y1="1046.628"
+       y2="1048.503"
+       gradientUnits="userSpaceOnUse" />
   </defs>
-  <path fill="#80b4ef" fill-rule="evenodd" stroke="url(#d)" d="m 22.718749,1037.8623 6.169845,6.5927 -6.84375,3.965 -6.232345,-6.6827 z" transform="translate(-14.156 -1036.331)"/>
-  <path fill="url(#e)" fill-rule="evenodd" stroke="#8f8b70" d="m 15.829234,1041.7098 c 0,0 -0.511908,0.2976 -0.734834,0.5205 -0.440434,0.4405 -0.281901,2.757 -0.281901,2.757 l 5.875,5.875 0.972075,0.2604 0,-3.2292 z" transform="translate(-14.156 -1036.331)"/>
-  <path fill="none" stroke="#727b84" d="m 21.874999,1051.0498 c 0.25,-0.094 7.729397,-4.4626 7.729397,-4.4626 m -0.220971,-2.3156 -0.607442,0.334 -5.325044,3.0112 -1.66969,0.8033" transform="translate(-14.156 -1036.331)"/>
-  <path fill="#fff" fill-rule="evenodd" stroke="#8f8b70" stroke-width="1.112" d="m 23.984508,1042.9939 0,-1.147 -1.077488,-1.0427 -1.216519,0 -0.973215,1.1817 -1.112246,0.034 -0.263635,0.9839 1.375881,1.0669 1.112246,0 1.216519,-1.1472 z" transform="translate(-14.156 -1036.331)"/>
-  <path fill="url(#f)" fill-rule="evenodd" d="m 22.156249,1048.1123 7.0625,-3.7188 0,2.375 -7.28125,4.0938 z" transform="translate(-14.156 -1036.331)"/>
+  <path
+     fill="#80b4ef"
+     fill-rule="evenodd"
+     stroke="url(#d)"
+     d="m 22.718749,1037.8623 6.169845,6.5927 -6.84375,3.965 -6.232345,-6.6827 z"
+     transform="translate(-14.156 -1036.331)"
+     id="path6" />
+  <path
+     fill="url(#e)"
+     fill-rule="evenodd"
+     stroke="#8f8b70"
+     d="m 15.829234,1041.7098 c 0,0 -0.511908,0.2976 -0.734834,0.5205 -0.440434,0.4405 -0.281901,2.757 -0.281901,2.757 l 5.875,5.875 0.972075,0.2604 0,-3.2292 z"
+     transform="translate(-14.156 -1036.331)"
+     id="path7" />
+  <path
+     fill="none"
+     stroke="#727b84"
+     d="m 21.874999,1051.0498 c 0.25,-0.094 7.729397,-4.4626 7.729397,-4.4626 m -0.220971,-2.3156 -0.607442,0.334 -5.325044,3.0112 -1.66969,0.8033"
+     transform="translate(-14.156 -1036.331)"
+     id="path8" />
+  <path
+     fill="#fff"
+     fill-rule="evenodd"
+     stroke="#8f8b70"
+     stroke-width="1.112"
+     d="m 23.984508,1042.9939 0,-1.147 -1.077488,-1.0427 -1.216519,0 -0.973215,1.1817 -1.112246,0.034 -0.263635,0.9839 1.375881,1.0669 1.112246,0 1.216519,-1.1472 z"
+     transform="translate(-14.156 -1036.331)"
+     id="path9" />
+  <path
+     fill="url(#f)"
+     fill-rule="evenodd"
+     d="m 22.156249,1048.1123 7.0625,-3.7188 0,2.375 -7.28125,4.0938 z"
+     transform="translate(-14.156 -1036.331)"
+     id="path10" />
 </svg>
diff --git a/org.eclipse.pde.doc.user/guide/images/toc_editor/toc_obj.svg b/org.eclipse.pde.doc.user/guide/images/toc_editor/toc_obj.svg
index dfcbedaef9a..b3daa1ede82 100644
--- a/org.eclipse.pde.doc.user/guide/images/toc_editor/toc_obj.svg
+++ b/org.eclipse.pde.doc.user/guide/images/toc_editor/toc_obj.svg
@@ -1,22 +1,91 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="16" height="16">
-  <defs>
-    <linearGradient xlink:href="#a" id="d" x1="24.121" x2="24.121" y1="1050.003" y2="1040.597" gradientUnits="userSpaceOnUse"/>
-    <linearGradient id="a">
-      <stop offset="0" stop-color="#dfe9f8"/>
-      <stop offset="1" stop-color="#fff"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="16"
+   height="16"
+   version="1.1"
+   id="svg8"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs6">
+    <linearGradient
+       xlink:href="#a"
+       id="d"
+       x1="24.121"
+       x2="24.121"
+       y1="1050.003"
+       y2="1040.597"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="a">
+      <stop
+         offset="0"
+         stop-color="#dfe9f8"
+         id="stop1" />
+      <stop
+         offset="1"
+         stop-color="#fff"
+         id="stop2" />
     </linearGradient>
-    <linearGradient xlink:href="#b" id="e" x1="22.994" x2="22.994" y1="1063.875" y2="1052.517" gradientTransform="translate(0 -12.562)" gradientUnits="userSpaceOnUse"/>
-    <linearGradient id="b">
-      <stop offset="0" stop-color="#525f71"/>
-      <stop offset="1" stop-color="#928d6e"/>
+    <linearGradient
+       xlink:href="#b"
+       id="e"
+       x1="22.994"
+       x2="22.994"
+       y1="1063.875"
+       y2="1052.517"
+       gradientTransform="translate(0 -12.562)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="b">
+      <stop
+         offset="0"
+         stop-color="#525f71"
+         id="stop3" />
+      <stop
+         offset="1"
+         stop-color="#928d6e"
+         id="stop4" />
     </linearGradient>
-    <linearGradient xlink:href="#c" id="f" x1="21.094" x2="21.094" y1="1039.222" y2="1048.347" gradientUnits="userSpaceOnUse"/>
-    <linearGradient id="c">
-      <stop offset="0" stop-color="#958e6c"/>
-      <stop offset="1" stop-color="#536071"/>
+    <linearGradient
+       xlink:href="#c"
+       id="f"
+       x1="21.094"
+       x2="21.094"
+       y1="1039.222"
+       y2="1048.347"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="c">
+      <stop
+         offset="0"
+         stop-color="#958e6c"
+         id="stop5" />
+      <stop
+         offset="1"
+         stop-color="#536071"
+         id="stop6" />
     </linearGradient>
   </defs>
-  <path fill="url(#d)" stroke="url(#e)" d="M18.627 1039.819H27.632V1050.829H18.627z" transform="translate(-14.125 -1036.331)"/>
-  <path fill="#7aace7" fill-rule="evenodd" stroke="url(#f)" d="m 17.656249,1039.1123 8.031249,-2.125 0,11.0312 -8.062499,2.125 z" transform="translate(-14.125 -1036.331)"/>
-  <path fill="#fff" fill-rule="evenodd" stroke="#958e6c" d="m 19.643305,1041.6966 4.016734,-0.7459 -0.0221,2.3242 -4.014839,0.7291 z" transform="translate(-14.125 -1036.331)"/>
+  <path
+     fill="url(#d)"
+     stroke="url(#e)"
+     d="M18.627 1039.819H27.632V1050.829H18.627z"
+     transform="translate(-14.125 -1036.331)"
+     id="path6" />
+  <path
+     fill="#7aace7"
+     fill-rule="evenodd"
+     stroke="url(#f)"
+     d="m 17.656249,1039.1123 8.031249,-2.125 0,11.0312 -8.062499,2.125 z"
+     transform="translate(-14.125 -1036.331)"
+     id="path7" />
+  <path
+     fill="#fff"
+     fill-rule="evenodd"
+     stroke="#958e6c"
+     d="m 19.643305,1041.6966 4.016734,-0.7459 -0.0221,2.3242 -4.014839,0.7291 z"
+     transform="translate(-14.125 -1036.331)"
+     id="path8" />
 </svg>
diff --git a/org.eclipse.pde.doc.user/guide/images/toc_editor/toc_topic_obj.svg b/org.eclipse.pde.doc.user/guide/images/toc_editor/toc_topic_obj.svg
index df979ffe009..bf8f1e53f05 100644
--- a/org.eclipse.pde.doc.user/guide/images/toc_editor/toc_topic_obj.svg
+++ b/org.eclipse.pde.doc.user/guide/images/toc_editor/toc_topic_obj.svg
@@ -1,42 +1,170 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="16" height="16">
-  <defs>
-    <linearGradient id="e">
-      <stop offset="0" stop-color="#d1d6dd"/>
-      <stop offset="1" stop-color="#bfc9d6"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="16"
+   height="16"
+   version="1.1"
+   id="svg17"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs10">
+    <linearGradient
+       id="e">
+      <stop
+         offset="0"
+         stop-color="#d1d6dd"
+         id="stop1" />
+      <stop
+         offset="1"
+         stop-color="#bfc9d6"
+         id="stop2" />
     </linearGradient>
-    <linearGradient id="c">
-      <stop offset="0" stop-color="#bfc9d6"/>
-      <stop offset="1" stop-color="#cbd2db"/>
+    <linearGradient
+       id="c">
+      <stop
+         offset="0"
+         stop-color="#bfc9d6"
+         id="stop3" />
+      <stop
+         offset="1"
+         stop-color="#cbd2db"
+         id="stop4" />
     </linearGradient>
-    <linearGradient id="b">
-      <stop offset="0" stop-color="#eef6ff"/>
-      <stop offset="1" stop-color="#fdfeff"/>
+    <linearGradient
+       id="b">
+      <stop
+         offset="0"
+         stop-color="#eef6ff"
+         id="stop5" />
+      <stop
+         offset="1"
+         stop-color="#fdfeff"
+         id="stop6" />
     </linearGradient>
-    <linearGradient id="a">
-      <stop offset="0" stop-color="#717883"/>
-      <stop offset="1" stop-color="#81733e"/>
+    <linearGradient
+       id="a">
+      <stop
+         offset="0"
+         stop-color="#717883"
+         id="stop7" />
+      <stop
+         offset="1"
+         stop-color="#81733e"
+         id="stop8" />
     </linearGradient>
-    <linearGradient id="d">
-      <stop offset="0" stop-color="#d6e0e6"/>
-      <stop offset="1" stop-color="#d6e0e6" stop-opacity="0"/>
-    </linearGradient>
-    <linearGradient xlink:href="#a" id="g" x1="21.948" x2="21.948" y1="1035.72" y2="1028.428" gradientTransform="translate(-14.203 22.03)" gradientUnits="userSpaceOnUse"/>
-    <linearGradient xlink:href="#b" id="f" x1="20.932" x2="20.932" y1="1036.206" y2="1030.549" gradientTransform="translate(-14.203 22.03)" gradientUnits="userSpaceOnUse"/>
-    <linearGradient xlink:href="#c" id="i" x1="23.191" x2="26.213" y1="1022.839" y2="1022.839" gradientUnits="userSpaceOnUse"/>
-    <linearGradient xlink:href="#c" id="j" x1="23.191" x2="26.213" y1="1022.839" y2="1022.839" gradientTransform="translate(0 -2)" gradientUnits="userSpaceOnUse"/>
-    <linearGradient xlink:href="#c" id="k" x1="23.191" x2="26.213" y1="1022.839" y2="1022.839" gradientTransform="translate(0 -3.984)" gradientUnits="userSpaceOnUse"/>
-    <linearGradient xlink:href="#d" id="h" x1="15.156" x2="28.135" y1="1043.8" y2="1043.8" gradientUnits="userSpaceOnUse"/>
-    <linearGradient xlink:href="#e" id="l" x1="17.206" x2="21.227" y1="1020.343" y2="1020.343" gradientTransform="translate(-14.203 34.03)" gradientUnits="userSpaceOnUse"/>
-    <linearGradient xlink:href="#e" id="m" x1="17.206" x2="21.227" y1="1020.343" y2="1020.343" gradientTransform="translate(-14.203 36.037)" gradientUnits="userSpaceOnUse"/>
+    <linearGradient
+       xlink:href="#a"
+       id="g"
+       x1="21.948"
+       x2="21.948"
+       y1="1035.72"
+       y2="1028.428"
+       gradientTransform="translate(-14.203 22.03)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#b"
+       id="f"
+       x1="20.932"
+       x2="20.932"
+       y1="1036.206"
+       y2="1030.549"
+       gradientTransform="translate(-14.203 22.03)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#c"
+       id="i"
+       x1="23.191"
+       x2="26.213"
+       y1="1022.839"
+       y2="1022.839"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#c"
+       id="j"
+       x1="23.191"
+       x2="26.213"
+       y1="1022.839"
+       y2="1022.839"
+       gradientTransform="translate(0 -2)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#c"
+       id="k"
+       x1="23.191"
+       x2="26.213"
+       y1="1022.839"
+       y2="1022.839"
+       gradientTransform="translate(0 -3.984)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#e"
+       id="l"
+       x1="17.206"
+       x2="21.227"
+       y1="1020.343"
+       y2="1020.343"
+       gradientTransform="translate(-14.203 34.03)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#e"
+       id="m"
+       x1="17.206"
+       x2="21.227"
+       y1="1020.343"
+       y2="1020.343"
+       gradientTransform="translate(-14.203 36.037)"
+       gradientUnits="userSpaceOnUse" />
   </defs>
-  <path fill="#3d4b65" stroke="#3d4b65" d="M8.264 1051.324H14.513V1059.917H8.264z" transform="translate(0 -1048.355)"/>
-  <path fill="#3d4b65" fill-rule="evenodd" stroke="#3d4b65" d="m 7.535109,1056.0246 -2.209709,0 c -0.369764,0 -0.359452,-1.0385 -0.795495,-1.0385 l -3.071495,0 0,4.9497 2.452777,0 c 0.637939,0 0.201444,1.0469 0.60439,1.0469 l 3.019532,0 z m -0.0221,0.044 c 0,-0.4897 1.06066,-1.0164 1.06066,-1.0164 l -0.132583,4.9939 -0.883883,0.8839 c 0,0 -0.04419,-2.1102 -0.04419,-4.8614 z" transform="translate(0 -1048.355)"/>
-  <path fill="url(#f)" fill-rule="evenodd" stroke="url(#g)" d="m 7.57662,1051.91 -2.209709,0 c -0.369764,0 -0.359452,-1.0385 -0.795495,-1.0385 l -3.071495,0 0,8.0433 2.452777,0 c 0.637939,0 0.201444,1.0469 0.60439,1.0469 l 3.019532,0 z m -0.0221,0.044 c 0,-0.4897 0.570981,-1.0164 1.06066,-1.0164 l 4.905553,0 0,8.0875 c 0,0 -3.574259,0 -5.038136,0 -0.350397,0 -0.883883,0.8839 -0.883883,0.8839 0,0 -0.04419,-5.2038 -0.04419,-7.955 z" transform="translate(0 -1048.355)"/>
-  <g stroke="none">
-    <path fill="url(#i)" d="M23.191 1022.333H26.213V1023.344H23.191z" transform="translate(-14.172 -1014.325)"/>
-    <path fill="url(#j)" d="M23.191 1020.333H26.213V1021.344H23.191z" transform="translate(-14.172 -1014.325)"/>
-    <path fill="url(#k)" d="M23.191 1018.349H26.213V1019.36H23.191z" transform="translate(-14.172 -1014.325)"/>
+  <path
+     fill="#3d4b65"
+     stroke="#3d4b65"
+     d="M8.264 1051.324H14.513V1059.917H8.264z"
+     transform="translate(0 -1048.355)"
+     id="path10" />
+  <path
+     fill="#3d4b65"
+     fill-rule="evenodd"
+     stroke="#3d4b65"
+     d="m 7.535109,1056.0246 -2.209709,0 c -0.369764,0 -0.359452,-1.0385 -0.795495,-1.0385 l -3.071495,0 0,4.9497 2.452777,0 c 0.637939,0 0.201444,1.0469 0.60439,1.0469 l 3.019532,0 z m -0.0221,0.044 c 0,-0.4897 1.06066,-1.0164 1.06066,-1.0164 l -0.132583,4.9939 -0.883883,0.8839 c 0,0 -0.04419,-2.1102 -0.04419,-4.8614 z"
+     transform="translate(0 -1048.355)"
+     id="path11" />
+  <path
+     fill="url(#f)"
+     fill-rule="evenodd"
+     stroke="url(#g)"
+     d="m 7.57662,1051.91 -2.209709,0 c -0.369764,0 -0.359452,-1.0385 -0.795495,-1.0385 l -3.071495,0 0,8.0433 2.452777,0 c 0.637939,0 0.201444,1.0469 0.60439,1.0469 l 3.019532,0 z m -0.0221,0.044 c 0,-0.4897 0.570981,-1.0164 1.06066,-1.0164 l 4.905553,0 0,8.0875 c 0,0 -3.574259,0 -5.038136,0 -0.350397,0 -0.883883,0.8839 -0.883883,0.8839 0,0 -0.04419,-5.2038 -0.04419,-7.955 z"
+     transform="translate(0 -1048.355)"
+     id="path12" />
+  <g
+     stroke="none"
+     id="g15">
+    <path
+       fill="url(#i)"
+       d="M23.191 1022.333H26.213V1023.344H23.191z"
+       transform="translate(-14.172 -1014.325)"
+       id="path13" />
+    <path
+       fill="url(#j)"
+       d="M23.191 1020.333H26.213V1021.344H23.191z"
+       transform="translate(-14.172 -1014.325)"
+       id="path14" />
+    <path
+       fill="url(#k)"
+       d="M23.191 1018.349H26.213V1019.36H23.191z"
+       transform="translate(-14.172 -1014.325)"
+       id="path15" />
   </g>
-  <path fill="none" stroke="url(#l)" d="m 7.024208,1054.8923 -1.325826,0 c -0.369764,0 -0.359452,-1.0385 -0.795495,-1.0385 l -1.900349,0" transform="translate(0 -1048.355)"/>
-  <path fill="none" stroke="url(#m)" d="m 7.024208,1056.8993 -1.325826,0 c -0.369764,0 -0.359452,-1.0385 -0.795495,-1.0385 l -1.900349,0" transform="translate(0 -1048.355)"/>
+  <path
+     fill="none"
+     stroke="url(#l)"
+     d="m 7.024208,1054.8923 -1.325826,0 c -0.369764,0 -0.359452,-1.0385 -0.795495,-1.0385 l -1.900349,0"
+     transform="translate(0 -1048.355)"
+     id="path16" />
+  <path
+     fill="none"
+     stroke="url(#m)"
+     d="m 7.024208,1056.8993 -1.325826,0 c -0.369764,0 -0.359452,-1.0385 -0.795495,-1.0385 l -1.900349,0"
+     transform="translate(0 -1048.355)"
+     id="path17" />
 </svg>
diff --git a/ua/org.eclipse.pde.ua.ui/META-INF/MANIFEST.MF b/ua/org.eclipse.pde.ua.ui/META-INF/MANIFEST.MF
index 3c8f5df243e..67e6ce63621 100644
--- a/ua/org.eclipse.pde.ua.ui/META-INF/MANIFEST.MF
+++ b/ua/org.eclipse.pde.ua.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.pde.ua.ui;singleton:=true
-Bundle-Version: 1.4.200.qualifier
+Bundle-Version: 1.4.300.qualifier
 Bundle-Activator: org.eclipse.pde.internal.ua.ui.PDEUserAssistanceUIPlugin
 Require-Bundle: org.eclipse.ui;bundle-version="[3.205.0,4.0.0)",
  org.eclipse.core.runtime;bundle-version="[3.30.0,4.0.0)",
diff --git a/ua/org.eclipse.pde.ua.ui/icons/etool16/ctx_help_wiz.svg b/ua/org.eclipse.pde.ua.ui/icons/etool16/ctx_help_wiz.svg
index 4b3217793be..629ee081b4e 100644
--- a/ua/org.eclipse.pde.ua.ui/icons/etool16/ctx_help_wiz.svg
+++ b/ua/org.eclipse.pde.ua.ui/icons/etool16/ctx_help_wiz.svg
@@ -2,24 +2,19 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="ctx_help_wiz.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4259"
        id="linearGradient4265"
        x1="24.120523"
@@ -28,7 +23,6 @@
        y2="1040.597"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4259">
       <stop
          style="stop-color:#dfe9f8;stop-opacity:1"
@@ -40,7 +34,6 @@
          id="stop4263" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4185"
        id="linearGradient4191"
        x1="22.993999"
@@ -50,7 +43,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(0,-12.561868)" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4185">
       <stop
          style="stop-color:#525f71;stop-opacity:1"
@@ -62,7 +54,6 @@
          id="stop4189" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4193"
        id="linearGradient4199"
        x1="21.093748"
@@ -71,7 +62,6 @@
        y2="1048.3466"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4193">
       <stop
          style="stop-color:#958e6c;stop-opacity:1;"
@@ -90,11 +80,9 @@
        gradientTransform="translate(-15.015625,1046.6356)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient6323-7-1-1"
-       xlink:href="#linearGradient5068-6-9-4-9"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient5068-6-9-4-9" />
     <linearGradient
-       id="linearGradient5068-6-9-4-9"
-       inkscape:collect="always">
+       id="linearGradient5068-6-9-4-9">
       <stop
          id="stop5070-8-0-4-9"
          offset="0"
@@ -112,8 +100,7 @@
        y1="1043.3622"
        x1="12"
        id="linearGradient5084-3-3-2-6"
-       xlink:href="#linearGradient5068-6-9-4-9"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient5068-6-9-4-9" />
     <linearGradient
        gradientTransform="translate(-15.015625,10.2734)"
        gradientUnits="userSpaceOnUse"
@@ -122,8 +109,7 @@
        y1="1043.3622"
        x1="13"
        id="linearGradient5086-8-0-8-5"
-       xlink:href="#linearGradient5068-6-9-4-9"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient5068-6-9-4-9" />
     <linearGradient
        gradientTransform="translate(-15.015625,10.2734)"
        gradientUnits="userSpaceOnUse"
@@ -132,8 +118,7 @@
        y1="1042.3622"
        x1="12"
        id="linearGradient5082-1-0-8-1"
-       xlink:href="#linearGradient5068-6-9-4-9"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient5068-6-9-4-9" />
     <linearGradient
        gradientTransform="translate(-15.015625,10.2734)"
        gradientUnits="userSpaceOnUse"
@@ -142,8 +127,7 @@
        y1="1041.3622"
        x1="10"
        id="linearGradient5078-8-2-1-4"
-       xlink:href="#linearGradient5068-6-9-4-9"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient5068-6-9-4-9" />
     <linearGradient
        gradientTransform="translate(-15.015625,10.2734)"
        gradientUnits="userSpaceOnUse"
@@ -152,10 +136,8 @@
        y1="1040.3622"
        x1="10"
        id="linearGradient5076-5-2-9-8"
-       xlink:href="#linearGradient5068-6-9-4-9"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient5068-6-9-4-9" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient5068-6-9-4-9"
        id="linearGradient3500-5"
        gradientUnits="userSpaceOnUse"
@@ -172,10 +154,8 @@
        y1="1041.3622"
        x1="14"
        id="linearGradient5088-1-4-8-6"
-       xlink:href="#linearGradient5068-6-9-4-9"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient5068-6-9-4-9" />
     <radialGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4528-9-5-7-9-7-3"
        id="radialGradient3091-1-9-6-4-6"
        gradientUnits="userSpaceOnUse"
@@ -197,7 +177,6 @@
          id="stop4532-7-9-3-3-6-1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient6281-8-0-1-6-6-4-2-8-0"
        id="linearGradient3093-5-2-7-0-9"
        gradientUnits="userSpaceOnUse"
@@ -238,31 +217,6 @@
          id="stop4881" />
     </linearGradient>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="16"
-     inkscape:cx="21.512377"
-     inkscape:cy="-1.5914195"
-     inkscape:document-units="px"
-     inkscape:current-layer="g4274"
-     showgrid="true"
-     inkscape:window-width="1440"
-     inkscape:window-height="900"
-     inkscape:window-x="1082"
-     inkscape:window-y="535"
-     inkscape:window-maximized="0"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3999" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -276,8 +230,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
@@ -301,14 +253,11 @@
           <path
              style="display:inline;fill:#7aace7;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4199);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
              d="m 17.656249,1039.1123 8.031249,-2.125 0,11.0312 -8.062499,2.125 z"
-             id="path4156"
-             inkscape:connector-curvature="0" />
+             id="path4156" />
           <path
              style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#958e6c;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
              d="m 19.643305,1041.6966 4.016734,-0.7459 -0.0221,2.3242 -4.014839,0.7291 z"
-             id="path4181"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccc" />
+             id="path4181" />
         </g>
       </g>
       <g
@@ -318,51 +267,35 @@
         <path
            style="display:inline;fill:url(#linearGradient6323-7-1-1);fill-opacity:1;stroke:none"
            d="m -7.007813,1053.62 2,0 1.492188,-1.4844 -2.0312504,0 z"
-           id="path5581-1-1"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
+           id="path5581-1-1" />
         <path
            style="display:inline;fill:url(#linearGradient5084-3-3-2-6);fill-opacity:1;stroke:none"
            d="m -5.007813,1055.62 4,0 0,-1 -0.476562,-0.4844 -2.03125,0 z"
-           id="path5581-1-1-8"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccccc" />
+           id="path5581-1-1-8" />
         <path
-           inkscape:connector-curvature="0"
            style="display:inline;fill:url(#linearGradient5086-8-0-8-5);fill-opacity:1;stroke:none"
            d="m -1.484375,1052.1356 0,2 0.476562,0.4844 0,-2 z"
-           id="path5581-1-1-7"
-           sodipodi:nodetypes="ccccc" />
+           id="path5581-1-1-7" />
         <path
-           inkscape:connector-curvature="0"
            style="display:inline;fill:url(#linearGradient5082-1-0-8-1);fill-opacity:1;stroke:none"
            d="m -5.007813,1053.62 0,2 1.492188,-1.4844 0,-2 z"
-           id="path5581-1-1-6"
-           sodipodi:nodetypes="ccccc" />
+           id="path5581-1-1-6" />
         <path
-           inkscape:connector-curvature="0"
            style="display:inline;fill:url(#linearGradient5078-8-2-1-4);fill-opacity:1;stroke:none"
            d="m -7.007813,1048.62 0,5 1.4609376,-1.4844 0,-2 z"
-           id="path5581-1-1-1"
-           sodipodi:nodetypes="ccccc" />
+           id="path5581-1-1-1" />
         <path
-           inkscape:connector-curvature="0"
            style="display:inline;fill:url(#linearGradient5076-5-2-9-8);fill-opacity:1;stroke:none"
            d="m -5.007813,1048.62 -2,0 1.4609375,1.5156 2.0312505,0 z"
-           id="path5581-1-1-89"
-           sodipodi:nodetypes="ccccc" />
+           id="path5581-1-1-89" />
         <path
-           inkscape:connector-curvature="0"
            style="display:inline;fill:url(#linearGradient3500-5);fill-opacity:1;stroke:none"
            d="m -5.007813,1048.62 0,0 1.503907,1.5273 0,-1.5156 z"
-           id="path5581-1-1-2"
-           sodipodi:nodetypes="ccccc" />
+           id="path5581-1-1-2" />
         <path
-           inkscape:connector-curvature="0"
            style="display:inline;fill:url(#linearGradient5088-1-4-8-6);fill-opacity:1;stroke:none"
            d="m -1.011718,1052.1356 -0.472657,0 0.476563,0.4844 -0.0039,0 z"
-           id="path5581-1-1-79"
-           sodipodi:nodetypes="ccccc" />
+           id="path5581-1-1-79" />
         <g
            style="display:inline"
            id="g4514"
@@ -379,8 +312,6 @@
                y="-740.41083"
                transform="matrix(-0.70710678,-0.70710678,0.70710678,-0.70710678,0,0)" />
             <path
-               sodipodi:nodetypes="ccccccccccccc"
-               inkscape:connector-curvature="0"
                id="path5581-5-5"
                d="m 12.471186,1054.309 1.001133,0 0,2.0123 1.986639,0 0,0.9934 -1.986639,0 0,2 -1.001133,0 0,-2 -1.98664,0 0,-0.9934 1.98664,0 z"
                style="display:inline;fill:url(#linearGradient3093-5-2-7-0-9);fill-opacity:1;stroke:none" />
@@ -401,18 +332,15 @@
             <path
                d="m -7.154226,1066.2953 a 5.7367152,5.7367152 0 0 1 -5.736715,5.7366 5.7367152,5.7367152 0 0 1 -5.736714,-5.7366 5.7367152,5.7367152 0 0 1 5.736714,-5.7367 5.7367152,5.7367152 0 0 1 5.736715,5.7367 z"
                id="path4110"
-               style="fill:url(#linearGradient4118);fill-opacity:1;stroke:#304b8a;stroke-width:1.42852704;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-               inkscape:connector-curvature="0" />
+               style="fill:url(#linearGradient4118);fill-opacity:1;stroke:#304b8a;stroke-width:1.42852704;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
             <g
                id="g4234"
                transform="matrix(0.67482559,0,0,0.66166238,-6.6079452,355.46025)">
               <path
-                 inkscape:connector-curvature="0"
                  style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:20.03678703px;line-height:125%;font-family:Reznor;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#2a4484;fill-opacity:1;stroke:none"
                  d="m -9.4357617,1068.2736 c -1.2738953,10e-5 -2.2909443,0.3542 -3.0669773,1.0668 -0.776035,0.7126 -1.180487,1.6995 -1.22679,2.9336 l 2.106879,0.2667 c 0.06927,-1.5258 0.767628,-2.2669 2.0535413,-2.2669 0.544332,0 0.986005,0.1392 1.333468,0.4534 0.347451,0.3142 0.50671,0.7177 0.506718,1.2001 -8e-6,0.4489 -0.155573,0.8368 -0.480048,1.1734 -0.173559,0.1795 -0.518749,0.4482 -1.040106,0.7735 -0.47471,0.2917 -0.7828553,0.6247 -0.9334273,1.04 -0.13927,0.348 -0.21336,0.8822 -0.213355,1.6002 l 0,0.9601 1.9468633,0 0,-0.6134 c -6e-6,-0.7067 0.304445,-1.2494 0.906758,-1.6534 0.787868,-0.5387 1.32567,-1.0168 1.626831,-1.3868 0.416727,-0.5387 0.640055,-1.1881 0.640064,-1.9736 -9e-6,-1.0772 -0.431305,-1.9671 -1.253459,-2.6403 -0.787883,-0.6283 -1.760322,-0.9333 -2.90696,-0.9334 z"
                  id="text4882" />
               <path
-                 inkscape:connector-curvature="0"
                  style="display:inline;fill:#294384;fill-opacity:1;stroke:none"
                  id="path4908-1"
                  d="m -8.0758489,1079.7271 a 1.472991,1.2557853 0 0 1 -1.4729931,1.2558 1.472991,1.2557853 0 0 1 -1.472991,-1.2558 1.472991,1.2557853 0 0 1 1.472991,-1.2558 1.472991,1.2557853 0 0 1 1.4729931,1.2558 z" />
diff --git a/ua/org.eclipse.pde.ua.ui/icons/etool16/new_cheatsheet_wiz.svg b/ua/org.eclipse.pde.ua.ui/icons/etool16/new_cheatsheet_wiz.svg
index 54d5c36cd7f..d1821c410f9 100644
--- a/ua/org.eclipse.pde.ua.ui/icons/etool16/new_cheatsheet_wiz.svg
+++ b/ua/org.eclipse.pde.ua.ui/icons/etool16/new_cheatsheet_wiz.svg
@@ -2,25 +2,20 @@
 <!-- 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="16"
    height="16"
    viewBox="0 0 16 16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="new_cheatsheet_wiz.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4350">
       <stop
          style="stop-color:#304bb0;stop-opacity:1"
@@ -32,7 +27,6 @@
          id="stop4354" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4190">
       <stop
          style="stop-color:#2846b3;stop-opacity:1"
@@ -44,7 +38,6 @@
          id="stop4194" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4170">
       <stop
          style="stop-color:#85c0ed;stop-opacity:1;"
@@ -56,7 +49,6 @@
          id="stop4174" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4187">
       <stop
          style="stop-color:#17325d;stop-opacity:1"
@@ -72,8 +64,7 @@
          id="stop4191" />
     </linearGradient>
     <linearGradient
-       id="linearGradient4178-1"
-       inkscape:collect="always">
+       id="linearGradient4178-1">
       <stop
          id="stop4180-5"
          offset="0"
@@ -91,8 +82,7 @@
        y1="1052.2014"
        x1="20.299725"
        id="linearGradient4184-2"
-       xlink:href="#linearGradient4350"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4350" />
     <linearGradient
        gradientTransform="translate(-0.18040135,0)"
        gradientUnits="userSpaceOnUse"
@@ -101,8 +91,7 @@
        y1="1036.3827"
        x1="3.9750192"
        id="linearGradient4206-38"
-       xlink:href="#linearGradient4187"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4187" />
     <linearGradient
        gradientTransform="translate(1.8459821,0)"
        gradientUnits="userSpaceOnUse"
@@ -111,8 +100,7 @@
        y1="1036.3827"
        x1="3.9750192"
        id="linearGradient4206-1"
-       xlink:href="#linearGradient4187"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4187" />
     <linearGradient
        gradientTransform="translate(3.860491,-4.2568467e-7)"
        gradientUnits="userSpaceOnUse"
@@ -121,8 +109,7 @@
        y1="1036.3827"
        x1="3.9750192"
        id="linearGradient4206-1-9"
-       xlink:href="#linearGradient4187"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4187" />
     <linearGradient
        gradientTransform="matrix(0.83688828,0,0,1.10534,6.5850277,-109.21828)"
        gradientUnits="userSpaceOnUse"
@@ -131,40 +118,8 @@
        y1="1036.3827"
        x1="3.9750192"
        id="linearGradient4206-1-9-5"
-       xlink:href="#linearGradient4187"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4187" />
     <linearGradient
-       gradientTransform="translate(1.8303571,0)"
-       gradientUnits="userSpaceOnUse"
-       y2="1039.2346"
-       x2="3.9750192"
-       y1="1036.3827"
-       x1="3.9750192"
-       id="linearGradient4326"
-       xlink:href="#linearGradient4187"
-       inkscape:collect="always" />
-    <linearGradient
-       gradientTransform="translate(3.8839285,-4.2568467e-7)"
-       gradientUnits="userSpaceOnUse"
-       y2="1039.2346"
-       x2="3.9750192"
-       y1="1036.3827"
-       x1="3.9750192"
-       id="linearGradient4328"
-       xlink:href="#linearGradient4187"
-       inkscape:collect="always" />
-    <linearGradient
-       gradientTransform="matrix(0.83688828,0,0,1.10534,6.6397152,-109.42141)"
-       gradientUnits="userSpaceOnUse"
-       y2="1039.2346"
-       x2="3.9750192"
-       y1="1036.3827"
-       x1="3.9750192"
-       id="linearGradient4330"
-       xlink:href="#linearGradient4187"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4178-1"
        id="linearGradient4340"
        gradientUnits="userSpaceOnUse"
@@ -174,7 +129,6 @@
        x2="20.299725"
        y2="1036.755" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4187"
        id="linearGradient4342"
        gradientUnits="userSpaceOnUse"
@@ -184,7 +138,6 @@
        x2="3.9750192"
        y2="1039.2346" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4187"
        id="linearGradient4344"
        gradientUnits="userSpaceOnUse"
@@ -194,7 +147,6 @@
        x2="3.9750192"
        y2="1039.2346" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4187"
        id="linearGradient4346"
        gradientUnits="userSpaceOnUse"
@@ -204,7 +156,6 @@
        x2="3.9750192"
        y2="1039.2346" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4187"
        id="linearGradient4348"
        gradientUnits="userSpaceOnUse"
@@ -214,7 +165,6 @@
        x2="3.9750192"
        y2="1039.2346" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4170"
        id="linearGradient4362"
        x1="6.5091562"
@@ -223,7 +173,6 @@
        y2="1040.5598"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4190"
        id="linearGradient4196-9"
        x1="20.767859"
@@ -240,11 +189,9 @@
        gradientTransform="translate(-15.015625,1046.6356)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient6323-7-1-1"
-       xlink:href="#linearGradient5068-6-9-4-9"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient5068-6-9-4-9" />
     <linearGradient
-       id="linearGradient5068-6-9-4-9"
-       inkscape:collect="always">
+       id="linearGradient5068-6-9-4-9">
       <stop
          id="stop5070-8-0-4-9"
          offset="0"
@@ -262,8 +209,7 @@
        y1="1043.3622"
        x1="12"
        id="linearGradient5084-3-3-2-6"
-       xlink:href="#linearGradient5068-6-9-4-9"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient5068-6-9-4-9" />
     <linearGradient
        gradientTransform="translate(-15.015625,10.2734)"
        gradientUnits="userSpaceOnUse"
@@ -272,8 +218,7 @@
        y1="1043.3622"
        x1="13"
        id="linearGradient5086-8-0-8-5"
-       xlink:href="#linearGradient5068-6-9-4-9"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient5068-6-9-4-9" />
     <linearGradient
        gradientTransform="translate(-15.015625,10.2734)"
        gradientUnits="userSpaceOnUse"
@@ -282,8 +227,7 @@
        y1="1042.3622"
        x1="12"
        id="linearGradient5082-1-0-8-1"
-       xlink:href="#linearGradient5068-6-9-4-9"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient5068-6-9-4-9" />
     <linearGradient
        gradientTransform="translate(-15.015625,10.2734)"
        gradientUnits="userSpaceOnUse"
@@ -292,8 +236,7 @@
        y1="1041.3622"
        x1="10"
        id="linearGradient5078-8-2-1-4"
-       xlink:href="#linearGradient5068-6-9-4-9"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient5068-6-9-4-9" />
     <linearGradient
        gradientTransform="translate(-15.015625,10.2734)"
        gradientUnits="userSpaceOnUse"
@@ -302,10 +245,8 @@
        y1="1040.3622"
        x1="10"
        id="linearGradient5076-5-2-9-8"
-       xlink:href="#linearGradient5068-6-9-4-9"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient5068-6-9-4-9" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient5068-6-9-4-9"
        id="linearGradient3500-5"
        gradientUnits="userSpaceOnUse"
@@ -322,10 +263,8 @@
        y1="1041.3622"
        x1="14"
        id="linearGradient5088-1-4-8-6"
-       xlink:href="#linearGradient5068-6-9-4-9"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient5068-6-9-4-9" />
     <radialGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4528-9-5-7-9-7-3"
        id="radialGradient3091-1-9-6-4-6"
        gradientUnits="userSpaceOnUse"
@@ -347,7 +286,6 @@
          id="stop4532-7-9-3-3-6-1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient6281-8-0-1-6-6-4-2-8-0"
        id="linearGradient3093-5-2-7-0-9"
        gradientUnits="userSpaceOnUse"
@@ -380,43 +318,16 @@
     </mask>
     <filter
        style="color-interpolation-filters:sRGB"
-       height="1.4800004"
-       y="-0.24000017"
-       width="1.4799995"
-       x="-0.23999982"
-       id="filter8410-9-1"
-       inkscape:collect="always">
+       height="1.8794502"
+       y="-0.43972754"
+       width="1.879449"
+       x="-0.43972418"
+       id="filter8410-9-1">
       <feGaussianBlur
          id="feGaussianBlur8412-2-6"
-         stdDeviation="1.4653611"
-         inkscape:collect="always" />
+         stdDeviation="1.4653611" />
     </filter>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="90.509668"
-     inkscape:cx="4.9593106"
-     inkscape:cy="12.68636"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1-3"
-     showgrid="true"
-     units="px"
-     inkscape:snap-others="false"
-     inkscape:snap-grids="false"
-     inkscape:window-width="1231"
-     inkscape:window-height="964"
-     inkscape:window-x="437"
-     inkscape:window-y="211"
-     inkscape:window-maximized="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3336" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -430,13 +341,10 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      transform="translate(0,-1036.3622)">
     <g
        id="layer1-3-2"
-       inkscape:label="Layer 1"
        transform="translate(2.9909444,4.2785891)">
       <rect
          ry="0.37885904"
@@ -448,8 +356,6 @@
          id="rect3368-9-6"
          style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:url(#linearGradient4340);stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
       <path
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
          id="path4307-4-6"
          d="m 4.0354196,1037.8348 6.6613034,0"
          style="fill:#b7d2e4;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
@@ -457,34 +363,25 @@
          transform="translate(0.12626957,-0.20518724)"
          id="g4280-6-2">
         <path
-           sodipodi:nodetypes="cc"
            style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4342);stroke-width:1;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
            d="m 4.3932593,1036.8711 0.00271,2.0536"
-           id="path4198-65-8"
-           inkscape:connector-curvature="0" />
+           id="path4198-65-8" />
         <path
-           sodipodi:nodetypes="cc"
            style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4344);stroke-width:1;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
            d="M 6.294643,1036.8711 6.25,1038.9247"
-           id="path4198-7-5"
-           inkscape:connector-curvature="0" />
+           id="path4198-7-5" />
         <path
-           sodipodi:nodetypes="cc"
            style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4346);stroke-width:1;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
            d="m 8.3482144,1036.8711 -0.044643,2.0536"
-           id="path4198-7-2-3"
-           inkscape:connector-curvature="0" />
+           id="path4198-7-2-3" />
         <path
-           sodipodi:nodetypes="cc"
            style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4348);stroke-width:0.96179312;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
            d="m 10.375824,1036.6737 -0.03736,2.2699"
-           id="path4198-7-2-6-7"
-           inkscape:connector-curvature="0" />
+           id="path4198-7-2-6-7" />
       </g>
     </g>
     <g
        id="layer1-3"
-       inkscape:label="Layer 1"
        transform="translate(-1.9272359,1.1849966)">
       <rect
          ry="0.37885904"
@@ -498,36 +395,26 @@
       <path
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
          d="m 4.1230469,1036.1752 0,2.149 6.6621091,0 0,-2.149 z"
-         id="path4307-4"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
+         id="path4307-4" />
       <g
          transform="translate(0.12626957,-0.20518724)"
          id="g4280-6">
         <path
-           sodipodi:nodetypes="cc"
            style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4206-38);stroke-width:1;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
            d="m 4.2838843,1036.8711 0.00271,2.0536"
-           id="path4198-65"
-           inkscape:connector-curvature="0" />
+           id="path4198-65" />
         <path
-           sodipodi:nodetypes="cc"
            style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4206-1);stroke-width:1;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
            d="m 6.310268,1036.8711 -0.044643,2.0536"
-           id="path4198-7"
-           inkscape:connector-curvature="0" />
+           id="path4198-7" />
         <path
-           sodipodi:nodetypes="cc"
            style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4206-1-9);stroke-width:1;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
            d="m 8.3247769,1036.8711 -0.044643,2.0536"
-           id="path4198-7-2"
-           inkscape:connector-curvature="0" />
+           id="path4198-7-2" />
         <path
-           sodipodi:nodetypes="cc"
            style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4206-1-9-5);stroke-width:0.96179312;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
            d="m 10.321136,1036.8768 -0.03736,2.2699"
-           id="path4198-7-2-6"
-           inkscape:connector-curvature="0" />
+           id="path4198-7-2-6" />
       </g>
     </g>
     <rect
@@ -549,8 +436,6 @@
          transform="matrix(0.51237963,0,0,0.51237963,21.788022,514.89288)"
          style="display:inline;fill:#ffffff;stroke:#ffffff">
         <path
-           sodipodi:nodetypes="czczczczc"
-           inkscape:connector-curvature="0"
            id="rect6501-1-6-8-6"
            d="m -16.30668,1023.0143 c 0,0 0.754772,2.7548 2.663409,4.6634 1.908637,1.9086 4.663405,2.6634 4.663405,2.6634 0,0 -2.739141,0.7391 -4.663398,2.6634 -1.924257,1.9243 -2.663409,4.6634 -2.663409,4.6634 0,0 -0.676645,-2.6766 -2.66341,-4.6634 -1.986765,-1.9868 -4.663405,-2.6634 -4.663405,-2.6634 0,0 2.801649,-0.8017 4.663405,-2.6634 1.861756,-1.8618 2.663403,-4.6634 2.663403,-4.6634 z"
            style="display:inline;opacity:0.85;fill:#ffffff;stroke:#ffffff;stroke-width:5.85503387;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter8410-9-1)" />
@@ -563,51 +448,35 @@
       <path
          style="display:inline;fill:url(#linearGradient6323-7-1-1);fill-opacity:1;stroke:none"
          d="m -7.007813,1053.62 2,0 1.492188,-1.4844 -2.0312504,0 z"
-         id="path5581-1-1"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
+         id="path5581-1-1" />
       <path
          style="display:inline;fill:url(#linearGradient5084-3-3-2-6);fill-opacity:1;stroke:none"
          d="m -5.007813,1055.62 4,0 0,-1 -0.476562,-0.4844 -2.03125,0 z"
-         id="path5581-1-1-8"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccc" />
+         id="path5581-1-1-8" />
       <path
-         inkscape:connector-curvature="0"
          style="display:inline;fill:url(#linearGradient5086-8-0-8-5);fill-opacity:1;stroke:none"
          d="m -1.484375,1052.1356 0,2 0.476562,0.4844 0,-2 z"
-         id="path5581-1-1-7"
-         sodipodi:nodetypes="ccccc" />
+         id="path5581-1-1-7" />
       <path
-         inkscape:connector-curvature="0"
          style="display:inline;fill:url(#linearGradient5082-1-0-8-1);fill-opacity:1;stroke:none"
          d="m -5.007813,1053.62 0,2 1.492188,-1.4844 0,-2 z"
-         id="path5581-1-1-6"
-         sodipodi:nodetypes="ccccc" />
+         id="path5581-1-1-6" />
       <path
-         inkscape:connector-curvature="0"
          style="display:inline;fill:url(#linearGradient5078-8-2-1-4);fill-opacity:1;stroke:none"
          d="m -7.007813,1048.62 0,5 1.4609376,-1.4844 0,-2 z"
-         id="path5581-1-1-1"
-         sodipodi:nodetypes="ccccc" />
+         id="path5581-1-1-1" />
       <path
-         inkscape:connector-curvature="0"
          style="display:inline;fill:url(#linearGradient5076-5-2-9-8);fill-opacity:1;stroke:none"
          d="m -5.007813,1048.62 -2,0 1.4609375,1.5156 2.0312505,0 z"
-         id="path5581-1-1-89"
-         sodipodi:nodetypes="ccccc" />
+         id="path5581-1-1-89" />
       <path
-         inkscape:connector-curvature="0"
          style="display:inline;fill:url(#linearGradient3500-5);fill-opacity:1;stroke:none"
          d="m -5.007813,1048.62 0,0 1.503907,1.5273 0,-1.5156 z"
-         id="path5581-1-1-2"
-         sodipodi:nodetypes="ccccc" />
+         id="path5581-1-1-2" />
       <path
-         inkscape:connector-curvature="0"
          style="display:inline;fill:url(#linearGradient5088-1-4-8-6);fill-opacity:1;stroke:none"
          d="m -1.011718,1052.1356 -0.472657,0 0.476563,0.4844 -0.0039,0 z"
-         id="path5581-1-1-79"
-         sodipodi:nodetypes="ccccc" />
+         id="path5581-1-1-79" />
       <g
          style="display:inline"
          id="g4514"
@@ -624,8 +493,6 @@
              y="-740.41083"
              transform="matrix(-0.70710678,-0.70710678,0.70710678,-0.70710678,0,0)" />
           <path
-             sodipodi:nodetypes="ccccccccccccc"
-             inkscape:connector-curvature="0"
              id="path5581-5-5"
              d="m 12.471186,1054.309 1.001133,0 0,1.946 1.986639,0 0,1.0167 -1.986639,0 0,2.043 -1.001133,0 0,-2.043 -1.98664,0 0,-1.0167 1.98664,0 z"
              style="display:inline;fill:url(#linearGradient3093-5-2-7-0-9);fill-opacity:1;stroke:none" />
diff --git a/ua/org.eclipse.pde.ua.ui/icons/etool16/toc_wiz.svg b/ua/org.eclipse.pde.ua.ui/icons/etool16/toc_wiz.svg
index c6ea74f0412..d8ed551e16c 100644
--- a/ua/org.eclipse.pde.ua.ui/icons/etool16/toc_wiz.svg
+++ b/ua/org.eclipse.pde.ua.ui/icons/etool16/toc_wiz.svg
@@ -2,24 +2,19 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="toc_wiz.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4259"
        id="linearGradient4265"
        x1="24.120523"
@@ -28,7 +23,6 @@
        y2="1040.597"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4259">
       <stop
          style="stop-color:#dfe9f8;stop-opacity:1"
@@ -40,7 +34,6 @@
          id="stop4263" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4185"
        id="linearGradient4191"
        x1="22.993999"
@@ -50,7 +43,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(0,-12.561868)" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4185">
       <stop
          style="stop-color:#525f71;stop-opacity:1"
@@ -62,7 +54,6 @@
          id="stop4189" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4193"
        id="linearGradient4199"
        x1="21.093748"
@@ -71,7 +62,6 @@
        y2="1048.3466"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4193">
       <stop
          style="stop-color:#958e6c;stop-opacity:1;"
@@ -90,11 +80,9 @@
        gradientTransform="translate(-15.015625,1046.6356)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient6323-7-1-1"
-       xlink:href="#linearGradient5068-6-9-4-9"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient5068-6-9-4-9" />
     <linearGradient
-       id="linearGradient5068-6-9-4-9"
-       inkscape:collect="always">
+       id="linearGradient5068-6-9-4-9">
       <stop
          id="stop5070-8-0-4-9"
          offset="0"
@@ -112,8 +100,7 @@
        y1="1043.3622"
        x1="12"
        id="linearGradient5084-3-3-2-6"
-       xlink:href="#linearGradient5068-6-9-4-9"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient5068-6-9-4-9" />
     <linearGradient
        gradientTransform="translate(-15.015625,10.2734)"
        gradientUnits="userSpaceOnUse"
@@ -122,8 +109,7 @@
        y1="1043.3622"
        x1="13"
        id="linearGradient5086-8-0-8-5"
-       xlink:href="#linearGradient5068-6-9-4-9"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient5068-6-9-4-9" />
     <linearGradient
        gradientTransform="translate(-15.015625,10.2734)"
        gradientUnits="userSpaceOnUse"
@@ -132,8 +118,7 @@
        y1="1042.3622"
        x1="12"
        id="linearGradient5082-1-0-8-1"
-       xlink:href="#linearGradient5068-6-9-4-9"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient5068-6-9-4-9" />
     <linearGradient
        gradientTransform="translate(-15.015625,10.2734)"
        gradientUnits="userSpaceOnUse"
@@ -142,8 +127,7 @@
        y1="1041.3622"
        x1="10"
        id="linearGradient5078-8-2-1-4"
-       xlink:href="#linearGradient5068-6-9-4-9"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient5068-6-9-4-9" />
     <linearGradient
        gradientTransform="translate(-15.015625,10.2734)"
        gradientUnits="userSpaceOnUse"
@@ -152,10 +136,8 @@
        y1="1040.3622"
        x1="10"
        id="linearGradient5076-5-2-9-8"
-       xlink:href="#linearGradient5068-6-9-4-9"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient5068-6-9-4-9" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient5068-6-9-4-9"
        id="linearGradient3500-5"
        gradientUnits="userSpaceOnUse"
@@ -172,10 +154,8 @@
        y1="1041.3622"
        x1="14"
        id="linearGradient5088-1-4-8-6"
-       xlink:href="#linearGradient5068-6-9-4-9"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient5068-6-9-4-9" />
     <radialGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4528-9-5-7-9-7-3"
        id="radialGradient3091-1-9-6-4-6"
        gradientUnits="userSpaceOnUse"
@@ -197,7 +177,6 @@
          id="stop4532-7-9-3-3-6-1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient6281-8-0-1-6-6-4-2-8-0"
        id="linearGradient3093-5-2-7-0-9"
        gradientUnits="userSpaceOnUse"
@@ -218,31 +197,6 @@
          style="stop-color:#ffd680;stop-opacity:1" />
     </linearGradient>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="8"
-     inkscape:cx="-17.203137"
-     inkscape:cy="13.981623"
-     inkscape:document-units="px"
-     inkscape:current-layer="g4274"
-     showgrid="false"
-     inkscape:window-width="1440"
-     inkscape:window-height="900"
-     inkscape:window-x="1062"
-     inkscape:window-y="509"
-     inkscape:window-maximized="0"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3999" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -256,8 +210,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
@@ -281,14 +233,11 @@
           <path
              style="display:inline;fill:#7aace7;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4199);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
              d="m 17.656249,1039.1123 8.031249,-2.125 0,11.0312 -8.062499,2.125 z"
-             id="path4156"
-             inkscape:connector-curvature="0" />
+             id="path4156" />
           <path
              style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#958e6c;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
              d="m 19.643305,1041.6966 4.016734,-0.7459 -0.0221,2.3242 -4.014839,0.7291 z"
-             id="path4181"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccc" />
+             id="path4181" />
         </g>
       </g>
       <g
@@ -298,51 +247,35 @@
         <path
            style="display:inline;fill:url(#linearGradient6323-7-1-1);fill-opacity:1;stroke:none"
            d="m -7.007813,1053.62 2,0 1.492188,-1.4844 -2.0312504,0 z"
-           id="path5581-1-1"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
+           id="path5581-1-1" />
         <path
            style="display:inline;fill:url(#linearGradient5084-3-3-2-6);fill-opacity:1;stroke:none"
            d="m -5.007813,1055.62 4,0 0,-1 -0.476562,-0.4844 -2.03125,0 z"
-           id="path5581-1-1-8"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccccc" />
+           id="path5581-1-1-8" />
         <path
-           inkscape:connector-curvature="0"
            style="display:inline;fill:url(#linearGradient5086-8-0-8-5);fill-opacity:1;stroke:none"
            d="m -1.484375,1052.1356 0,2 0.476562,0.4844 0,-2 z"
-           id="path5581-1-1-7"
-           sodipodi:nodetypes="ccccc" />
+           id="path5581-1-1-7" />
         <path
-           inkscape:connector-curvature="0"
            style="display:inline;fill:url(#linearGradient5082-1-0-8-1);fill-opacity:1;stroke:none"
            d="m -5.007813,1053.62 0,2 1.492188,-1.4844 0,-2 z"
-           id="path5581-1-1-6"
-           sodipodi:nodetypes="ccccc" />
+           id="path5581-1-1-6" />
         <path
-           inkscape:connector-curvature="0"
            style="display:inline;fill:url(#linearGradient5078-8-2-1-4);fill-opacity:1;stroke:none"
            d="m -7.007813,1048.62 0,5 1.4609376,-1.4844 0,-2 z"
-           id="path5581-1-1-1"
-           sodipodi:nodetypes="ccccc" />
+           id="path5581-1-1-1" />
         <path
-           inkscape:connector-curvature="0"
            style="display:inline;fill:url(#linearGradient5076-5-2-9-8);fill-opacity:1;stroke:none"
            d="m -5.007813,1048.62 -2,0 1.4609375,1.5156 2.0312505,0 z"
-           id="path5581-1-1-89"
-           sodipodi:nodetypes="ccccc" />
+           id="path5581-1-1-89" />
         <path
-           inkscape:connector-curvature="0"
            style="display:inline;fill:url(#linearGradient3500-5);fill-opacity:1;stroke:none"
            d="m -5.007813,1048.62 0,0 1.503907,1.5273 0,-1.5156 z"
-           id="path5581-1-1-2"
-           sodipodi:nodetypes="ccccc" />
+           id="path5581-1-1-2" />
         <path
-           inkscape:connector-curvature="0"
            style="display:inline;fill:url(#linearGradient5088-1-4-8-6);fill-opacity:1;stroke:none"
            d="m -1.011718,1052.1356 -0.472657,0 0.476563,0.4844 -0.0039,0 z"
-           id="path5581-1-1-79"
-           sodipodi:nodetypes="ccccc" />
+           id="path5581-1-1-79" />
         <g
            style="display:inline"
            id="g4514"
@@ -359,8 +292,6 @@
                y="-740.41083"
                transform="matrix(-0.70710678,-0.70710678,0.70710678,-0.70710678,0,0)" />
             <path
-               sodipodi:nodetypes="ccccccccccccc"
-               inkscape:connector-curvature="0"
                id="path5581-5-5"
                d="m 12.471186,1054.309 1.001133,0 0,2.0123 1.986639,0 0,0.9934 -1.986639,0 0,2 -1.001133,0 0,-2 -1.98664,0 0,-0.9934 1.98664,0 z"
                style="display:inline;fill:url(#linearGradient3093-5-2-7-0-9);fill-opacity:1;stroke:none" />
diff --git a/ua/org.eclipse.pde.ua.ui/icons/obj16/cheatsheet_composite_obj.svg b/ua/org.eclipse.pde.ua.ui/icons/obj16/cheatsheet_composite_obj.svg
index 58875f0385c..f919fe0e114 100644
--- a/ua/org.eclipse.pde.ua.ui/icons/obj16/cheatsheet_composite_obj.svg
+++ b/ua/org.eclipse.pde.ua.ui/icons/obj16/cheatsheet_composite_obj.svg
@@ -2,25 +2,20 @@
 <!-- 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="16"
    height="16"
    viewBox="0 0 16 16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="cheatsheet_composite_obj.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4309">
       <stop
          style="stop-color:#b7d2e4;stop-opacity:0"
@@ -40,7 +35,6 @@
          id="stop4313" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4200">
       <stop
          style="stop-color:#3e72a7;stop-opacity:1"
@@ -52,7 +46,6 @@
          id="stop4204" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4190">
       <stop
          style="stop-color:#2846b3;stop-opacity:1"
@@ -64,7 +57,6 @@
          id="stop4194" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4178">
       <stop
          style="stop-color:#2846b3;stop-opacity:1"
@@ -76,7 +68,6 @@
          id="stop4182" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4170">
       <stop
          style="stop-color:#85c0ed;stop-opacity:1;"
@@ -88,7 +79,6 @@
          id="stop4174" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4170"
        id="linearGradient4176"
        x1="8.70749"
@@ -98,7 +88,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(0.03156757,0)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4178"
        id="linearGradient4184"
        x1="20.299725"
@@ -108,7 +97,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-11.869292,0)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4190"
        id="linearGradient4196"
        x1="20.767859"
@@ -118,7 +106,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-12.074479,-0.0473509)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4200"
        id="linearGradient4206"
        x1="3.9750192"
@@ -127,7 +114,6 @@
        y2="1039.4132"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4200"
        id="linearGradient4206-3"
        x1="3.9750192"
@@ -137,7 +123,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(2.0089286,0)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4200"
        id="linearGradient4206-3-3"
        x1="3.9750192"
@@ -147,7 +132,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(4.0178572,1.596788e-7)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4200"
        id="linearGradient4206-3-3-6"
        x1="3.9750192"
@@ -157,7 +141,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(6.0044644,1.6017289e-7)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4309"
        id="linearGradient4315"
        x1="4.0354196"
@@ -166,7 +149,6 @@
        y2="1037.8348"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4200"
        id="linearGradient4206-3-3-6-5"
        x1="3.9750192"
@@ -176,31 +158,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(-1,0,0,1,16.986607,-3.7977057e-7)" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="2.8"
-     inkscape:cx="-70.831062"
-     inkscape:cy="-2.8978434"
-     inkscape:document-units="px"
-     inkscape:current-layer="g4322"
-     showgrid="true"
-     units="px"
-     inkscape:snap-others="false"
-     inkscape:snap-grids="false"
-     inkscape:window-width="1234"
-     inkscape:window-height="964"
-     inkscape:window-x="1215"
-     inkscape:window-y="427"
-     inkscape:window-maximized="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3336" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -214,8 +171,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      transform="translate(0,-1036.3622)">
     <rect
@@ -239,44 +194,34 @@
     <path
        style="fill:#b7d2e4;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4315);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
        d="m 4.0354196,1037.8348 8.9380894,0"
-       id="path4307"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc" />
+       id="path4307" />
     <g
        id="g4280"
        transform="translate(0.12626957,0)">
       <path
-         inkscape:connector-curvature="0"
          id="path4198"
          d="m 4.4642857,1036.8711 2.0535715,2.0536"
          style="fill:none;fill-rule:evenodd;stroke:url(#linearGradient4206);stroke-width:0.75;stroke-linecap:round;stroke-linejoin:bevel;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none" />
       <path
-         inkscape:connector-curvature="0"
          id="path4198-6"
          d="m 6.4732143,1036.8711 2.0535715,2.0536"
          style="fill:none;fill-rule:evenodd;stroke:url(#linearGradient4206-3);stroke-width:0.75;stroke-linecap:round;stroke-linejoin:bevel;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none" />
       <path
-         inkscape:connector-curvature="0"
          id="path4198-6-0"
          d="m 8.4821429,1036.8711 2.0535711,2.0536"
          style="fill:none;fill-rule:evenodd;stroke:url(#linearGradient4206-3-3);stroke-width:0.75;stroke-linecap:round;stroke-linejoin:bevel;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none" />
       <path
-         inkscape:connector-curvature="0"
          id="path4198-6-0-2"
          d="m 10.46875,1036.8711 2.053571,2.0536"
          style="fill:none;fill-rule:evenodd;stroke:url(#linearGradient4206-3-3-6);stroke-width:0.75;stroke-linecap:round;stroke-linejoin:bevel;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none" />
       <path
-         inkscape:connector-curvature="0"
          id="path4198-6-0-2-1"
          d="m 12.566964,1036.7148 -0.346775,0.2941"
-         style="fill:none;fill-rule:evenodd;stroke:url(#linearGradient4206-3-3-6-5);stroke-width:0.75;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         sodipodi:nodetypes="cc" />
+         style="fill:none;fill-rule:evenodd;stroke:url(#linearGradient4206-3-3-6-5);stroke-width:0.75;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
       <path
-         inkscape:connector-curvature="0"
          id="path4198-6-0-2-1-1"
          d="m 4.5312497,1038.6791 -0.267857,0.3572"
-         style="fill:#1c3a66;fill-rule:evenodd;stroke:#1b3965;stroke-width:0.75;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;fill-opacity:1"
-         sodipodi:nodetypes="cc" />
+         style="fill:#1c3a66;fill-rule:evenodd;stroke:#1b3965;stroke-width:0.75;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;fill-opacity:1" />
     </g>
     <g
        id="g4322"
diff --git a/ua/org.eclipse.pde.ua.ui/icons/obj16/cheatsheet_conclusion_obj.svg b/ua/org.eclipse.pde.ua.ui/icons/obj16/cheatsheet_conclusion_obj.svg
index 2e738fd6ce5..45aa80d4d6c 100644
--- a/ua/org.eclipse.pde.ua.ui/icons/obj16/cheatsheet_conclusion_obj.svg
+++ b/ua/org.eclipse.pde.ua.ui/icons/obj16/cheatsheet_conclusion_obj.svg
@@ -2,25 +2,20 @@
 <!-- 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="16"
    height="16"
    viewBox="0 0 16 16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="cheatsheet_conclusion_obj.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4242">
       <stop
          style="stop-color:#fce9a0;stop-opacity:1;"
@@ -32,7 +27,6 @@
          id="stop4246" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4204">
       <stop
          style="stop-color:#a098c8;stop-opacity:1;"
@@ -44,7 +38,6 @@
          id="stop4208" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4307">
       <stop
          style="stop-color:#17325d;stop-opacity:1"
@@ -60,8 +53,7 @@
          id="stop4314" />
     </linearGradient>
     <linearGradient
-       id="linearGradient4187"
-       inkscape:collect="always">
+       id="linearGradient4187">
       <stop
          id="stop4189"
          offset="0"
@@ -76,7 +68,6 @@
          style="stop-color:#3e72a7;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4178">
       <stop
          style="stop-color:#7e713d;stop-opacity:1"
@@ -88,7 +79,6 @@
          id="stop4182" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4178"
        id="linearGradient4184"
        x1="20.299725"
@@ -98,7 +88,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-11.869292,0)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4187"
        id="linearGradient4206"
        x1="3.9750192"
@@ -108,7 +97,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-0.07102635,0)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4187"
        id="linearGradient4206-1"
        x1="3.9750192"
@@ -118,7 +106,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(1.9308035,-0.05580357)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4187"
        id="linearGradient4206-1-9"
        x1="3.9750192"
@@ -128,7 +115,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(3.8839285,-4.2568467e-7)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4187"
        id="linearGradient4206-1-9-5"
        x1="3.9750192"
@@ -138,7 +124,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(0.83688828,0,0,1.10534,6.6397152,-109.42141)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4307"
        id="linearGradient4206-1-9-5-1"
        x1="3.9750192"
@@ -148,7 +133,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(7.9352678,-4.2546071e-7)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4178"
        id="linearGradient4184-6"
        x1="20.299725"
@@ -158,7 +142,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-11.869292,2.6382813e-5)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4204"
        id="linearGradient4210"
        x1="5.0507627"
@@ -168,7 +151,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1.0145296,0,0,1.1702295,-0.12918908,-178.2274)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4204"
        id="linearGradient4210-5"
        x1="5.0507627"
@@ -178,7 +160,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(0.73039537,0,0,1.1702295,1.3059054,-176.2408)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4242"
        id="linearGradient4248"
        x1="6.213675"
@@ -187,32 +168,6 @@
        y2="1044.6735"
        gradientUnits="userSpaceOnUse" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="44.8"
-     inkscape:cx="7.1980475"
-     inkscape:cy="16.61627"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     units="px"
-     inkscape:snap-others="false"
-     inkscape:snap-grids="false"
-     inkscape:window-width="1234"
-     inkscape:window-height="964"
-     inkscape:window-x="219"
-     inkscape:window-y="324"
-     inkscape:window-maximized="0"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3336" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -226,8 +181,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      transform="translate(0,-1036.3622)">
     <rect
@@ -276,8 +229,6 @@
     <g
        id="g4896">
       <path
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
          id="path4307"
          d="m 4.0354196,1037.8348 8.9380894,0"
          style="fill:#b7d2e4;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
@@ -285,35 +236,25 @@
          transform="translate(0.12626957,0)"
          id="g4280">
         <path
-           sodipodi:nodetypes="cc"
            style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4206);stroke-width:1;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
            d="m 4.3932593,1036.8711 0.00271,2.0536"
-           id="path4198"
-           inkscape:connector-curvature="0" />
+           id="path4198" />
         <path
-           sodipodi:nodetypes="cc"
            style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4206-1);stroke-width:1;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
            d="m 6.3950894,1036.8153 0.00271,2.0694"
-           id="path4198-7"
-           inkscape:connector-curvature="0" />
+           id="path4198-7" />
         <path
-           sodipodi:nodetypes="cc"
            style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4206-1-9);stroke-width:1;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
            d="m 8.3482144,1036.8711 0.050059,1.8484"
-           id="path4198-7-2"
-           inkscape:connector-curvature="0" />
+           id="path4198-7-2" />
         <path
-           sodipodi:nodetypes="cc"
            style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4206-1-9-5);stroke-width:0.96179312;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
            d="m 10.375824,1036.8315 -0.03736,1.9858"
-           id="path4198-7-2-6"
-           inkscape:connector-curvature="0" />
+           id="path4198-7-2-6" />
         <path
-           sodipodi:nodetypes="cc"
            style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4206-1-9-5-1);stroke-width:1;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
            d="m 12.399554,1036.8711 -0.03348,2.0424"
-           id="path4198-7-2-6-7"
-           inkscape:connector-curvature="0" />
+           id="path4198-7-2-6-7" />
       </g>
       <g
          transform="translate(0.08123145,0.1866137)"
diff --git a/ua/org.eclipse.pde.ua.ui/icons/obj16/cheatsheet_intro_obj.svg b/ua/org.eclipse.pde.ua.ui/icons/obj16/cheatsheet_intro_obj.svg
index 23792fcb45c..f3cfad74761 100644
--- a/ua/org.eclipse.pde.ua.ui/icons/obj16/cheatsheet_intro_obj.svg
+++ b/ua/org.eclipse.pde.ua.ui/icons/obj16/cheatsheet_intro_obj.svg
@@ -2,25 +2,20 @@
 <!-- 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="16"
    height="16"
    viewBox="0 0 16 16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="cheatsheet_intro_obj.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4242">
       <stop
          style="stop-color:#fce9a0;stop-opacity:1;"
@@ -32,7 +27,6 @@
          id="stop4246" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4204">
       <stop
          style="stop-color:#a098c8;stop-opacity:1;"
@@ -44,7 +38,6 @@
          id="stop4208" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4178">
       <stop
          style="stop-color:#7e713d;stop-opacity:1"
@@ -56,7 +49,6 @@
          id="stop4182" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4178"
        id="linearGradient4184"
        x1="20.299725"
@@ -66,7 +58,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-11.869292,0)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4178"
        id="linearGradient4184-6"
        x1="20.299725"
@@ -76,7 +67,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-11.869292,2.6382813e-5)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4204"
        id="linearGradient4210"
        x1="5.0507627"
@@ -86,7 +76,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1.0145296,0,0,1.1702295,-0.12918908,-178.2274)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4204"
        id="linearGradient4210-5"
        x1="5.0507627"
@@ -96,7 +85,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(0.73039537,0,0,1.1702295,1.3059054,-176.2408)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4242"
        id="linearGradient4248"
        x1="6.213675"
@@ -105,7 +93,6 @@
        y2="1044.6735"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4187"
        id="linearGradient4206"
        x1="3.9750192"
@@ -115,8 +102,7 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-0.07102635,0)" />
     <linearGradient
-       id="linearGradient4187"
-       inkscape:collect="always">
+       id="linearGradient4187">
       <stop
          id="stop4189"
          offset="0"
@@ -131,7 +117,6 @@
          style="stop-color:#3e72a7;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4187"
        id="linearGradient4206-1"
        x1="3.9750192"
@@ -141,7 +126,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(1.9308035,-0.05580357)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4187"
        id="linearGradient4206-1-9"
        x1="3.9750192"
@@ -151,7 +135,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(3.8839285,-4.2568467e-7)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4187"
        id="linearGradient4206-1-9-5"
        x1="3.9750192"
@@ -161,7 +144,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(0.83688828,0,0,1.10534,6.6397152,-109.42141)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4307"
        id="linearGradient4206-1-9-5-1"
        x1="3.9750192"
@@ -171,7 +153,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(7.9352678,-4.2546071e-7)" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4307">
       <stop
          style="stop-color:#17325d;stop-opacity:1"
@@ -187,31 +168,6 @@
          id="stop4314" />
     </linearGradient>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="11.2"
-     inkscape:cx="18.694597"
-     inkscape:cy="8.7798265"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     units="px"
-     inkscape:snap-others="false"
-     inkscape:snap-grids="false"
-     inkscape:window-width="1234"
-     inkscape:window-height="964"
-     inkscape:window-x="900"
-     inkscape:window-y="540"
-     inkscape:window-maximized="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3336" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -225,8 +181,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      transform="translate(0,-1036.3622)">
     <rect
@@ -287,42 +241,30 @@
         <path
            style="fill:#b7d2e4;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
            d="m 4.0354196,1037.8348 8.9380894,0"
-           id="path4307"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cc" />
+           id="path4307" />
         <g
            id="g4280"
            transform="translate(0.12626957,0)">
           <path
-             inkscape:connector-curvature="0"
              id="path4198"
              d="m 4.3932593,1036.8711 0.00271,2.0536"
-             style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4206);stroke-width:1;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-             sodipodi:nodetypes="cc" />
+             style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4206);stroke-width:1;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
           <path
-             inkscape:connector-curvature="0"
              id="path4198-7"
              d="m 6.3950894,1036.8153 0.00271,2.0694"
-             style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4206-1);stroke-width:1;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-             sodipodi:nodetypes="cc" />
+             style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4206-1);stroke-width:1;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
           <path
-             inkscape:connector-curvature="0"
              id="path4198-7-2"
              d="m 8.3482144,1036.8711 0.050059,1.8484"
-             style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4206-1-9);stroke-width:1;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-             sodipodi:nodetypes="cc" />
+             style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4206-1-9);stroke-width:1;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
           <path
-             inkscape:connector-curvature="0"
              id="path4198-7-2-6"
              d="m 10.375824,1036.8315 -0.03736,1.9858"
-             style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4206-1-9-5);stroke-width:0.96179312;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-             sodipodi:nodetypes="cc" />
+             style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4206-1-9-5);stroke-width:0.96179312;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
           <path
-             inkscape:connector-curvature="0"
              id="path4198-7-2-6-7"
              d="m 12.399554,1036.8711 -0.03348,2.0424"
-             style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4206-1-9-5-1);stroke-width:1;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-             sodipodi:nodetypes="cc" />
+             style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4206-1-9-5-1);stroke-width:1;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
         </g>
         <g
            id="g4322"
diff --git a/ua/org.eclipse.pde.ua.ui/icons/obj16/cheatsheet_item_obj.svg b/ua/org.eclipse.pde.ua.ui/icons/obj16/cheatsheet_item_obj.svg
index c0e2fc4c389..f0f26976d8c 100644
--- a/ua/org.eclipse.pde.ua.ui/icons/obj16/cheatsheet_item_obj.svg
+++ b/ua/org.eclipse.pde.ua.ui/icons/obj16/cheatsheet_item_obj.svg
@@ -2,25 +2,20 @@
 <!-- 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="16"
    height="16"
    viewBox="0 0 16 16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="cheatsheet_item_obj.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4242">
       <stop
          style="stop-color:#1e5484;stop-opacity:1"
@@ -32,7 +27,6 @@
          id="stop4246" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4204">
       <stop
          style="stop-color:#a098c8;stop-opacity:1;"
@@ -44,7 +38,6 @@
          id="stop4208" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4178">
       <stop
          style="stop-color:#7e713d;stop-opacity:1"
@@ -56,7 +49,6 @@
          id="stop4182" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4178"
        id="linearGradient4184"
        x1="20.299725"
@@ -66,7 +58,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-11.869292,0)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4204"
        id="linearGradient4210"
        x1="5.0507627"
@@ -76,7 +67,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1.0145296,0,0,1.1702295,-0.12918908,-178.2274)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4204"
        id="linearGradient4210-5"
        x1="5.0507627"
@@ -86,7 +76,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(0.73039537,0,0,1.1702295,1.3059054,-174.32116)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4204"
        id="linearGradient4210-6"
        x1="5.0507627"
@@ -96,7 +85,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1.0145296,0,0,1.1702295,-0.129189,-176.26314)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4242"
        id="linearGradient4248"
        x1="-9.9107141"
@@ -106,7 +94,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(12.410714,11.205357)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4187"
        id="linearGradient4206"
        x1="3.9750192"
@@ -116,8 +103,7 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-0.07102635,0)" />
     <linearGradient
-       id="linearGradient4187"
-       inkscape:collect="always">
+       id="linearGradient4187">
       <stop
          id="stop4189"
          offset="0"
@@ -132,7 +118,6 @@
          style="stop-color:#3e72a7;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4187"
        id="linearGradient4206-1"
        x1="3.9750192"
@@ -142,7 +127,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(1.9308035,-0.05580357)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4187"
        id="linearGradient4206-1-9"
        x1="3.9750192"
@@ -152,7 +136,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(3.8839285,-4.2568467e-7)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4187"
        id="linearGradient4206-1-9-5"
        x1="3.9750192"
@@ -162,7 +145,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(0.83688828,0,0,1.10534,6.6397152,-109.42141)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4307"
        id="linearGradient4206-1-9-5-1"
        x1="3.9750192"
@@ -172,7 +154,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(7.9352678,-4.2546071e-7)" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4307">
       <stop
          style="stop-color:#17325d;stop-opacity:1"
@@ -188,31 +169,6 @@
          id="stop4314" />
     </linearGradient>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="31.678384"
-     inkscape:cx="6.364861"
-     inkscape:cy="10.108057"
-     inkscape:document-units="px"
-     inkscape:current-layer="g4189"
-     showgrid="true"
-     units="px"
-     inkscape:snap-others="false"
-     inkscape:snap-grids="false"
-     inkscape:window-width="1234"
-     inkscape:window-height="964"
-     inkscape:window-x="558"
-     inkscape:window-y="450"
-     inkscape:window-maximized="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3336" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -226,8 +182,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      transform="translate(0,-1036.3622)">
     <rect
@@ -275,9 +229,7 @@
         <path
            style="fill:url(#linearGradient4248);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
            d="m 2.0089282,1044.3293 0,5 1.495536,0 2.9799108,-2.4889 -2.9799108,-2.5111 z"
-           id="path4232"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccccc" />
+           id="path4232" />
         <g
            transform="translate(3.1295776e-8,3.9760489)"
            id="g4984">
@@ -293,42 +245,30 @@
             <path
                style="fill:#b7d2e4;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
                d="m 4.0354196,1037.8348 8.9380894,0"
-               id="path4307"
-               inkscape:connector-curvature="0"
-               sodipodi:nodetypes="cc" />
+               id="path4307" />
             <g
                id="g4280"
                transform="translate(0.12626957,0)">
               <path
-                 inkscape:connector-curvature="0"
                  id="path4198"
                  d="m 4.3932593,1036.8711 0.00271,2.0536"
-                 style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4206);stroke-width:1;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-                 sodipodi:nodetypes="cc" />
+                 style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4206);stroke-width:1;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
               <path
-                 inkscape:connector-curvature="0"
                  id="path4198-7"
                  d="m 6.3950894,1036.8153 0.00271,2.0694"
-                 style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4206-1);stroke-width:1;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-                 sodipodi:nodetypes="cc" />
+                 style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4206-1);stroke-width:1;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
               <path
-                 inkscape:connector-curvature="0"
                  id="path4198-7-2"
                  d="m 8.3482144,1036.8711 0.050059,1.8484"
-                 style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4206-1-9);stroke-width:1;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-                 sodipodi:nodetypes="cc" />
+                 style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4206-1-9);stroke-width:1;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
               <path
-                 inkscape:connector-curvature="0"
                  id="path4198-7-2-6"
                  d="m 10.375824,1036.8315 -0.03736,1.9858"
-                 style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4206-1-9-5);stroke-width:0.96179312;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-                 sodipodi:nodetypes="cc" />
+                 style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4206-1-9-5);stroke-width:0.96179312;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
               <path
-                 inkscape:connector-curvature="0"
                  id="path4198-7-2-6-7"
                  d="m 12.399554,1036.8711 -0.03348,2.0424"
-                 style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4206-1-9-5-1);stroke-width:1;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-                 sodipodi:nodetypes="cc" />
+                 style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4206-1-9-5-1);stroke-width:1;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
             </g>
             <g
                id="g4322"
diff --git a/ua/org.eclipse.pde.ua.ui/icons/obj16/cheatsheet_obj.svg b/ua/org.eclipse.pde.ua.ui/icons/obj16/cheatsheet_obj.svg
index f8a34cbc277..40dae0fe8c0 100644
--- a/ua/org.eclipse.pde.ua.ui/icons/obj16/cheatsheet_obj.svg
+++ b/ua/org.eclipse.pde.ua.ui/icons/obj16/cheatsheet_obj.svg
@@ -2,25 +2,20 @@
 <!-- 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="16"
    height="16"
    viewBox="0 0 16 16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="cheatsheet_obj.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4350">
       <stop
          style="stop-color:#304bb0;stop-opacity:1"
@@ -32,7 +27,6 @@
          id="stop4354" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4190">
       <stop
          style="stop-color:#2846b3;stop-opacity:1"
@@ -44,7 +38,6 @@
          id="stop4194" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4170">
       <stop
          style="stop-color:#85c0ed;stop-opacity:1;"
@@ -56,7 +49,6 @@
          id="stop4174" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4187">
       <stop
          style="stop-color:#17325d;stop-opacity:1"
@@ -72,8 +64,7 @@
          id="stop4191" />
     </linearGradient>
     <linearGradient
-       id="linearGradient4178-1"
-       inkscape:collect="always">
+       id="linearGradient4178-1">
       <stop
          id="stop4180-5"
          offset="0"
@@ -91,40 +82,8 @@
        y1="1052.2014"
        x1="20.299725"
        id="linearGradient4184-2"
-       xlink:href="#linearGradient4350"
-       inkscape:collect="always" />
-    <linearGradient
-       gradientTransform="translate(1.8303571,0)"
-       gradientUnits="userSpaceOnUse"
-       y2="1039.2346"
-       x2="3.9750192"
-       y1="1036.3827"
-       x1="3.9750192"
-       id="linearGradient4326"
-       xlink:href="#linearGradient4187"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4350" />
     <linearGradient
-       gradientTransform="translate(3.8839285,-4.2568467e-7)"
-       gradientUnits="userSpaceOnUse"
-       y2="1039.2346"
-       x2="3.9750192"
-       y1="1036.3827"
-       x1="3.9750192"
-       id="linearGradient4328"
-       xlink:href="#linearGradient4187"
-       inkscape:collect="always" />
-    <linearGradient
-       gradientTransform="matrix(0.83688828,0,0,1.10534,6.6397152,-109.42141)"
-       gradientUnits="userSpaceOnUse"
-       y2="1039.2346"
-       x2="3.9750192"
-       y1="1036.3827"
-       x1="3.9750192"
-       id="linearGradient4330"
-       xlink:href="#linearGradient4187"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4178-1"
        id="linearGradient4340"
        gradientUnits="userSpaceOnUse"
@@ -134,7 +93,6 @@
        x2="20.299725"
        y2="1036.755" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4170"
        id="linearGradient4362"
        x1="6.5091562"
@@ -143,7 +101,6 @@
        y2="1040.5598"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4190"
        id="linearGradient4196-9"
        x1="20.767859"
@@ -160,8 +117,7 @@
        y1="1036.3827"
        x1="3.9750192"
        id="linearGradient4206-38"
-       xlink:href="#linearGradient4187"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4187" />
     <linearGradient
        gradientTransform="translate(1.8459821,0)"
        gradientUnits="userSpaceOnUse"
@@ -170,8 +126,7 @@
        y1="1036.3827"
        x1="3.9750192"
        id="linearGradient4206-1"
-       xlink:href="#linearGradient4187"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4187" />
     <linearGradient
        gradientTransform="translate(3.860491,-4.2568467e-7)"
        gradientUnits="userSpaceOnUse"
@@ -180,8 +135,7 @@
        y1="1036.3827"
        x1="3.9750192"
        id="linearGradient4206-1-9"
-       xlink:href="#linearGradient4187"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4187" />
     <linearGradient
        gradientTransform="matrix(0.83688828,0,0,1.10534,6.5850277,-109.21828)"
        gradientUnits="userSpaceOnUse"
@@ -190,40 +144,8 @@
        y1="1036.3827"
        x1="3.9750192"
        id="linearGradient4206-1-9-5"
-       xlink:href="#linearGradient4187"
-       inkscape:collect="always" />
-    <linearGradient
-       gradientTransform="translate(1.8459821,0)"
-       gradientUnits="userSpaceOnUse"
-       y2="1039.2346"
-       x2="3.9750192"
-       y1="1036.3827"
-       x1="3.9750192"
-       id="linearGradient4648"
-       xlink:href="#linearGradient4187"
-       inkscape:collect="always" />
-    <linearGradient
-       gradientTransform="translate(3.860491,-4.2568467e-7)"
-       gradientUnits="userSpaceOnUse"
-       y2="1039.2346"
-       x2="3.9750192"
-       y1="1036.3827"
-       x1="3.9750192"
-       id="linearGradient4650"
-       xlink:href="#linearGradient4187"
-       inkscape:collect="always" />
-    <linearGradient
-       gradientTransform="matrix(0.83688828,0,0,1.10534,6.5850277,-109.21828)"
-       gradientUnits="userSpaceOnUse"
-       y2="1039.2346"
-       x2="3.9750192"
-       y1="1036.3827"
-       x1="3.9750192"
-       id="linearGradient4652"
-       xlink:href="#linearGradient4187"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4187" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4187"
        id="linearGradient4674"
        gradientUnits="userSpaceOnUse"
@@ -233,7 +155,6 @@
        x2="3.9750192"
        y2="1039.2346" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4187"
        id="linearGradient4676"
        gradientUnits="userSpaceOnUse"
@@ -243,7 +164,6 @@
        x2="3.9750192"
        y2="1039.2346" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4187"
        id="linearGradient4678"
        gradientUnits="userSpaceOnUse"
@@ -253,7 +173,6 @@
        x2="3.9750192"
        y2="1039.2346" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4187"
        id="linearGradient4680"
        gradientUnits="userSpaceOnUse"
@@ -263,32 +182,6 @@
        x2="3.9750192"
        y2="1039.2346" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="15.839192"
-     inkscape:cx="4.2696908"
-     inkscape:cy="14.238158"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1-3-2"
-     showgrid="true"
-     units="px"
-     inkscape:snap-others="false"
-     inkscape:snap-grids="false"
-     inkscape:window-width="1234"
-     inkscape:window-height="964"
-     inkscape:window-x="512"
-     inkscape:window-y="347"
-     inkscape:window-maximized="0"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3336" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -302,13 +195,10 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      transform="translate(0,-1036.3622)">
     <g
        id="layer1-3-2"
-       inkscape:label="Layer 1"
        transform="translate(4.0074104,4.2785891)">
       <rect
          ry="0.37885904"
@@ -320,8 +210,6 @@
          id="rect3368-9-6"
          style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:url(#linearGradient4340);stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
       <path
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
          id="path4307-4-6"
          d="m 4.0354196,1037.8348 6.6613034,0"
          style="fill:#b7d2e4;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
@@ -329,8 +217,6 @@
          transform="translate(-0.03231284,-0.10411906)"
          id="g4307-7">
         <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
            id="path4307-4-2"
            d="m 4.2234368,1036.1791 0,2.149 6.6621092,0 0,-2.149 z"
            style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
@@ -338,29 +224,21 @@
            id="g4280-6-06"
            transform="translate(0.22665952,-0.20124145)">
           <path
-             inkscape:connector-curvature="0"
              id="path4198-65-4"
              d="m 4.2838843,1036.8711 0.00271,2.0536"
-             style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4674);stroke-width:1;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-             sodipodi:nodetypes="cc" />
+             style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4674);stroke-width:1;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
           <path
-             inkscape:connector-curvature="0"
              id="path4198-7-3"
              d="m 6.310268,1036.8711 -0.044643,2.0536"
-             style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4676);stroke-width:1;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-             sodipodi:nodetypes="cc" />
+             style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4676);stroke-width:1;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
           <path
-             inkscape:connector-curvature="0"
              id="path4198-7-2-7"
              d="m 8.3247769,1036.8711 -0.044643,2.0536"
-             style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4678);stroke-width:1;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-             sodipodi:nodetypes="cc" />
+             style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4678);stroke-width:1;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
           <path
-             inkscape:connector-curvature="0"
              id="path4198-7-2-6-2"
              d="m 10.321136,1036.8768 -0.03736,1.9965"
-             style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4680);stroke-width:0.96179312;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-             sodipodi:nodetypes="cc" />
+             style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4680);stroke-width:0.96179312;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
         </g>
         <g
            transform="translate(0.10038992,-4.1451644e-5)"
@@ -442,7 +320,6 @@
     </g>
     <g
        id="layer1-3"
-       inkscape:label="Layer 1"
        transform="translate(-3.0320902,1.1849966)">
       <rect
          ry="0.37885904"
@@ -456,8 +333,6 @@
       <g
          id="g4307">
         <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
            id="path4307-4"
            d="m 4.2234368,1036.1791 0,2.149 6.6621092,0 0,-2.149 z"
            style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
@@ -465,29 +340,21 @@
            id="g4280-6"
            transform="translate(0.22665952,-0.20124145)">
           <path
-             inkscape:connector-curvature="0"
              id="path4198-65"
              d="m 4.2838843,1036.8711 0.00271,2.0536"
-             style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4206-38);stroke-width:1;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-             sodipodi:nodetypes="cc" />
+             style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4206-38);stroke-width:1;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
           <path
-             inkscape:connector-curvature="0"
              id="path4198-7"
              d="m 6.310268,1036.8711 -0.044643,2.0536"
-             style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4206-1);stroke-width:1;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-             sodipodi:nodetypes="cc" />
+             style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4206-1);stroke-width:1;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
           <path
-             inkscape:connector-curvature="0"
              id="path4198-7-2"
              d="m 8.3247769,1036.8711 -0.044643,2.0536"
-             style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4206-1-9);stroke-width:1;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-             sodipodi:nodetypes="cc" />
+             style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4206-1-9);stroke-width:1;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
           <path
-             inkscape:connector-curvature="0"
              id="path4198-7-2-6"
              d="m 10.321136,1036.8768 -0.03736,1.9965"
-             style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4206-1-9-5);stroke-width:0.96179312;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-             sodipodi:nodetypes="cc" />
+             style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4206-1-9-5);stroke-width:0.96179312;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
         </g>
         <g
            transform="translate(0.10038992,-4.1451644e-5)"
diff --git a/ua/org.eclipse.pde.ua.ui/icons/obj16/cheatsheet_simple_obj.svg b/ua/org.eclipse.pde.ua.ui/icons/obj16/cheatsheet_simple_obj.svg
index 585bdfa1264..600f664f66f 100644
--- a/ua/org.eclipse.pde.ua.ui/icons/obj16/cheatsheet_simple_obj.svg
+++ b/ua/org.eclipse.pde.ua.ui/icons/obj16/cheatsheet_simple_obj.svg
@@ -2,25 +2,20 @@
 <!-- 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="16"
    height="16"
    viewBox="0 0 16 16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="cheatsheet_simple_obj.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4178">
       <stop
          style="stop-color:#7e713d;stop-opacity:1"
@@ -32,7 +27,6 @@
          id="stop4182" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4178"
        id="linearGradient4184"
        x1="20.299725"
@@ -42,7 +36,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-11.869292,0)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4187"
        id="linearGradient4206"
        x1="3.9750192"
@@ -52,8 +45,7 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-0.07102635,0)" />
     <linearGradient
-       id="linearGradient4187"
-       inkscape:collect="always">
+       id="linearGradient4187">
       <stop
          id="stop4189"
          offset="0"
@@ -68,7 +60,6 @@
          style="stop-color:#3e72a7;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4187"
        id="linearGradient4206-1"
        x1="3.9750192"
@@ -78,7 +69,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(1.9308035,-0.05580357)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4187"
        id="linearGradient4206-1-9"
        x1="3.9750192"
@@ -88,7 +78,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(3.8839285,-4.2568467e-7)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4187"
        id="linearGradient4206-1-9-5"
        x1="3.9750192"
@@ -98,7 +87,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(0.83688828,0,0,1.10534,6.6397152,-109.42141)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4307"
        id="linearGradient4206-1-9-5-1"
        x1="3.9750192"
@@ -108,7 +96,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(7.9352678,-4.2546071e-7)" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4307">
       <stop
          style="stop-color:#17325d;stop-opacity:1"
@@ -124,31 +111,6 @@
          id="stop4314" />
     </linearGradient>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="22.4"
-     inkscape:cx="8.6440017"
-     inkscape:cy="7.5875244"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     units="px"
-     inkscape:snap-others="false"
-     inkscape:snap-grids="false"
-     inkscape:window-width="1234"
-     inkscape:window-height="964"
-     inkscape:window-x="512"
-     inkscape:window-y="347"
-     inkscape:window-maximized="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3336" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -162,8 +124,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      transform="translate(0,-1036.3622)">
     <rect
@@ -189,42 +149,30 @@
         <path
            style="fill:#b7d2e4;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
            d="m 4.0354196,1037.8348 8.9380894,0"
-           id="path4307"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cc" />
+           id="path4307" />
         <g
            id="g4280"
            transform="translate(0.12626957,0)">
           <path
-             inkscape:connector-curvature="0"
              id="path4198"
              d="m 4.3932593,1036.8711 0.00271,2.0536"
-             style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4206);stroke-width:1;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-             sodipodi:nodetypes="cc" />
+             style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4206);stroke-width:1;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
           <path
-             inkscape:connector-curvature="0"
              id="path4198-7"
              d="m 6.3950894,1036.8153 0.00271,2.0694"
-             style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4206-1);stroke-width:1;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-             sodipodi:nodetypes="cc" />
+             style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4206-1);stroke-width:1;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
           <path
-             inkscape:connector-curvature="0"
              id="path4198-7-2"
              d="m 8.3482144,1036.8711 0.050059,1.8484"
-             style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4206-1-9);stroke-width:1;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-             sodipodi:nodetypes="cc" />
+             style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4206-1-9);stroke-width:1;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
           <path
-             inkscape:connector-curvature="0"
              id="path4198-7-2-6"
              d="m 10.375824,1036.8315 -0.03736,1.9858"
-             style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4206-1-9-5);stroke-width:0.96179312;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-             sodipodi:nodetypes="cc" />
+             style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4206-1-9-5);stroke-width:0.96179312;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
           <path
-             inkscape:connector-curvature="0"
              id="path4198-7-2-6-7"
              d="m 12.399554,1036.8711 -0.03348,2.0424"
-             style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4206-1-9-5-1);stroke-width:1;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-             sodipodi:nodetypes="cc" />
+             style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4206-1-9-5-1);stroke-width:1;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
         </g>
         <g
            id="g4322"
diff --git a/ua/org.eclipse.pde.ua.ui/icons/obj16/cheatsheet_subitem_obj.svg b/ua/org.eclipse.pde.ua.ui/icons/obj16/cheatsheet_subitem_obj.svg
index 75e5c42da46..2d581d85c0a 100644
--- a/ua/org.eclipse.pde.ua.ui/icons/obj16/cheatsheet_subitem_obj.svg
+++ b/ua/org.eclipse.pde.ua.ui/icons/obj16/cheatsheet_subitem_obj.svg
@@ -2,26 +2,21 @@
 <!-- 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="16"
    height="16"
    viewBox="0 0 16 16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="cheatsheet_subitem_obj.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient4188"
-       inkscape:collect="always">
+       id="linearGradient4188">
       <stop
          id="stop4190"
          offset="0"
@@ -32,8 +27,7 @@
          style="stop-color:#6155a0;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       id="linearGradient4180"
-       inkscape:collect="always">
+       id="linearGradient4180">
       <stop
          id="stop4183"
          offset="0"
@@ -44,7 +38,6 @@
          style="stop-color:#6155a0;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4178">
       <stop
          style="stop-color:#7e713d;stop-opacity:1"
@@ -56,7 +49,6 @@
          id="stop4182" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4178"
        id="linearGradient4184"
        x1="20.299725"
@@ -88,7 +80,6 @@
          id="stop7596-5-6" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient7584-9-3"
        id="linearGradient7608-9-7"
        gradientUnits="userSpaceOnUse"
@@ -97,7 +88,6 @@
        x2="22.930616"
        y2="1041.7356" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient7592-0-5"
        id="linearGradient7610-7-6"
        gradientUnits="userSpaceOnUse"
@@ -106,7 +96,6 @@
        x2="22.930616"
        y2="1041.7356" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4180"
        id="linearGradient4210"
        x1="6.9209113"
@@ -116,7 +105,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1.0145296,0,0,1.1702295,1.9946511,-182.23112)" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4204">
       <stop
          style="stop-color:#c8c3df;stop-opacity:1"
@@ -128,7 +116,6 @@
          id="stop4208" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4188"
        id="linearGradient4210-6"
        x1="7.2289357"
@@ -138,7 +125,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1.0145296,0,0,1.1702295,1.9946511,-180.26682)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4204"
        id="linearGradient4210-5"
        x1="7.1288934"
@@ -148,7 +134,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(0.73039537,0,0,1.1702295,3.4297451,-178.32482)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4187"
        id="linearGradient4206"
        x1="3.9750192"
@@ -158,8 +143,7 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-0.07102635,0)" />
     <linearGradient
-       id="linearGradient4187"
-       inkscape:collect="always">
+       id="linearGradient4187">
       <stop
          id="stop4189"
          offset="0"
@@ -174,7 +158,6 @@
          style="stop-color:#3e72a7;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4187"
        id="linearGradient4206-1"
        x1="3.9750192"
@@ -184,7 +167,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(1.9308035,-0.05580357)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4187"
        id="linearGradient4206-1-9"
        x1="3.9750192"
@@ -194,7 +176,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(3.8839285,-4.2568467e-7)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4187"
        id="linearGradient4206-1-9-5"
        x1="3.9750192"
@@ -204,7 +185,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(0.83688828,0,0,1.10534,6.6397152,-109.42141)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4307"
        id="linearGradient4206-1-9-5-1"
        x1="3.9750192"
@@ -214,7 +194,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(7.9352678,-4.2546071e-7)" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4307">
       <stop
          style="stop-color:#17325d;stop-opacity:1"
@@ -230,31 +209,6 @@
          id="stop4314" />
     </linearGradient>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="15.839192"
-     inkscape:cx="8.2926231"
-     inkscape:cy="9.7019003"
-     inkscape:document-units="px"
-     inkscape:current-layer="g4374"
-     showgrid="true"
-     units="px"
-     inkscape:snap-others="false"
-     inkscape:snap-grids="false"
-     inkscape:window-width="896"
-     inkscape:window-height="853"
-     inkscape:window-x="1146"
-     inkscape:window-y="542"
-     inkscape:window-maximized="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3336" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -268,8 +222,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      transform="translate(0,-1036.3622)">
     <rect
@@ -326,42 +278,30 @@
           <path
              style="fill:#b7d2e4;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
              d="m 4.0354196,1037.8348 8.9380894,0"
-             id="path4307"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="cc" />
+             id="path4307" />
           <g
              id="g4280"
              transform="translate(0.12626957,0)">
             <path
-               inkscape:connector-curvature="0"
                id="path4198"
                d="m 4.3932593,1036.8711 0.00271,2.0536"
-               style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4206);stroke-width:1;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-               sodipodi:nodetypes="cc" />
+               style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4206);stroke-width:1;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
             <path
-               inkscape:connector-curvature="0"
                id="path4198-7"
                d="m 6.3950894,1036.8153 0.00271,2.0694"
-               style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4206-1);stroke-width:1;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-               sodipodi:nodetypes="cc" />
+               style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4206-1);stroke-width:1;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
             <path
-               inkscape:connector-curvature="0"
                id="path4198-7-2"
                d="m 8.3482144,1036.8711 0.050059,1.8484"
-               style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4206-1-9);stroke-width:1;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-               sodipodi:nodetypes="cc" />
+               style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4206-1-9);stroke-width:1;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
             <path
-               inkscape:connector-curvature="0"
                id="path4198-7-2-6"
                d="m 10.375824,1036.8315 -0.03736,1.9858"
-               style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4206-1-9-5);stroke-width:0.96179312;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-               sodipodi:nodetypes="cc" />
+               style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4206-1-9-5);stroke-width:0.96179312;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
             <path
-               inkscape:connector-curvature="0"
                id="path4198-7-2-6-7"
                d="m 12.399554,1036.8711 -0.03348,2.0424"
-               style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4206-1-9-5-1);stroke-width:1;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-               sodipodi:nodetypes="cc" />
+               style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4206-1-9-5-1);stroke-width:1;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
           </g>
           <g
              id="g4322"
@@ -445,14 +385,10 @@
        id="g7604-6"
        transform="matrix(-1,0,0,-1,28.84981,2085.3275)">
       <path
-         sodipodi:nodetypes="ccssscsscsssszcc"
-         inkscape:connector-curvature="0"
          id="path7582-7"
          d="m 23.585155,1039.3249 0,-1.591 c 0,0 -0.353553,-0.8397 -1.370019,-0.044 -1.016466,0.7955 -2.209709,2.0772 -2.386486,2.4307 -0.176776,0.3536 -0.928077,0.9723 0.08839,1.9446 1.016466,0.9722 2.121321,1.9887 2.121321,1.9887 0,0 0.404271,0.3812 0.799458,0.5707 0.37782,0.1811 0.747338,0.1871 0.747338,-0.4827 0,-1.37 0,-1.812 0,-1.812 1.366404,-0.063 1.727345,0.3446 2.039845,0.6884 0.3125,0.3437 0.8125,1.9687 1.21875,2.0937 0.40625,0.125 0.625,-2.1875 0.625,-2.625 0,-0.4375 -0.09375,-1.3125 -0.71875,-1.9687 -0.625,-0.6563 -1.006571,-0.9555 -1.53125,-1.0998 -0.524679,-0.1444 -1.633595,-0.094 -1.633595,-0.094 z"
          style="fill:url(#linearGradient7608-9-7);fill-opacity:1;stroke:url(#linearGradient7610-7-6);stroke-width:0.80000001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
       <path
-         sodipodi:nodetypes="ccssscc"
-         inkscape:connector-curvature="0"
          id="path7602-2"
          d="m 23.069359,1042.9731 0,0.5966 c 0,0 0.110485,0.3757 -0.220971,0.2431 -0.331456,-0.1326 -0.972272,-0.6629 -1.038563,-0.7734 -0.06629,-0.1105 -0.751301,-0.5966 -0.596622,-0.8176 0.15468,-0.221 1.458408,-0.066 1.458408,-0.066 z"
          style="opacity:0.85714285;fill:#ffffff;fill-opacity:1;stroke:none" />
diff --git a/ua/org.eclipse.pde.ua.ui/icons/obj16/cheatsheet_taskgroup_obj.svg b/ua/org.eclipse.pde.ua.ui/icons/obj16/cheatsheet_taskgroup_obj.svg
index 7724278881d..80d80c7c3e6 100644
--- a/ua/org.eclipse.pde.ua.ui/icons/obj16/cheatsheet_taskgroup_obj.svg
+++ b/ua/org.eclipse.pde.ua.ui/icons/obj16/cheatsheet_taskgroup_obj.svg
@@ -2,24 +2,19 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="cheatsheet_taskgroup_obj.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4845">
       <stop
          style="stop-color:#afb8cd;stop-opacity:1;"
@@ -31,7 +26,6 @@
          id="stop4849" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4837">
       <stop
          style="stop-color:#acbfd5;stop-opacity:1;"
@@ -58,7 +52,6 @@
          id="stop4788" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4767">
       <stop
          style="stop-color:#f1c373;stop-opacity:1"
@@ -70,7 +63,6 @@
          id="stop4771" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4767"
        id="linearGradient4774"
        x1="-11.999999"
@@ -80,7 +72,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(21.96875,0)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4784"
        id="linearGradient4790"
        x1="-17.3125"
@@ -90,7 +81,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(21.96875,0)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4837"
        id="linearGradient4843"
        x1="-11.375669"
@@ -100,7 +90,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(21.96875,0)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4845"
        id="linearGradient4851"
        x1="-12.921875"
@@ -117,8 +106,7 @@
        y1="1039.153"
        x1="9.8946028"
        id="linearGradient5000-6"
-       xlink:href="#linearGradient4994-7"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4994-7" />
     <linearGradient
        gradientTransform="translate(-4,-2)"
        gradientUnits="userSpaceOnUse"
@@ -127,8 +115,7 @@
        y1="1038.5779"
        x1="10.544736"
        id="linearGradient4908"
-       xlink:href="#linearGradient4902"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4902" />
     <linearGradient
        gradientTransform="matrix(0.72293526,0,0,1,-13.971893,-4.125)"
        gradientUnits="userSpaceOnUse"
@@ -137,8 +124,7 @@
        y1="1047.857"
        x1="7.0070496"
        id="linearGradient4871"
-       xlink:href="#linearGradient5147"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient5147" />
     <linearGradient
        gradientTransform="matrix(0.57546531,0,0,1,-12.938564,-4.125)"
        gradientUnits="userSpaceOnUse"
@@ -147,8 +133,7 @@
        y1="1045.857"
        x1="7.0070496"
        id="linearGradient4869"
-       xlink:href="#linearGradient4861"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4861" />
     <linearGradient
        gradientTransform="matrix(0.82571734,0,0,1,-14.692092,-4.125)"
        gradientUnits="userSpaceOnUse"
@@ -157,11 +142,9 @@
        y1="1043.857"
        x1="7.0070496"
        id="linearGradient4867"
-       xlink:href="#linearGradient4877"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4877" />
     <linearGradient
-       id="linearGradient4861"
-       inkscape:collect="always">
+       id="linearGradient4861">
       <stop
          id="stop4863"
          offset="0"
@@ -172,7 +155,6 @@
          style="stop-color:#637aa7;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4877">
       <stop
          style="stop-color:#91a5c7;stop-opacity:1;"
@@ -184,8 +166,7 @@
          id="stop4881" />
     </linearGradient>
     <linearGradient
-       id="linearGradient4902"
-       inkscape:collect="always">
+       id="linearGradient4902">
       <stop
          id="stop4904"
          offset="0"
@@ -196,8 +177,7 @@
          style="stop-color:#9a9a8f;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       id="linearGradient4994-7"
-       inkscape:collect="always">
+       id="linearGradient4994-7">
       <stop
          id="stop4996-7"
          offset="0"
@@ -208,7 +188,6 @@
          style="stop-color:#dce7f7;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient5147">
       <stop
          style="stop-color:#91a5c7;stop-opacity:1;"
@@ -227,8 +206,7 @@
        y1="1047.8571"
        x1="7.0070496"
        id="linearGradient4871-8"
-       xlink:href="#linearGradient4861"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4861" />
     <linearGradient
        gradientTransform="matrix(0.85699884,0,0,1,-18.038949,-0.9574)"
        gradientUnits="userSpaceOnUse"
@@ -237,8 +215,7 @@
        y1="1045.8571"
        x1="7.0070496"
        id="linearGradient4869-2"
-       xlink:href="#linearGradient4861"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4861" />
     <linearGradient
        gradientTransform="matrix(1.5144312,0,0,1,-22.645609,-0.9574)"
        gradientUnits="userSpaceOnUse"
@@ -247,8 +224,7 @@
        y1="1043.8571"
        x1="7.0070496"
        id="linearGradient4867-9"
-       xlink:href="#linearGradient4877"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4877" />
     <linearGradient
        gradientTransform="translate(-1.0285853,1.9176)"
        gradientUnits="userSpaceOnUse"
@@ -257,8 +233,7 @@
        y1="1038.5779"
        x1="10.544736"
        id="linearGradient4908-9"
-       xlink:href="#linearGradient4902"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4902" />
     <linearGradient
        gradientTransform="translate(-1.0285853,1.9176)"
        gradientUnits="userSpaceOnUse"
@@ -267,10 +242,8 @@
        y1="1039.153"
        x1="9.8946028"
        id="linearGradient5000-6-7"
-       xlink:href="#linearGradient4994-7"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4994-7" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4837"
        id="linearGradient4843-2"
        x1="-11.375669"
@@ -280,7 +253,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(21.96875,0)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4845"
        id="linearGradient4851-7"
        x1="-12.921875"
@@ -290,7 +262,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(21.96875,0)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4767"
        id="linearGradient4774-3"
        x1="-11.999999"
@@ -300,7 +271,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(21.96875,0)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4784"
        id="linearGradient4790-5"
        x1="-17.3125"
@@ -310,31 +280,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(21.96875,0)" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="5.6568541"
-     inkscape:cx="24.546447"
-     inkscape:cy="24.966829"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1241"
-     inkscape:window-height="814"
-     inkscape:window-x="887"
-     inkscape:window-y="418"
-     inkscape:window-maximized="0"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3999" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -348,8 +293,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
@@ -365,29 +308,20 @@
     <path
        style="fill:url(#linearGradient4851);fill-opacity:1;stroke:none"
        d="m 4.9843751,1040.3466 1.53125,-1.3672 0.9375,-2.1172 1.5,0 1.4999999,0 0.953125,2.1172 1.546875,1.3672"
-       id="path4794"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccc" />
+       id="path4794" />
     <path
        style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:url(#linearGradient4843);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;"
        d="m 7.3125001,1036.375 c -0.138213,0.043 -0.255616,0.1482 -0.3125,0.2812 l -0.875,2 -0.966084,0.8634 c -0.219449,0.2194 -0.161431,0.3252 -0.190934,0.8384 0.205415,0 0.484943,0 0.746694,-3e-4 l 1.129074,-1.0139 c 0.0516,-0.043 0.0944,-0.097 0.125,-0.1563 l 0.8125,-1.8125 1.1875,0 1.1562499,0 0.8125,1.8125 c 0.0306,0.06 0.0734,0.1133 0.125,0.1563 l 1.173251,1.0325 c 0.113518,0 0.471938,-0.02 0.715999,-0.031 0,-0.2129 0.08262,-0.5753 -0.123815,-0.7817 l -1.015435,-0.9075 -0.90625,-2 c -0.07974,-0.164 -0.255243,-0.2768 -0.4375,-0.2812 l -1.4999999,0 -1.5,0 c -0.05166,-0.01 -0.104595,-0.01 -0.15625,0 z"
-       id="path4794-5"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccccccccccccccccccc" />
+       id="path4794-5" />
     <g
        style="display:inline"
        id="layer1-3"
-       inkscape:label="Layer 1"
        transform="translate(3.1589147,4.1676048)">
       <path
-         sodipodi:nodetypes="cccccc"
-         inkscape:connector-curvature="0"
          id="rect4001-3"
          d="m 1.4972825,1036.9037 8.1563025,0 0.759173,3.0066 0,6.5483 -8.9154755,0 z"
          style="fill:url(#linearGradient5000-6);fill-opacity:1;stroke:none;display:inline" />
       <path
-         sodipodi:nodetypes="cccccc"
-         inkscape:connector-curvature="0"
          id="rect4001"
          d="m 1.4972825,1036.9037 8.4908829,0 0.04042,3.0066 0,6.4546 -8.5313047,0 z"
          style="fill:none;stroke:url(#linearGradient4908);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0" />
@@ -428,24 +362,16 @@
     <path
        style="display:inline;fill:url(#linearGradient4851-7);fill-opacity:1;stroke:none"
        d="m 4.9843751,1040.3466 1.53125,-1.3672 0.9375,-2.1172 1.5,0 1.4999999,0 0.953125,2.1172 1.546875,1.3672"
-       id="path4794-9"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccc" />
+       id="path4794-9" />
     <path
        style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient4843-2);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;marker:none;enable-background:accumulate"
        d="m 7.3125001,1036.375 c -0.138213,0.043 -0.255616,0.1482 -0.3125,0.2812 l -0.875,2 -0.966084,0.8634 c -0.219449,0.2194 -0.161431,0.3252 -0.190934,0.8384 0.205415,0 0.484943,0 0.746694,-3e-4 l 1.129074,-1.0139 c 0.0516,-0.043 0.0944,-0.097 0.125,-0.1563 l 0.8125,-1.8125 1.1875,0 1.1562499,0 0.8125,1.8125 c 0.0306,0.06 0.0734,0.1133 0.125,0.1563 l 1.173251,1.0325 c 0.113518,0 0.471938,-0.02 0.715999,-0.031 0,-0.2129 0.08262,-0.5753 -0.123815,-0.7817 l -1.015435,-0.9075 -0.90625,-2 c -0.07974,-0.164 -0.255243,-0.2768 -0.4375,-0.2812 l -1.4999999,0 -1.5,0 c -0.05166,-0.01 -0.104595,-0.01 -0.15625,0 z"
-       id="path4794-5-4"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccccccccccccccccccc" />
+       id="path4794-5-4" />
     <path
-       sodipodi:nodetypes="cccccc"
-       inkscape:connector-curvature="0"
        id="rect4001-3-6"
        d="m 4.4686972,1040.8213 8.8125528,0 0.102923,3.0066 0,6.5483 -8.9154758,0 z"
        style="display:inline;fill:url(#linearGradient5000-6-7);fill-opacity:1;stroke:none" />
     <path
-       sodipodi:nodetypes="cccccc"
-       inkscape:connector-curvature="0"
        id="rect4001-4"
        d="m 4.4686972,1040.8213 9.0221328,0 0.04042,3.0066 0,6.0483 -9.0625534,0 z"
        style="display:inline;fill:none;stroke:url(#linearGradient4908-9);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1" />
diff --git a/ua/org.eclipse.pde.ua.ui/icons/obj16/cheatsheet_unsupported_obj.svg b/ua/org.eclipse.pde.ua.ui/icons/obj16/cheatsheet_unsupported_obj.svg
index 29f17c6004c..47daa7bb4e8 100644
--- a/ua/org.eclipse.pde.ua.ui/icons/obj16/cheatsheet_unsupported_obj.svg
+++ b/ua/org.eclipse.pde.ua.ui/icons/obj16/cheatsheet_unsupported_obj.svg
@@ -2,25 +2,20 @@
 <!-- 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="16"
    height="16"
    viewBox="0 0 16 16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="cheatsheet_unsupported_obj.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4220">
       <stop
          style="stop-color:#194e7e;stop-opacity:1"
@@ -32,7 +27,6 @@
          id="stop4224" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4178">
       <stop
          style="stop-color:#7e713d;stop-opacity:1"
@@ -44,7 +38,6 @@
          id="stop4182" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4178"
        id="linearGradient4184"
        x1="20.299725"
@@ -54,7 +47,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-11.869292,0)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4220"
        id="linearGradient4226"
        x1="12.486175"
@@ -64,7 +56,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(0.97952579,0,0,1.0014501,0.33294211,-1.5197025)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4187"
        id="linearGradient4206"
        x1="3.9750192"
@@ -74,8 +65,7 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-0.07102635,0)" />
     <linearGradient
-       id="linearGradient4187"
-       inkscape:collect="always">
+       id="linearGradient4187">
       <stop
          id="stop4189"
          offset="0"
@@ -90,7 +80,6 @@
          style="stop-color:#3e72a7;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4187"
        id="linearGradient4206-1"
        x1="3.9750192"
@@ -100,7 +89,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(1.9308035,-0.05580357)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4187"
        id="linearGradient4206-1-9"
        x1="3.9750192"
@@ -110,7 +98,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(3.8839285,-4.2568467e-7)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4187"
        id="linearGradient4206-1-9-5"
        x1="3.9750192"
@@ -120,7 +107,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(0.83688828,0,0,1.10534,6.6397152,-109.42141)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4307"
        id="linearGradient4206-1-9-5-1"
        x1="3.9750192"
@@ -130,7 +116,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(7.9352678,-4.2546071e-7)" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4307">
       <stop
          style="stop-color:#17325d;stop-opacity:1"
@@ -146,31 +131,6 @@
          id="stop4314" />
     </linearGradient>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="22.4"
-     inkscape:cx="7.0878613"
-     inkscape:cy="8.215014"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     units="px"
-     inkscape:snap-others="false"
-     inkscape:snap-grids="false"
-     inkscape:window-width="1234"
-     inkscape:window-height="964"
-     inkscape:window-x="951"
-     inkscape:window-y="465"
-     inkscape:window-maximized="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3336" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -184,8 +144,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      transform="translate(0,-1036.3622)">
     <rect
@@ -204,9 +162,7 @@
       <path
          id="path4194"
          style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4226);stroke-width:1.08923517;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
-         d="m 15.314628,1045.5691 -4.686116,4.873 m 5.403079,-2.4215 c 3.8e-5,1.8334 -1.453645,3.3196 -3.246865,3.3196 -1.79322,0 -3.2469022,-1.4862 -3.2468654,-3.3196 1.73e-5,-1.8334 1.4536834,-3.3195 3.2468654,-3.3195 1.793181,0 3.246848,1.4861 3.246865,3.3195 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccscsc" />
+         d="m 15.314628,1045.5691 -4.686116,4.873 m 5.403079,-2.4215 c 3.8e-5,1.8334 -1.453645,3.3196 -3.246865,3.3196 -1.79322,0 -3.2469022,-1.4862 -3.2468654,-3.3196 1.73e-5,-1.8334 1.4536834,-3.3195 3.2468654,-3.3195 1.793181,0 3.246848,1.4861 3.246865,3.3195 z" />
     </g>
     <g
        id="g4984">
@@ -222,42 +178,30 @@
         <path
            style="fill:#b7d2e4;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
            d="m 4.0354196,1037.8348 8.9380894,0"
-           id="path4307"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cc" />
+           id="path4307" />
         <g
            id="g4280"
            transform="translate(0.12626957,0)">
           <path
-             inkscape:connector-curvature="0"
              id="path4198"
              d="m 4.3932593,1036.8711 0.00271,2.0536"
-             style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4206);stroke-width:1;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-             sodipodi:nodetypes="cc" />
+             style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4206);stroke-width:1;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
           <path
-             inkscape:connector-curvature="0"
              id="path4198-7"
              d="m 6.3950894,1036.8153 0.00271,2.0694"
-             style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4206-1);stroke-width:1;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-             sodipodi:nodetypes="cc" />
+             style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4206-1);stroke-width:1;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
           <path
-             inkscape:connector-curvature="0"
              id="path4198-7-2"
              d="m 8.3482144,1036.8711 0.050059,1.8484"
-             style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4206-1-9);stroke-width:1;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-             sodipodi:nodetypes="cc" />
+             style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4206-1-9);stroke-width:1;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
           <path
-             inkscape:connector-curvature="0"
              id="path4198-7-2-6"
              d="m 10.375824,1036.8315 -0.03736,1.9858"
-             style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4206-1-9-5);stroke-width:0.96179312;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-             sodipodi:nodetypes="cc" />
+             style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4206-1-9-5);stroke-width:0.96179312;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
           <path
-             inkscape:connector-curvature="0"
              id="path4198-7-2-6-7"
              d="m 12.399554,1036.8711 -0.03348,2.0424"
-             style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4206-1-9-5-1);stroke-width:1;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-             sodipodi:nodetypes="cc" />
+             style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4206-1-9-5-1);stroke-width:1;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
         </g>
         <g
            id="g4322"
diff --git a/ua/org.eclipse.pde.ua.ui/icons/obj16/ctxhelp_command_obj.svg b/ua/org.eclipse.pde.ua.ui/icons/obj16/ctxhelp_command_obj.svg
index 73d0a29146f..a253bbef0b8 100644
--- a/ua/org.eclipse.pde.ua.ui/icons/obj16/ctxhelp_command_obj.svg
+++ b/ua/org.eclipse.pde.ua.ui/icons/obj16/ctxhelp_command_obj.svg
@@ -2,32 +2,18 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.48.0 r9654"
-   sodipodi:docname="blank - Copy.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4738"
-       id="linearGradient4744"
-       x1="-13.936629"
-       y1="1049.9579"
-       x2="-13.936629"
-       y2="1040.053"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(20,0)" />
     <linearGradient
        id="linearGradient4738">
       <stop
@@ -44,17 +30,6 @@
          id="stop4742" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4741"
-       id="linearGradient4747"
-       x1="11.0625"
-       y1="1038.5497"
-       x2="11.0625"
-       y2="1049.912"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-1.314993,0)" />
-    <linearGradient
-       inkscape:collect="always"
        id="linearGradient4741">
       <stop
          style="stop-color:#30825a;stop-opacity:1"
@@ -73,8 +48,7 @@
        gradientTransform="translate(20,0)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient3980"
-       xlink:href="#linearGradient4738"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4738" />
     <linearGradient
        y2="1049.912"
        x2="11.0625"
@@ -83,35 +57,8 @@
        gradientTransform="translate(-1.314993,0)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient3982"
-       xlink:href="#linearGradient4741"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4741" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="20.48"
-     inkscape:cx="2.9255652"
-     inkscape:cy="12.862354"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="953"
-     inkscape:window-height="789"
-     inkscape:window-x="275"
-     inkscape:window-y="275"
-     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>
@@ -125,15 +72,11 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      transform="translate(0,-1036.3622)">
     <path
        style="fill:url(#linearGradient3980);fill-opacity:1;stroke:url(#linearGradient3982);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline"
        d="m 2.497507,1039.8618 0,2.0277 0,5 0,3 1,0 9.546687,-4.5273 c 0.59227,-0.3746 0.618127,-0.6299 0,-1 l -9.126842,-4.5004 z"
-       id="rect3968"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccccc" />
+       id="rect3968" />
   </g>
 </svg>
diff --git a/ua/org.eclipse.pde.ua.ui/icons/obj16/ctxhelp_context_obj.svg b/ua/org.eclipse.pde.ua.ui/icons/obj16/ctxhelp_context_obj.svg
index b24ab9a8267..9ee410cc28a 100644
--- a/ua/org.eclipse.pde.ua.ui/icons/obj16/ctxhelp_context_obj.svg
+++ b/ua/org.eclipse.pde.ua.ui/icons/obj16/ctxhelp_context_obj.svg
@@ -2,24 +2,19 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="ctxhelp_context_obj.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4181">
       <stop
          style="stop-color:#5680a8;stop-opacity:1"
@@ -31,7 +26,6 @@
          id="stop4185" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4238">
       <stop
          style="stop-color:#84a7cb;stop-opacity:1"
@@ -43,7 +37,6 @@
          id="stop4242" />
     </linearGradient>
     <radialGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4887-7-5"
        id="radialGradient4975-4"
        gradientUnits="userSpaceOnUse"
@@ -54,8 +47,7 @@
        fy="1056.0647"
        r="2.4573503" />
     <linearGradient
-       id="linearGradient4887-7-5"
-       inkscape:collect="always">
+       id="linearGradient4887-7-5">
       <stop
          id="stop4889-4-5"
          offset="0"
@@ -66,7 +58,6 @@
          style="stop-color:#778eb6;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4893-4-1"
        id="linearGradient4977-7"
        gradientUnits="userSpaceOnUse"
@@ -76,7 +67,6 @@
        x2="-6.6929808"
        y2="1053.8477" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4893-4-1">
       <stop
          style="stop-color:#7890b8;stop-opacity:1"
@@ -88,7 +78,6 @@
          id="stop4897-8-5" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4877-7">
       <stop
          style="stop-color:#f7f9fc;stop-opacity:1"
@@ -100,7 +89,6 @@
          id="stop4881-1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4901-2">
       <stop
          style="stop-color:#6c96c1;stop-opacity:1"
@@ -120,8 +108,7 @@
        gradientTransform="matrix(0.9878308,0.00829728,-0.01514192,1.7912223,18.37536,1047.474)"
        gradientUnits="userSpaceOnUse"
        id="radialGradient5007"
-       xlink:href="#linearGradient4877-7"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4877-7" />
     <linearGradient
        y2="3.2040119"
        x2="4.1679511"
@@ -130,7 +117,6 @@
        gradientUnits="userSpaceOnUse"
        id="linearGradient5009"
        xlink:href="#linearGradient4901-2"
-       inkscape:collect="always"
        gradientTransform="matrix(1.3487176,0,0,1.3638541,16.991693,1048.5837)" />
     <linearGradient
        id="linearGradient4877">
@@ -153,7 +139,6 @@
        y2="17.832731"
        gradientTransform="matrix(0.72618098,0,0,0.72618098,-20.175843,1059.2142)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4238"
        id="linearGradient4244"
        x1="12.606616"
@@ -163,7 +148,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-0.02762136,-0.03314563)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4181"
        id="linearGradient4187"
        x1="10.198831"
@@ -172,31 +156,6 @@
        y2="1061.1849"
        gradientUnits="userSpaceOnUse" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="32.000001"
-     inkscape:cx="2.4850082"
-     inkscape:cy="15.679322"
-     inkscape:document-units="px"
-     inkscape:current-layer="g4203"
-     showgrid="false"
-     inkscape:window-width="1160"
-     inkscape:window-height="909"
-     inkscape:window-x="1137"
-     inkscape:window-y="597"
-     inkscape:window-maximized="0"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid4092" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -210,8 +169,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
@@ -222,14 +179,11 @@
       <path
          style="fill:url(#linearGradient4244);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4187);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
          d="m 10.698831,1058.6151 0,5.1437 3.987329,0 0,-5.1114 z"
-         id="path4207"
-         inkscape:connector-curvature="0" />
+         id="path4207" />
       <g
          id="g4203"
          transform="matrix(1.4295578,0,0,1.4341381,-18.323561,-457.01045)">
         <path
-           sodipodi:nodetypes="cssssc"
-           inkscape:connector-curvature="0"
            id="rect4875-2-1"
            d="m 23.789274,1057.2805 0,-1.7812 c 0,-1.0276 -0.738157,-1.875 -1.7657,-1.875 l -0.63424,0 c -1.027543,0 -1.78756,0.5423 -1.78756,1.5699 l 0,2.0863"
            style="display:inline;fill:url(#radialGradient4975-4);fill-opacity:1;stroke:url(#linearGradient4977-7);stroke-width:0.69839907;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
@@ -254,18 +208,15 @@
             <path
                d="m -4.3360189,1067.7015 a 7.1710367,7.1710367 0 0 1 -7.1710371,7.1709 7.1710367,7.1710367 0 0 1 -7.171036,-7.1709 7.1710367,7.1710367 0 0 1 7.171036,-7.1711 7.1710367,7.1710367 0 0 1 7.1710371,7.1711 z"
                id="path4110"
-               style="fill:url(#linearGradient4118);fill-opacity:1;stroke:#304b8a;stroke-width:1.45764947;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-               inkscape:connector-curvature="0" />
+               style="fill:url(#linearGradient4118);fill-opacity:1;stroke:#304b8a;stroke-width:1.45764947;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
             <g
                id="g4234"
                transform="matrix(0.81211594,0,0,0.79627474,-3.7855424,211.70207)">
               <path
-                 inkscape:connector-curvature="0"
                  style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:20.03678703px;line-height:125%;font-family:Reznor;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#2a4484;fill-opacity:1;stroke:none"
                  d="m -9.4357617,1068.2736 c -1.2738953,10e-5 -2.2909443,0.3542 -3.0669773,1.0668 -0.776035,0.7126 -1.180487,1.6995 -1.22679,2.9336 l 2.106879,0.2667 c 0.06927,-1.5258 0.767628,-2.2669 2.0535413,-2.2669 0.544332,0 0.986005,0.1392 1.333468,0.4534 0.347451,0.3142 0.50671,0.7177 0.506718,1.2001 -8e-6,0.4489 -0.155573,0.8368 -0.480048,1.1734 -0.173559,0.1795 -0.518749,0.4482 -1.040106,0.7735 -0.47471,0.2917 -0.7828553,0.6247 -0.9334273,1.04 -0.13927,0.348 -0.21336,0.8822 -0.213355,1.6002 l 0,0.9601 1.9468633,0 0,-0.6134 c -6e-6,-0.7067 0.304445,-1.2494 0.906758,-1.6534 0.787868,-0.5387 1.32567,-1.0168 1.626831,-1.3868 0.416727,-0.5387 0.640055,-1.1881 0.640064,-1.9736 -9e-6,-1.0772 -0.431305,-1.9671 -1.253459,-2.6403 -0.787883,-0.6283 -1.760322,-0.9333 -2.90696,-0.9334 z"
                  id="text4882" />
               <path
-                 inkscape:connector-curvature="0"
                  style="display:inline;fill:#294384;fill-opacity:1;stroke:none"
                  id="path4908-1"
                  d="m -8.0758489,1079.7271 a 1.472991,1.2557853 0 0 1 -1.4729931,1.2558 1.472991,1.2557853 0 0 1 -1.472991,-1.2558 1.472991,1.2557853 0 0 1 1.472991,-1.2558 1.472991,1.2557853 0 0 1 1.4729931,1.2558 z" />
diff --git a/ua/org.eclipse.pde.ua.ui/icons/obj16/ctxhelp_desc_obj.svg b/ua/org.eclipse.pde.ua.ui/icons/obj16/ctxhelp_desc_obj.svg
index 448b368ccf4..43b4d2abcb7 100644
--- a/ua/org.eclipse.pde.ua.ui/icons/obj16/ctxhelp_desc_obj.svg
+++ b/ua/org.eclipse.pde.ua.ui/icons/obj16/ctxhelp_desc_obj.svg
@@ -2,20 +2,16 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r"
-   sodipodi:docname="ctxhelp_desc_obj.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
@@ -30,18 +26,6 @@
          id="stop5242" />
     </linearGradient>
     <linearGradient
-       id="linearGradient5148-9-8">
-      <stop
-         style="stop-color:#05507d;stop-opacity:1;"
-         offset="0"
-         id="stop5150-6-3" />
-      <stop
-         style="stop-color:#6b8fa5;stop-opacity:1;"
-         offset="1"
-         id="stop5152-5-4" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient5238"
        id="linearGradient5244"
        x1="12.531334"
@@ -68,8 +52,7 @@
        x1="12.531334"
        gradientUnits="userSpaceOnUse"
        id="linearGradient5261"
-       xlink:href="#linearGradient5238-1"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient5238-1" />
     <linearGradient
        id="linearGradient5238-1-3">
       <stop
@@ -89,8 +72,7 @@
        gradientTransform="matrix(0.84444446,0,0,1,0.81631946,5.9182454)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient5295"
-       xlink:href="#linearGradient5238-1-3"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient5238-1-3" />
     <linearGradient
        id="linearGradient5238-1-3-6">
       <stop
@@ -110,8 +92,7 @@
        gradientTransform="translate(-0.07812493,7.9807454)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient5329"
-       xlink:href="#linearGradient5238-1-3-6"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient5238-1-3-6" />
     <linearGradient
        id="linearGradient5238-1-3-6-4">
       <stop
@@ -131,11 +112,9 @@
        gradientTransform="matrix(1.2844444,0,0,1,-1.7136804,9.918245)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient5363"
-       xlink:href="#linearGradient5238-1-3-6-4"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient5238-1-3-6-4" />
     <linearGradient
        gradientTransform="translate(7.1228027e-8,1.9687552)"
-       inkscape:collect="always"
        xlink:href="#linearGradient5238"
        id="linearGradient5244-9"
        x1="12.531334"
@@ -144,32 +123,6 @@
        y2="1041.9091"
        gradientUnits="userSpaceOnUse" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="31.999999"
-     inkscape:cx="5.3721275"
-     inkscape:cy="7.5712502"
-     inkscape:document-units="px"
-     inkscape:current-layer="g5382"
-     showgrid="true"
-     inkscape:window-width="1181"
-     inkscape:window-height="870"
-     inkscape:window-x="360"
-     inkscape:window-y="543"
-     inkscape:window-maximized="0"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-others="false"
-     inkscape:snap-nodes="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid4176" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -183,8 +136,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
diff --git a/ua/org.eclipse.pde.ua.ui/icons/obj16/toc_anchor_obj.svg b/ua/org.eclipse.pde.ua.ui/icons/obj16/toc_anchor_obj.svg
index 1a2b05ff87c..da549980cd5 100644
--- a/ua/org.eclipse.pde.ua.ui/icons/obj16/toc_anchor_obj.svg
+++ b/ua/org.eclipse.pde.ua.ui/icons/obj16/toc_anchor_obj.svg
@@ -2,24 +2,19 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r"
-   sodipodi:docname="toc_anchor_obj.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <radialGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4206"
        id="radialGradient4216"
        cx="19.032227"
@@ -30,7 +25,6 @@
        gradientTransform="matrix(1.1024822,-0.00577547,0.00898139,1.7144603,-13.024771,1030.6744)"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4206">
       <stop
          style="stop-color:#496e95;stop-opacity:1;"
@@ -46,31 +40,6 @@
          id="stop4210" />
     </linearGradient>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="16.000001"
-     inkscape:cx="22.830858"
-     inkscape:cy="7.642835"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1440"
-     inkscape:window-height="900"
-     inkscape:window-x="81"
-     inkscape:window-y="29"
-     inkscape:window-maximized="0"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3999" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -84,22 +53,16 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
     <path
        style="display:inline;fill:url(#radialGradient4216);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="m 7.0410165,1038.3661 0,2.0117 -3.027344,0 0,0.9844 3.027344,0 0,6.3476 c 0,0 -1.2091643,-0.7226 -1.5892893,-1.1288 -0.380125,-0.4063 -0.632812,-1.9375 -0.632812,-1.9375 l -0.828125,-0.3125 c 0,0 0.033267,2.4687 0.318359,3.25 0.285094,0.7812 2.9525703,2.8437 2.9525703,2.8437 l 0.740234,0.5235 0.800781,-0.5235 c 0,0 2.6031365,-2.0625 2.8882315,-2.8437 0.285094,-0.7813 0.316406,-3.25 0.316406,-3.25 l -0.794922,0.3125 c 0,0 -0.252686,1.5976 -0.632812,2.0039 -0.380127,0.4062 -1.5542465,1.0624 -1.5542465,1.0624 l 0,-6.3476 2.9882805,0 0,-0.9844 -2.9882805,0 0,-2.0117 -0.75586,0 -0.472656,0 z"
-       id="path4185"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccccccccccccccccccccccc" />
+       id="path4185" />
     <path
        style="display:inline;fill:#01467a;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="m 7.0410165,1049.3664 c 0,0 -1.2091643,-1.0976 -1.5892893,-1.5038 -0.380125,-0.4063 -0.976562,-1.8437 -0.976562,-1.8437 l -0.484375,-1.6879 c 0,0 0.033267,2.4687 0.318359,3.25 0.285094,0.7812 2.9525703,2.8437 2.9525703,2.8437 l 0.740234,0.5235 0.800781,-0.5235 c 0,0 2.6031365,-2.0625 2.8882315,-2.8437 0.285094,-0.7813 0.316406,-3.25 0.316406,-3.25 l -0.513672,1.7035 c 0,0 -0.533936,1.4882 -0.914062,1.8945 -0.380127,0.4062 -1.5542465,1.4374 -1.5542465,1.4374 z"
-       id="path4185-2"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccccccccccc" />
+       id="path4185-2" />
   </g>
 </svg>
diff --git a/ua/org.eclipse.pde.ua.ui/icons/obj16/toc_leaftopic_obj.svg b/ua/org.eclipse.pde.ua.ui/icons/obj16/toc_leaftopic_obj.svg
index fbad0ece47f..0060ae897b5 100644
--- a/ua/org.eclipse.pde.ua.ui/icons/obj16/toc_leaftopic_obj.svg
+++ b/ua/org.eclipse.pde.ua.ui/icons/obj16/toc_leaftopic_obj.svg
@@ -2,24 +2,19 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.48.0 r9654"
-   sodipodi:docname="file_obj.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient5135-7"
        id="linearGradient4873-1"
        x1="7.0070496"
@@ -29,8 +24,7 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-1.977903,-3.044194)" />
     <linearGradient
-       id="linearGradient5135-7"
-       inkscape:collect="always">
+       id="linearGradient5135-7">
       <stop
          id="stop5137-4"
          offset="0"
@@ -41,7 +35,6 @@
          style="stop-color:#637aa7;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient5141-4"
        id="linearGradient4875-9"
        x1="7.0070496"
@@ -51,8 +44,7 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-1.977903,-3.044194)" />
     <linearGradient
-       id="linearGradient5141-4"
-       inkscape:collect="always">
+       id="linearGradient5141-4">
       <stop
          id="stop5143-8"
          offset="0"
@@ -63,7 +55,6 @@
          style="stop-color:#637aa7;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient5147-4"
        id="linearGradient4871-2"
        x1="7.0070496"
@@ -73,8 +64,7 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-1.977903,-3.044194)" />
     <linearGradient
-       id="linearGradient5147-4"
-       inkscape:collect="always">
+       id="linearGradient5147-4">
       <stop
          id="stop5149-5"
          offset="0"
@@ -85,7 +75,6 @@
          style="stop-color:#637aa7;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4861-1"
        id="linearGradient4869-17"
        x1="7.0070496"
@@ -95,7 +84,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-1.977903,-3.044194)" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4861-1">
       <stop
          style="stop-color:#91a5c7;stop-opacity:1;"
@@ -107,7 +95,6 @@
          id="stop4865-52" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4877-6"
        id="linearGradient4867-7"
        x1="7.0070496"
@@ -117,8 +104,7 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-1.977903,-3.044194)" />
     <linearGradient
-       id="linearGradient4877-6"
-       inkscape:collect="always">
+       id="linearGradient4877-6">
       <stop
          id="stop4879-1"
          offset="0"
@@ -129,7 +115,6 @@
          style="stop-color:#5e76a3;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4902-3"
        id="linearGradient4908-2"
        x1="10.544736"
@@ -139,7 +124,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-1.977903,-1.044194)" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4902-3">
       <stop
          style="stop-color:#bfb688;stop-opacity:1"
@@ -151,7 +135,6 @@
          id="stop4906-2" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4894-6"
        id="linearGradient4900-1"
        x1="7.9987183"
@@ -161,7 +144,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(2.022097,-1.044194)" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4894-6">
       <stop
          style="stop-color:#e0c88f;stop-opacity:1"
@@ -173,7 +155,6 @@
          id="stop4898-5" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4994-6">
       <stop
          style="stop-color:#f9fafc;stop-opacity:1;"
@@ -192,34 +173,8 @@
        gradientUnits="userSpaceOnUse"
        id="linearGradient4101"
        xlink:href="#linearGradient4994-6"
-       inkscape:collect="always"
        gradientTransform="translate(-1.977903,-1.044194)" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="11.313709"
-     inkscape:cx="39.563403"
-     inkscape:cy="1.2514114"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1440"
-     inkscape:window-height="900"
-     inkscape:window-x="81"
-     inkscape:window-y="29"
-     inkscape:window-maximized="0"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3999" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -233,28 +188,21 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
     <path
        style="fill:url(#linearGradient4101);fill-opacity:1;stroke:none;display:inline"
        d="m 3.5193795,1037.8597 7.0096695,0 3.062057,3.0066 0,9.9546 -10.0717265,0 z"
-       id="rect4001-3"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccc" />
+       id="rect4001-3" />
     <path
        style="fill:url(#linearGradient4900-1);fill-opacity:1;stroke:none;display:inline"
        d="m 9.998718,1037.397 0,3.9112 3.977478,0 z"
-       id="path4884"
-       inkscape:connector-curvature="0" />
+       id="path4884" />
     <path
        style="fill:none;stroke:url(#linearGradient4908-2);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;display:inline"
        d="m 3.5193795,1037.8597 7.0096695,0 3.062057,3.0066 0,9.9546 -10.0717265,0 z"
-       id="rect4001"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccc" />
+       id="rect4001" />
     <rect
        style="fill:url(#linearGradient4867-7);fill-opacity:1;stroke:none;display:inline"
        id="rect4001-1"
diff --git a/ua/org.eclipse.pde.ua.ui/icons/obj16/toc_link_obj.svg b/ua/org.eclipse.pde.ua.ui/icons/obj16/toc_link_obj.svg
index 6ded0022dc0..09956715e8f 100644
--- a/ua/org.eclipse.pde.ua.ui/icons/obj16/toc_link_obj.svg
+++ b/ua/org.eclipse.pde.ua.ui/icons/obj16/toc_link_obj.svg
@@ -2,24 +2,19 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="toc_link_obj.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4191">
       <stop
          style="stop-color:#b9cad4;stop-opacity:1"
@@ -31,7 +26,6 @@
          id="stop4195" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4181">
       <stop
          style="stop-color:#998f6a;stop-opacity:1"
@@ -43,7 +37,6 @@
          id="stop4185" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4173">
       <stop
          style="stop-color:#267fe3;stop-opacity:1"
@@ -55,7 +48,6 @@
          id="stop4177" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4173"
        id="linearGradient4179"
        x1="16.798458"
@@ -64,7 +56,6 @@
        y2="1045.6079"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4181"
        id="linearGradient4187"
        x1="18.834337"
@@ -73,7 +64,6 @@
        y2="1045.91"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4191"
        id="linearGradient4197"
        x1="25.593748"
@@ -82,31 +72,6 @@
        y2="1048.5029"
        gradientUnits="userSpaceOnUse" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="45.254834"
-     inkscape:cx="8.5007097"
-     inkscape:cy="6.1408713"
-     inkscape:document-units="px"
-     inkscape:current-layer="g4274"
-     showgrid="true"
-     inkscape:window-width="1214"
-     inkscape:window-height="1045"
-     inkscape:window-x="680"
-     inkscape:window-y="379"
-     inkscape:window-maximized="0"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3999" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -120,8 +85,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
@@ -131,31 +94,23 @@
       <path
          style="fill:#80b4ef;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4187);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
          d="m 22.718749,1037.8623 6.169845,6.5927 -6.84375,3.965 -6.232345,-6.6827 z"
-         id="path4163"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
+         id="path4163" />
       <path
          style="fill:url(#linearGradient4179);fill-opacity:1;fill-rule:evenodd;stroke:#8f8b70;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
          d="m 15.829234,1041.7098 c 0,0 -0.511908,0.2976 -0.734834,0.5205 -0.440434,0.4405 -0.281901,2.757 -0.281901,2.757 l 5.875,5.875 0.972075,0.2604 0,-3.2292 z"
-         id="path4165"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="csccccc" />
+         id="path4165" />
       <path
          style="fill:none;fill-rule:evenodd;stroke:#727b84;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
          d="m 21.874999,1051.0498 c 0.25,-0.094 7.729397,-4.4626 7.729397,-4.4626 m -0.220971,-2.3156 -0.607442,0.334 -5.325044,3.0112 -1.66969,0.8033"
-         id="path4169"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccc" />
+         id="path4169" />
       <path
          style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#8f8b70;stroke-width:1.11224616px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
          d="m 23.984508,1042.9939 0,-1.147 -1.077488,-1.0427 -1.216519,0 -0.973215,1.1817 -1.112246,0.034 -0.263635,0.9839 1.375881,1.0669 1.112246,0 1.216519,-1.1472 z"
-         id="path4171"
-         inkscape:connector-curvature="0" />
+         id="path4171" />
       <path
          style="fill:url(#linearGradient4197);fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1"
          d="m 22.156249,1048.1123 7.0625,-3.7188 0,2.375 -7.28125,4.0938 z"
-         id="path4189"
-         inkscape:connector-curvature="0" />
+         id="path4189" />
     </g>
   </g>
 </svg>
diff --git a/ua/org.eclipse.pde.ua.ui/icons/obj16/toc_obj.svg b/ua/org.eclipse.pde.ua.ui/icons/obj16/toc_obj.svg
index 5b6159bc444..4370489484d 100644
--- a/ua/org.eclipse.pde.ua.ui/icons/obj16/toc_obj.svg
+++ b/ua/org.eclipse.pde.ua.ui/icons/obj16/toc_obj.svg
@@ -2,24 +2,19 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="toc_obj.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4259"
        id="linearGradient4265"
        x1="24.120523"
@@ -28,7 +23,6 @@
        y2="1040.597"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4259">
       <stop
          style="stop-color:#dfe9f8;stop-opacity:1"
@@ -40,7 +34,6 @@
          id="stop4263" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4185"
        id="linearGradient4191"
        x1="22.993999"
@@ -50,7 +43,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(0,-12.561868)" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4185">
       <stop
          style="stop-color:#525f71;stop-opacity:1"
@@ -62,7 +54,6 @@
          id="stop4189" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4193"
        id="linearGradient4199"
        x1="21.093748"
@@ -71,7 +62,6 @@
        y2="1048.3466"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4193">
       <stop
          style="stop-color:#958e6c;stop-opacity:1;"
@@ -83,31 +73,6 @@
          id="stop4197" />
     </linearGradient>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1"
-     inkscape:cx="143.92411"
-     inkscape:cy="-16.55322"
-     inkscape:document-units="px"
-     inkscape:current-layer="g4274"
-     showgrid="false"
-     inkscape:window-width="1440"
-     inkscape:window-height="900"
-     inkscape:window-x="781"
-     inkscape:window-y="423"
-     inkscape:window-maximized="0"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3999" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -121,8 +86,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
@@ -146,14 +109,11 @@
           <path
              style="display:inline;fill:#7aace7;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4199);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
              d="m 17.656249,1039.1123 8.031249,-2.125 0,11.0312 -8.062499,2.125 z"
-             id="path4156"
-             inkscape:connector-curvature="0" />
+             id="path4156" />
           <path
              style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#958e6c;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
              d="m 19.643305,1041.6966 4.016734,-0.7459 -0.0221,2.3242 -4.014839,0.7291 z"
-             id="path4181"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccc" />
+             id="path4181" />
         </g>
       </g>
     </g>
diff --git a/ua/org.eclipse.pde.ua.ui/icons/obj16/toc_topic_obj.svg b/ua/org.eclipse.pde.ua.ui/icons/obj16/toc_topic_obj.svg
index 9b09e9b1848..f3c08b989a9 100644
--- a/ua/org.eclipse.pde.ua.ui/icons/obj16/toc_topic_obj.svg
+++ b/ua/org.eclipse.pde.ua.ui/icons/obj16/toc_topic_obj.svg
@@ -2,24 +2,19 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="toc_topic_obj.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4446">
       <stop
          style="stop-color:#d1d6dd;stop-opacity:1"
@@ -31,7 +26,6 @@
          id="stop4450" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4289">
       <stop
          style="stop-color:#bfc9d6;stop-opacity:1"
@@ -43,7 +37,6 @@
          id="stop4293" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4209">
       <stop
          style="stop-color:#eef6ff;stop-opacity:1"
@@ -55,7 +48,6 @@
          id="stop4213" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4201">
       <stop
          style="stop-color:#717883;stop-opacity:1"
@@ -67,7 +59,6 @@
          id="stop4205" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4179">
       <stop
          style="stop-color:#d6e0e6;stop-opacity:1;"
@@ -79,7 +70,6 @@
          id="stop4183" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4201"
        id="linearGradient4207"
        x1="21.948286"
@@ -89,7 +79,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-14.203124,22.029685)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4209"
        id="linearGradient4215"
        x1="20.93182"
@@ -99,7 +88,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-14.203124,22.029685)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4289"
        id="linearGradient4295"
        x1="23.191113"
@@ -109,7 +97,6 @@
        gradientUnits="userSpaceOnUse" />
     <linearGradient
        gradientTransform="translate(-5.4632568e-7,-2.0000302)"
-       inkscape:collect="always"
        xlink:href="#linearGradient4289"
        id="linearGradient4295-6"
        x1="23.191113"
@@ -119,7 +106,6 @@
        gradientUnits="userSpaceOnUse" />
     <linearGradient
        gradientTransform="translate(-5.4632568e-7,-3.9844052)"
-       inkscape:collect="always"
        xlink:href="#linearGradient4289"
        id="linearGradient4295-6-2"
        x1="23.191113"
@@ -128,7 +114,6 @@
        y2="1022.8389"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4179"
        id="linearGradient4374"
        gradientUnits="userSpaceOnUse"
@@ -137,7 +122,6 @@
        x2="28.135472"
        y2="1043.7998" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4446"
        id="linearGradient4452"
        x1="17.205662"
@@ -148,7 +132,6 @@
        gradientTransform="translate(-14.203124,34.030335)" />
     <linearGradient
        gradientTransform="translate(-14.203124,36.037394)"
-       inkscape:collect="always"
        xlink:href="#linearGradient4446"
        id="linearGradient4452-6"
        x1="17.205662"
@@ -157,31 +140,6 @@
        y2="1020.3426"
        gradientUnits="userSpaceOnUse" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="5.6568542"
-     inkscape:cx="16.491742"
-     inkscape:cy="3.3705216"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="964"
-     inkscape:window-height="972"
-     inkscape:window-x="1353"
-     inkscape:window-y="422"
-     inkscape:window-maximized="0"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3999" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -195,8 +153,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
@@ -213,13 +169,10 @@
            id="rect4217"
            style="opacity:1;fill:#3d4b65;fill-opacity:1;stroke:#3d4b65;stroke-width:1;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
         <path
-           sodipodi:nodetypes="cssccssccscccs"
-           inkscape:connector-curvature="0"
            d="m 7.535109,1056.0246 -2.209709,0 c -0.369764,0 -0.359452,-1.0385 -0.795495,-1.0385 l -3.071495,0 0,4.9497 2.452777,0 c 0.637939,0 0.201444,1.0469 0.60439,1.0469 l 3.019532,0 z m -0.0221,0.044 c 0,-0.4897 1.06066,-1.0164 1.06066,-1.0164 l -0.132583,4.9939 -0.883883,0.8839 c 0,0 -0.04419,-2.1102 -0.04419,-4.8614 z"
            style="display:inline;fill:#3d4b65;fill-opacity:1;fill-rule:evenodd;stroke:#3d4b65;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
            id="path4192-8" />
         <path
-           inkscape:connector-curvature="0"
            d="m 7.57662,1051.91 -2.209709,0 c -0.369764,0 -0.359452,-1.0385 -0.795495,-1.0385 l -3.071495,0 0,8.0433 2.452777,0 c 0.637939,0 0.201444,1.0469 0.60439,1.0469 l 3.019532,0 z m -0.0221,0.044 c 0,-0.4897 0.570981,-1.0164 1.06066,-1.0164 l 4.905553,0 0,8.0875 c 0,0 -3.574259,0 -5.038136,0 -0.350397,0 -0.883883,0.8839 -0.883883,0.8839 0,0 -0.04419,-5.2038 -0.04419,-7.955 z"
            style="fill:url(#linearGradient4215);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4207);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
            id="path4192" />
@@ -253,15 +206,11 @@
       <path
          id="path4192-1"
          style="display:inline;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4452);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 7.024208,1054.8923 -1.325826,0 c -0.369764,0 -0.359452,-1.0385 -0.795495,-1.0385 l -1.900349,0"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cssc" />
+         d="m 7.024208,1054.8923 -1.325826,0 c -0.369764,0 -0.359452,-1.0385 -0.795495,-1.0385 l -1.900349,0" />
       <path
          id="path4192-1-0"
          style="display:inline;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4452-6);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 7.024208,1056.8993 -1.325826,0 c -0.369764,0 -0.359452,-1.0385 -0.795495,-1.0385 l -1.900349,0"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cssc" />
+         d="m 7.024208,1056.8993 -1.325826,0 c -0.369764,0 -0.359452,-1.0385 -0.795495,-1.0385 l -1.900349,0" />
     </g>
   </g>
 </svg>
diff --git a/ua/org.eclipse.pde.ua.ui/icons/wizban/new_cheatsheet_wiz.svg b/ua/org.eclipse.pde.ua.ui/icons/wizban/new_cheatsheet_wiz.svg
index 5519cf18dec..e2a3ae17ff1 100644
--- a/ua/org.eclipse.pde.ua.ui/icons/wizban/new_cheatsheet_wiz.svg
+++ b/ua/org.eclipse.pde.ua.ui/icons/wizban/new_cheatsheet_wiz.svg
@@ -1,17 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg
-   inkscape:export-ydpi="90"
-   inkscape:export-xdpi="90"
-   inkscape:export-filename="/Users/d021678/git/eclipse.jdt.ui/org.eclipse.jdt.ui/icons/full/wizban/newclass_wiz2.png"
-   sodipodi:docname="new_cheatsheet_wiz.svg"
-   inkscape:version="1.3 (0e150ed, 2023-07-21)"
    version="1.1"
    id="svg2"
    height="66"
    width="75"
    xml:space="preserve"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:svg="http://www.w3.org/2000/svg"
@@ -19,7 +12,6 @@
    xmlns:cc="http://creativecommons.org/ns#"
    xmlns:dc="http://purl.org/dc/elements/1.1/"><defs
      id="defs4"><linearGradient
-       inkscape:collect="always"
        id="linearGradient5"><stop
          style="stop-color:#537071;stop-opacity:1;"
          offset="0"
@@ -27,306 +19,6 @@
          style="stop-color:#eac28d;stop-opacity:1;"
          offset="1"
          id="stop5" /></linearGradient><linearGradient
-       id="linearGradient4541"
-       inkscape:collect="always"><stop
-         id="stop4543"
-         offset="0"
-         style="stop-color:#a1adb2;stop-opacity:1" /><stop
-         id="stop4545"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" /></linearGradient><linearGradient
-       id="linearGradient4972"
-       inkscape:collect="always"><stop
-         id="stop4974"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1" /><stop
-         id="stop4976"
-         offset="1"
-         style="stop-color:#f5f8fd;stop-opacity:1" /></linearGradient><linearGradient
-       id="linearGradient4964"
-       inkscape:collect="always"><stop
-         id="stop4966"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1" /><stop
-         id="stop4968"
-         offset="1"
-         style="stop-color:#e8eefa;stop-opacity:1" /></linearGradient><linearGradient
-       id="linearGradient4956"
-       inkscape:collect="always"><stop
-         id="stop4958"
-         offset="0"
-         style="stop-color:#fcfdfe;stop-opacity:1" /><stop
-         id="stop4960"
-         offset="1"
-         style="stop-color:#dee6f8;stop-opacity:1" /></linearGradient><filter
-       id="filter8854"
-       inkscape:label="Drop Shadow"
-       style="color-interpolation-filters:sRGB"><feFlood
-         id="feFlood8856"
-         result="flood"
-         flood-color="rgb(244,248,254)"
-         flood-opacity="0.933333" /><feComposite
-         id="feComposite8858"
-         result="composite1"
-         operator="in"
-         in2="SourceGraphic"
-         in="flood" /><feGaussianBlur
-         id="feGaussianBlur8860"
-         result="blur"
-         stdDeviation="1.2"
-         in="composite1" /><feOffset
-         id="feOffset8862"
-         result="offset"
-         dy="3"
-         dx="-1" /><feComposite
-         id="feComposite8864"
-         result="composite2"
-         operator="over"
-         in2="offset"
-         in="SourceGraphic" /></filter><linearGradient
-       id="linearGradient6122"><stop
-         id="stop6124"
-         offset="0"
-         style="stop-color:#c0c0c0;stop-opacity:1" /><stop
-         style="stop-color:#adadad;stop-opacity:1"
-         offset="0.5"
-         id="stop6132" /><stop
-         id="stop6126"
-         offset="1"
-         style="stop-color:#808080;stop-opacity:1" /></linearGradient><linearGradient
-       id="linearGradient7087"><stop
-         id="stop7089"
-         offset="0"
-         style="stop-color:#17325d;stop-opacity:1;" /><stop
-         style="stop-color:#b4d0e2;stop-opacity:1"
-         offset="0.25"
-         id="stop7091" /><stop
-         style="stop-color:#b7d2e4;stop-opacity:1"
-         offset="0.5"
-         id="stop7093" /><stop
-         id="stop7095"
-         offset="0.75"
-         style="stop-color:#acc9de;stop-opacity:1" /><stop
-         id="stop7097"
-         offset="1"
-         style="stop-color:#3e72a7;stop-opacity:1" /></linearGradient><mask
-       maskUnits="userSpaceOnUse"
-       id="mask7366"><path
-         sodipodi:nodetypes="ccccccc"
-         inkscape:connector-curvature="0"
-         id="path7368"
-         d="m -16.593048,1040.862 9.990206,0 0,10.0018 -2.983353,3.0385 -5.966213,0 c -0.53033,-0.022 -1.04064,-0.5519 -1.04064,-1.0385 z"
-         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;display:inline" /></mask><linearGradient
-       id="linearGradient7584-5"><stop
-         style="stop-color:#f9cd5f;stop-opacity:1"
-         offset="0"
-         id="stop7586-4" /><stop
-         style="stop-color:#fbf0b4;stop-opacity:1"
-         offset="1"
-         id="stop7588-5" /></linearGradient><linearGradient
-       id="linearGradient7592-1"><stop
-         style="stop-color:#bd8416;stop-opacity:1"
-         offset="0"
-         id="stop7594-6" /><stop
-         style="stop-color:#a66b10;stop-opacity:1"
-         offset="1"
-         id="stop7596-9" /></linearGradient><linearGradient
-       id="linearGradient10798-1-9-3-7-6-6-6-2-6-7-98-9-4-1"><stop
-         id="stop10800-5-2-1-8-20-4-0-2-1-9-0-0-1-1"
-         offset="0"
-         style="stop-color:#5aad60;stop-opacity:1;" /><stop
-         style="stop-color:#5bb26a;stop-opacity:1;"
-         offset="0.5"
-         id="stop10806-6-8-5-3-9-2-2-7-0-4-2-7-8-9" /><stop
-         id="stop10802-1-5-3-0-4-6-8-5-5-6-69-6-4-0"
-         offset="1"
-         style="stop-color:#a4c589;stop-opacity:1" /></linearGradient><mask
-       id="mask7366-4"
-       maskUnits="userSpaceOnUse"><path
-         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;display:inline"
-         d="m -16.593048,1040.862 9.990206,0 0,10.0018 -2.983353,3.0385 -5.966213,0 c -0.53033,-0.022 -1.04064,-0.5519 -1.04064,-1.0385 z"
-         id="path7368-2"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccccc" /></mask><linearGradient
-       y2="1041.911"
-       x2="4.7776356"
-       y1="1039.8118"
-       x1="4.7776356"
-       gradientTransform="translate(-20,0)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient9331"
-       xlink:href="#linearGradient7087"
-       inkscape:collect="always" /><linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient7087"
-       id="linearGradient9333"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-18,4.7e-5)"
-       x1="4.7776356"
-       y1="1039.8118"
-       x2="4.7776356"
-       y2="1041.911" /><linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient7087"
-       id="linearGradient9335"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-16,4.7e-5)"
-       x1="4.7776356"
-       y1="1039.8118"
-       x2="4.7776356"
-       y2="1041.911" /><linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient7087"
-       id="linearGradient9337"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-14,4.7e-5)"
-       x1="4.7776356"
-       y1="1039.8118"
-       x2="4.7776356"
-       y2="1041.911" /><linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient7087"
-       id="linearGradient9339"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-12,4.7e-5)"
-       x1="4.7776356"
-       y1="1039.8118"
-       x2="4.7776356"
-       y2="1041.911" /><linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4956"
-       id="linearGradient68073"
-       x1="88.220117"
-       y1="1042.7973"
-       x2="163.22012"
-       y2="1042.7973"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-80,0)" /><linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4964"
-       id="linearGradient68075"
-       x1="94.469681"
-       y1="1032.2668"
-       x2="163.22012"
-       y2="1032.2669"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-80,0)" /><linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4972"
-       id="linearGradient68077"
-       x1="88.220116"
-       y1="1032.2668"
-       x2="152.72206"
-       y2="1032.2668"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-80,0)" /><filter
-       style="color-interpolation-filters:sRGB"
-       inkscape:label="Drop Shadow"
-       id="filter8854-9"><feFlood
-         flood-opacity="0.933333"
-         flood-color="rgb(244,248,254)"
-         result="flood"
-         id="feFlood8856-0" /><feComposite
-         in="flood"
-         in2="SourceGraphic"
-         operator="in"
-         result="composite1"
-         id="feComposite8858-2" /><feGaussianBlur
-         in="composite1"
-         stdDeviation="1.2"
-         result="blur"
-         id="feGaussianBlur8860-3" /><feOffset
-         dx="-1"
-         dy="3"
-         result="offset"
-         id="feOffset8862-2" /><feComposite
-         in="SourceGraphic"
-         in2="offset"
-         operator="over"
-         result="composite2"
-         id="feComposite8864-3" /></filter><linearGradient
-       id="linearGradient10798-1-9-3-7-6-8-9-0-9-1"><stop
-         style="stop-color:#7564b1;stop-opacity:1"
-         offset="0"
-         id="stop10800-5-2-1-8-20-6-4-9-8-2" /><stop
-         id="stop10806-6-8-5-3-9-24-8-4-3-2"
-         offset="0.5"
-         style="stop-color:#5d4aa1;stop-opacity:1" /><stop
-         style="stop-color:#9283c3;stop-opacity:1"
-         offset="1"
-         id="stop10802-1-5-3-0-4-8-4-2-9-2" /></linearGradient><linearGradient
-       id="linearGradient7540-2-3-8-7"><stop
-         style="stop-color:#ffffff;stop-opacity:0.502"
-         offset="0"
-         id="stop7542-8-7-5-3" /><stop
-         id="stop7544-8-2-0-5"
-         offset="0.47623286"
-         style="stop-color:#ffffff;stop-opacity:1" /><stop
-         id="stop7546-1-7-9-5"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0" /><stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop7548-98-9-2-4" /></linearGradient><linearGradient
-       id="linearGradient7272-66-4-5-5-5-8"
-       inkscape:collect="always"><stop
-         id="stop7274-6-0-1-7-4-7"
-         offset="0"
-         style="stop-color:#8f6c10;stop-opacity:1" /><stop
-         id="stop7276-66-6-3-9-1-4"
-         offset="1"
-         style="stop-color:#c9a645;stop-opacity:1" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient7540-2-3-8-7"
-       id="linearGradient10540"
-       gradientUnits="userSpaceOnUse"
-       x1="-22.453552"
-       y1="1030.3411"
-       x2="-10.159802"
-       y2="1030.3411" /><linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient7540-2-3-8-7"
-       id="linearGradient10542"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0,1,-1,0,1014.0344,1046.6478)"
-       x1="-22.453552"
-       y1="1030.3411"
-       x2="-10.159802"
-       y2="1030.3411" /><linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient7272-66-4-5-5-5-8"
-       id="linearGradient10544"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.95585117,0,0,0.95585117,-0.71992063,45.488394)"
-       x1="-15.945988"
-       y1="1037.4661"
-       x2="-15.945988"
-       y2="1023.2569" /><mask
-       maskUnits="userSpaceOnUse"
-       id="mask10620"><path
-         sodipodi:type="arc"
-         style="font-size:13.58917427px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:2.16621375;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline;font-family:Sans"
-         id="path10622"
-         sodipodi:cx="388.125"
-         sodipodi:cy="468.23718"
-         sodipodi:rx="10.625"
-         sodipodi:ry="10.625"
-         d="m 398.75,468.23718 a 10.625,10.625 0 1 1 -21.25,0 10.625,10.625 0 1 1 21.25,0 z"
-         transform="matrix(0.55482947,0,0,0.55482947,-206.96039,787.08655)" /></mask><linearGradient
-       id="linearGradient4528-9-5-7-9-7-3"><stop
-         style="stop-color:#e0c576;stop-opacity:1;"
-         offset="0"
-         id="stop4530-0-5-0-5-8-4" /><stop
-         style="stop-color:#9e7916;stop-opacity:1"
-         offset="1"
-         id="stop4532-7-9-3-3-6-1" /></linearGradient><linearGradient
-       id="linearGradient6281-8-0-1-6-6-4-2-8-0"><stop
-         id="stop6283-0-2-2-1-2-0-1-6-0"
-         offset="0"
-         style="stop-color:#f7f9fb;stop-opacity:1" /><stop
-         id="stop6285-5-0-9-7-6-9-9-1-9"
-         offset="1"
-         style="stop-color:#ffd680;stop-opacity:1" /></linearGradient><linearGradient
        gradientTransform="translate(-88.220116,-999.2669)"
        gradientUnits="userSpaceOnUse"
        y2="1032.2668"
@@ -334,10 +26,8 @@
        y1="1032.2668"
        x1="88.220116"
        id="linearGradient4978"
-       xlink:href="#linearGradient4972-7"
-       inkscape:collect="always" /><linearGradient
-       id="linearGradient4972-7"
-       inkscape:collect="always"><stop
+       xlink:href="#linearGradient4972-7" /><linearGradient
+       id="linearGradient4972-7"><stop
          id="stop4974-8"
          offset="0"
          style="stop-color:#b8ccf1;stop-opacity:0.10196079" /><stop
@@ -351,10 +41,8 @@
        y1="1032.1835"
        x1="118.38584"
        id="linearGradient4970"
-       xlink:href="#linearGradient4964-3"
-       inkscape:collect="always" /><linearGradient
-       id="linearGradient4964-3"
-       inkscape:collect="always"><stop
+       xlink:href="#linearGradient4964-3" /><linearGradient
+       id="linearGradient4964-3"><stop
          id="stop4966-1"
          offset="0"
          style="stop-color:#ffffff;stop-opacity:0.349" /><stop
@@ -368,46 +56,14 @@
        y1="1042.7972"
        x1="88.220116"
        id="linearGradient4962"
-       xlink:href="#linearGradient4956-2"
-       inkscape:collect="always" /><linearGradient
-       id="linearGradient4956-2"
-       inkscape:collect="always"><stop
+       xlink:href="#linearGradient4956-2" /><linearGradient
+       id="linearGradient4956-2"><stop
          id="stop4958-5"
          offset="0"
          style="stop-color:#fcfdfe;stop-opacity:0.25641027" /><stop
          id="stop4960-6"
          offset="1"
          style="stop-color:#98aae7;stop-opacity:0.40392157" /></linearGradient><linearGradient
-       id="linearGradient3827"><stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="0"
-         id="stop3829" /><stop
-         id="stop3835"
-         offset="0.60149658"
-         style="stop-color:#ffffff;stop-opacity:1;" /><stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop3831" /></linearGradient><linearGradient
-       id="linearGradient10798-1-9-3-7-6-8-9-0-9-1-0"><stop
-         style="stop-color:#f3faed;stop-opacity:1"
-         offset="0"
-         id="stop10800-5-2-1-8-20-6-4-9-8-2-9" /><stop
-         id="stop10806-6-8-5-3-9-24-8-4-3-2-4"
-         offset="0.65917557"
-         style="stop-color:#e7f4da;stop-opacity:1" /><stop
-         style="stop-color:#67bf1f;stop-opacity:1"
-         offset="1"
-         id="stop10802-1-5-3-0-4-8-4-2-9-2-5" /></linearGradient><linearGradient
-       gradientTransform="matrix(0,1,-1,0,1034.3618,967.36133)"
-       gradientUnits="userSpaceOnUse"
-       y2="1008.3622"
-       x2="60"
-       y1="1007.8622"
-       x1="41"
-       id="linearGradient5885"
-       xlink:href="#linearGradient4541"
-       inkscape:collect="always" /><linearGradient
-       inkscape:collect="always"
        id="linearGradient4200"><stop
          style="stop-color:#3e72a7;stop-opacity:1"
          offset="0"
@@ -415,7 +71,6 @@
          style="stop-color:#17325d;stop-opacity:1"
          offset="1"
          id="stop4204" /></linearGradient><linearGradient
-       inkscape:collect="always"
        id="linearGradient4190"><stop
          style="stop-color:#2846b3;stop-opacity:1"
          offset="0"
@@ -423,7 +78,6 @@
          style="stop-color:#92808a;stop-opacity:1"
          offset="1"
          id="stop4194" /></linearGradient><linearGradient
-       inkscape:collect="always"
        id="linearGradient4170"><stop
          style="stop-color:#85c0ed;stop-opacity:1;"
          offset="0"
@@ -431,7 +85,6 @@
          style="stop-color:#dbedfa;stop-opacity:1"
          offset="1"
          id="stop4174" /></linearGradient><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4170"
        id="linearGradient4176"
        x1="8.70749"
@@ -440,7 +93,6 @@
        y2="1038.8831"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(2.7066975,0,0,2.4604569,82.515823,-2539.5638)" /><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4190"
        id="linearGradient4184"
        x1="20.299725"
@@ -449,7 +101,6 @@
        y2="1036.755"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(2.7066975,0,0,2.4604569,50.303796,-2539.5638)" /><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4190"
        id="linearGradient4196"
        x1="20.767859"
@@ -458,7 +109,6 @@
        y2="1041.6479"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(2.6502559,0,0,2.4856034,51.207041,-2566.4489)" /><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4200"
        id="linearGradient4206"
        x1="3.9750192"
@@ -467,7 +117,6 @@
        y2="1039.4132"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(2.6028563,0,-1.6764618,2.4917504,1821.246,-2572.5332)" /><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4200"
        id="linearGradient4206-3"
        x1="3.9750192"
@@ -476,7 +125,6 @@
        y2="1039.4132"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(2.6028563,0,-1.6764618,2.4917504,1825.5173,-2572.5332)" /><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4200"
        id="linearGradient4206-3-3"
        x1="3.9750192"
@@ -485,7 +133,6 @@
        y2="1039.4132"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(2.6028563,0,-1.6764618,2.4917504,1829.7885,-2572.5332)" /><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4200"
        id="linearGradient4206-3-3-6"
        x1="3.9750192"
@@ -494,7 +141,6 @@
        y2="1039.4132"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(2.6028563,0,-1.6764618,2.4917504,1834.0599,-2572.5332)" /><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4200"
        id="linearGradient1"
        gradientUnits="userSpaceOnUse"
@@ -503,7 +149,6 @@
        y1="1036.3827"
        x2="7.0229073"
        y2="1039.4132" /><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4200"
        id="linearGradient4206-4"
        x1="3.9750192"
@@ -512,7 +157,6 @@
        y2="1039.4132"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(2.6028563,0,-1.6764618,2.4917504,1821.246,-2572.5332)" /><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4200"
        id="linearGradient4206-3-4"
        x1="3.9750192"
@@ -521,7 +165,6 @@
        y2="1039.4132"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(2.6028563,0,-1.6764618,2.4917504,1825.5173,-2572.5332)" /><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4200"
        id="linearGradient4206-3-3-60"
        x1="3.9750192"
@@ -530,7 +173,6 @@
        y2="1039.4132"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(2.6028563,0,-1.6764618,2.4917504,1829.7885,-2572.5332)" /><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4200"
        id="linearGradient4206-3-3-6-3"
        x1="3.9750192"
@@ -539,7 +181,6 @@
        y2="1039.4132"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(2.6028563,0,-1.6764618,2.4917504,1834.0599,-2572.5332)" /><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4200"
        id="linearGradient1-2"
        gradientUnits="userSpaceOnUse"
@@ -548,7 +189,6 @@
        y1="1036.3827"
        x2="7.0229073"
        y2="1039.4132" /><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient5"
        id="linearGradient3"
        gradientUnits="userSpaceOnUse"
@@ -556,77 +196,26 @@
        x1="20.270239"
        y1="1050.9364"
        x2="20.299725"
-       y2="1036.755" /></defs><sodipodi:namedview
-     inkscape:document-rotation="0"
-     inkscape:bbox-nodes="true"
-     inkscape:snap-bbox="true"
-     inkscape:snap-global="false"
-     inkscape:guide-bbox="true"
-     showguides="true"
-     inkscape:window-maximized="1"
-     inkscape:window-y="25"
-     inkscape:window-x="0"
-     inkscape:window-height="1027"
-     inkscape:window-width="1920"
-     showgrid="true"
-     inkscape:current-layer="layer2"
-     inkscape:document-units="px"
-     inkscape:cy="28.89305"
-     inkscape:cx="58.463281"
-     inkscape:zoom="8.8602622"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0"
-     borderopacity="1.0"
-     bordercolor="#666666"
-     pagecolor="#bcbcbc"
-     id="base"
-     inkscape:showpageshadow="2"
-     inkscape:pagecheckerboard="0"
-     inkscape:deskcolor="#d1d1d1"><inkscape:grid
-       snapvisiblegridlinesonly="true"
-       enabled="true"
-       visible="true"
-       empspacing="5"
-       id="grid4112"
-       type="xygrid"
-       originx="0"
-       originy="0"
-       spacingy="1"
-       spacingx="1"
-       units="px" /></sodipodi:namedview><metadata
+       y2="1036.755" /></defs><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" /></cc:Work></rdf:RDF></metadata><g
      style="display:inline"
-     inkscape:label="Background"
-     id="layer2"
-     inkscape:groupmode="layer"><path
+     id="layer2"><path
        style="display:inline;fill:url(#linearGradient4978);fill-opacity:1;stroke:none"
        d="M 75,0 V 66 H 1e-6 C 1e-6,41.2048 50.00969,0 75,0 Z"
-       id="rect4113-1"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccc"
-       inkscape:label="shadow3" /><path
+       id="rect4113-1" /><path
        style="display:inline;opacity:0.404;fill:url(#linearGradient4962);fill-opacity:1;stroke:none"
        d="M 75,21.0607 V 66 H 1e-6 C 10.625001,47.804 43.509694,25.4357 75,21.0607 Z"
-       id="rect4113-1-0"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccc"
-       inkscape:label="shadow2" /><path
+       id="rect4113-1-0" /><path
        style="display:inline;opacity:0.184;fill:url(#linearGradient4970);fill-opacity:1;stroke:none"
        d="M 75,4.0000001e-7 V 66 H 30.000003 C 30.000003,46.1545 47.70944,9.2500004 75,4e-7 Z"
-       id="rect4113-1-7"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccc"
-       inkscape:label="shadow1" /></g><g
+       id="rect4113-1-7" /></g><g
      transform="translate(0,-986.3622)"
      style="display:inline"
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Foreground"><g
+     id="layer1"><g
        id="g5"
        transform="translate(-108.95133,986.68143)"
-       inkscape:label="whiteBook"
        style="display:inline"><rect
          style="fill:#f9fafc;fill-opacity:1;stroke:url(#linearGradient3);stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
          id="rect3368-9"
@@ -639,29 +228,23 @@
          id="g1-1"
          transform="matrix(1.0003075,0,0,0.99333242,46.383089,7.9797066)"
          style="stroke-width:1.0032"><path
-           inkscape:connector-curvature="0"
            id="path4198-3"
            d="m 94.591178,11.090748 1.902367,5.117059"
            style="fill:none;fill-rule:evenodd;stroke:url(#linearGradient4206-4);stroke-width:2.00639;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /><path
-           inkscape:connector-curvature="0"
            id="path4198-6-7"
            d="m 98.862457,11.090748 1.902373,5.117059"
            style="fill:none;fill-rule:evenodd;stroke:url(#linearGradient4206-3-4);stroke-width:2.00639;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /><path
-           inkscape:connector-curvature="0"
            id="path4198-6-0-8"
            d="m 103.13374,11.090748 1.90236,5.117059"
            style="fill:none;fill-rule:evenodd;stroke:url(#linearGradient4206-3-3-60);stroke-width:2.00639;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /><path
-           inkscape:connector-curvature="0"
            id="path4198-6-0-2-8"
            d="m 107.40501,11.090748 1.90236,5.117059"
            style="fill:none;fill-rule:evenodd;stroke:url(#linearGradient4206-3-3-6-3);stroke-width:2.00639;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /><path
-           inkscape:connector-curvature="0"
            id="path4198-6-0-2-7-3"
            d="m 111.67628,11.090748 1.90236,5.117059"
            style="display:inline;fill:none;fill-rule:evenodd;stroke:url(#linearGradient1-2);stroke-width:2.00639;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /></g></g><g
        id="g2"
        transform="translate(-80,986.36205)"
-       inkscape:label="blueBook"
        style="display:inline"><rect
          style="fill:url(#linearGradient4176);fill-opacity:1;stroke:url(#linearGradient4184);stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
          id="rect3368"
@@ -682,23 +265,18 @@
          id="g1"
          transform="matrix(1.0003075,0,0,0.99333242,1.3830886,-0.02013945)"
          style="stroke-width:1.0032"><path
-           inkscape:connector-curvature="0"
            id="path4198"
            d="m 94.591178,11.090748 1.902367,5.117059"
            style="fill:none;fill-rule:evenodd;stroke:url(#linearGradient4206);stroke-width:2.00639;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /><path
-           inkscape:connector-curvature="0"
            id="path4198-6"
            d="m 98.862457,11.090748 1.902373,5.117059"
            style="fill:none;fill-rule:evenodd;stroke:url(#linearGradient4206-3);stroke-width:2.00639;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /><path
-           inkscape:connector-curvature="0"
            id="path4198-6-0"
            d="m 103.13374,11.090748 1.90236,5.117059"
            style="fill:none;fill-rule:evenodd;stroke:url(#linearGradient4206-3-3);stroke-width:2.00639;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /><path
-           inkscape:connector-curvature="0"
            id="path4198-6-0-2"
            d="m 107.40501,11.090748 1.90236,5.117059"
            style="fill:none;fill-rule:evenodd;stroke:url(#linearGradient4206-3-3-6);stroke-width:2.00639;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /><path
-           inkscape:connector-curvature="0"
            id="path4198-6-0-2-7"
            d="m 111.67628,11.090748 1.90236,5.117059"
            style="display:inline;fill:none;fill-rule:evenodd;stroke:url(#linearGradient1);stroke-width:2.00639;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /></g></g></g></svg>
diff --git a/ui/org.eclipse.pde.bnd.ui/icons/brkpi_obj.svg b/ui/org.eclipse.pde.bnd.ui/icons/brkpi_obj.svg
index b56f918486d..6df73708cc1 100644
--- a/ui/org.eclipse.pde.bnd.ui/icons/brkpi_obj.svg
+++ b/ui/org.eclipse.pde.bnd.ui/icons/brkpi_obj.svg
@@ -2,87 +2,17 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.48.5 r10040"
-   sodipodi:docname="brkpi_obj.svg">
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient10798-1-9-3-7-6-8-9-0-9-1">
-      <stop
-         style="stop-color:#75ba7a;stop-opacity:1;"
-         offset="0"
-         id="stop10800-5-2-1-8-20-6-4-9-8-2" />
-      <stop
-         id="stop10806-6-8-5-3-9-24-8-4-3-2"
-         offset="0.5"
-         style="stop-color:#418a4d;stop-opacity:1" />
-      <stop
-         style="stop-color:#a4c589;stop-opacity:1"
-         offset="1"
-         id="stop10802-1-5-3-0-4-8-4-2-9-2" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient10798-1-9-3-7-6-8-9-0-9-1-2"
-       id="linearGradient9837-1"
-       gradientUnits="userSpaceOnUse"
-       x1="388.63736"
-       y1="478.18777"
-       x2="388.63736"
-       y2="462.11539" />
-    <linearGradient
-       id="linearGradient10798-1-9-3-7-6-8-9-0-9-1-2">
-      <stop
-         style="stop-color:#75ba7a;stop-opacity:1;"
-         offset="0"
-         id="stop10800-5-2-1-8-20-6-4-9-8-2-0" />
-      <stop
-         id="stop10806-6-8-5-3-9-24-8-4-3-2-2"
-         offset="0.5"
-         style="stop-color:#418a4d;stop-opacity:1" />
-      <stop
-         style="stop-color:#a4c589;stop-opacity:1"
-         offset="1"
-         id="stop10802-1-5-3-0-4-8-4-2-9-2-2" />
-    </linearGradient>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="16"
-     inkscape:cx="8.1831043"
-     inkscape:cy="7.2601498"
-     inkscape:document-units="px"
-     inkscape:current-layer="g6438"
-     showgrid="true"
-     inkscape:window-width="1287"
-     inkscape:window-height="862"
-     inkscape:window-x="525"
-     inkscape:window-y="544"
-     inkscape:window-maximized="0"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3960" />
-  </sodipodi:namedview>
+     id="defs4" />
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -96,8 +26,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
@@ -122,23 +50,13 @@
          style="font-size:13.58917427px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;display:inline;font-family:Sans"
          id="g6438">
         <path
-           sodipodi:type="arc"
            style="font-size:13.58917427px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:3.17967892;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline;font-family:Sans"
            id="path10796-2-6-2-7"
-           sodipodi:cx="388.125"
-           sodipodi:cy="468.23718"
-           sodipodi:rx="13.656706"
-           sodipodi:ry="13.656706"
            d="m 401.78171,468.23718 a 13.656706,13.656706 0 1 1 -27.31342,0 13.656706,13.656706 0 1 1 27.31342,0 z"
            transform="matrix(0.32984735,0,0,0.32984735,-136.12701,882.92787)" />
         <path
-           sodipodi:type="arc"
            style="fill:#a4c589;fill-opacity:1;stroke:#058149;stroke-width:3.17967892000000019;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline"
            id="path10796-2-6-2"
-           sodipodi:cx="388.125"
-           sodipodi:cy="468.23718"
-           sodipodi:rx="10.625"
-           sodipodi:ry="10.625"
            d="m 398.75,468.23718 c 0,5.86803 -4.75697,10.625 -10.625,10.625 -5.86803,0 -10.625,-4.75697 -10.625,-10.625 0,-5.86802 4.75697,-10.625 10.625,-10.625 5.86803,0 10.625,4.75698 10.625,10.625 z"
            transform="matrix(0.32984735,0,0,0.32984735,-136.12701,882.92787)" />
       </g>
diff --git a/ui/org.eclipse.pde.bnd.ui/icons/bundle-importer-exporter.svg b/ui/org.eclipse.pde.bnd.ui/icons/bundle-importer-exporter.svg
index b135cce3ade..890740ff3ef 100644
--- a/ui/org.eclipse.pde.bnd.ui/icons/bundle-importer-exporter.svg
+++ b/ui/org.eclipse.pde.bnd.ui/icons/bundle-importer-exporter.svg
@@ -2,20 +2,16 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="bundle-importer-exporter.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
@@ -109,29 +105,6 @@
          id="stop11152-8-4-35-5-4-6" />
     </linearGradient>
     <linearGradient
-       id="linearGradient11146-7-5-30-1-1-4">
-      <stop
-         id="stop11150-9-6-9-5-6-9"
-         offset="0"
-         style="stop-color:#faefba;stop-opacity:1" />
-      <stop
-         style="stop-color:#9e6542;stop-opacity:1"
-         offset="1"
-         id="stop11152-6-7-6-3-3-3" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient11146-8-7-5-7-5-6-8">
-      <stop
-         id="stop11150-7-8-3-8-7-0-6"
-         offset="0"
-         style="stop-color:#faefba;stop-opacity:1" />
-      <stop
-         style="stop-color:#9e6542;stop-opacity:1"
-         offset="1"
-         id="stop11152-8-8-6-3-2-5-1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10507"
        id="linearGradient4895"
        gradientUnits="userSpaceOnUse"
@@ -141,7 +114,6 @@
        y2="449.88141"
        gradientTransform="matrix(0,1,-1,0,824.74991,74.781558)" />
     <radialGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient11146-8-3-2-6-1-7"
        id="radialGradient10503"
        gradientUnits="userSpaceOnUse"
@@ -190,10 +162,8 @@
        gradientTransform="matrix(-1,0,0,-1,749.87676,899.67118)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient10544"
-       xlink:href="#linearGradient10507-2"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient10507-2" />
     <radialGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4192"
        id="radialGradient10503-3"
        gradientUnits="userSpaceOnUse"
@@ -204,7 +174,6 @@
        fy="442.99802"
        r="6.1875" />
     <radialGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient11146-4-4-4-6-2"
        id="radialGradient10503-5"
        gradientUnits="userSpaceOnUse"
@@ -215,7 +184,6 @@
        fy="447.11966"
        r="6.1875" />
     <radialGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4198"
        id="radialGradient10503-3-2"
        gradientUnits="userSpaceOnUse"
@@ -226,14 +194,12 @@
        fy="446.32083"
        r="6.1875" />
     <filter
-       inkscape:collect="always"
        id="filter3854"
-       x="-0.17271166"
-       width="1.3454233"
-       y="-0.18946901"
-       height="1.378938">
+       x="-0.25070617"
+       width="1.501411"
+       y="-0.27503093"
+       height="1.5500619">
       <feGaussianBlur
-         inkscape:collect="always"
          stdDeviation="0.79164101"
          id="feGaussianBlur3856" />
     </filter>
@@ -245,8 +211,7 @@
        gradientTransform="translate(15.825436,0)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient6032"
-       xlink:href="#linearGradient4738"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4738" />
     <linearGradient
        id="linearGradient4738">
       <stop
@@ -270,11 +235,9 @@
        gradientTransform="translate(-5.4895565,0)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient6034"
-       xlink:href="#linearGradient4741"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4741" />
     <linearGradient
-       id="linearGradient4741"
-       inkscape:collect="always">
+       id="linearGradient4741">
       <stop
          id="stop4743"
          offset="0"
@@ -285,19 +248,16 @@
          style="stop-color:#106643;stop-opacity:1" />
     </linearGradient>
     <filter
-       inkscape:collect="always"
        id="filter3854-2"
-       x="-0.17271166"
-       width="1.3454233"
-       y="-0.18946901"
-       height="1.378938">
+       x="-0.24561919"
+       width="1.4912371"
+       y="-0.26945039"
+       height="1.5389008">
       <feGaussianBlur
-         inkscape:collect="always"
          stdDeviation="0.79164101"
          id="feGaussianBlur3856-1" />
     </filter>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4353"
        id="linearGradient4348"
        gradientUnits="userSpaceOnUse"
@@ -307,31 +267,6 @@
        x2="-13.936629"
        y2="1040.053" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#c7c7c7"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="66.466675"
-     inkscape:cx="11.989401"
-     inkscape:cy="7.9999969"
-     inkscape:document-units="px"
-     inkscape:current-layer="g11260-4-2"
-     showgrid="true"
-     inkscape:window-width="2560"
-     inkscape:window-height="1391"
-     inkscape:window-x="0"
-     inkscape:window-y="1"
-     inkscape:window-maximized="1"
-     inkscape:snap-global="true"
-     inkscape:snap-bbox="true"
-     inkscape:bbox-nodes="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3947" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -340,13 +275,11 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
@@ -357,8 +290,7 @@
       <g
          transform="matrix(3.5838051,0,0,3.5838051,511.44753,-3423.3167)"
          style="font-style:normal;font-weight:normal;font-size:13.58917427px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;display:inline;fill:#ffffff;fill-opacity:1;stroke:none"
-         id="layer1-9"
-         inkscape:label="Layer 1">
+         id="layer1-9">
         <g
            id="g11260-4-2"
            transform="matrix(0.27903303,0,0,0.27903303,-109.29986,933.62804)"
@@ -366,36 +298,24 @@
           <path
              style="font-style:normal;font-weight:normal;font-size:13.58917427px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;display:inline;fill:url(#radialGradient10503-5);fill-opacity:1;stroke:none;stroke-width:3.58380508;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
              d="m 375.04584,467.87065 12.70006,-4.27794 5.26516,-13.68728 -17.96522,0 z"
-             id="rect10961-9-0-4-7"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccc" />
+             id="rect10961-9-0-4-7" />
           <path
              style="font-style:normal;font-weight:normal;font-size:13.58917427px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;display:inline;fill:url(#radialGradient10503-3-2);fill-opacity:1;stroke:none;stroke-width:3.58380508;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
              d="m 374.583,467.87065 -12.70006,-4.27794 -5.26516,-13.68728 17.96522,0 z"
-             id="rect10961-9-0-4-6-0"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccc" />
+             id="rect10961-9-0-4-6-0" />
           <path
              style="display:inline;fill:url(#radialGradient10503);fill-opacity:1;stroke:none;stroke-width:3.58380508;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
              d="m 375.04584,431.97098 12.70006,4.27794 5.26516,13.68728 -17.96522,0 z"
-             id="rect10961-9-0-4"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccc" />
+             id="rect10961-9-0-4" />
           <path
              style="font-style:normal;font-weight:normal;font-size:13.58917427px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;display:inline;fill:url(#radialGradient10503-3);fill-opacity:1;stroke:none;stroke-width:3.58380508;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
              d="m 374.583,431.97098 -12.70006,4.27794 -5.26516,13.68728 17.96522,0 z"
-             id="rect10961-9-0-4-6"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccc" />
+             id="rect10961-9-0-4-6" />
           <path
-             sodipodi:nodetypes="cc"
-             inkscape:connector-curvature="0"
              id="path11108-6-7-5"
              d="m 374.86851,426.49505 0,46.58947"
              style="display:inline;fill:#915323;fill-opacity:1;stroke:url(#linearGradient4895);stroke-width:3.58380508;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
           <path
-             sodipodi:nodetypes="cc"
-             inkscape:connector-curvature="0"
              id="path11108-6-7-5-6"
              d="m 398.16325,449.78978 -46.58947,0"
              style="font-style:normal;font-weight:normal;font-size:13.58917427px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;display:inline;fill:#915323;fill-opacity:1;stroke:url(#linearGradient10544);stroke-width:3.58380508;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
@@ -409,11 +329,8 @@
           <g
              style="display:inline;fill:#ffffff;stroke:#ffffff;stroke-width:0.77931756;filter:url(#filter3854)"
              id="layer1-6-4"
-             inkscape:label="Layer 1"
              transform="matrix(2.187253,0,0,1.9941877,384.42509,-1621.3023)">
             <path
-               sodipodi:nodetypes="ccccccccc"
-               inkscape:connector-curvature="0"
                id="rect3968-5"
                d="m -1.6770565,1039.8618 0,2.0277 0,5 0,3 0.99999995,0 9.54668705,-4.5273 c 0.59227,-0.3746 0.618127,-0.6299 0,-1 l -9.12684205,-4.5004 z"
                style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1.71597862;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
@@ -421,11 +338,8 @@
           <g
              style="display:inline"
              id="layer1-6"
-             inkscape:label="Layer 1"
              transform="matrix(1.9421191,0,0,1.8087665,385.36232,-1427.5602)">
             <path
-               sodipodi:nodetypes="ccccccccc"
-               inkscape:connector-curvature="0"
                id="rect3968"
                d="m -1.6770565,1039.8618 0,2.0277 0,5 0,3 0.99999995,0 9.54668705,-4.5273 c 0.59227,-0.3746 0.618127,-0.6299 0,-1 l -9.12684205,-4.5004 z"
                style="fill:url(#linearGradient6032);fill-opacity:1;stroke:url(#linearGradient6034);stroke-width:1.91212034;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
@@ -434,15 +348,7 @@
              y="422.91125"
              x="401.74704"
              id="image4297"
-             xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAUZJREFU
-OI2dk9FNxDAQRJ9pBEvQh5c6+Egk6kDx1cFH9qSjCj5u3QcId7J8+JI7hwMhRlpFdrTjmVk72Ls5
-QLpLgf8hO2Qnu9u7ubuz1JBSt75WN40DYIfcG2GHl4/ieRSvRPIoblm81qZ0i9BO34pqnyEdURWq
-GWogoyCSO6s3PzubiBGoRoyQR9BsbJX0BLmV6j2ft9L9qhVGgaq93IsMptY4H0n+Qq1987JW64UG
-1YMDzPMbkdpkn2A1IrHy8LwDYH6a2JfCkBJq1rJYxjENyf1zcj+mtZY9Mk7G05y+jXrNQCJUO+tb
-LdS2l1KCCHIQRMXLR/EuxDjm1d+l/y22RGeCKEFGYczn0C7DuwrbjFEkh3wakxrsSyFr31NKAQWN
-B0wt/HrPl7ewhjgkVz10IQb3q1e8w37/6gDD8Pjtxf6J4Dd8ATk4Ca6BxTRTAAAAAElFTkSuQmCC
-
-"
+             xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAUZJREFU OI2dk9FNxDAQRJ9pBEvQh5c6+Egk6kDx1cFH9qSjCj5u3QcId7J8+JI7hwMhRlpFdrTjmVk72Ls5 QLpLgf8hO2Qnu9u7ubuz1JBSt75WN40DYIfcG2GHl4/ieRSvRPIoblm81qZ0i9BO34pqnyEdURWq GWogoyCSO6s3PzubiBGoRoyQR9BsbJX0BLmV6j2ft9L9qhVGgaq93IsMptY4H0n+Qq1987JW64UG 1YMDzPMbkdpkn2A1IrHy8LwDYH6a2JfCkBJq1rJYxjENyf1zcj+mtZY9Mk7G05y+jXrNQCJUO+tb LdS2l1KCCHIQRMXLR/EuxDjm1d+l/y22RGeCKEFGYczn0C7DuwrbjFEkh3wakxrsSyFr31NKAQWN B0wt/HrPl7ewhjgkVz10IQb3q1e8w37/6gDD8Pjtxf6J4Dd8ATk4Ca6BxTRTAAAAAElFTkSuQmCC  "
              style="image-rendering:optimizeSpeed"
              preserveAspectRatio="none"
              height="57.340881"
@@ -450,11 +356,8 @@ B0wt/HrPl7ewhjgkVz10IQb3q1e8w37/6gDD8Pjtxf6J4Dd8ATk4Ca6BxTRTAAAAAElFTkSuQmCC
           <g
              style="font-style:normal;font-weight:normal;font-size:13.58917427px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;display:inline;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:0.72848868;filter:url(#filter3854-2)"
              id="layer1-6-4-7"
-             inkscape:label="Layer 1"
              transform="matrix(2.5031236,0,0,1.9941877,349.13959,-1646.385)">
             <path
-               sodipodi:nodetypes="ccccccccc"
-               inkscape:connector-curvature="0"
                id="rect3968-5-2"
                d="m -1.6770565,1039.8618 0,2.0277 0,5 0,3 0.99999995,0 9.54668705,-4.5273 c 0.59227,-0.3746 0.618127,-0.6299 0,-1 l -9.12684205,-4.5004 z"
                style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1.60405862;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
@@ -462,9 +365,7 @@ B0wt/HrPl7ewhjgkVz10IQb3q1e8w37/6gDD8Pjtxf6J4Dd8ATk4Ca6BxTRTAAAAAElFTkSuQmCC
           <path
              style="font-style:normal;font-weight:normal;font-size:medium;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;fill:url(#linearGradient4348);fill-opacity:1;stroke:#000080;stroke-width:3.58380532;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
              d="m 346.19807,428.28695 0,3.62341 0,8.93475 0,5.36087 2.28047,0 21.77095,-8.09008 c 1.35065,-0.66939 1.40962,-1.1256 0,-1.78694 l -20.8135,-8.04201 z"
-             id="rect3968-2"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccccccc" />
+             id="rect3968-2" />
         </g>
         <g
            id="g11331-3"
diff --git a/ui/org.eclipse.pde.bnd.ui/icons/excludeMode_filter.svg b/ui/org.eclipse.pde.bnd.ui/icons/excludeMode_filter.svg
index f6a4a1bb5c0..e284d3f03c8 100644
--- a/ui/org.eclipse.pde.bnd.ui/icons/excludeMode_filter.svg
+++ b/ui/org.eclipse.pde.bnd.ui/icons/excludeMode_filter.svg
@@ -2,24 +2,19 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.48.0 r9654"
-   sodipodi:docname="excludeMode_filter.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10798-1-9-3-7-1-15-1-7-6-1"
        id="linearGradient8163-2"
        gradientUnits="userSpaceOnUse"
@@ -43,26 +38,6 @@
          id="stop10802-1-5-3-0-2-0-9-8-4-3" />
     </linearGradient>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="16"
-     inkscape:cx="6.5644611"
-     inkscape:cy="4.7576349"
-     inkscape:document-units="px"
-     inkscape:current-layer="g8159"
-     showgrid="false"
-     inkscape:window-width="1171"
-     inkscape:window-height="959"
-     inkscape:window-x="1272"
-     inkscape:window-y="371"
-     inkscape:window-maximized="0"
-     showguides="true"
-     inkscape:guide-bbox="true" />
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -76,8 +51,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
@@ -86,13 +59,8 @@
        id="g8159"
        transform="translate(-8.2201163,-12.904699)">
       <path
-         sodipodi:type="arc"
          style="fill:url(#linearGradient8163-2);fill-opacity:1;stroke:#c93e35;stroke-width:1.97452511000000008;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline"
          id="path10796-2-6-0"
-         sodipodi:cx="388.125"
-         sodipodi:cy="468.23718"
-         sodipodi:rx="10.625"
-         sodipodi:ry="10.625"
          d="m 398.75,468.23718 c 0,5.86803 -4.75697,10.625 -10.625,10.625 -5.86803,0 -10.625,-4.75697 -10.625,-10.625 0,-5.86802 4.75697,-10.625 10.625,-10.625 5.86803,0 10.625,4.75698 10.625,10.625 z"
          transform="matrix(0.50645089,0,0,0.50645089,-180.12602,820.2612)" />
       <g
diff --git a/ui/org.eclipse.pde.bnd.ui/icons/help.svg b/ui/org.eclipse.pde.bnd.ui/icons/help.svg
index cfe92203561..d3a148d6f87 100644
--- a/ui/org.eclipse.pde.bnd.ui/icons/help.svg
+++ b/ui/org.eclipse.pde.bnd.ui/icons/help.svg
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <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"
    version="1.1"
    id="svg2"
    height="16"
-   width="16">
+   width="16"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
@@ -40,7 +40,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
diff --git a/ui/org.eclipse.pde.bnd.ui/icons/jar_obj.svg b/ui/org.eclipse.pde.bnd.ui/icons/jar_obj.svg
index 5e37a58bc86..384cdd30df7 100644
--- a/ui/org.eclipse.pde.bnd.ui/icons/jar_obj.svg
+++ b/ui/org.eclipse.pde.bnd.ui/icons/jar_obj.svg
@@ -2,20 +2,16 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="jar_obj.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
@@ -72,7 +68,6 @@
          id="stop4851" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4825">
       <stop
          style="stop-color:#c7a229;stop-opacity:1"
@@ -84,7 +79,6 @@
          id="stop4829" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4817">
       <stop
          style="stop-color:#fefdef;stop-opacity:1;"
@@ -96,7 +90,6 @@
          id="stop4821" />
     </linearGradient>
     <radialGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4847"
        id="radialGradient4089"
        gradientUnits="userSpaceOnUse"
@@ -107,7 +100,6 @@
        fy="1043.2388"
        r="5.3910385" />
     <radialGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4960"
        id="radialGradient4091"
        gradientUnits="userSpaceOnUse"
@@ -118,7 +110,6 @@
        fy="1044.4122"
        r="5.0160384" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4968"
        id="linearGradient4093"
        gradientUnits="userSpaceOnUse"
@@ -128,7 +119,6 @@
        x2="33.922783"
        y2="1040.4603" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4817"
        id="linearGradient4095"
        gradientUnits="userSpaceOnUse"
@@ -138,7 +128,6 @@
        x2="31.931776"
        y2="1038.8719" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4825"
        id="linearGradient4097"
        gradientUnits="userSpaceOnUse"
@@ -148,31 +137,6 @@
        x2="27.425272"
        y2="1039.8464" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="15.999999"
-     inkscape:cx="7.6464263"
-     inkscape:cy="5.955383"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1124"
-     inkscape:window-height="713"
-     inkscape:window-x="272"
-     inkscape:window-y="356"
-     inkscape:window-maximized="0"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid4042" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -186,8 +150,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
@@ -195,20 +157,14 @@
        id="g4083"
        transform="matrix(0.90162747,0,0,0.90162747,0.30656226,102.31711)">
       <path
-         sodipodi:nodetypes="ccssssssc"
-         inkscape:connector-curvature="0"
          id="rect4044"
          d="m 5.2136895,1038.7143 6.6566975,0 c 0.453044,1.6907 2.762136,2.5911 2.762136,5.1157 l 0,5.4202 c 0,1.5302 -1.231912,2.7621 -2.762136,2.7621 l -6.6566975,0 c -1.530224,0 -2.762136,-1.2319 -2.762136,-2.7621 l 0,-5.4202 c 0,-2.5909 2.334749,-3.5207 2.762136,-5.1157 z"
          style="fill:url(#radialGradient4089);fill-opacity:1;stroke:none" />
       <path
-         sodipodi:nodetypes="ccssssssc"
-         inkscape:connector-curvature="0"
          id="rect4044-7"
          d="m 5.2136895,1038.7143 6.6566975,0 c 0.453044,1.6907 2.762136,2.5911 2.762136,5.1157 l 0,5.4202 c 0,1.5302 -1.231912,2.7621 -2.762136,2.7621 l -6.6566975,0 c -1.530224,0 -2.762136,-1.2319 -2.762136,-2.7621 l 0,-5.4202 c 0,-2.5909 2.334749,-3.5207 2.762136,-5.1157 z"
          style="fill:url(#radialGradient4091);fill-opacity:1;stroke:none;display:inline" />
       <path
-         sodipodi:nodetypes="ccssssssc"
-         inkscape:connector-curvature="0"
          id="rect4044-1"
          d="m 5.2136895,1038.7143 6.6566975,0 c 0.453044,1.6907 2.762136,2.5911 2.762136,5.1157 l 0,5.4202 c 0,1.5302 -1.231912,2.7621 -2.762136,2.7621 l -6.6566975,0 c -1.530224,0 -2.762136,-1.2319 -2.762136,-2.7621 l 0,-5.4202 c 0,-2.5909 2.334749,-3.5207 2.762136,-5.1157 z"
          style="fill:none;stroke:url(#linearGradient4093);stroke-width:1.10910547;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline" />
@@ -223,18 +179,14 @@
          style="fill:url(#linearGradient4095);fill-opacity:1;stroke:url(#linearGradient4097);stroke-width:1.10910547;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
     </g>
     <path
-       inkscape:connector-curvature="0"
        id="path21763"
        style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10px;line-height:125%;font-family:Gautami;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;display:inline;fill:#10305a;fill-opacity:1;stroke:#17325d;stroke-width:0.43093461;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="m 6.738238,1045.3769 c -4e-6,0.5057 -0.09722,0.9203 -0.291688,1.2435 -0.22402,0.3749 -0.548377,0.5624 -0.973072,0.5624 -0.424698,0 -0.749834,-0.1875 -0.975405,-0.5624 -0.196014,-0.3232 -0.294022,-0.7378 -0.294022,-1.2435 0,-0.5058 0.09801,-0.9202 0.294022,-1.2435 0.225571,-0.375 0.550707,-0.5624 0.975405,-0.5625 0.424695,10e-5 0.749052,0.1875 0.973072,0.5625 0.194455,0.3233 0.291684,0.7377 0.291688,1.2435 z m -0.410697,0 c -4e-6,-0.3646 -0.07079,-0.6769 -0.21235,-0.9365 -0.160236,-0.2924 -0.37414,-0.4385 -0.641713,-0.4385 -0.269131,0 -0.483814,0.1461 -0.644047,0.4385 -0.143123,0.2596 -0.214683,0.5719 -0.214683,0.9365 0,0.3647 0.07157,0.6767 0.214683,0.9366 0.160233,0.2922 0.374916,0.4385 0.644047,0.4385 0.267573,0 0.481477,-0.1463 0.641713,-0.4385 0.141565,-0.2599 0.212346,-0.5719 0.21235,-0.9366 z" />
     <path
-       inkscape:connector-curvature="0"
        id="path21765"
        style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10px;line-height:125%;font-family:Gautami;-inkscape-font-specification:Gautami;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;display:inline;fill:#10305a;fill-opacity:1;stroke:#17325d;stroke-width:0.26428938;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 8.8747035,1043.4881 0,3.7435 -0.7456623,0 0.00726,-3.7513 z"
-       sodipodi:nodetypes="ccccc" />
+       d="m 8.8747035,1043.4881 0,3.7435 -0.7456623,0 0.00726,-3.7513 z" />
     <path
-       inkscape:connector-curvature="0"
        id="path21763-3"
        style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10px;line-height:125%;font-family:Gautami;-inkscape-font-specification:Gautami;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;display:inline;fill:#10305a;fill-opacity:1;stroke:#17325d;stroke-width:0.43324903;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="m 12.77305,1045.3769 c -3e-6,0.5053 -0.09834,0.9197 -0.295019,1.2427 -0.226576,0.3747 -0.554637,0.562 -0.984182,0.562 -0.429549,0 -0.758395,-0.1873 -0.986541,-0.562 -0.198254,-0.323 -0.297379,-0.7374 -0.297379,-1.2427 0,-0.5054 0.09912,-0.9196 0.297379,-1.2427 0.228146,-0.3748 0.556992,-0.562 0.986541,-0.5621 0.429545,10e-5 0.757606,0.1873 0.984182,0.5621 0.196677,0.3231 0.295016,0.7373 0.295019,1.2427 z m -0.415386,0 c -4e-6,-0.3644 -0.07158,-0.6765 -0.214775,-0.9359 -0.162064,-0.2922 -0.378411,-0.4383 -0.64904,-0.4383 -0.272205,0 -0.489338,0.1461 -0.651401,0.4383 -0.144757,0.2594 -0.217133,0.5715 -0.217133,0.9359 0,0.3645 0.07238,0.6763 0.217133,0.936 0.162063,0.292 0.379196,0.4383 0.651401,0.4383 0.270629,0 0.486976,-0.1463 0.649041,-0.4383 0.143181,-0.2597 0.21477,-0.5715 0.214774,-0.936 z" />
diff --git a/ui/org.eclipse.pde.bnd.ui/icons/jcu_obj.svg b/ui/org.eclipse.pde.bnd.ui/icons/jcu_obj.svg
index 2f6738bc744..99e1230eaba 100644
--- a/ui/org.eclipse.pde.bnd.ui/icons/jcu_obj.svg
+++ b/ui/org.eclipse.pde.bnd.ui/icons/jcu_obj.svg
@@ -2,24 +2,19 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r"
-   sodipodi:docname="jcu_obj.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4902-3"
        id="linearGradient4908-2"
        x1="10.544736"
@@ -29,7 +24,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-1.977903,-1.044194)" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4902-3">
       <stop
          style="stop-color:#b28a30;stop-opacity:1"
@@ -41,7 +35,6 @@
          id="stop4906-2" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4894-6"
        id="linearGradient4900-1"
        x1="7.9987183"
@@ -51,7 +44,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(2.022097,-1.044194)" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4894-6">
       <stop
          style="stop-color:#e0c88f;stop-opacity:1"
@@ -63,7 +55,6 @@
          id="stop4898-5" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4994-6">
       <stop
          style="stop-color:#f9fafc;stop-opacity:1;"
@@ -82,34 +73,8 @@
        gradientUnits="userSpaceOnUse"
        id="linearGradient4101"
        xlink:href="#linearGradient4994-6"
-       inkscape:collect="always"
        gradientTransform="translate(-1.977903,-1.044194)" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="21.34375"
-     inkscape:cx="-2.553461"
-     inkscape:cy="6.8195344"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="900"
-     inkscape:window-x="75"
-     inkscape:window-y="75"
-     inkscape:window-maximized="0"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3999" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -123,31 +88,22 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
     <path
        style="fill:url(#linearGradient4101);fill-opacity:1;stroke:none;display:inline"
        d="m 3.5193795,1037.8597 7.0096695,0 3.062057,3.0066 0,9.9546 -10.0717265,0 z"
-       id="rect4001-3"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccc" />
+       id="rect4001-3" />
     <path
        style="fill:url(#linearGradient4900-1);fill-opacity:1;stroke:none;display:inline"
        d="m 9.998718,1037.397 0,3.9112 3.977478,0 z"
-       id="path4884"
-       inkscape:connector-curvature="0" />
+       id="path4884" />
     <path
        style="fill:none;stroke:url(#linearGradient4908-2);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;display:inline"
        d="m 3.5193795,1037.8597 7.0096695,0 3.062057,3.0066 0,9.9546 -10.0717265,0 z"
-       id="rect4001"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccc" />
+       id="rect4001" />
     <path
-       sodipodi:nodetypes="ssscccssscccscss"
-       inkscape:connector-curvature="0"
        id="path10927-5-7-4-4"
        d="m 6.6084618,1048.3431 c -0.2116277,-0.019 -0.4602115,-0.062 -0.6598209,-0.1162 -0.3097493,-0.083 -0.2788869,0.017 -0.2788869,-0.9031 0,-0.4813 0.0088,-0.7987 0.022313,-0.8035 0.012257,0 0.036259,0 0.053355,0.013 0.055439,0.038 0.3369032,0.1706 0.4300938,0.2023 0.2132743,0.072 0.5332849,0.1095 0.7587063,0.088 0.4997134,-0.048 0.838345,-0.3094 1.0086665,-0.7765 0.1373503,-0.3768 0.1304394,-0.2307 0.1445726,-3.0571 l 0.013011,-2.6 0.9485572,0 0.9485603,0 0.00704,2.4239 c 0.0073,2.5055 -6.28e-4,2.7987 -0.08886,3.2552 -0.1787185,0.9256 -0.684485,1.6223 -1.4343096,1.9754 -0.5040536,0.2374 -1.2358574,0.3542 -1.8729745,0.299 z"
        style="display:inline;fill:#366c9a;fill-opacity:1" />
diff --git a/ui/org.eclipse.pde.bnd.ui/icons/lockedstate.svg b/ui/org.eclipse.pde.bnd.ui/icons/lockedstate.svg
index 7767244e411..c3182c6a747 100644
--- a/ui/org.eclipse.pde.bnd.ui/icons/lockedstate.svg
+++ b/ui/org.eclipse.pde.bnd.ui/icons/lockedstate.svg
@@ -2,20 +2,16 @@
 <!-- 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="20"
    height="20"
    id="svg2"
    version="1.1"
-   inkscape:version="0.48.0 r9654"
-   sodipodi:docname="lockedstate.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
@@ -38,7 +34,6 @@
          id="stop5160" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient5001">
       <stop
          style="stop-color:#000000;stop-opacity:1;"
@@ -50,7 +45,6 @@
          id="stop5005" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4886">
       <stop
          style="stop-color:#dec26f;stop-opacity:1"
@@ -62,7 +56,6 @@
          id="stop4890" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4870">
       <stop
          style="stop-color:#fdf3cb;stop-opacity:1"
@@ -74,7 +67,6 @@
          id="stop4874" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4862">
       <stop
          style="stop-color:#c79c2f;stop-opacity:1"
@@ -86,7 +78,6 @@
          id="stop4866" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4862"
        id="linearGradient4868"
        x1="30.0625"
@@ -96,7 +87,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-20,0)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4870"
        id="linearGradient4876"
        x1="25.65625"
@@ -106,7 +96,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-20,0)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4886"
        id="linearGradient4892"
        x1="32.325939"
@@ -116,7 +105,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-20,0)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient5001"
        id="linearGradient5007"
        x1="29.435884"
@@ -126,7 +114,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-20,0)" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4878">
       <stop
          style="stop-color:#a77e1c;stop-opacity:1"
@@ -145,18 +132,18 @@
        x1="29.263437"
        gradientUnits="userSpaceOnUse"
        id="linearGradient5103"
-       xlink:href="#linearGradient4878"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4878" />
     <filter
-       inkscape:collect="always"
-       id="filter5152">
+       id="filter5152"
+       x="-0.11338032"
+       y="-0.15654873"
+       width="1.2267606"
+       height="1.3130975">
       <feGaussianBlur
-         inkscape:collect="always"
          stdDeviation="0.32374297"
          id="feGaussianBlur5154" />
     </filter>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient5156"
        id="linearGradient5162"
        x1="26.334742"
@@ -166,35 +153,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-20,0)" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="31.999998"
-     inkscape:cx="4.2960564"
-     inkscape:cy="10.236278"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1241"
-     inkscape:window-height="814"
-     inkscape:window-x="379"
-     inkscape:window-y="250"
-     inkscape:window-maximized="0"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3999"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -208,22 +166,17 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1032.3622)">
     <path
        style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:url(#linearGradient4876);fill-opacity:1;stroke:url(#linearGradient4868);stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
        d="m 9.5,1034.625 c -2.758584,0 -5,2.2414 -5,5 l 0,2.9375 c 0,2.7586 2.241416,5.0313 5,5.0313 2.758584,0 5.03125,-2.2727 5.03125,-5.0313 l 0,-2.9375 c 0,-2.7586 -2.272666,-5 -5.03125,-5 z m 0,2 c 1.685179,0 3.03125,1.3148 3.03125,3 l 0,2.9375 c 0,1.6852 -1.346071,3.0313 -3.03125,3.0313 -1.685179,0 -3,-1.3461 -3,-3.0313 l 0,-2.9375 c 0,-1.6852 1.314821,-3 3,-3 z"
-       id="rect4838-1"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ssssssssssssss" />
+       id="rect4838-1" />
     <path
        style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:0.5;color:#000000;fill:url(#linearGradient5007);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
        d="m 9.5,1034.1122 c -3.029423,0 -5.5,2.4706 -5.5,5.5 l 0,2.9375 c 0,3.0294 2.466794,5.5313 5.5,5.5313 3.033206,0 5.53125,-2.4981 5.53125,-5.5313 l 0,-2.9375 c 0,-3.0332 -2.501827,-5.5 -5.53125,-5.5 z m 0,3 c 1.425108,0 2.53125,1.0811 2.53125,2.5 l 0,2.9375 c 0,1.4189 -1.112334,2.5313 -2.53125,2.5313 -1.418916,0 -2.5,-1.1062 -2.5,-2.5313 l 0,-2.9375 c 0,-1.4251 1.074892,-2.5 2.5,-2.5 z"
-       id="path4994"
-       inkscape:connector-curvature="0" />
+       id="path4994" />
     <rect
        style="fill:url(#linearGradient4892);fill-opacity:1;stroke:none"
        id="rect4838"
@@ -264,13 +217,8 @@
        x="3.9971676"
        y="1048.4247" />
     <path
-       sodipodi:type="arc"
        style="fill:#785b13;fill-opacity:1;stroke:none"
        id="path4066"
-       sodipodi:cx="9.4796505"
-       sodipodi:cy="12.531184"
-       sodipodi:rx="1.016466"
-       sodipodi:ry="1.016466"
        d="m 10.496117,12.531184 c 0,0.561379 -0.455088,1.016466 -1.0164665,1.016466 -0.5613787,0 -1.016466,-0.455087 -1.016466,-1.016466 0,-0.561378 0.4550873,-1.016466 1.016466,-1.016466 0.5613785,0 1.0164665,0.455088 1.0164665,1.016466 z"
        transform="translate(0,1032.3622)" />
     <rect
diff --git a/ui/org.eclipse.pde.bnd.ui/icons/package_obj.svg b/ui/org.eclipse.pde.bnd.ui/icons/package_obj.svg
index b70d20b4500..e39554e0ae9 100644
--- a/ui/org.eclipse.pde.bnd.ui/icons/package_obj.svg
+++ b/ui/org.eclipse.pde.bnd.ui/icons/package_obj.svg
@@ -2,24 +2,19 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.48.0 r9654"
-   sodipodi:docname="package_obj.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient10573">
       <stop
          style="stop-color:#c18965;stop-opacity:1;"
@@ -106,7 +101,6 @@
          id="stop11152-8-8-6-3-2-5-1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10507"
        id="linearGradient4895"
        gradientUnits="userSpaceOnUse"
@@ -116,7 +110,6 @@
        y2="449.88141"
        gradientTransform="matrix(0,1,-1,0,824.88775,74.875059)" />
     <radialGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient11146-7-5-30-1-1-4"
        id="radialGradient10499"
        gradientUnits="userSpaceOnUse"
@@ -127,7 +120,6 @@
        fy="442.57816"
        r="6.1875" />
     <radialGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient11146-8-7-5-7-5-6-8"
        id="radialGradient10501"
        gradientUnits="userSpaceOnUse"
@@ -138,7 +130,6 @@
        fy="442.57816"
        r="6.1875" />
     <radialGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient11146-8-3-2-6-1-7"
        id="radialGradient10503"
        gradientUnits="userSpaceOnUse"
@@ -149,7 +140,6 @@
        fy="442.57816"
        r="6.1875" />
     <radialGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient11146-4-4-4-6-2"
        id="radialGradient10505"
        gradientUnits="userSpaceOnUse"
@@ -198,10 +188,8 @@
        gradientTransform="matrix(-1,0,0,-1,750.01459,899.76468)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient10544"
-       xlink:href="#linearGradient10507-2"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient10507-2" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10573"
        id="linearGradient10579"
        x1="366.04819"
@@ -210,29 +198,6 @@
        y2="466.01041"
        gradientUnits="userSpaceOnUse" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="30.80334"
-     inkscape:cx="1.2064551"
-     inkscape:cy="10.646745"
-     inkscape:document-units="px"
-     inkscape:current-layer="g13862"
-     showgrid="true"
-     inkscape:window-width="1920"
-     inkscape:window-height="1138"
-     inkscape:window-x="-8"
-     inkscape:window-y="-8"
-     inkscape:window-maximized="1"
-     inkscape:snap-global="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3947" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -246,8 +211,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
@@ -258,8 +221,7 @@
       <g
          transform="matrix(3.5838051,0,0,3.5838051,511.21484,-3419.8264)"
          style="font-size:13.58917427px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;display:inline;font-family:Sans"
-         id="layer1-9"
-         inkscape:label="Layer 1">
+         id="layer1-9">
         <g
            id="g11260-4-2"
            transform="matrix(0.27903303,0,0,0.27903303,-109.29986,933.62804)"
@@ -279,31 +241,22 @@
              x="375.04584"
              y="431.97098" />
           <path
-             sodipodi:nodetypes="ccccc"
-             inkscape:connector-curvature="0"
              id="rect10961-3-9-1"
              d="m 357.08057,449.75837 17.96523,0 0,18.13262 -17.96523,0 z"
              style="fill:url(#radialGradient10499);fill-opacity:1;stroke:#a45d2b;stroke-width:3.58380508;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline" />
           <path
-             sodipodi:nodetypes="ccccc"
-             inkscape:connector-curvature="0"
              id="rect10961-9-6-4-1"
              d="m 375.0458,449.75837 17.96522,0 0,18.13262 -17.96522,0 z"
              style="fill:url(#radialGradient10501);fill-opacity:1;stroke:#a45d2b;stroke-width:3.58380508;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline" />
           <path
              style="font-size:13.58917427px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:none;stroke:url(#linearGradient10579);stroke-width:3.58380508;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline;font-family:Sans"
              d="m 357.27589,432.15148 0,17.71804 0,17.85756 17.71805,0 17.85755,0 0,-17.85756 0,-0.13951 0,-17.57853 -17.85755,0 -17.71805,0 z"
-             id="rect10961-8-3-6"
-             inkscape:connector-curvature="0" />
+             id="rect10961-8-3-6" />
           <path
-             sodipodi:nodetypes="cc"
-             inkscape:connector-curvature="0"
              id="path11108-6-7-5"
              d="m 375.00635,426.58855 0,46.58947"
              style="fill:#915323;fill-opacity:1;stroke:url(#linearGradient4895);stroke-width:3.58380508;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
           <path
-             sodipodi:nodetypes="cc"
-             inkscape:connector-curvature="0"
              id="path11108-6-7-5-6"
              d="m 398.30108,449.88328 -46.58947,0"
              style="font-size:13.58917427px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#915323;fill-opacity:1;stroke:url(#linearGradient10544);stroke-width:3.58380508;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline;font-family:Sans" />
diff --git a/ui/org.eclipse.pde.bnd.ui/icons/signed_yes_tbl.svg b/ui/org.eclipse.pde.bnd.ui/icons/signed_yes_tbl.svg
index 0fca5f284fc..5c0aba89c0e 100644
--- a/ui/org.eclipse.pde.bnd.ui/icons/signed_yes_tbl.svg
+++ b/ui/org.eclipse.pde.bnd.ui/icons/signed_yes_tbl.svg
@@ -2,20 +2,16 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.48.0 r9654"
-   sodipodi:docname="signed_yes_tbl.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
@@ -30,7 +26,6 @@
          style="stop-color:#bc9617;stop-opacity:1;" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4910-4">
       <stop
          style="stop-color:#ffffff;stop-opacity:0"
@@ -42,8 +37,7 @@
          id="stop4914-8" />
     </linearGradient>
     <linearGradient
-       id="linearGradient4994-4"
-       inkscape:collect="always">
+       id="linearGradient4994-4">
       <stop
          id="stop4996-5"
          offset="0"
@@ -54,7 +48,6 @@
          style="stop-color:#ffffff;stop-opacity:0;" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4810"
        id="linearGradient6101"
        gradientUnits="userSpaceOnUse"
@@ -64,7 +57,6 @@
        x2="8.0137892"
        y2="1050.0707" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4910-4"
        id="linearGradient6103"
        gradientUnits="userSpaceOnUse"
@@ -74,7 +66,6 @@
        x2="-15"
        y2="1047.3622" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4994-4"
        id="linearGradient6105"
        gradientUnits="userSpaceOnUse"
@@ -91,10 +82,8 @@
        gradientTransform="translate(2.0918142,-0.65403543)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient9203-3"
-       xlink:href="#linearGradient4877-6-4-2-5"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4877-6-4-2-5" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4877-6-4-2-5">
       <stop
          style="stop-color:#91a5c7;stop-opacity:1;"
@@ -113,11 +102,9 @@
        y1="1045.8571"
        x1="7.0070496"
        id="linearGradient4869-17-7-2-5"
-       xlink:href="#linearGradient4861-1-9-7-3"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4861-1-9-7-3" />
     <linearGradient
-       id="linearGradient4861-1-9-7-3"
-       inkscape:collect="always">
+       id="linearGradient4861-1-9-7-3">
       <stop
          id="stop4863-1-0-5-5"
          offset="0"
@@ -128,7 +115,6 @@
          style="stop-color:#637aa7;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient5147-4-0-5-8">
       <stop
          style="stop-color:#91a5c7;stop-opacity:1;"
@@ -147,8 +133,7 @@
        gradientTransform="translate(1.1637366,-2.7311616)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient9273"
-       xlink:href="#linearGradient5147-4-0-5-8"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient5147-4-0-5-8" />
     <linearGradient
        id="linearGradient9334-5">
       <stop
@@ -180,8 +165,7 @@
        gradientTransform="matrix(3.8020701,0,0,0.71327892,-16.439119,-2.0966268)"
        gradientUnits="userSpaceOnUse"
        id="radialGradient9405"
-       xlink:href="#linearGradient9334-5"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient9334-5" />
     <linearGradient
        y2="-5.5260382"
        x2="6.2367058"
@@ -189,38 +173,8 @@
        x1="5.8667765"
        gradientUnits="userSpaceOnUse"
        id="linearGradient9407"
-       xlink:href="#linearGradient9368-7"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient9368-7" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="45.254832"
-     inkscape:cx="12.437581"
-     inkscape:cy="5.4419504"
-     inkscape:document-units="px"
-     inkscape:current-layer="g9376"
-     showgrid="true"
-     inkscape:window-width="1171"
-     inkscape:window-height="959"
-     inkscape:window-x="150"
-     inkscape:window-y="150"
-     inkscape:window-maximized="0"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid6094"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -234,8 +188,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
@@ -250,14 +202,10 @@
          id="rect3997-9"
          style="fill:#f4fcff;fill-opacity:1;stroke:url(#linearGradient6101);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline" />
       <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
          id="rect4853-82-7"
          d="m 6.03125,1039.3622 0,12 -1,0 0,-13 z"
          style="fill:url(#linearGradient6103);fill-opacity:1;stroke:none;display:inline" />
       <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
          id="rect4853-82-0"
          d="m 5.7897727,1039.3622 8.2102273,0 0,-1 -9.03125,0 z"
          style="fill:url(#linearGradient6105);fill-opacity:1;stroke:none;display:inline" />
@@ -292,21 +240,14 @@
          id="g9376"
          transform="matrix(0,0.86269695,-1,0,1042.5476,1024.8382)">
         <path
-           sodipodi:nodetypes="cccccccccc"
-           inkscape:connector-curvature="0"
            d="m 19.621029,1031.4547 0,3.5871 -1.393288,1.2842 0,-4.7827 1.51995,-0.088 m 0,0 1.519951,0.088 0,4.7828 -1.393288,-1.2843 0,-3.5871"
            style="fill:#f4006e;fill-opacity:1;stroke:#f4006e;stroke-width:0.48878345;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
            id="path9345-4" />
         <path
            transform="matrix(0.99059914,0,0,1.2070442,13.898978,1040.7488)"
            d="m 8.3526988,-7.3124266 c 0,0.9396991 -1.1129853,1.7014758 -2.4859223,1.7014758 -1.372937,0 -2.4859224,-0.7617767 -2.4859224,-1.7014758 0,-0.9396991 1.1129854,-1.7014757 2.4859224,-1.7014757 1.372937,0 2.4859223,0.7617766 2.4859223,1.7014757 z"
-           sodipodi:ry="1.7014757"
-           sodipodi:rx="2.4859223"
-           sodipodi:cy="-7.3124266"
-           sodipodi:cx="5.8667765"
            id="path9314"
-           style="fill:url(#radialGradient9405);fill-opacity:1;stroke:url(#linearGradient9407);stroke-width:0.5;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-           sodipodi:type="arc" />
+           style="fill:url(#radialGradient9405);fill-opacity:1;stroke:url(#linearGradient9407);stroke-width:0.5;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
       </g>
     </g>
   </g>
diff --git a/ui/org.eclipse.pde.bnd.ui/icons/tricks.svg b/ui/org.eclipse.pde.bnd.ui/icons/tricks.svg
index b45ba974def..4a6a2839557 100644
--- a/ui/org.eclipse.pde.bnd.ui/icons/tricks.svg
+++ b/ui/org.eclipse.pde.bnd.ui/icons/tricks.svg
@@ -2,24 +2,19 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="tricks.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient6281-8-0-1-6-6-4-2-8"
        id="linearGradient3093-5-2-7-0"
        gradientUnits="userSpaceOnUse"
@@ -40,7 +35,6 @@
          style="stop-color:#ffd680;stop-opacity:1" />
     </linearGradient>
     <radialGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4528-9-5-7-9-7"
        id="radialGradient3091-1-9-6-4"
        gradientUnits="userSpaceOnUse"
@@ -62,7 +56,6 @@
          id="stop4532-7-9-3-3-6" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient6281-8-0-1-6-6-4-2-8"
        id="linearGradient3093-5-2-7-0-6"
        gradientUnits="userSpaceOnUse"
@@ -72,7 +65,6 @@
        x2="0.9375"
        y2="7.549418" />
     <radialGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4528-9-5-7-9-7"
        id="radialGradient3091-1-9-6-4-3"
        gradientUnits="userSpaceOnUse"
@@ -83,46 +75,17 @@
        fy="-738.83777"
        r="3.4803574" />
     <filter
-       inkscape:collect="always"
        style="color-interpolation-filters:sRGB"
        id="filter5531"
-       x="-0.44375949"
+       x="-0.4437595"
        width="1.887519"
-       y="-0.44424077"
-       height="1.8884815">
+       y="-0.44424078"
+       height="1.8884816">
       <feGaussianBlur
-         inkscape:collect="always"
          stdDeviation="0.83048467"
          id="feGaussianBlur5533" />
     </filter>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="22.180449"
-     inkscape:cx="10.644739"
-     inkscape:cy="-2.0000313"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="2560"
-     inkscape:window-height="1392"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="false"
-     inkscape:snap-bbox="true"
-     inkscape:bbox-nodes="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3999" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -131,13 +94,11 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
@@ -145,14 +106,7 @@
        y="1036.272"
        x="21.054579"
        id="image4657"
-       xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAAZiS0dEAKoA
-wQDg87MiRwAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0SU1FB9wFCQ0UH7e+//0AAADsSURBVDjL
-Y2DAAnZNV/vPQC4Aaf739/1/sgzZOlH5/9ZJymADQDQIE615XZf8/79fzkPwZygGskHiRBuytEnq
-Pwj/eb74/zIgvaxRCqx51cEHTEQbMq9S7P/vu83/QTQQ/APiP0AD/hEdgCB6ZokwSDMLSPPfv3//
-gzDQkCckhf7qQw9YQDYDwX8Qnr3gGMgQZqJDH6gYZAATEP+cvfAY2AAGvvz/ZIU+0BBNsGYoBvIl
-iAp9ZADUJIlmCBfO0MfmTaAGRjADyRAMRaDQxxXIMAOAtBhQ822QAeziJeTnGZyuIBYAXcJDkQEw
-QwAXy/ppHcLvJQAAAABJRU5ErkJggg==
-"
+       xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAAZiS0dEAKoA wQDg87MiRwAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0SU1FB9wFCQ0UH7e+//0AAADsSURBVDjL Y2DAAnZNV/vPQC4Aaf739/1/sgzZOlH5/9ZJymADQDQIE615XZf8/79fzkPwZygGskHiRBuytEnq Pwj/eb74/zIgvaxRCqx51cEHTEQbMq9S7P/vu83/QTQQ/APiP0AD/hEdgCB6ZokwSDMLSPPfv3// gzDQkCckhf7qQw9YQDYDwX8Qnr3gGMgQZqJDH6gYZAATEP+cvfAY2AAGvvz/ZIU+0BBNsGYoBvIl iAp9ZADUJIlmCBfO0MfmTaAGRjADyRAMRaDQxxXIMAOAtBhQ822QAeziJeTnGZyuIBYAXcJDkQEw QwAXy/ppHcLvJQAAAABJRU5ErkJggg== "
        style="image-rendering:optimizeSpeed"
        preserveAspectRatio="none"
        height="16.000017"
@@ -160,13 +114,11 @@ QwAXy/ppHcLvJQAAAABJRU5ErkJggg==
     <path
        style="display:inline;fill:none;fill-rule:evenodd;stroke:#394e75;stroke-width:2.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="m 9.368794,1043.1191 6.369165,6.9799"
-       id="path4268-5"
-       inkscape:connector-curvature="0" />
+       id="path4268-5" />
     <path
        style="display:inline;fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.50000012;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="m 9.4101707,1043.1648 0.4715283,0.4656"
-       id="path4268-6-3"
-       inkscape:connector-curvature="0" />
+       id="path4268-6-3" />
     <rect
        style="display:inline;fill:url(#radialGradient3091-1-9-6-4);fill-opacity:1;stroke:#a27d18;stroke-width:1.03244627;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect3910"
@@ -176,8 +128,6 @@ QwAXy/ppHcLvJQAAAABJRU5ErkJggg==
        y="-735.46869"
        transform="matrix(-0.70916057,-0.70504701,0.70916057,-0.70504701,0,0)" />
     <path
-       sodipodi:nodetypes="ccccccccccccc"
-       inkscape:connector-curvature="0"
        id="path5581-5-5"
        d="m 4.9968591,1037.3622 1.0062828,0 0,2 1.9968581,0 0,0.9593 -1.9968581,0 0,2.0407 -1.0062828,0 0,-2.0407 -1.9968591,0 0,-0.9593 1.9968591,0 z"
        style="display:inline;fill:url(#linearGradient3093-5-2-7-0);fill-opacity:1;stroke:none" />
@@ -190,15 +140,12 @@ QwAXy/ppHcLvJQAAAABJRU5ErkJggg==
        y="-741.13385"
        transform="matrix(-0.70916057,-0.70504701,0.70916057,-0.70504701,0,0)" />
     <path
-       sodipodi:nodetypes="ccccccccccccc"
-       inkscape:connector-curvature="0"
        id="path5581-5-5-9"
        d="m 3,1043.3622 1.003142,0 0,2 1.996858,0 0,1 -1.996858,0 0,2 -1.003142,0 0,-2 -2,0 0,-1 2,0 z"
        style="display:inline;fill:url(#linearGradient3093-5-2-7-0-6);fill-opacity:1;stroke:none" />
     <path
        style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0.939;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;filter:url(#filter5531)"
        d="m 8.8828125,1040.5508 a 2.0002,2.0002 0 0 0 -1.3710937,3.4433 l 0.4707031,0.4668 a 2.0005,2.0005 0 0 0 2.8105471,-2.8476 l -0.470703,-0.4649 a 2.0002,2.0002 0 0 0 -1.4394535,-0.5976 z"
-       id="path4268-6-3-5"
-       inkscape:connector-curvature="0" />
+       id="path4268-6-3-5" />
   </g>
 </svg>
diff --git a/ui/org.eclipse.pde.bnd.ui/icons/warning_obj.svg b/ui/org.eclipse.pde.bnd.ui/icons/warning_obj.svg
index d96c6a2f93a..e3f383c7066 100644
--- a/ui/org.eclipse.pde.bnd.ui/icons/warning_obj.svg
+++ b/ui/org.eclipse.pde.bnd.ui/icons/warning_obj.svg
@@ -2,24 +2,19 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="warning_st_obj.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient5091">
       <stop
          style="stop-color:#d67a00;stop-opacity:1"
@@ -46,7 +41,6 @@
          id="stop5085" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient5091"
        id="linearGradient4200"
        gradientUnits="userSpaceOnUse"
@@ -56,7 +50,6 @@
        y2="0.39338252"
        gradientTransform="matrix(1.0698871,0,0,1.0698871,15.590192,1043.527)" />
     <radialGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient5081"
        id="radialGradient4963"
        cx="19.36529"
@@ -67,35 +60,6 @@
        gradientTransform="matrix(2.8249601,0,0,1.7930635,-35.371372,-833.43041)"
        gradientUnits="userSpaceOnUse" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="32"
-     inkscape:cx="8.8556338"
-     inkscape:cy="9.0157213"
-     inkscape:document-units="px"
-     inkscape:current-layer="g4159"
-     showgrid="true"
-     inkscape:window-width="1514"
-     inkscape:window-height="1178"
-     inkscape:window-x="759"
-     inkscape:window-y="300"
-     inkscape:window-maximized="0"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid4202"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -109,8 +73,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
@@ -123,8 +85,6 @@
          transform="matrix(1.4166388,0,0,1.4166388,-3.2411359,-441.5072)"
          style="opacity:1">
         <path
-           sodipodi:nodetypes="ccccccccc"
-           inkscape:connector-curvature="0"
            id="path4292"
            d="m 18.599249,1044.4966 -2.362015,4.3798 c -0.648383,1.0968 -0.206291,2.7732 1.003019,2.7928 l 1.5596,0 1.069887,0 1.5596,0 c 1.209311,-0.019 1.651402,-1.6961 1.003019,-2.7928 l -2.362015,-4.3798 c -0.314859,-0.5957 -1.196998,-0.4999 -1.471095,0 z"
            style="fill:url(#radialGradient4963);fill-opacity:1;stroke:url(#linearGradient4200);stroke-width:0.75522922999999986;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
@@ -139,9 +99,7 @@
           <path
              style="display:inline;fill:#5b3c0d;fill-opacity:1;stroke:#4f3e08;stroke-opacity:1;stroke-width:0.33985316;stroke-miterlimit:4;stroke-dasharray:none"
              d="m 19.33408,1045.9822 c -0.396905,0 -0.734631,0.2572 -0.734631,0.5911 l 0.09582,1.1371 c 0,0.2969 0.286004,0.5375 0.638809,0.5375 0.352804,0 0.638807,-0.2406 0.638807,-0.5375 l 0.06388,-1.1371 c 0,-0.3339 -0.305784,-0.5911 -0.70269,-0.5911 z"
-             id="path4253-7"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="sccsccs" />
+             id="path4253-7" />
         </g>
       </g>
     </g>
diff --git a/ui/org.eclipse.pde.bnd.ui/icons/webresources16.svg b/ui/org.eclipse.pde.bnd.ui/icons/webresources16.svg
index 7524d977f84..616d30f3b6d 100644
--- a/ui/org.eclipse.pde.bnd.ui/icons/webresources16.svg
+++ b/ui/org.eclipse.pde.bnd.ui/icons/webresources16.svg
@@ -2,24 +2,17 @@
 <!-- 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"
    version="1.1"
    id="svg8918"
    width="16"
    height="16"
    viewBox="0 0 16 16"
-   sodipodi:docname="webresources16.svg"
-   inkscape:export-filename="Z:\Users\d021678\git\eclipse.platform.images\org.eclipse.images\eclipse-svg\org.eclipse.ui.intro.universal\themes\circles\graphics\launchbar\webresources16.png"
-   inkscape:export-xdpi="96"
-   inkscape:export-ydpi="96"
-   inkscape:version="0.92.4 (5da689c313, 2019-01-14)">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <metadata
      id="metadata8924">
     <rdf:RDF>
@@ -28,40 +21,12 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
   <defs
      id="defs8922" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1680"
-     inkscape:window-height="987"
-     id="namedview8920"
-     showgrid="true"
-     inkscape:snap-bbox="true"
-     inkscape:bbox-nodes="true"
-     inkscape:snap-nodes="false"
-     inkscape:snap-global="false"
-     inkscape:zoom="26.411734"
-     inkscape:cx="4.8421876"
-     inkscape:cy="2.0947825"
-     inkscape:window-x="-8"
-     inkscape:window-y="-8"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg8918">
-    <inkscape:grid
-       type="xygrid"
-       id="grid9471" />
-  </sodipodi:namedview>
   <circle
      style="opacity:1;fill:#a3d2ef;fill-opacity:1;stroke:#1f5d98;stroke-width:0.99999988;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
      id="path9484"
@@ -71,304 +36,40 @@
   <path
      style="fill:none;stroke:#1f5d98;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
      d="M 12.61471,12.681329 8.5,7.673"
-     id="path9525-7-8-8"
-     inkscape:connector-curvature="0"
-     sodipodi:nodetypes="cc"
-     inkscape:transform-center-x="-2.1023425"
-     inkscape:transform-center-y="2.4998378" />
+     id="path9525-7-8-8" />
   <image
      y="39"
      x="138"
      id="image9481"
-     xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGcAAABnCAYAAAAdQVz5AAAABHNCSVQICAgIfAhkiAAAIABJREFU
-eJzFnVmTXMl133+Zd6mlq3rvBtCNHQPMCm4xFCkxLIXokBfJUigcDr/YH8H+BH7x57Af/OYI68Vh
-LREOiVZYFDUckeIMh+QMMYPBju4GGr1vtd2b6Ydc761qAAOOqUQ06tZd8maek+ec/zknM0v8s//w
-n7RGI4QAAA3+uztG2EsaX9yhe0xX7xMC0NXnBAKtozomVYSOK7WHE77bY/9eEapybY7bKxCgFdrd
-G71ex18m9TZuYtx8Yds0dlHYQw2i2mfhmm7bXm1M/DJIESC0qLxUWEK4RytMiZsRMSZ6EKGFJVr1
-WT32EjwD/R1aVyngOqlr3+MPoUFpT1pTg7LvF4YQOIpQI7Bp7yTi+Ia6ftWv6uie+iAT2jChxpj6
-59hYjZiVVuvUY0waGyj2T8SDw3MpdEbo6sgde7enr6p1dEKpD7D6YNXxVyfB4f1aafPNUiXWEtXB
-4Z6JawgDwTyvxwkTDeO4caJOUx1oB6AnDopAoLTaaVG/bsdhaKaoNjnul31hdSRWVB0CpUtzvv6u
-sQ6P1/38IkzzK0PRyo4whBDaMEjH0ihErRbX3loDRO1sXX1M7IRV51ZCPI8mjVnbDt82RCQ58Xvs
-034MCRC+8ucN8UiKasdaq2hsSKuWJ0jNqUyKRlZ9RLoBrUEKQSPPSJOEdp4C0MiysdoGoxEAJ8OC
-oizpDwu01kHytJE2hLTtd+JZa2BFE+jaiXDsbLCz566+IEV1yaEuOdUbAq8mUy+2za4tFTDhn9MI
-pGeGZ4rvVL2TcWerDQ76MLSp227TzlPOLswz3W7RbWQ0221ajZw0TTmtFEXBcX/AsNfjcDBia/+I
-nYN9ToYFhyf9aqN8tydJzySm1CTKMd7ZrxjjCCzD4oohrbzDG7Pqe5z9EJUX1uyh74NAq/EOGAMt
-/ae5fQKTPD90zR7EZNFMT7WZm2pxZeUM01NtZrsdpJR8kZKmKTOdFDpTLAFXz0NRlhwcHbN3eMyD
-J5vsHvcMoywVBZqAf7SFCbFunlR0sNPaDeogPZPUHFjmVHpeBx6+ITVoqqMXRG2qoi2HGoRlbFAZ
-OlZL9a54HRp9mgucne9yfnmR80uLzE53TiHGq5c0SZifmWZ+Zporq2fZPThkfWuHx5tbPNk9rFoU
-IaM2+rPRcbAjTq0J4RiiI7Q2SX0I0hoHqvVG7wmSY1kkImbFKkzEFTldFzFDGxH2hlfYayp6p2tw
-ZITPzs1w48Iq55bmaTUapxL3yyxCCOZnppmbmebyylnWN7e4u/6EJ3tHrtOTnppYDwQaCBGY5A2I
-7auOQEaK1pH2qCn+GIGNGXqNdS+CzoyYhR0pEZIw0udHjiIySYEx0f0omOu0efPyBS6cXfq1MSUu
-DqN2Wk1uXDrPhbNL3F97yi8frXNw3DM3OdVtuwvxsfV3HEMq54hoDPVBHdSaCCc9IvEARdQYpC00
-DJGFccbYs0pbpRY/66TPtarSQrQGKQVvXjrP65dWmOlMvSptv4QSIU6g1WjwxtWLnFmY5fPHT7n1
-aB2lje10jKkeOykx/QzSg2daqL1a0nE3NbIhp6g27USUujqLq4nOa2tHFDg/u9okHVlKmO+0+er1
-K1w8u/yFjfyXXSKFBNiWa83cTJdvdKZYnOnw8zv32T3um+sOU1WQb9DXgiBe4x5VeEYISGPPucaJ
-WiMDUyrQWhAZefugsx/2a8V/sBe1NqrNNURrEFJyaWmer16/wvzs9KmA4ddRqqStoUbb5zRJuHL+
-HNOdNj///D4Pn+1GA71iQInZ7BRGLBdVJ9R8WigdIKFwJPY2gCrP9CRIrSMVFXoXEJm26E6DcgwK
-tgsNWSK5ceE8N1+7SKvZqNkhfu2MGlME0flKaFTD4sw07755nanWGp8+XqcslbU5df8sAgIVxtja
-4jEvNFUPzduCmqoTGN9FVEeRjzZHEYVYhZmeBDuCsiNJRzVoTZZI3rl6iXeuXiRN0wDbI3P0j8Eg
-20LCMIowa2wqgU67xc3XLpJnCb+4v0ZRFJVaJkFhH2yITH3siKZxBSEeWPVgvRqLiePQn7KGzjMo
-Iqp5OOhrHdHY3i+l5Gs3rvLWlYvevgRJrFHqH0WC6ijVag8hKgNZAM1GzjvXLgHw83uPKEvlnwxE
-sWx2JrbiI9q77TnpTLMz02MR+4oEBQZoXTXwiKrZdGMuSLbGg+0orvTV1y4HxsRByLqdrLXr11ni
-VxuGuCtOAoTvZ5JI3rl6kZtXLtTATFVROhhtx689JyLbow0gqD4VNaKu77VjZBSZFvaycqKvfG4F
-Iax6c/pUVwj8+oUV3rkaJEbYZ3RFxBg/hjFGhVCI5uCkZO2gxc5xwdFAcVrpNCTNPGexPWKpq+g0
-67a0+srQlNAI4QZ01K4kSXjn6kV6/T6frm9a7VIvQbUFBlVVU+oyg0K7kR1AgXJEqvpGoFRgUJQi
-MN8tVFRYPWYZExFPSMG5+Vm+9vo1MhsxjlTveDmFSS6GVyrFUU/xaHvI48MWvaGmOZMwszhPt9Gk
-mwua09P81z9/wHQ3599/d4Xy8JCTQtE4PmKnP+DxoyMAzs8KVuagkerJbYnb6Maah8+huUmacPP6
-VfaPT3iye1hTycI/K4RTGHXwYKE0Oj7l1JsaH6UCKxVRIEdbafG8cFKjIxAQ9DRAM895983rtJvN
-sQaZzOWkaEM4dirVMeXzjR4PD5s0Z+aZWZ1hbmGB3EpjkoZOb+8N2d4b8uBpj0tnuswlgmxpjhl7
-/Wh3n52nz3h874j5qZTXlkvyVE1Ap3bMRmpY64j69vRUs8G7b17nL3/yM4aDGkCwYzhYjbrvZ6G0
-kxaPSGqQ2BcbqzEMUN6gae0AQUjJOTGN63IM+tab11mam41eEbgviOxcTWJjpqii4NMnBbe3M5oz
-S8zfvEyzYRiSS8lULskSQZoIMkvEhdkcgFYnpdNIqJeF5TnOnJ2nPDnh6aNNfnRvm/OzkitLdbVk
-+4gOwXOr3oWmElBfmJnm3deu8P4v76CUiiTIaiw/wBkThhQhY/YZAjkV5MQ1uCOEIGY8unWFqFqf
-knpWisurZ7l2YaXClNhvCJJfHYlaGUYXoxEHvT7/cB9OVIu5N96m1TGgc66ZMt1ImGokNFNBnkjy
-RCAF3NsZcPl8x9+30EoptaYoNYV9TWGlvDHV5vJbVzhzYZnPf36HrQfw9rmCVl5S1fOOwEHuvQBF
-Ovr6pVXWnm3zYHOnRpMo/eAZE2xRig4GU0dTQ7wn67C3P68Mo1wQzzPLSYwKfoCr176j28z4+o1r
-/nwcdXDxNz8Rwxtb0wEnLU/3C378uEVzpsvStatk0hB7qZMx30qZbSZM5ZJUmt4mAgal5u/Xjrm0
-0mYwVGzsD/nG6hSjUlNqzajUFEqjtEBZBimlmZqe4qvf+Qp3P77HxxuHvHVWM9WojriKndTWXjtQ
-E6nkm69d5tnBESf9YThJcErHmK0xgMBkLlVEUV15sUNeBolFhI0Ya5BZENFYipyY37hymbmZbvSG
-qtS4aRUePNh/pVKMhgM+39T8Yr1k6bVLdM4skUvJuW7GcifjXDdjaSplphEYA9AvNGuHI+aaCSw2
-OeiXnAxKnh2NWJnOGSlNJjUjpSmVAUFaQ2nbkErB21+7xpOHT/ng1gOuLSWszJYRbWJpD3a3YjeF
-UW83zp/jp58/iHofmIoLjurAIAsIgtGGWGhFUFlQyblolAcIjqH1YKhjntaK2W6X1y+txmMktK2O
-04R5t9KKslQM+322j7GMuUrnzBKtPOFcJ+P8dM756YyznZRznZxmZuxOf6QYlZpeorizO2C1m9PJ
-S/aygr1U8rOnJ1yYzUmkoFSCRGlKKz2l1pRKGLQKlArOXjxDK5X88rM1Ztuadh6HoBw4ssciDoYF
-wHVt9Sx3NzZDqsF3NoAfr7EAiZAYUKUjJ0gElWKJHdBbNXFmVKQCVfMnlGOMCay+dfliDZ3FzasG
-hQxjNGVRMhoO2Dnq8YM7kxlzrjvOGIBmZgDBoFQsNgRzrZSZRsJsK2W2ldDKEz7cOKGZGrvUTAVZ
-Yv+kIJOKLBHICJHNry5z+eo5Pt5IORnKqMW2DxYWh7lzVZXVabd488JKPfseKnFI1Wp26/3Zu2N3
-ldj0ObhEFB9zUYIAgZ3R1lp5SRVaM9ftcOHc8kTGTOqE0gqtFKPRkP5Jjx+tTTOzvORV2XIrZbGd
-MtdKmG8lTGVJhTH10sgzLsxkTDcT2pnk0myDbibZOip4tD8kSwSJEOT2M5GCRCbhnK1aCrh89Rwr
-qwvc24rfFyFSr0F05ZLzHVeWF5hpt8afFWLMyZMVWxM8okjvE74Lh0bie3Ql/hZUmfbHF86coVtp
-UChOTkNbAyob9gd8vGHq7V67CsBsy6CxbiOhmydk1r70R+ORgFFpnm2mgpVOhhSQJ4LrCw0WpzKm
-csnPN3scDEqEgEQIsgQjOVaKpD2fRBJ0/cZ5+kmT9b1kDJA6ChsTIsIpS/zpqTbnFxcQySTxcbeb
-a9J52QEZWa4LB53tfDNn1c3JmJbmeSEgmk3j4HgzS7m6Ollq4hJ3UpWKwWDA9nGfR4c5y2+8Riah
-lSd0GgmdXNJMDeHSaADHDDrsl/QKRaE0MzWfRgrBN861ySyBfvDwyKsSVxJhGSPNZ4QxyLOUd29e
-Zm0/YViISI1Fg004NVcDPEJwZXmOVCbREzWa2gEvUYW/pxp4s0Y/GgkhnaYjRhqRVaoMEmTtjdKw
-MD/H/HT3pRijtEY5dTYYcn9TM7O8RHu6Sy4l3cwgsUaiSaWxB4Xlx6g0kPiwX7J5NGJvUHA8KpnK
-DGMGpaqEuNqZ5JvnTfq7Nyz5q7sHnIwUqQxqLGZQIqsjfX6hy9mlWdZ3sTSYQGD/xdHUmIO5uVkW
-Oq2IMbHvFBSY1CpyGJ1N0XGl5oIytTsqxi2iVOM5dJv+4fzyIkky7o3HJW6iU2e7J32eDjrMXzfq
-LEmNt99MBEIkHi6PlOZ4ZKRkb1Dw6HDI0+OCw6GqQGqAYVEwLEMjl9oZ31o1DDrol/zZx7vc3h5Y
-u+PaJLzU1Bl08+0LbJ1kDArh73Vm208Gc5rIGnyECYyeX15EyNhjdSUcS6kVqHICyeLwTHhIx7Gy
-GDxoUMTnNM1McuYl55ZpKzVFUTAY9Hm8LZlZNsgsSQVNacIw0jGl1AxLRalgp6f42WaPW1sDdo5H
-7A9KMiloJJJBqRiUisOhYlAaJ/NgUHo/5uJMzncuGckeKM337xzwJx9tGyZJo84cg+rqrdFuVKTH
-csh7kS667ugY4C3MdjpkWRI/QJVJkGqtDBTG6kDhVJpzToOn7l/ugUg4HzNGWca12lPMzc+9FHME
-MBqNGA2HFEXB08EMF+dnaEpBX2mDqJIwivf6Jfd3B2z1CpqpZLaZ0MkTRCvhUjelmRoY7UIy93aH
-9EeKfqn5fGfAbDNBCoHScGkm54/fnOWv7x3yaHvA0VDx/TsHvHdPsDKTc3m+wUo3I0/GEeG5szN8
-emsHTeH7YQ4iWxKvTrBStDDbpZlmUUC0anu0hlQIWc10CkBohAKECrZH4JdSuCnpSpUIO9E7liJX
-5qe7ZM+ZqxwXpRSlKhkWJTsDI8n/88M+fGjC/O9en2F+KmHnuGT7pCDPJbPdjJlWwvJURjOVXJlL
-We2aFES/CO3Z6ZU83B/StwZqr1fw2faAGwsN409p6OQJv399hrUzIz5YO+bB9oCR0tzd7HF3s0ep
-NMvtlDOzOZ12ytFJwfZQMZXmlCNJbyi9Y2pIGeBB3VVAaJqNnLmpFge9npWGaNRbn8lEpXUUrtbu
-v3CvU1kONgutbYBa2twOKBECpu5z7gVAwHfEqrSyKNDliM39nNluh+2NIWBC/fceHbEwmzPdzZmf
-yZnpZIwKzcp0ztvLLVa7OYk0TIkH+LDUfLBxQr9Q9AtFYW3OR09PWGgnHsk5CTvTSfmXr8+w3y+5
-tzPg080eW4dmRcLmScHmSUEiBWkmaeXmRZeXZtk72aaVxywIwMppIB0ugjb0efhst5ZoE57OEkBq
-hdax3REBSkdTGEOgMvLnBTZ+5mySQguBzFKmT/FtJhVVlpRFaVVah+zMMv/x317jO99Y9KF+gGYj
-YTQyoRZto8p7vZJhqRgUmn6h6I00w1Kz0yv52wdHbB2PuLHQpDc0IZ3riyZS8Ve3D1g/HHnGFN6e
-ws5JwcGgZGDPOcSWSGP3ZpsJX1+d4o/fnGVuborByIVzqr6k8HS0V1zAWAim2y2kA0shvOC/plor
-KwGWVcKJo64ELYXWFRBgBEz52U6BhwKUIhcJU82XnGiutVdphV03szQ3RbeV8N2b83z35jx/9+k+
-H93apT8oydqSolDsHYz4YHjEJ096fC8VXF9ssjiVkSeC9YMho1LTV5pvrU6x2E7pK01ZaJqp5Hcu
-dfmzT/f437f2aDYk06lkbipj93jEnZ0Bpcb651V1LaVgfirlj9+Z99Hv7swUD+4lQFHtVuV/t/wx
-LAnoNjKSBMoiesKhOqzN8Zec92/xoBNHBzK0fbDeYJ/R0yoYwiRjeioJztdzitLahH7KEWVoKWki
-vBr6nbdm2dodcnhimPdbN2Y4KBS7+yOOByVaS25v9Xm4MyCxoZxMwrcvdFnpZiit6Q1LRgpKpZlt
-JnznYofv3zlgv1eyVRSwa9SoY8xcO+HcTM656ZwPHh2xc1yQpYJ/8cYsjSjDOt2QnIzkhF6Gge4J
-Lxxg0+StFqmQDD0PqzVYm6NqZsuqLu8D6RqsDlIjrDUyo0KCVY+5hCxvvJAxjjlgFjMpO51obnHW
-ZDATPIN+/5uL/I+/2eDwZMTPHh7z735zmUwK+oVm83jE470h6/tDMpc0k4L/+/k+f5tJVrsZ/YFi
-oDTvPTjioFd4lTWKwMNiN+XGYouznYxuQ1Iq+HvLGCEE//yNWaYbSSVfNDt7moaI/R8d6Tgz8FvZ
-88CSpoINRQwGhAYhzQRNLPqoRZ61VpTO8Km63eKlkRpaU5a1Z4WBzmAkCGCunfLNN0x6++Fmj5+v
-HVOqkmYquDbf4LvXpvmNSx2GI+UJfjRUnAxKbm/1PTPW94cMlGZUaBpSMDOVorVmsZvyB6/Pcn2h
-QdemvJ8eDvl4/QSAt861OD+de+XgGNTIxp3s2LwDYZ6bD41pUrs80peKwRJV5njD5aCdVggVcdyv
-xrLBzQihubWTrlXJBJ/gZYqyA6BhVVMzlX4OQFlqvnVtmpUlY9Df+2yf45Exl6PSJMxem2+yOttg
-OFL81pUu//rmPG+eaXmGDUcKrTVvnmnxb74yzx+9Pc/+cUGeSX7vtZmx9vzwgZmVM9VKeNeGe+LI
-gxTVtIIrk11L7dW+cCgufsDe4o4jg+OqiNPW7lLNh1Gmcqdlvb1xOnWCz/Oyxc1hG4xC+CWJJmkU
-SvNP3pqjPyjZORjxwb0DhqWB9qUyaedvX+yglOa9e4e0M2nAQaErf1tHBVO55KcbxwxHit+9Nk2e
-CNwkzVLBL5/12Tk2NtBdj6UmsRGDYVnVKBCYEphk3QwCYKtEreMHLPmkD/ELifDoTBDPLRDaWEhH
-8sC0aqPEhBH0quVodx+gwiCn5pY6GTdsTOwf7pmRXerAICng6nKLx9sDPlg/5sFmn1GheH2pwRvL
-TZR1Lj/cODEp7FyyPJVRKkgknkEfrh0DsDJvknqJEBOlZmc/zmxaWhALg6G6t78eMuvJDzjJ8R4+
-Gi2kYRIENRVNNeUFAuEypEKIaJ7wq5dmYojh/uLy9dem6Q9KTvoln2wcUyrDoJEyTJptJRSF4u8+
-3WdUGO/+W5e7fPvyNIvdjFJpfvj5AUeHI0SUqHPNvrs74Lhn7OA3VqZIxGSpAdDFiHZ2en/rG7b4
-KVVao8siQmqiogeD5PigmrJEHl/pXNnDhfHGxBO9wcTKvmhRSjHX0mzumlGbiiA9MZOWOhnzMzn9
-QcntDRNeKRWBSaWmKBSl0qTK2KoHe0MeHwz5zUsdH2Het2pL6eqs2fs7A5TSzE+lnOtmximMEJqT
-mkTC9gTJGS/j+/EMRiMPqNDaaK5Igjyc8llvG0kN2YK6vVEVcGzcoOqERCEEo6LkuD9gdsIGDWMl
-HpVZSt475mDtCY2vXGJkiRuHg50nf3W5xc7+kEfbfRNlVtgJG3DrkWFuUSiOgP/+w6ekNjOXSGHD
-9absnoxH5df3jc9zcb5RUWcujxQL8saTfebap6sVp9Swn05Qev2B7X4UeYlgXrQmVPql2272p7My
-DsABfm6AOw4Ranevy6gqDo97zHZfHCWQQiBlQpqmDICF/JBPDjsMCkWaCGQikNrMJSu0UXeFhrOL
-Tbi9z87+kO3jgoWpFBT8+O4+j7bNMsCZTsb52ZwzszmL0zmpFDzZG7B5XPDombnn6HjEjx8f8c3z
-HWO3tKY/KJFScGm2MVGdOakpRgVPnu3x5pmCuhPpGFOBYFE56Q8py9LGNu2d0fJ5s7LNzsCJK6u4
-pNaBEgQmuWSahjA/2qFqIegPC076/Rcyxt0vpEAkGUmS0k7Mc2sbO1y7uOgDg45JAKnSvLHU5M9t
-HRuHI+ZbCQ8Oh/zws0MAXl9t84dfX/DvcfMAVmzkOnlL8Bef7PJ4e8CP7x5ybjrn4kzOk8MRUgqy
-VLAynXl1WldniRDce7JPO1M0M5d2qfUNfCwyRm+GOX1GNtnsXc5IU0kA5aXGRArCUg9bZRRRjcM9
-1UaEkeFS2HtHL6OLDXMSabzu1KrBM40jbt9Zt4QIoMAlvNLEBCCdz7N/MOS40Pyv958xKhXdqYR/
-+tYsMS5xCTZnW0ql+b0bXdpNQ9S//GSXkdIcjRR5JhFCTGBMqC+R8OndZ7SzkuQ5C4tjEKajk3tH
-PbQq8csvIz8IYZlTh8ACjawk2CZDZC0mX3Kqbedg/9QG14tMErLcMCbNUhbyQ/Y3nzHo9Ukkfg5Z
-nkhPsDwRdPKEZiOhN1T86QdbjCw3/uDri2TWxjwPOOZpyh+8NUtmY2V/8cku/UKRpYILCw2/c5Nj
-TCw1J/0RT57tcaZbnP6CCcW4hYY+1tLXrpoPw5xoOJibreTE0AEmRAciW1RXg8DBwQGHJy+WHiEE
-UkqSNCVrtKxqK5lraX7241tkUvi8fswoKQSXlxq0mwmfrp1wdFKQJZJ/9e4i56bzQMjahI140kYi
-BGe6Ob/7xixpJjkclNy1tqgpBUhJJscZk0j463+4x2J7RJ69vI/n7jo4PuGgN/BxSzHhJimERHlf
-R0aYPDg31eCl9Oc9M4QwfpH3sczBcX/A1u7eSzVaSkkiE/I0Ic0ypJScS5/w+foWG88OkILApHiy
-n02WdafM59eudPjqaotEEiYJCuEJ7HMytj5zDt5ZbvHmmRZ5JhkoTbuR2MmGTGTMo61j1te2Wer0
-SOTzJ7DUiwB2Dw4ZFnbZv0dyUajUozUfLa0SPZwJzqVSJQhMGtu9TEdTdKMyGhVsbO1wZfXcSzU6
-zTKyPCcdpGR5Tlv1OdM44v33PuaP/vA3yNOUBGMrwBBsOpU0bUaymUsOeiX/7Ydb9PtFBTqD0RAp
-INKQNFuZN4m8lemcVi5pW2Zn0tg1B51jxpQK/ub7P2WxXdLMM05DY6cVjWZz95CiiP1AUbtHIElT
-KzFgZnQ63sVxVbeVlYXLNsRT3YFRTmzf+ubmS6E2p9rSNKXRaJJmGWmWcqG1x97hEe+/H9Rblhji
-Kg0Ptgc08sT/HQxKtNI08oQ0laSpUUt5LslSQZpLslSSZub71mHBfs+oMqfOMmkWYBU2ZhczBuD/
-/OQ+AKvTfRKZfOGw1XFvwMbWVkTbaEKnX9ukSbVIPQ8cHI6C2+6SmSMAgKzG3YSdRKUnW92D4x5P
-t3e/kPTkzYbPiqpS8VZ3g0/uwtmFLl+5edmsChDwt/cOORiU5Lnk5kqbxErKdCNhphlUjZv5KmSY
-ViuEcWb3+iVlaaZL9ZVJyLXyxNgb4LPtPl872/aM+cVnG9y/u8GNhX1k2uSLSg3A1u4eh3bWjVkV
-V61D2LRCKmS8vD1eMBXbFOd42inaAqQOC5tM2qAaP3JlNCq4t/6Uy6tnX5h4c9KTZTmtZoEuW5Rl
-QVsVvNXd4Ps/hryR8/brq9za6vNge0CWSt5eafNblyY7u/Ec53oeJj6OofJ2r2DjcMSToxFbJwVP
-j0dcmsn5xd1nvPfhfS5ObdPKcis1z+3SWFFKcW/9KaUqjHmw4YJg4UOp7PFpdhIM6MFsVlr6R30U
-zrlCXrTkqZIDcH9tna3XLlfWgZ5ahJkRmecNP+EDerQpuNAd8r0f/ByAR6JDlgpmpjJ++8rzZ/nU
-g6bxuZgpLi9ztpOx2s350doxw1Kz2yvZ2VjnvQ/vc7a1y1w3t/7YF5eanYNDNnYOLLlCjkDHasrG
-OdNwIooRxOwTYSmhK7GtEcKlmSNUV/G2jPTcfrj2Uswxk72Nemu129GVHmfYpNtN+N4PYOm1q3zl
-+ipfP9eeSPx6ie9xaq7OFGdb3PFvrE5xb2/ArU8ecPfeBjfmDpmeSpBpWplX/rJFa83th2sMi6IS
-Bov44fklsFsXC/zkW9w3h+BqdEYKMwEC8JlQP8s+mhAS7wALcOveA16/dJ6F2fFsY70IIZCJROqU
-vNnw2VEnQW91N9hY03z8dJNL3/0KF889n+nxaovYy4+ZYu4LRj+TgkdbR7z//Z9yMpK8MbvFVKtF
-luUkUr5S7mp7/4A7T7Yr6swYAhkBMKe1JMlr3/rt/0zMQVTIN0TS5JjkJ8m5Ku0Fj9HHPCpTlFKM
-lObK6tmX6oiZnywQUiKlCe8oG1DNhGYuOeB4UPDh5/tsPNvn4tlZWo3ULgsJ/k1iR3jiIbH5niaR
-QyrCWhyAk/6Iv/ibT3n/g9s0xCGXO3u0Wi3yRoMk+eLoDIzU/Oz2XTb3D739NxGWKF4tRMWridSa
-MxvSTu0tkUKiUCQaSvAJPKXxdke4CKiQaKWea38+f/iIKytnXhq5GSJvYVNpAAAQlklEQVQmkDe8
-o5emKf1ej7IsuMAeC+Uh22tb/Jc/2eHS6jxfvX6Oa5eWaOXjk0viaQ1JTWqKUclnj7b56PYmzza3
-aXHAhakT5loN8qaVmFdkDMCDjad8tvY0gCeLil0UJpYb94Y0EDNsd6hd0EwbV0hhuBFvge91ppDE
-+3UKi+CMuqyqNq00H92+x8rCHI1T1ofWi2OQEoJWu02SJogkYzTokSQj5HBIOzFMOnx2wPc21vhT
-1eLS6jwXVxY4v9Cm2cg4u9AhSUzsbjAc8Xj7iNGoZHP3hMebBzzb3AagxQGrrWM6KbSnpsjzBjJN
-X1mVAfQGA249eIxSYRcTr2YctI9sh3Po/T4EYd9TZ3Nw+QCwcbQ4rVZZPu8pGUnNpOta83TzGT/5
-9A7fvvmWX87xouIhdp4jk4QkTRmmCYNBnzTLKEYj0rKgU26hEsVJmXD47ICfbKzxE0Cnk9FcpyER
-gy2ajZzFZI8pUdBstWg0miZSkaakWfZKxt8VpRQ//fQOGzsHQdtHuNlNMDS8coyyoMgTNDg41pgL
-oKxsk6+tcZGAkmYSu1uJKAhB0Op28OPR7Vv3HrAwM83rly+8dCcdcdI09XG4LM8ZDYcMixJdjuj3
-TJA1LQum2fETFGGjUpe0uixJUkht2KjRJk8TzxQnLfG7v3DRms8frXN7/RkSC6BEdaO/yiC3Ksf9
-X1XMnqMWdUlh+aZDvkdHK+Vt0q66CYU0kwsjmFdHbqNRwU9vfUa72eTC2aWX7qsjkpSSvNEwIZ40
-JVclZVHQaDQ9o6o7BY6XNE0RSUaeJiSpkcZEGpicJNL0y8/geOkmVsrjzW1+cf8xWplNJSoui9dM
-GHfFXnIWSON2Kqwb8chemPCMLVr4GBwItDbTqZzdCc/LEAw9pewdHvOTW7dpN/OXgtdxqTNJKYXK
-FKosyZWJrbk1qpOfBykTE86RiZnpL0SQFOdf/AplZ/+AX9y9z/7RiVkfYFWLdnsNiedJpKGzsTnC
-jhQL79wGdg47C2RwRMccHwL3pOWbSzVa1Xdaebr5jB998hnf+cpbTL/C3tGuc0mSmMmIaeoDiEpH
-yabxBw1M98QRuNR9uKd2/AWkZ+/giI9u3+PJzoEP7xjbIq0WsvVF6DGmrROoNMxPI6rFiZ4EYafk
-2k4pH4OzUqWlV28eXEjplx76qERNtTnCPVwz9uBVGeQ75wOalmHuNXHXqE1PikMmdeK/oirbPzrm
-w8/ucP/JMxCSwPPqHIyJwbTa18rsG+y8qbARhIrUorDrPolmiCikiOd7hV76vHgkPfH+lXHE8OHj
-dQC+/fYbfuOiL6tUBaCmRkRtqMafr1D2Do54/+NbbOzsG9UugvsezER9GaJrS0Q3CwzGPbVaINQc
-mF0+3C9/OPYr785qO/Ej3nkKvK54gXpDCB6ubXDc6/PbN99gefnlQcJpJZaY6vlo6PpBok9/4CXL
-46db/OLufTa294IUu3Z43ya8wP3GUNhEImq4bUh1yoifWRMcpSB9JpQS1W6T2rVRIKWf+CGEcUqF
-NYCVhvnGhOe3t3f4yx99yCd3HryIFi8sjjAVpGqvuFnLk4gWVMUplU4ov7z7kPc+/pSNnX2D8GIm
-VHz/4EkKHWB1vNETBN9n4gIar9WcExpZfbdVfPixCPuTRW4QRtsZaxtBcL2uZFPHRoyp4LjX5wcf
-/ownO7t8++3rtNu/gh0aO1NV+JXl+yK6FDPoOXbp8PiEX9y5z6ePNrzKCuY6lkxLDx8ns1akNmh9
-u630jDNHRAfRZELz3f1qlNsRT4QYG6AtOBDa2SrrvmojQVrU9vAkAgrRaNNac/v+Q3b2drl5/TVu
-XDr/6o5gpWvRO9DVAVJRx9T5WGGMUorPH63zy/uP2D44MvW4wGMghqcRNhTg3y7djoyh3oo9tu+d
-wBwLDDThByiiFcDCYnXh7Etkg2JwIKkaPlEDBnUGVRpmibW9e8D3f/IRd9ef8M7Vy1/IYZ1U7FBx
-Si2ok0r/a5+18vjpFrcfrfHw6Zbfoy7QQIZHPbPcu8OewmAXnQmX3HRD2fo/1tE3aer6ptR+9mcg
-WIiPmordnAKhlY9Ya+0mpNsfz7MbUIhYxblVDJF69K+dgOZUWfLw8Tobm8+4vLrC9QurrCzNv3A/
-nUnFaYDKoPHSU9X7MXOKouTJ1i63H62xvr3DYFhUJNl02cJcr8VjRyZMODOayDHU5M3cCo9YkrU+
-xeaMd8kqYT9CwvZUSoBQKgI+ykYVrKS46LYfkZZhcewtGsHx/tP2BrTWJpt6/yH319Y5t7zE+eVF
-LpxZeuFE+Qm0jkl1Cqw19+zuH7KxtcODp5ts7R0wLMpqENTZE6FBu0UAka0JGi2aKxCpVu+huo/q
-oDET2U+THuf32ApMXcLuNQAaFdIGaMuEKJQjJcLmeOK9ceKRU1md4EW/yqSYWaNRwcO1DR5vPOWj
-Rs7KmWWW5mY4uzDHbGfK7/Ae0Xliqao4Q5iiLNnePeHZ/jbPdvd5srtPfzD028j4X+ByhAebZjGh
-Ed9OJ0XOfGhTv5TSj3P/UzcVwFH97eyXWu4stAhbFdtdIYQdLVpq7wOZCSEqAhGgpWGW1AIthVnf
-4wTQLTmJmGY2L63q65hZjkBKKY57fW7ff8idh5IkkUxPtZifnWOq1Wa206LdbNJsZDSyjDRNyJKE
-UVlSFCWD0Yj+YMRJv8/eUY/j3gk7B4f0ez0Gyu3rIyxTggtRCflULLoTmOq5cBgxQlMZFFHllt5x
-4JPnS4+1cHhj5u2fS2cLb8iMGnLgwEmFCwOZ95e2Or/VopMaHUby2ACpO3BR0VpTFCU7+0fs7B+F
-e6yXPiltpF0S0RLDrc9yqkYiQMjxBy0RQ3DU0EW4wKLLQdeARWXgxWR2AMBvWRw8o5fbKMCBMhNM
-C6sLlPDtcPtJ+Xu9nXFqysBspTELoRwc90EIV6lFNppIWgmftj0vbLLWgN09MQIBwhJd41azCc9A
-bR1rM9HPBntFLQPq+uT9vwnZzQn0mwiAPOdspNrfV5Mcc89k6XFwz2gyt/eAwE+YdtyPGhf+V95m
-QSRF2kzfTbRyv48Udcax26rCuM/xD2BMKHVfxn0Kayvdq+K9A+Jfe9eujZi0gu9fLCkCCwCcFNfE
-JOqvIaGRFh9b8zOWgqaooEb7jjHJmcQgYSXGAxNDc0xswBHM7SrlQIKzPxKhSoQUPoeutYXqwqA6
-072wB6ewI9d1txL5F5Zgp01idOAEwrwwF3ZyqMgNMCnrM2E9Y1w2WFTUVMQE4dUJEVqKKnIfETCI
-Igj+GpHdicCBqEvO84rx7iP/xKocAdGmRdrqajdKrF8jEgQaB1ZMXxwRnGQZtSed3zRuJ6tOt5AV
-poV0QJCK+tZjzkczdcgAc2sG36keKQ1j7DcC1LIE1HWmxQRzdo8KEDB316TGqd2K9lCnxNZOkx6E
-H7EuhWDqtOFxv9m3tUveY3b61E5ClFZ9WEdNYWA5mCWQUpvvOkI+spLVc20KhJda2E97zpkEQqBT
-YQaMMJT3NiX0j+qxHenSD0Z7XuLVctUYxo2LTse20v6uUF1qxtSxkKdLzkT7Yy54BsmaAyk8uhOW
-wBEFcYMowAeH7HBEEy6gatWhfUprs3WlcO+gvtlrtBxFulgd3rg7D0AiPFOYxBgX+8OoM+02AJR1
-xlT0YCB8oG40mJ16cdciNjiNWFdv9vi5am0ig3xaW/lGGPpWxTJMobKjzgZJnRHxq7l8gi+8q7oo
-WCFE4v2nwA5RqVOEC+6/Kr2s+jK+SzIxEhEzBsziKk1gjDPs/j2O6HVzE2P3WHpi5BleW40pRuWF
-NmeMQV46HIOskfdhGun9HDOC3WREgRYuqu0o5mb1GNUXqzuN0/1udEv7iKoyT2DtmquTifeH/RGs
-MysNdSujGBcSFXYgBGmxvvZEDVYltoxO6uo99Wcd3539qpWXixCcpuJcpNm9OPaOnY1xCA5Am1i1
-iijiD7X7BRijb/1WI3hQbY7tqDeDWATg4WqMQyyAECFA6mc6CRE1VVSINp6aEEgdVvyNSUs0KKrP
-1mlBhVexSvMJt4gqL1RrlSZKgS5LDFS1RHU+hyWm62y8fZWODnz8TAe7pV2ewRJMIK3ak75fYD1o
-DP+Fs1Wiakjx9Av3xothfQzMnfGqySFREWEoHaG+Wv3CRt0jok/enyGyOU731hhUiSdSFYCXZg6A
-SBKzt7QNWgbVZo9tjkcibJDWhXfcZAfrfNolJsYZk2ipgj2yPwHjXAIfwarr9figptIQVMeh0BFd
-Iklxxlm6F4R3xbN0nAPqf+kkRo2OMf4FcUNjydEVZhqVVg3n1ENXX4g5EKk4p9PjkekYBCHOBoCy
-I19WwkAu9mVAg22aUGGPA1dvZUD5ngQax+tQnIy4AWS+OYfetFj7065XFQMvvYQLQkipZutwWwk5
-B1fUGiuiDoRTsQTFv69aobF96AszB6o2aFL62BM6HhG2rSYdJKwaE+DUA+DiVaZGFdEuvCNOKYxd
-9rMpQxim2jr7XiIbYjGHsJi7klvyKtB1zDJERLaubkuof7c36OhiNBDqUh87pq/EHP/aGCi4UeoJ
-EqC1Wzri41Mi2BADhbDTeh3BAorTNdQT9L+onyCAkvB6xyRzykIO6wxrKSpqBSvFyHiuQ9AM2seD
-qkkzT2ULgoh/HC9q3lgnIlDgR7PXhF8AEJxW6mpuLOblYFGMdX06W4fbYwgaqSwTyRXWkIvo/vgd
-7r3SE1B4Q6XDwIiAggExtXrci7Uz1KFN7ntlUkg0t2JMCrx0xJyIvtcUjpNYr5n1K6o1oOJoOQbF
-v4ngr2nt2+8aHvYdFQgZVmmHDy9ylpEOvWlrJ2JwbYubhB5vamrf4WgsdZyv97wbT/hoLGMCYUUk
-LfWZM2OfFWkUTpfHjYoIhLc/DlILG5k4JZv0ckUrHWyPFH7dS6VEet+YGxl11IXwhWlQPBtRgtF3
-Tq3EZlN6IDIWDZZR5x0814YTDmtZ/hh1FzMm0qABkYkKMV2uCao0jgSzWlnMMAPtKu+pqLjae35l
-m+Mrc0yys2Jip9VDWCIiey8wVglWHuqQ1G7W58941eAydXV5ddIaRrAfIJXEmHujrhLJMi7Ovbha
-Y4hdb+Y4EHAnY6rXdFfFLFX78SvbHF/xBEaZtrgom/3uwjyWIEFlO53sDGpovzt0RjOG73WgZCsx
-UF6794elkL6VAjSyEj13aM/1JWaMeSRirKV5zKxo9EScq+kwZ/irzR0v4ktkzljd1g6ZOJbNT2vr
-71QCmLFcuT6JYJTHklg2MFlDp6gSVIlQ1RVtdZl63rWwvVkaJMy/YkL+BYiVbcXOxCOnMopifVaX
-nsgg/yqA4HllElgAq/Jq0NvLVb0jzlZ4xFMbgVqDKpHliPrm469azI9nKFCFea1MUVIiRRJCT6dJ
-bQ2UjTMmhnDRQ3VV6LHQr+jnTCpa6QpDYsAwFt0mpn3I9FR0WTTANNpsdqYKpDJho8lq7cspQhUk
-TiMmKcjE/EUDPNx8yvcxDkb9e17jv0y1FjPBfU5izIuyrPG8r6AJhFFbZeHV1sswxU1wjNMHr1pE
-WSDKAi1Tw6i6I6qftwLW1xI+a/PMPc8i/v1/AwSnAoRJqYdQCWORBl2iLWGEu+clypel6saaqMwA
-0TKFJB1Df9VGPK8ix6DavRH//h9qOh+tmbH4ogAAAABJRU5ErkJggg==
-"
+     xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGcAAABnCAYAAAAdQVz5AAAABHNCSVQICAgIfAhkiAAAIABJREFU eJzFnVmTXMl133+Zd6mlq3rvBtCNHQPMCm4xFCkxLIXokBfJUigcDr/YH8H+BH7x57Af/OYI68Vh LREOiVZYFDUckeIMh+QMMYPBju4GGr1vtd2b6Ydc761qAAOOqUQ06tZd8maek+ec/zknM0v8s//w n7RGI4QAAA3+uztG2EsaX9yhe0xX7xMC0NXnBAKtozomVYSOK7WHE77bY/9eEapybY7bKxCgFdrd G71ex18m9TZuYtx8Yds0dlHYQw2i2mfhmm7bXm1M/DJIESC0qLxUWEK4RytMiZsRMSZ6EKGFJVr1 WT32EjwD/R1aVyngOqlr3+MPoUFpT1pTg7LvF4YQOIpQI7Bp7yTi+Ia6ftWv6uie+iAT2jChxpj6 59hYjZiVVuvUY0waGyj2T8SDw3MpdEbo6sgde7enr6p1dEKpD7D6YNXxVyfB4f1aafPNUiXWEtXB 4Z6JawgDwTyvxwkTDeO4caJOUx1oB6AnDopAoLTaaVG/bsdhaKaoNjnul31hdSRWVB0CpUtzvv6u sQ6P1/38IkzzK0PRyo4whBDaMEjH0ihErRbX3loDRO1sXX1M7IRV51ZCPI8mjVnbDt82RCQ58Xvs 034MCRC+8ucN8UiKasdaq2hsSKuWJ0jNqUyKRlZ9RLoBrUEKQSPPSJOEdp4C0MiysdoGoxEAJ8OC oizpDwu01kHytJE2hLTtd+JZa2BFE+jaiXDsbLCz566+IEV1yaEuOdUbAq8mUy+2za4tFTDhn9MI pGeGZ4rvVL2TcWerDQ76MLSp227TzlPOLswz3W7RbWQ0221ajZw0TTmtFEXBcX/AsNfjcDBia/+I nYN9ToYFhyf9aqN8tydJzySm1CTKMd7ZrxjjCCzD4oohrbzDG7Pqe5z9EJUX1uyh74NAq/EOGAMt /ae5fQKTPD90zR7EZNFMT7WZm2pxZeUM01NtZrsdpJR8kZKmKTOdFDpTLAFXz0NRlhwcHbN3eMyD J5vsHvcMoywVBZqAf7SFCbFunlR0sNPaDeogPZPUHFjmVHpeBx6+ITVoqqMXRG2qoi2HGoRlbFAZ OlZL9a54HRp9mgucne9yfnmR80uLzE53TiHGq5c0SZifmWZ+Zporq2fZPThkfWuHx5tbPNk9rFoU IaM2+rPRcbAjTq0J4RiiI7Q2SX0I0hoHqvVG7wmSY1kkImbFKkzEFTldFzFDGxH2hlfYayp6p2tw ZITPzs1w48Iq55bmaTUapxL3yyxCCOZnppmbmebyylnWN7e4u/6EJ3tHrtOTnppYDwQaCBGY5A2I 7auOQEaK1pH2qCn+GIGNGXqNdS+CzoyYhR0pEZIw0udHjiIySYEx0f0omOu0efPyBS6cXfq1MSUu DqN2Wk1uXDrPhbNL3F97yi8frXNw3DM3OdVtuwvxsfV3HEMq54hoDPVBHdSaCCc9IvEARdQYpC00 DJGFccbYs0pbpRY/66TPtarSQrQGKQVvXjrP65dWmOlMvSptv4QSIU6g1WjwxtWLnFmY5fPHT7n1 aB2lje10jKkeOykx/QzSg2daqL1a0nE3NbIhp6g27USUujqLq4nOa2tHFDg/u9okHVlKmO+0+er1 K1w8u/yFjfyXXSKFBNiWa83cTJdvdKZYnOnw8zv32T3um+sOU1WQb9DXgiBe4x5VeEYISGPPucaJ WiMDUyrQWhAZefugsx/2a8V/sBe1NqrNNURrEFJyaWmer16/wvzs9KmA4ddRqqStoUbb5zRJuHL+ HNOdNj///D4Pn+1GA71iQInZ7BRGLBdVJ9R8WigdIKFwJPY2gCrP9CRIrSMVFXoXEJm26E6DcgwK tgsNWSK5ceE8N1+7SKvZqNkhfu2MGlME0flKaFTD4sw07755nanWGp8+XqcslbU5df8sAgIVxtja 4jEvNFUPzduCmqoTGN9FVEeRjzZHEYVYhZmeBDuCsiNJRzVoTZZI3rl6iXeuXiRN0wDbI3P0j8Eg 20LCMIowa2wqgU67xc3XLpJnCb+4v0ZRFJVaJkFhH2yITH3siKZxBSEeWPVgvRqLiePQn7KGzjMo Iqp5OOhrHdHY3i+l5Gs3rvLWlYvevgRJrFHqH0WC6ijVag8hKgNZAM1GzjvXLgHw83uPKEvlnwxE sWx2JrbiI9q77TnpTLMz02MR+4oEBQZoXTXwiKrZdGMuSLbGg+0orvTV1y4HxsRByLqdrLXr11ni VxuGuCtOAoTvZ5JI3rl6kZtXLtTATFVROhhtx689JyLbow0gqD4VNaKu77VjZBSZFvaycqKvfG4F Iax6c/pUVwj8+oUV3rkaJEbYZ3RFxBg/hjFGhVCI5uCkZO2gxc5xwdFAcVrpNCTNPGexPWKpq+g0 67a0+srQlNAI4QZ01K4kSXjn6kV6/T6frm9a7VIvQbUFBlVVU+oyg0K7kR1AgXJEqvpGoFRgUJQi MN8tVFRYPWYZExFPSMG5+Vm+9vo1MhsxjlTveDmFSS6GVyrFUU/xaHvI48MWvaGmOZMwszhPt9Gk mwua09P81z9/wHQ3599/d4Xy8JCTQtE4PmKnP+DxoyMAzs8KVuagkerJbYnb6Maah8+huUmacPP6 VfaPT3iye1hTycI/K4RTGHXwYKE0Oj7l1JsaH6UCKxVRIEdbafG8cFKjIxAQ9DRAM895983rtJvN sQaZzOWkaEM4dirVMeXzjR4PD5s0Z+aZWZ1hbmGB3EpjkoZOb+8N2d4b8uBpj0tnuswlgmxpjhl7 /Wh3n52nz3h874j5qZTXlkvyVE1Ap3bMRmpY64j69vRUs8G7b17nL3/yM4aDGkCwYzhYjbrvZ6G0 kxaPSGqQ2BcbqzEMUN6gae0AQUjJOTGN63IM+tab11mam41eEbgviOxcTWJjpqii4NMnBbe3M5oz S8zfvEyzYRiSS8lULskSQZoIMkvEhdkcgFYnpdNIqJeF5TnOnJ2nPDnh6aNNfnRvm/OzkitLdbVk +4gOwXOr3oWmElBfmJnm3deu8P4v76CUiiTIaiw/wBkThhQhY/YZAjkV5MQ1uCOEIGY8unWFqFqf knpWisurZ7l2YaXClNhvCJJfHYlaGUYXoxEHvT7/cB9OVIu5N96m1TGgc66ZMt1ImGokNFNBnkjy RCAF3NsZcPl8x9+30EoptaYoNYV9TWGlvDHV5vJbVzhzYZnPf36HrQfw9rmCVl5S1fOOwEHuvQBF Ovr6pVXWnm3zYHOnRpMo/eAZE2xRig4GU0dTQ7wn67C3P68Mo1wQzzPLSYwKfoCr176j28z4+o1r /nwcdXDxNz8Rwxtb0wEnLU/3C378uEVzpsvStatk0hB7qZMx30qZbSZM5ZJUmt4mAgal5u/Xjrm0 0mYwVGzsD/nG6hSjUlNqzajUFEqjtEBZBimlmZqe4qvf+Qp3P77HxxuHvHVWM9WojriKndTWXjtQ E6nkm69d5tnBESf9YThJcErHmK0xgMBkLlVEUV15sUNeBolFhI0Ya5BZENFYipyY37hymbmZbvSG qtS4aRUePNh/pVKMhgM+39T8Yr1k6bVLdM4skUvJuW7GcifjXDdjaSplphEYA9AvNGuHI+aaCSw2 OeiXnAxKnh2NWJnOGSlNJjUjpSmVAUFaQ2nbkErB21+7xpOHT/ng1gOuLSWszJYRbWJpD3a3YjeF UW83zp/jp58/iHofmIoLjurAIAsIgtGGWGhFUFlQyblolAcIjqH1YKhjntaK2W6X1y+txmMktK2O 04R5t9KKslQM+322j7GMuUrnzBKtPOFcJ+P8dM756YyznZRznZxmZuxOf6QYlZpeorizO2C1m9PJ S/aygr1U8rOnJ1yYzUmkoFSCRGlKKz2l1pRKGLQKlArOXjxDK5X88rM1Ztuadh6HoBw4ssciDoYF wHVt9Sx3NzZDqsF3NoAfr7EAiZAYUKUjJ0gElWKJHdBbNXFmVKQCVfMnlGOMCay+dfliDZ3FzasG hQxjNGVRMhoO2Dnq8YM7kxlzrjvOGIBmZgDBoFQsNgRzrZSZRsJsK2W2ldDKEz7cOKGZGrvUTAVZ Yv+kIJOKLBHICJHNry5z+eo5Pt5IORnKqMW2DxYWh7lzVZXVabd488JKPfseKnFI1Wp26/3Zu2N3 ldj0ObhEFB9zUYIAgZ3R1lp5SRVaM9ftcOHc8kTGTOqE0gqtFKPRkP5Jjx+tTTOzvORV2XIrZbGd MtdKmG8lTGVJhTH10sgzLsxkTDcT2pnk0myDbibZOip4tD8kSwSJEOT2M5GCRCbhnK1aCrh89Rwr qwvc24rfFyFSr0F05ZLzHVeWF5hpt8afFWLMyZMVWxM8okjvE74Lh0bie3Ql/hZUmfbHF86coVtp UChOTkNbAyob9gd8vGHq7V67CsBsy6CxbiOhmydk1r70R+ORgFFpnm2mgpVOhhSQJ4LrCw0WpzKm csnPN3scDEqEgEQIsgQjOVaKpD2fRBJ0/cZ5+kmT9b1kDJA6ChsTIsIpS/zpqTbnFxcQySTxcbeb a9J52QEZWa4LB53tfDNn1c3JmJbmeSEgmk3j4HgzS7m6Ollq4hJ3UpWKwWDA9nGfR4c5y2+8Riah lSd0GgmdXNJMDeHSaADHDDrsl/QKRaE0MzWfRgrBN861ySyBfvDwyKsSVxJhGSPNZ4QxyLOUd29e Zm0/YViISI1Fg004NVcDPEJwZXmOVCbREzWa2gEvUYW/pxp4s0Y/GgkhnaYjRhqRVaoMEmTtjdKw MD/H/HT3pRijtEY5dTYYcn9TM7O8RHu6Sy4l3cwgsUaiSaWxB4Xlx6g0kPiwX7J5NGJvUHA8KpnK DGMGpaqEuNqZ5JvnTfq7Nyz5q7sHnIwUqQxqLGZQIqsjfX6hy9mlWdZ3sTSYQGD/xdHUmIO5uVkW Oq2IMbHvFBSY1CpyGJ1N0XGl5oIytTsqxi2iVOM5dJv+4fzyIkky7o3HJW6iU2e7J32eDjrMXzfq LEmNt99MBEIkHi6PlOZ4ZKRkb1Dw6HDI0+OCw6GqQGqAYVEwLEMjl9oZ31o1DDrol/zZx7vc3h5Y u+PaJLzU1Bl08+0LbJ1kDArh73Vm208Gc5rIGnyECYyeX15EyNhjdSUcS6kVqHICyeLwTHhIx7Gy GDxoUMTnNM1McuYl55ZpKzVFUTAY9Hm8LZlZNsgsSQVNacIw0jGl1AxLRalgp6f42WaPW1sDdo5H 7A9KMiloJJJBqRiUisOhYlAaJ/NgUHo/5uJMzncuGckeKM337xzwJx9tGyZJo84cg+rqrdFuVKTH csh7kS667ugY4C3MdjpkWRI/QJVJkGqtDBTG6kDhVJpzToOn7l/ugUg4HzNGWca12lPMzc+9FHME MBqNGA2HFEXB08EMF+dnaEpBX2mDqJIwivf6Jfd3B2z1CpqpZLaZ0MkTRCvhUjelmRoY7UIy93aH 9EeKfqn5fGfAbDNBCoHScGkm54/fnOWv7x3yaHvA0VDx/TsHvHdPsDKTc3m+wUo3I0/GEeG5szN8 emsHTeH7YQ4iWxKvTrBStDDbpZlmUUC0anu0hlQIWc10CkBohAKECrZH4JdSuCnpSpUIO9E7liJX 5qe7ZM+ZqxwXpRSlKhkWJTsDI8n/88M+fGjC/O9en2F+KmHnuGT7pCDPJbPdjJlWwvJURjOVXJlL We2aFES/CO3Z6ZU83B/StwZqr1fw2faAGwsN409p6OQJv399hrUzIz5YO+bB9oCR0tzd7HF3s0ep NMvtlDOzOZ12ytFJwfZQMZXmlCNJbyi9Y2pIGeBB3VVAaJqNnLmpFge9npWGaNRbn8lEpXUUrtbu v3CvU1kONgutbYBa2twOKBECpu5z7gVAwHfEqrSyKNDliM39nNluh+2NIWBC/fceHbEwmzPdzZmf yZnpZIwKzcp0ztvLLVa7OYk0TIkH+LDUfLBxQr9Q9AtFYW3OR09PWGgnHsk5CTvTSfmXr8+w3y+5 tzPg080eW4dmRcLmScHmSUEiBWkmaeXmRZeXZtk72aaVxywIwMppIB0ugjb0efhst5ZoE57OEkBq hdax3REBSkdTGEOgMvLnBTZ+5mySQguBzFKmT/FtJhVVlpRFaVVah+zMMv/x317jO99Y9KF+gGYj YTQyoRZto8p7vZJhqRgUmn6h6I00w1Kz0yv52wdHbB2PuLHQpDc0IZ3riyZS8Ve3D1g/HHnGFN6e ws5JwcGgZGDPOcSWSGP3ZpsJX1+d4o/fnGVuborByIVzqr6k8HS0V1zAWAim2y2kA0shvOC/plor KwGWVcKJo64ELYXWFRBgBEz52U6BhwKUIhcJU82XnGiutVdphV03szQ3RbeV8N2b83z35jx/9+k+ H93apT8oydqSolDsHYz4YHjEJ096fC8VXF9ssjiVkSeC9YMho1LTV5pvrU6x2E7pK01ZaJqp5Hcu dfmzT/f437f2aDYk06lkbipj93jEnZ0Bpcb651V1LaVgfirlj9+Z99Hv7swUD+4lQFHtVuV/t/wx LAnoNjKSBMoiesKhOqzN8Zec92/xoBNHBzK0fbDeYJ/R0yoYwiRjeioJztdzitLahH7KEWVoKWki vBr6nbdm2dodcnhimPdbN2Y4KBS7+yOOByVaS25v9Xm4MyCxoZxMwrcvdFnpZiit6Q1LRgpKpZlt JnznYofv3zlgv1eyVRSwa9SoY8xcO+HcTM656ZwPHh2xc1yQpYJ/8cYsjSjDOt2QnIzkhF6Gge4J Lxxg0+StFqmQDD0PqzVYm6NqZsuqLu8D6RqsDlIjrDUyo0KCVY+5hCxvvJAxjjlgFjMpO51obnHW ZDATPIN+/5uL/I+/2eDwZMTPHh7z735zmUwK+oVm83jE470h6/tDMpc0k4L/+/k+f5tJVrsZ/YFi oDTvPTjioFd4lTWKwMNiN+XGYouznYxuQ1Iq+HvLGCEE//yNWaYbSSVfNDt7moaI/R8d6Tgz8FvZ 88CSpoINRQwGhAYhzQRNLPqoRZ61VpTO8Km63eKlkRpaU5a1Z4WBzmAkCGCunfLNN0x6++Fmj5+v HVOqkmYquDbf4LvXpvmNSx2GI+UJfjRUnAxKbm/1PTPW94cMlGZUaBpSMDOVorVmsZvyB6/Pcn2h QdemvJ8eDvl4/QSAt861OD+de+XgGNTIxp3s2LwDYZ6bD41pUrs80peKwRJV5njD5aCdVggVcdyv xrLBzQihubWTrlXJBJ/gZYqyA6BhVVMzlX4OQFlqvnVtmpUlY9Df+2yf45Exl6PSJMxem2+yOttg OFL81pUu//rmPG+eaXmGDUcKrTVvnmnxb74yzx+9Pc/+cUGeSX7vtZmx9vzwgZmVM9VKeNeGe+LI gxTVtIIrk11L7dW+cCgufsDe4o4jg+OqiNPW7lLNh1Gmcqdlvb1xOnWCz/Oyxc1hG4xC+CWJJmkU SvNP3pqjPyjZORjxwb0DhqWB9qUyaedvX+yglOa9e4e0M2nAQaErf1tHBVO55KcbxwxHit+9Nk2e CNwkzVLBL5/12Tk2NtBdj6UmsRGDYVnVKBCYEphk3QwCYKtEreMHLPmkD/ELifDoTBDPLRDaWEhH 8sC0aqPEhBH0quVodx+gwiCn5pY6GTdsTOwf7pmRXerAICng6nKLx9sDPlg/5sFmn1GheH2pwRvL TZR1Lj/cODEp7FyyPJVRKkgknkEfrh0DsDJvknqJEBOlZmc/zmxaWhALg6G6t78eMuvJDzjJ8R4+ Gi2kYRIENRVNNeUFAuEypEKIaJ7wq5dmYojh/uLy9dem6Q9KTvoln2wcUyrDoJEyTJptJRSF4u8+ 3WdUGO/+W5e7fPvyNIvdjFJpfvj5AUeHI0SUqHPNvrs74Lhn7OA3VqZIxGSpAdDFiHZ2en/rG7b4 KVVao8siQmqiogeD5PigmrJEHl/pXNnDhfHGxBO9wcTKvmhRSjHX0mzumlGbiiA9MZOWOhnzMzn9 QcntDRNeKRWBSaWmKBSl0qTK2KoHe0MeHwz5zUsdH2Het2pL6eqs2fs7A5TSzE+lnOtmximMEJqT mkTC9gTJGS/j+/EMRiMPqNDaaK5Igjyc8llvG0kN2YK6vVEVcGzcoOqERCEEo6LkuD9gdsIGDWMl HpVZSt475mDtCY2vXGJkiRuHg50nf3W5xc7+kEfbfRNlVtgJG3DrkWFuUSiOgP/+w6ekNjOXSGHD 9absnoxH5df3jc9zcb5RUWcujxQL8saTfebap6sVp9Swn05Qev2B7X4UeYlgXrQmVPql2272p7My DsABfm6AOw4Ranevy6gqDo97zHZfHCWQQiBlQpqmDICF/JBPDjsMCkWaCGQikNrMJSu0UXeFhrOL Tbi9z87+kO3jgoWpFBT8+O4+j7bNMsCZTsb52ZwzszmL0zmpFDzZG7B5XPDombnn6HjEjx8f8c3z HWO3tKY/KJFScGm2MVGdOakpRgVPnu3x5pmCuhPpGFOBYFE56Q8py9LGNu2d0fJ5s7LNzsCJK6u4 pNaBEgQmuWSahjA/2qFqIegPC076/Rcyxt0vpEAkGUmS0k7Mc2sbO1y7uOgDg45JAKnSvLHU5M9t HRuHI+ZbCQ8Oh/zws0MAXl9t84dfX/DvcfMAVmzkOnlL8Bef7PJ4e8CP7x5ybjrn4kzOk8MRUgqy VLAynXl1WldniRDce7JPO1M0M5d2qfUNfCwyRm+GOX1GNtnsXc5IU0kA5aXGRArCUg9bZRRRjcM9 1UaEkeFS2HtHL6OLDXMSabzu1KrBM40jbt9Zt4QIoMAlvNLEBCCdz7N/MOS40Pyv958xKhXdqYR/ +tYsMS5xCTZnW0ql+b0bXdpNQ9S//GSXkdIcjRR5JhFCTGBMqC+R8OndZ7SzkuQ5C4tjEKajk3tH PbQq8csvIz8IYZlTh8ACjawk2CZDZC0mX3Kqbedg/9QG14tMErLcMCbNUhbyQ/Y3nzHo9Ukkfg5Z nkhPsDwRdPKEZiOhN1T86QdbjCw3/uDri2TWxjwPOOZpyh+8NUtmY2V/8cku/UKRpYILCw2/c5Nj TCw1J/0RT57tcaZbnP6CCcW4hYY+1tLXrpoPw5xoOJibreTE0AEmRAciW1RXg8DBwQGHJy+WHiEE UkqSNCVrtKxqK5lraX7241tkUvi8fswoKQSXlxq0mwmfrp1wdFKQJZJ/9e4i56bzQMjahI140kYi BGe6Ob/7xixpJjkclNy1tqgpBUhJJscZk0j463+4x2J7RJ69vI/n7jo4PuGgN/BxSzHhJimERHlf R0aYPDg31eCl9Oc9M4QwfpH3sczBcX/A1u7eSzVaSkkiE/I0Ic0ypJScS5/w+foWG88OkILApHiy n02WdafM59eudPjqaotEEiYJCuEJ7HMytj5zDt5ZbvHmmRZ5JhkoTbuR2MmGTGTMo61j1te2Wer0 SOTzJ7DUiwB2Dw4ZFnbZv0dyUajUozUfLa0SPZwJzqVSJQhMGtu9TEdTdKMyGhVsbO1wZfXcSzU6 zTKyPCcdpGR5Tlv1OdM44v33PuaP/vA3yNOUBGMrwBBsOpU0bUaymUsOeiX/7Ydb9PtFBTqD0RAp INKQNFuZN4m8lemcVi5pW2Zn0tg1B51jxpQK/ub7P2WxXdLMM05DY6cVjWZz95CiiP1AUbtHIElT KzFgZnQ63sVxVbeVlYXLNsRT3YFRTmzf+ubmS6E2p9rSNKXRaJJmGWmWcqG1x97hEe+/H9Rblhji Kg0Ptgc08sT/HQxKtNI08oQ0laSpUUt5LslSQZpLslSSZub71mHBfs+oMqfOMmkWYBU2ZhczBuD/ /OQ+AKvTfRKZfOGw1XFvwMbWVkTbaEKnX9ukSbVIPQ8cHI6C2+6SmSMAgKzG3YSdRKUnW92D4x5P t3e/kPTkzYbPiqpS8VZ3g0/uwtmFLl+5edmsChDwt/cOORiU5Lnk5kqbxErKdCNhphlUjZv5KmSY ViuEcWb3+iVlaaZL9ZVJyLXyxNgb4LPtPl872/aM+cVnG9y/u8GNhX1k2uSLSg3A1u4eh3bWjVkV V61D2LRCKmS8vD1eMBXbFOd42inaAqQOC5tM2qAaP3JlNCq4t/6Uy6tnX5h4c9KTZTmtZoEuW5Rl QVsVvNXd4Ps/hryR8/brq9za6vNge0CWSt5eafNblyY7u/Ec53oeJj6OofJ2r2DjcMSToxFbJwVP j0dcmsn5xd1nvPfhfS5ObdPKcis1z+3SWFFKcW/9KaUqjHmw4YJg4UOp7PFpdhIM6MFsVlr6R30U zrlCXrTkqZIDcH9tna3XLlfWgZ5ahJkRmecNP+EDerQpuNAd8r0f/ByAR6JDlgpmpjJ++8rzZ/nU g6bxuZgpLi9ztpOx2s350doxw1Kz2yvZ2VjnvQ/vc7a1y1w3t/7YF5eanYNDNnYOLLlCjkDHasrG OdNwIooRxOwTYSmhK7GtEcKlmSNUV/G2jPTcfrj2Uswxk72Nemu129GVHmfYpNtN+N4PYOm1q3zl +ipfP9eeSPx6ie9xaq7OFGdb3PFvrE5xb2/ArU8ecPfeBjfmDpmeSpBpWplX/rJFa83th2sMi6IS Bov44fklsFsXC/zkW9w3h+BqdEYKMwEC8JlQP8s+mhAS7wALcOveA16/dJ6F2fFsY70IIZCJROqU vNnw2VEnQW91N9hY03z8dJNL3/0KF889n+nxaovYy4+ZYu4LRj+TgkdbR7z//Z9yMpK8MbvFVKtF luUkUr5S7mp7/4A7T7Yr6swYAhkBMKe1JMlr3/rt/0zMQVTIN0TS5JjkJ8m5Ku0Fj9HHPCpTlFKM lObK6tmX6oiZnywQUiKlCe8oG1DNhGYuOeB4UPDh5/tsPNvn4tlZWo3ULgsJ/k1iR3jiIbH5niaR QyrCWhyAk/6Iv/ibT3n/g9s0xCGXO3u0Wi3yRoMk+eLoDIzU/Oz2XTb3D739NxGWKF4tRMWridSa MxvSTu0tkUKiUCQaSvAJPKXxdke4CKiQaKWea38+f/iIKytnXhq5GSJvYVNpAAAQlklEQVQmkDe8 o5emKf1ej7IsuMAeC+Uh22tb/Jc/2eHS6jxfvX6Oa5eWaOXjk0viaQ1JTWqKUclnj7b56PYmzza3 aXHAhakT5loN8qaVmFdkDMCDjad8tvY0gCeLil0UJpYb94Y0EDNsd6hd0EwbV0hhuBFvge91ppDE +3UKi+CMuqyqNq00H92+x8rCHI1T1ofWi2OQEoJWu02SJogkYzTokSQj5HBIOzFMOnx2wPc21vhT 1eLS6jwXVxY4v9Cm2cg4u9AhSUzsbjAc8Xj7iNGoZHP3hMebBzzb3AagxQGrrWM6KbSnpsjzBjJN X1mVAfQGA249eIxSYRcTr2YctI9sh3Po/T4EYd9TZ3Nw+QCwcbQ4rVZZPu8pGUnNpOta83TzGT/5 9A7fvvmWX87xouIhdp4jk4QkTRmmCYNBnzTLKEYj0rKgU26hEsVJmXD47ICfbKzxE0Cnk9FcpyER gy2ajZzFZI8pUdBstWg0miZSkaakWfZKxt8VpRQ//fQOGzsHQdtHuNlNMDS8coyyoMgTNDg41pgL oKxsk6+tcZGAkmYSu1uJKAhB0Op28OPR7Vv3HrAwM83rly+8dCcdcdI09XG4LM8ZDYcMixJdjuj3 TJA1LQum2fETFGGjUpe0uixJUkht2KjRJk8TzxQnLfG7v3DRms8frXN7/RkSC6BEdaO/yiC3Ksf9 X1XMnqMWdUlh+aZDvkdHK+Vt0q66CYU0kwsjmFdHbqNRwU9vfUa72eTC2aWX7qsjkpSSvNEwIZ40 JVclZVHQaDQ9o6o7BY6XNE0RSUaeJiSpkcZEGpicJNL0y8/geOkmVsrjzW1+cf8xWplNJSoui9dM GHfFXnIWSON2Kqwb8chemPCMLVr4GBwItDbTqZzdCc/LEAw9pewdHvOTW7dpN/OXgtdxqTNJKYXK FKosyZWJrbk1qpOfBykTE86RiZnpL0SQFOdf/AplZ/+AX9y9z/7RiVkfYFWLdnsNiedJpKGzsTnC jhQL79wGdg47C2RwRMccHwL3pOWbSzVa1Xdaebr5jB998hnf+cpbTL/C3tGuc0mSmMmIaeoDiEpH yabxBw1M98QRuNR9uKd2/AWkZ+/giI9u3+PJzoEP7xjbIq0WsvVF6DGmrROoNMxPI6rFiZ4EYafk 2k4pH4OzUqWlV28eXEjplx76qERNtTnCPVwz9uBVGeQ75wOalmHuNXHXqE1PikMmdeK/oirbPzrm w8/ucP/JMxCSwPPqHIyJwbTa18rsG+y8qbARhIrUorDrPolmiCikiOd7hV76vHgkPfH+lXHE8OHj dQC+/fYbfuOiL6tUBaCmRkRtqMafr1D2Do54/+NbbOzsG9UugvsezER9GaJrS0Q3CwzGPbVaINQc mF0+3C9/OPYr785qO/Ej3nkKvK54gXpDCB6ubXDc6/PbN99gefnlQcJpJZaY6vlo6PpBok9/4CXL 46db/OLufTa294IUu3Z43ya8wP3GUNhEImq4bUh1yoifWRMcpSB9JpQS1W6T2rVRIKWf+CGEcUqF NYCVhvnGhOe3t3f4yx99yCd3HryIFi8sjjAVpGqvuFnLk4gWVMUplU4ov7z7kPc+/pSNnX2D8GIm VHz/4EkKHWB1vNETBN9n4gIar9WcExpZfbdVfPixCPuTRW4QRtsZaxtBcL2uZFPHRoyp4LjX5wcf /ownO7t8++3rtNu/gh0aO1NV+JXl+yK6FDPoOXbp8PiEX9y5z6ePNrzKCuY6lkxLDx8ns1akNmh9 u630jDNHRAfRZELz3f1qlNsRT4QYG6AtOBDa2SrrvmojQVrU9vAkAgrRaNNac/v+Q3b2drl5/TVu XDr/6o5gpWvRO9DVAVJRx9T5WGGMUorPH63zy/uP2D44MvW4wGMghqcRNhTg3y7djoyh3oo9tu+d wBwLDDThByiiFcDCYnXh7Etkg2JwIKkaPlEDBnUGVRpmibW9e8D3f/IRd9ef8M7Vy1/IYZ1U7FBx Si2ok0r/a5+18vjpFrcfrfHw6Zbfoy7QQIZHPbPcu8OewmAXnQmX3HRD2fo/1tE3aer6ptR+9mcg WIiPmordnAKhlY9Ya+0mpNsfz7MbUIhYxblVDJF69K+dgOZUWfLw8Tobm8+4vLrC9QurrCzNv3A/ nUnFaYDKoPHSU9X7MXOKouTJ1i63H62xvr3DYFhUJNl02cJcr8VjRyZMODOayDHU5M3cCo9YkrU+ xeaMd8kqYT9CwvZUSoBQKgI+ykYVrKS46LYfkZZhcewtGsHx/tP2BrTWJpt6/yH319Y5t7zE+eVF LpxZeuFE+Qm0jkl1Cqw19+zuH7KxtcODp5ts7R0wLMpqENTZE6FBu0UAka0JGi2aKxCpVu+huo/q oDET2U+THuf32ApMXcLuNQAaFdIGaMuEKJQjJcLmeOK9ceKRU1md4EW/yqSYWaNRwcO1DR5vPOWj Rs7KmWWW5mY4uzDHbGfK7/Ae0Xliqao4Q5iiLNnePeHZ/jbPdvd5srtPfzD028j4X+ByhAebZjGh Ed9OJ0XOfGhTv5TSj3P/UzcVwFH97eyXWu4stAhbFdtdIYQdLVpq7wOZCSEqAhGgpWGW1AIthVnf 4wTQLTmJmGY2L63q65hZjkBKKY57fW7ff8idh5IkkUxPtZifnWOq1Wa206LdbNJsZDSyjDRNyJKE UVlSFCWD0Yj+YMRJv8/eUY/j3gk7B4f0ez0Gyu3rIyxTggtRCflULLoTmOq5cBgxQlMZFFHllt5x 4JPnS4+1cHhj5u2fS2cLb8iMGnLgwEmFCwOZ95e2Or/VopMaHUby2ACpO3BR0VpTFCU7+0fs7B+F e6yXPiltpF0S0RLDrc9yqkYiQMjxBy0RQ3DU0EW4wKLLQdeARWXgxWR2AMBvWRw8o5fbKMCBMhNM C6sLlPDtcPtJ+Xu9nXFqysBspTELoRwc90EIV6lFNppIWgmftj0vbLLWgN09MQIBwhJd41azCc9A bR1rM9HPBntFLQPq+uT9vwnZzQn0mwiAPOdspNrfV5Mcc89k6XFwz2gyt/eAwE+YdtyPGhf+V95m QSRF2kzfTbRyv48Udcax26rCuM/xD2BMKHVfxn0Kayvdq+K9A+Jfe9eujZi0gu9fLCkCCwCcFNfE JOqvIaGRFh9b8zOWgqaooEb7jjHJmcQgYSXGAxNDc0xswBHM7SrlQIKzPxKhSoQUPoeutYXqwqA6 072wB6ewI9d1txL5F5Zgp01idOAEwrwwF3ZyqMgNMCnrM2E9Y1w2WFTUVMQE4dUJEVqKKnIfETCI Igj+GpHdicCBqEvO84rx7iP/xKocAdGmRdrqajdKrF8jEgQaB1ZMXxwRnGQZtSed3zRuJ6tOt5AV poV0QJCK+tZjzkczdcgAc2sG36keKQ1j7DcC1LIE1HWmxQRzdo8KEDB316TGqd2K9lCnxNZOkx6E H7EuhWDqtOFxv9m3tUveY3b61E5ClFZ9WEdNYWA5mCWQUpvvOkI+spLVc20KhJda2E97zpkEQqBT YQaMMJT3NiX0j+qxHenSD0Z7XuLVctUYxo2LTse20v6uUF1qxtSxkKdLzkT7Yy54BsmaAyk8uhOW wBEFcYMowAeH7HBEEy6gatWhfUprs3WlcO+gvtlrtBxFulgd3rg7D0AiPFOYxBgX+8OoM+02AJR1 xlT0YCB8oG40mJ16cdciNjiNWFdv9vi5am0ig3xaW/lGGPpWxTJMobKjzgZJnRHxq7l8gi+8q7oo WCFE4v2nwA5RqVOEC+6/Kr2s+jK+SzIxEhEzBsziKk1gjDPs/j2O6HVzE2P3WHpi5BleW40pRuWF NmeMQV46HIOskfdhGun9HDOC3WREgRYuqu0o5mb1GNUXqzuN0/1udEv7iKoyT2DtmquTifeH/RGs MysNdSujGBcSFXYgBGmxvvZEDVYltoxO6uo99Wcd3539qpWXixCcpuJcpNm9OPaOnY1xCA5Am1i1 iijiD7X7BRijb/1WI3hQbY7tqDeDWATg4WqMQyyAECFA6mc6CRE1VVSINp6aEEgdVvyNSUs0KKrP 1mlBhVexSvMJt4gqL1RrlSZKgS5LDFS1RHU+hyWm62y8fZWODnz8TAe7pV2ewRJMIK3ak75fYD1o DP+Fs1Wiakjx9Av3xothfQzMnfGqySFREWEoHaG+Wv3CRt0jok/enyGyOU731hhUiSdSFYCXZg6A SBKzt7QNWgbVZo9tjkcibJDWhXfcZAfrfNolJsYZk2ipgj2yPwHjXAIfwarr9figptIQVMeh0BFd Iklxxlm6F4R3xbN0nAPqf+kkRo2OMf4FcUNjydEVZhqVVg3n1ENXX4g5EKk4p9PjkekYBCHOBoCy I19WwkAu9mVAg22aUGGPA1dvZUD5ngQax+tQnIy4AWS+OYfetFj7065XFQMvvYQLQkipZutwWwk5 B1fUGiuiDoRTsQTFv69aobF96AszB6o2aFL62BM6HhG2rSYdJKwaE+DUA+DiVaZGFdEuvCNOKYxd 9rMpQxim2jr7XiIbYjGHsJi7klvyKtB1zDJERLaubkuof7c36OhiNBDqUh87pq/EHP/aGCi4UeoJ EqC1Wzri41Mi2BADhbDTeh3BAorTNdQT9L+onyCAkvB6xyRzykIO6wxrKSpqBSvFyHiuQ9AM2seD qkkzT2ULgoh/HC9q3lgnIlDgR7PXhF8AEJxW6mpuLOblYFGMdX06W4fbYwgaqSwTyRXWkIvo/vgd 7r3SE1B4Q6XDwIiAggExtXrci7Uz1KFN7ntlUkg0t2JMCrx0xJyIvtcUjpNYr5n1K6o1oOJoOQbF v4ngr2nt2+8aHvYdFQgZVmmHDy9ylpEOvWlrJ2JwbYubhB5vamrf4WgsdZyv97wbT/hoLGMCYUUk LfWZM2OfFWkUTpfHjYoIhLc/DlILG5k4JZv0ckUrHWyPFH7dS6VEet+YGxl11IXwhWlQPBtRgtF3 Tq3EZlN6IDIWDZZR5x0814YTDmtZ/hh1FzMm0qABkYkKMV2uCao0jgSzWlnMMAPtKu+pqLjae35l m+Mrc0yys2Jip9VDWCIiey8wVglWHuqQ1G7W58941eAydXV5ddIaRrAfIJXEmHujrhLJMi7Ovbha Y4hdb+Y4EHAnY6rXdFfFLFX78SvbHF/xBEaZtrgom/3uwjyWIEFlO53sDGpovzt0RjOG73WgZCsx UF6794elkL6VAjSyEj13aM/1JWaMeSRirKV5zKxo9EScq+kwZ/irzR0v4ktkzljd1g6ZOJbNT2vr 71QCmLFcuT6JYJTHklg2MFlDp6gSVIlQ1RVtdZl63rWwvVkaJMy/YkL+BYiVbcXOxCOnMopifVaX nsgg/yqA4HllElgAq/Jq0NvLVb0jzlZ4xFMbgVqDKpHliPrm469azI9nKFCFea1MUVIiRRJCT6dJ bQ2UjTMmhnDRQ3VV6LHQr+jnTCpa6QpDYsAwFt0mpn3I9FR0WTTANNpsdqYKpDJho8lq7cspQhUk TiMmKcjE/EUDPNx8yvcxDkb9e17jv0y1FjPBfU5izIuyrPG8r6AJhFFbZeHV1sswxU1wjNMHr1pE WSDKAi1Tw6i6I6qftwLW1xI+a/PMPc8i/v1/AwSnAoRJqYdQCWORBl2iLWGEu+clypel6saaqMwA 0TKFJB1Df9VGPK8ix6DavRH//h9qOh+tmbH4ogAAAABJRU5ErkJggg== "
      style="image-rendering:optimizeSpeed"
      preserveAspectRatio="none"
      height="103"
      width="103" />
   <path
-     sodipodi:type="star"
      style="opacity:1;fill:none;fill-opacity:1;stroke:#166fc5;stroke-width:8.0100069;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
      id="path9486-3"
-     sodipodi:sides="5"
-     sodipodi:cx="107.94611"
-     sodipodi:cy="18.287741"
-     sodipodi:r1="25.123196"
-     sodipodi:r2="16.488178"
-     sodipodi:arg1="0.94256121"
-     sodipodi:arg2="1.6115143"
-     inkscape:flatsided="false"
-     inkscape:rounded="0"
-     inkscape:randomized="0"
      d="M 122.71146,38.614065 107.27493,34.762253 93.177374,38.611601 92.070516,22.740315 84.053182,10.522253 98.805634,4.5650711 l 9.142576,-11.400526 10.22437,12.1895451 13.66776,5.1721488 -8.43344,13.490736 z"
-     inkscape:transform-center-x="-0.00024234256"
-     inkscape:transform-center-y="-0.8971278"
      transform="matrix(0.12494508,0,0,0.12474266,18.581946,6.6835973)" />
   <path
      style="fill:none;stroke:#1f5d98;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
      d="m 8.5,0.69710453 3e-6,7.14369677"
-     id="path9525-7"
-     inkscape:connector-curvature="0"
-     sodipodi:nodetypes="cc" />
+     id="path9525-7" />
   <path
      style="fill:none;stroke:#1f5d98;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
      d="M 4.3852903,12.681329 8.5,7.672521"
-     id="path9525-7-8-8-7"
-     inkscape:connector-curvature="0"
-     sodipodi:nodetypes="cc"
-     inkscape:transform-center-x="2.1023425"
-     inkscape:transform-center-y="2.4998378" />
+     id="path9525-7-8-8-7" />
   <path
      style="fill:none;stroke:#1f5d98;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
      d="M 14.781032,5.475214 8.5,7.492"
-     id="path9525-7-8-8-6"
-     inkscape:connector-curvature="0"
-     sodipodi:nodetypes="cc"
-     inkscape:transform-center-x="-2.5514978"
-     inkscape:transform-center-y="-2.0393364" />
+     id="path9525-7-8-8-6" />
   <path
      style="fill:none;stroke:#1f5d98;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
      d="m 2.1528591,5.476061 6.281032,2.016786"
-     id="path9525-7-8-8-6-4"
-     inkscape:connector-curvature="0"
-     sodipodi:nodetypes="cc"
-     inkscape:transform-center-x="2.5514978"
-     inkscape:transform-center-y="-2.0393364" />
+     id="path9525-7-8-8-6-4" />
   <path
-     sodipodi:type="star"
      style="opacity:1;fill:none;fill-opacity:1;stroke:#1f5d98;stroke-width:0.67826539;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
      id="path9704"
-     sodipodi:sides="5"
-     sodipodi:cx="-1.0481113"
-     sodipodi:cy="15.5015"
-     sodipodi:r1="3.6540225"
-     sodipodi:r2="2.3981092"
-     sodipodi:arg1="0.96247132"
-     sodipodi:arg2="1.5907898"
-     inkscape:flatsided="false"
-     inkscape:rounded="0"
-     inkscape:randomized="0"
      d="m 1.0401397,18.500014 -2.1361944,-0.600884 -2.1585081,0.515007 -0.088645,-2.217325 -1.1568161,-1.893718 2.0814085,-0.769498 1.4435564,-1.685388 1.37502655,1.741749 2.04898315,0.85209 -1.2315954,1.845958 z"
-     inkscape:transform-center-x="-0.0040486204"
-     inkscape:transform-center-y="-0.51936825"
      transform="matrix(1.4423713,-0.02417253,0.02525567,1.5066132,9.5808157,-15.815083)" />
 </svg>
diff --git a/ui/org.eclipse.pde.runtime/icons/elcl16/collapseall.svg b/ui/org.eclipse.pde.runtime/icons/elcl16/collapseall.svg
index 16b4be366bd..40e951e862f 100644
--- a/ui/org.eclipse.pde.runtime/icons/elcl16/collapseall.svg
+++ b/ui/org.eclipse.pde.runtime/icons/elcl16/collapseall.svg
@@ -2,20 +2,16 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.48.5 r10040"
-   sodipodi:docname="collapseall.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
@@ -30,7 +26,6 @@
          id="stop5084-3-8" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient5080-79"
        id="linearGradient5113-12"
        gradientUnits="userSpaceOnUse"
@@ -57,34 +52,8 @@
        x1="16.774115"
        gradientUnits="userSpaceOnUse"
        id="linearGradient5178"
-       xlink:href="#linearGradient5080-7-5"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient5080-7-5" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="22.627418"
-     inkscape:cx="9.3169434"
-     inkscape:cy="3.8885032"
-     inkscape:document-units="px"
-     inkscape:current-layer="g5108"
-     showgrid="true"
-     inkscape:window-width="1147"
-     inkscape:window-height="752"
-     inkscape:window-x="1197"
-     inkscape:window-y="810"
-     inkscape:window-maximized="0"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2997" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -98,8 +67,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
diff --git a/ui/org.eclipse.pde.runtime/icons/elcl16/cpyqual_menu.svg b/ui/org.eclipse.pde.runtime/icons/elcl16/cpyqual_menu.svg
index 54cd98eb454..a740ae35a9b 100644
--- a/ui/org.eclipse.pde.runtime/icons/elcl16/cpyqual_menu.svg
+++ b/ui/org.eclipse.pde.runtime/icons/elcl16/cpyqual_menu.svg
@@ -2,24 +2,19 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.48.0 r9654"
-   sodipodi:docname="cpyqual_menu.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4994-9">
       <stop
          style="stop-color:#f9fafc;stop-opacity:1;"
@@ -38,10 +33,8 @@
        gradientTransform="translate(-1.5069511,-0.28288642)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient5005"
-       xlink:href="#linearGradient4894-2"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4894-2" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4894-2">
       <stop
          style="stop-color:#e0c88f;stop-opacity:1"
@@ -53,7 +46,6 @@
          id="stop4898-1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4902-2"
        id="linearGradient4890"
        gradientUnits="userSpaceOnUse"
@@ -63,7 +55,6 @@
        x2="10.544736"
        y2="1052.3228" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4902-2">
       <stop
          style="stop-color:#c7b571;stop-opacity:1;"
@@ -82,10 +73,8 @@
        gradientTransform="translate(-25.53033,-1.2928864)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient4961-1"
-       xlink:href="#linearGradient4872-2"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4872-2" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4872-2">
       <stop
          style="stop-color:#8693a7;stop-opacity:1;"
@@ -98,7 +87,6 @@
     </linearGradient>
     <linearGradient
        gradientTransform="translate(-0.5303301,0.70711356)"
-       inkscape:collect="always"
        xlink:href="#linearGradient4994"
        id="linearGradient5000"
        x1="9.8946028"
@@ -107,7 +95,6 @@
        y2="1051.8378"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4994">
       <stop
          style="stop-color:#f9fafc;stop-opacity:1;"
@@ -119,7 +106,6 @@
          id="stop4998" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4894"
        id="linearGradient4900"
        x1="7.9987183"
@@ -129,7 +115,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(3.4930489,1.6283136)" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4894">
       <stop
          style="stop-color:#e0c88f;stop-opacity:1"
@@ -141,7 +126,6 @@
          id="stop4898" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4864-7"
        id="linearGradient4870-1"
        x1="11"
@@ -151,7 +135,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-5.5303301,-1.2928864)" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4864-7">
       <stop
          style="stop-color:#eef4fa;stop-opacity:1"
@@ -164,7 +147,6 @@
     </linearGradient>
     <linearGradient
        gradientTransform="translate(-0.5303301,0.70711356)"
-       inkscape:collect="always"
        xlink:href="#linearGradient4902"
        id="linearGradient4884"
        gradientUnits="userSpaceOnUse"
@@ -173,7 +155,6 @@
        x2="10.544736"
        y2="1052.3228" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4902">
       <stop
          style="stop-color:#c7b571;stop-opacity:1;"
@@ -185,7 +166,6 @@
          id="stop4906" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4872"
        id="linearGradient4878"
        x1="29"
@@ -195,7 +175,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-20.53033,0.70711356)" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4872">
       <stop
          style="stop-color:#8693a7;stop-opacity:1;"
@@ -208,7 +187,6 @@
     </linearGradient>
     <linearGradient
        gradientTransform="translate(-0.5303301,0.70711356)"
-       inkscape:collect="always"
        xlink:href="#linearGradient4864"
        id="linearGradient4870"
        x1="11"
@@ -217,7 +195,6 @@
        y2="1048.3622"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4864">
       <stop
          style="stop-color:#eef4fa;stop-opacity:1"
@@ -229,7 +206,6 @@
          id="stop4868" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4877-1"
        id="linearGradient4867-2"
        x1="7.0070496"
@@ -239,8 +215,7 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-4.5303301,-2.2906864)" />
     <linearGradient
-       id="linearGradient4877-1"
-       inkscape:collect="always">
+       id="linearGradient4877-1">
       <stop
          id="stop4879-4"
          offset="0"
@@ -251,7 +226,6 @@
          style="stop-color:#5e76a3;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4877"
        id="linearGradient4867"
        x1="7.0070496"
@@ -261,8 +235,7 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(0.46262035,-0.29288642)" />
     <linearGradient
-       id="linearGradient4877"
-       inkscape:collect="always">
+       id="linearGradient4877">
       <stop
          id="stop4879"
          offset="0"
@@ -280,11 +253,9 @@
        gradientTransform="translate(-4.5303301,1.7093136)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient4912"
-       xlink:href="#linearGradient4877-1-8"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4877-1-8" />
     <linearGradient
-       id="linearGradient4877-1-8"
-       inkscape:collect="always">
+       id="linearGradient4877-1-8">
       <stop
          id="stop4879-4-2"
          offset="0"
@@ -295,7 +266,6 @@
          style="stop-color:#5e76a3;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4877-0"
        id="linearGradient4867-4"
        x1="7.0070496"
@@ -305,8 +275,7 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(2,0,0,1,-6.5444291,3.7071136)" />
     <linearGradient
-       id="linearGradient4877-0"
-       inkscape:collect="always">
+       id="linearGradient4877-0">
       <stop
          id="stop4879-9"
          offset="0"
@@ -324,30 +293,8 @@
        gradientTransform="translate(-4.5303301,-0.29068642)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient5186"
-       xlink:href="#linearGradient4994-9"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4994-9" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="11.313709"
-     inkscape:cx="15.480552"
-     inkscape:cy="6.4070757"
-     inkscape:document-units="px"
-     inkscape:current-layer="g4827"
-     showgrid="false"
-     inkscape:window-width="1147"
-     inkscape:window-height="752"
-     inkscape:window-x="1198"
-     inkscape:window-y="809"
-     inkscape:window-maximized="0"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="false" />
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -361,8 +308,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
@@ -372,57 +317,43 @@
       <path
          style="fill:url(#linearGradient5186);fill-opacity:1;stroke:none;display:inline"
          d="m 1.4696699,1039.0693 5,0 3,3 1.0000001,8 -9.0000001,0 z"
-         id="rect4001-3-3"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccc" />
+         id="rect4001-3-3" />
       <path
          style="fill:url(#linearGradient5005);fill-opacity:1;stroke:none;display:inline"
          d="m 6.4696699,1038.1581 0,3.9112 3.9774761,0 z"
-         id="path4884-6"
-         inkscape:connector-curvature="0" />
+         id="path4884-6" />
       <path
          style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:url(#linearGradient4890);fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
          d="m 0.46966991,1038.1133 0,0.5 0,11.956 0,0.5 0.5,0 8.99999999,-0.013 0.5000001,0 0,-0.5 0,-8.956 0,-0.2187 -0.15625,-0.125 -3.0625001,-3 -0.125,-0.1563 -0.21875,0 -5.93749999,0.013 z m 0.99999999,1 5.25,-0.013 2.75,2.7188 0,8.2372 -8,0.013 z"
-         id="rect4001-8"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccccccccccccccccccc" />
+         id="rect4001-8" />
       <path
          style="fill:url(#linearGradient4961-1);fill-opacity:1;stroke:none;display:inline"
          d="m 0.46966991,1043.0693 0,5 10.00000009,0 0,-5 -10.00000009,0 z m 0.99999999,1 8,0 0,3 -8,0 0,-3 z"
-         id="rect4053-4"
-         inkscape:connector-curvature="0" />
+         id="rect4053-4" />
       <path
          style="fill:url(#linearGradient5000);fill-opacity:1;stroke:none;display:inline"
          d="m 6.4696699,1041.0693 5.5069511,-1.4585 3.062057,3.0066 0,9.9546 -8.5690081,-0.5027 z"
-         id="rect4001-3"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccc" />
+         id="rect4001-3" />
       <path
          style="fill:url(#linearGradient4900);fill-opacity:1;stroke:none;display:inline"
          d="m 11.46967,1040.0693 0,3.9112 3.977476,0 z"
-         id="path4884"
-         inkscape:connector-curvature="0" />
+         id="path4884" />
       <path
          style="fill:url(#linearGradient4870-1);fill-opacity:1;stroke:none;display:inline"
          d="m 1.4696699,1044.0693 8,0 0,3 -8,0 0,-3 z"
-         id="rect4053-7-2"
-         inkscape:connector-curvature="0" />
+         id="rect4053-7-2" />
       <path
          style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:url(#linearGradient4884);fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
          d="m 5.4696699,1040.0693 0,0.5 0,12 0,0.5 0.5,0 9.0625001,0.013 0.5,0 0,-0.5 0,-9 0,-0.2187 -0.15625,-0.125 -3.0625,-3 -0.125,-0.1563 -0.21875,0 -6.0000001,-0.013 z m 1,1 5.3125001,0.013 2.75,2.7188 0,8.2812 -8.0625001,-0.013 z"
-         id="rect4001"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccccccccccccccccccc" />
+         id="rect4001" />
       <path
          style="fill:url(#linearGradient4878);fill-opacity:1;stroke:none;display:inline"
          d="m 5.4696699,1045.0693 0,5 10.0000001,0 0,-5 -10.0000001,0 z m 1,1 8.0000001,0 0,3 -8.0000001,0 0,-3 z"
-         id="rect4053"
-         inkscape:connector-curvature="0" />
+         id="rect4053" />
       <path
          style="fill:url(#linearGradient4870);fill-opacity:1;stroke:none;display:inline"
          d="m 6.4696699,1046.0693 8.0000001,0 0,3 -8.0000001,0 0,-3 z"
-         id="rect4053-7"
-         inkscape:connector-curvature="0" />
+         id="rect4053-7" />
       <rect
          style="fill:url(#linearGradient4867-2);fill-opacity:1;stroke:none;display:inline"
          id="rect4001-1-6"
diff --git a/ui/org.eclipse.pde.runtime/icons/elcl16/refresh.svg b/ui/org.eclipse.pde.runtime/icons/elcl16/refresh.svg
index 97321996bcd..488ca36fd01 100644
--- a/ui/org.eclipse.pde.runtime/icons/elcl16/refresh.svg
+++ b/ui/org.eclipse.pde.runtime/icons/elcl16/refresh.svg
@@ -2,24 +2,19 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.48.5 r10040"
-   sodipodi:docname="refresh.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient7584-5-1"
        id="linearGradient7608-3-3"
        gradientUnits="userSpaceOnUse"
@@ -39,7 +34,6 @@
          id="stop7588-5-8" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient7592-1-2"
        id="linearGradient7610-5-8"
        gradientUnits="userSpaceOnUse"
@@ -59,7 +53,6 @@
          id="stop7596-9-7" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient7584-9-3-2"
        id="linearGradient7608-9-7-1"
        gradientUnits="userSpaceOnUse"
@@ -79,7 +72,6 @@
          id="stop7588-9-9-0" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient7134"
        id="linearGradient7140"
        x1="25.363291"
@@ -88,7 +80,6 @@
        y2="1037.7311"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient7134">
       <stop
          style="stop-color:#bd8416;stop-opacity:1"
@@ -100,31 +91,6 @@
          id="stop7138" />
     </linearGradient>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="22.627416"
-     inkscape:cx="14.77039"
-     inkscape:cy="-0.49944469"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1171"
-     inkscape:window-height="959"
-     inkscape:window-x="665"
-     inkscape:window-y="497"
-     inkscape:window-maximized="0"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid4090" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -138,8 +104,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
@@ -148,15 +112,11 @@
        id="g7604"
        transform="translate(-13.086169,0.51822429)">
       <path
-         sodipodi:nodetypes="ccssscscsssszcc"
-         inkscape:connector-curvature="0"
          id="path7582"
          d="m 23.585155,1039.3249 0,-1.591 c 0,0 -0.353553,-0.8397 -1.370019,-0.044 -1.016466,0.7955 -2.209709,2.0772 -2.386486,2.4307 -0.176776,0.3536 -0.928077,0.9723 0.08839,1.9446 1.016466,0.9722 2.121321,1.9887 2.121321,1.9887 0,0 1.546796,1.4584 1.546796,0.088 0,-1.37 0,-1.812 0,-1.812 1.366404,-0.063 1.694788,0.3552 2.039845,0.6884 0.345482,0.3336 0.8125,1.9687 1.21875,2.0937 0.40625,0.125 0.625,-2.1875 0.625,-2.625 0,-0.4375 -0.174793,-1.2439 -0.71875,-1.9687 -0.293544,-0.3911 -1.006571,-0.9555 -1.53125,-1.0998 -0.524679,-0.1444 -1.633595,-0.094 -1.633595,-0.094 z"
          style="fill:url(#linearGradient7608-3-3);fill-opacity:1;stroke:url(#linearGradient7610-5-8);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
       <path
-         sodipodi:nodetypes="ccssscc"
          transform="translate(0,1036.3622)"
-         inkscape:connector-curvature="0"
          id="path7602"
          d="m 23.069359,2.3660973 0,-0.5966213 c 0,0 0.110485,-0.3756505 -0.220971,-0.243068 -0.331456,0.1325826 -0.972272,0.6629126 -1.038563,0.773398 -0.06629,0.1104855 -0.751301,0.5966214 -0.596622,0.8175923 0.15468,0.2209709 1.458408,0.066291 1.458408,0.066291 z"
          style="opacity:0.85714285;fill:#ffffff;fill-opacity:1;stroke:none" />
@@ -166,14 +126,10 @@
        id="g7604-6"
        transform="matrix(-1,0,0,-1,29.049623,2089.2948)">
       <path
-         sodipodi:nodetypes="ccssscsscsssszcc"
-         inkscape:connector-curvature="0"
          id="path7582-7"
          d="m 23.585155,1039.3249 0,-1.591 c 0,0 -0.353553,-0.8397 -1.370019,-0.044 -1.016466,0.7955 -2.209709,2.0772 -2.386486,2.4307 -0.176776,0.3536 -0.928077,0.9723 0.08839,1.9446 1.016466,0.9722 2.121321,1.9887 2.121321,1.9887 0,0 0.404271,0.3812 0.799458,0.5707 0.37782,0.1811 0.747338,0.1871 0.747338,-0.4827 0,-1.37 0,-1.812 0,-1.812 1.366404,-0.063 1.727345,0.3446 2.039845,0.6884 0.3125,0.3437 0.8125,1.9687 1.21875,2.0937 0.40625,0.125 0.625,-2.1875 0.625,-2.625 0,-0.4375 -0.09375,-1.3125 -0.71875,-1.9687 -0.625,-0.6563 -1.006571,-0.9555 -1.53125,-1.0998 -0.524679,-0.1444 -1.633595,-0.094 -1.633595,-0.094 z"
          style="fill:url(#linearGradient7608-9-7-1);fill-opacity:1;stroke:url(#linearGradient7140);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
       <path
-         sodipodi:nodetypes="ccssscc"
-         inkscape:connector-curvature="0"
          id="path7602-2"
          d="m 23.069359,1042.9731 0,0.5966 c 0,0 0.110485,0.3757 -0.220971,0.2431 -0.331456,-0.1326 -0.972272,-0.6629 -1.038563,-0.7734 -0.06629,-0.1105 -0.751301,-0.5966 -0.596622,-0.8176 0.15468,-0.221 1.458408,-0.066 1.458408,-0.066 z"
          style="opacity:0.85714285;fill:#ffffff;fill-opacity:1;stroke:none" />
@@ -182,15 +138,7 @@
        y="1052.3622"
        x="0"
        id="image3013"
-       xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAXZJREFU
-OI2lUj1Iw1AQ/l5wKF1MKTaDiy7F3bEu6iS0Dh0EaREnQVoc1EVEkNDgYpbSqdBBhbpVLYhDbRYR
-3Cw42UkcSgzWgqKm9uccNCHBpBX94IN3j7vvvnfvGBHhP+B+k6RIAimS4Nipr4AiCTS5cfs3B+di
-wCzudAglUaCSaHfC3GZwtjVE08ltcJ4R2/2bdo3LgzRmRI31dNBqE/BaA5qajd7BYYTmFnCRHSUA
-GHATmN15ZIU1P4VjEXC+IIoZGQAQjkXg9QWhVZ/7zyAq19nxXhHdRhXtNiEq19mREbe6X0lEBCJC
-ORUg69ka5xM85RO8LTbOZkG30zCLyqkA6bpqE3Gj+YSPVhOhZBbWhRmPp+G2QAYYEUGRBArFVwF+
-7EeCrlZwo+QwsXzPnAQ4AJjafGBKbhdQrwBdtdEDHS+1994ODBTW/QQCCEB4aQXQ73C6f4Ko/OTY
-3fYLVuYTPOmVRdvk3ei4yodJHwHAfKbh3vkbn+0qFz9A+1qMAAAAAElFTkSuQmCC
-"
+       xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAXZJREFU OI2lUj1Iw1AQ/l5wKF1MKTaDiy7F3bEu6iS0Dh0EaREnQVoc1EVEkNDgYpbSqdBBhbpVLYhDbRYR 3Cw42UkcSgzWgqKm9uccNCHBpBX94IN3j7vvvnfvGBHhP+B+k6RIAimS4Nipr4AiCTS5cfs3B+di wCzudAglUaCSaHfC3GZwtjVE08ltcJ4R2/2bdo3LgzRmRI31dNBqE/BaA5qajd7BYYTmFnCRHSUA GHATmN15ZIU1P4VjEXC+IIoZGQAQjkXg9QWhVZ/7zyAq19nxXhHdRhXtNiEq19mREbe6X0lEBCJC ORUg69ka5xM85RO8LTbOZkG30zCLyqkA6bpqE3Gj+YSPVhOhZBbWhRmPp+G2QAYYEUGRBArFVwF+ 7EeCrlZwo+QwsXzPnAQ4AJjafGBKbhdQrwBdtdEDHS+1994ODBTW/QQCCEB4aQXQ73C6f4Ko/OTY 3fYLVuYTPOmVRdvk3ei4yodJHwHAfKbh3vkbn+0qFz9A+1qMAAAAAElFTkSuQmCC "
        height="16"
        width="16" />
   </g>
diff --git a/ui/org.eclipse.pde.runtime/icons/elcl16/up_nav.svg b/ui/org.eclipse.pde.runtime/icons/elcl16/up_nav.svg
index 3f607257aef..66281eec6f9 100644
--- a/ui/org.eclipse.pde.runtime/icons/elcl16/up_nav.svg
+++ b/ui/org.eclipse.pde.runtime/icons/elcl16/up_nav.svg
@@ -2,25 +2,20 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.48.0 r9654"
-   sodipodi:docname="up_nav.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient3973"
-       inkscape:collect="always">
+       id="linearGradient3973">
       <stop
          id="stop3975"
          offset="0"
@@ -31,8 +26,7 @@
          style="stop-color:#f8f0c8;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       id="linearGradient3967"
-       inkscape:collect="always">
+       id="linearGradient3967">
       <stop
          id="stop3969"
          offset="0"
@@ -66,7 +60,6 @@
          style="stop-color:#ba772f;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3949">
       <stop
          style="stop-color:#9e6627;stop-opacity:1"
@@ -78,7 +71,6 @@
          id="stop3953" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient3967"
        id="linearGradient3939"
        gradientUnits="userSpaceOnUse"
@@ -88,7 +80,6 @@
        x2="531.09253"
        y2="371.17883" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient3955"
        id="linearGradient3945"
        gradientUnits="userSpaceOnUse"
@@ -103,12 +94,9 @@
       <path
          style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;display:inline"
          d="m 462.77563,373.22885 29.11636,0 c 1.45425,0 2.625,1.17075 2.625,2.625 l 0,18.76896 c 0,1.45425 -1.17412,2.52598 -2.625,2.625 l -29.11636,1.98708 c -1.45088,0.099 -2.625,-1.17075 -2.625,-2.625 l 0,-20.75604 c 0,-1.45425 1.17075,-2.625 2.625,-2.625 z"
-         id="path4919"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="sssssssss" />
+         id="path4919" />
     </mask>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient3973"
        id="linearGradient4933"
        gradientUnits="userSpaceOnUse"
@@ -118,7 +106,6 @@
        x2="538.00562"
        y2="374.21222" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient3949"
        id="linearGradient4935"
        gradientUnits="userSpaceOnUse"
@@ -139,7 +126,6 @@
          id="stop5152" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient5148"
        id="linearGradient9162"
        x1="28.901876"
@@ -148,29 +134,6 @@
        y2="1042.0194"
        gradientUnits="userSpaceOnUse" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="16"
-     inkscape:cx="7.5096396"
-     inkscape:cy="4.8192667"
-     inkscape:document-units="px"
-     inkscape:current-layer="g7604-8"
-     showgrid="true"
-     inkscape:window-width="964"
-     inkscape:window-height="940"
-     inkscape:window-x="1234"
-     inkscape:window-y="421"
-     inkscape:window-maximized="0"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3947" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -184,8 +147,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
@@ -208,29 +169,23 @@
         <path
            style="fill:url(#linearGradient4933);fill-opacity:1;stroke:url(#linearGradient4935);stroke-width:3.02792978;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
            d="m 463.24874,368.76025 28.07551,0 c 1.45425,0 2.625,1.17075 2.625,2.625 l 0,18.92132 c 0,1.45425 -1.17074,2.62799 -2.625,2.625 l -28.07551,-0.0577 c -1.45425,-0.003 -2.625,-1.17075 -2.625,-2.625 l 0,-18.86359 c 0,-1.45425 1.17075,-2.625 2.625,-2.625 z"
-           id="rect13693"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="sssssssss" />
+           id="rect13693" />
         <path
            style="fill:none;stroke:url(#linearGradient3945);stroke-width:3.02792978;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
            d="m 462.26171,368.76025 20.09375,0"
-           id="path13797"
-           inkscape:connector-curvature="0" />
+           id="path13797" />
         <g
            id="g4914"
            mask="url(#mask4917)" />
         <g
            transform="matrix(0,-1.5754342,-1.5754342,0,2121.9777,401.22933)"
            style="display:inline"
-           id="layer1-9"
-           inkscape:label="Layer 1">
+           id="layer1-9">
           <g
              style="display:inline"
              id="g7604-8"
              transform="matrix(-1.6126329,0,0,-1.6126329,46.005373,2723.8623)">
             <path
-               sodipodi:nodetypes="ccsssscscsssszcc"
-               inkscape:connector-curvature="0"
                id="path7582-2"
                d="m 22.661327,1040.1179 0,-1.8566 c 0,0 -0.41258,-0.9799 -1.598748,-0.051 -1.186168,0.9283 -2.578626,2.424 -2.784917,2.8365 -0.206289,0.4127 -1.083079,1.1348 0.103147,2.2693 0.190189,0.1819 0.383029,0.3651 0.572781,0.5446 0.993695,0.9397 1.902701,1.7761 1.902701,1.7761 0,0 1.805038,1.7019 1.805038,0.1027 0,-1.5987 0,-2.1145 0,-2.1145 0.703285,0.019 2.652411,-0.1465 3.127354,0.1495 0.771951,0.4815 1.680072,0.9857 2.359903,3.5016 0.129381,0.4789 0.692227,-1.6976 0.631549,-3.065 -0.06353,-1.4316 -0.643779,-2.3394 -1.344769,-2.992 -0.980677,-0.913 -0.951882,-0.8604 -1.564157,-1.0288 -0.612276,-0.1685 -1.83184,-0.1097 -1.83184,-0.1097 z"
                style="fill:url(#linearGradient9162);fill-opacity:1;stroke:#1a659c;stroke-width:0.95345461;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
diff --git a/ui/org.eclipse.pde.runtime/icons/eview16/horizontal_view.svg b/ui/org.eclipse.pde.runtime/icons/eview16/horizontal_view.svg
index e3ef05116fa..9f0f0873765 100644
--- a/ui/org.eclipse.pde.runtime/icons/eview16/horizontal_view.svg
+++ b/ui/org.eclipse.pde.runtime/icons/eview16/horizontal_view.svg
@@ -2,25 +2,20 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.48.0 r9654"
-   sodipodi:docname="det_pane_right.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient4810"
-       inkscape:collect="always">
+       id="linearGradient4810">
       <stop
          id="stop4812"
          offset="0"
@@ -31,7 +26,6 @@
          style="stop-color:#8694ae;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient5057"
        id="linearGradient5065"
        x1="6"
@@ -41,7 +35,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(2,-2.000037)" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient5057">
       <stop
          style="stop-color:#677da9;stop-opacity:1;"
@@ -53,7 +46,6 @@
          id="stop5061" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient5067"
        id="linearGradient5063"
        x1="8"
@@ -63,8 +55,7 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(2,-2.000037)" />
     <linearGradient
-       id="linearGradient5067"
-       inkscape:collect="always">
+       id="linearGradient5067">
       <stop
          id="stop5069"
          offset="0"
@@ -83,10 +74,8 @@
        gradientTransform="matrix(0.43809804,0,0,0.47690359,1.974207,6.5201176)"
        gradientUnits="userSpaceOnUse"
        id="radialGradient5038"
-       xlink:href="#linearGradient4962-2"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4962-2" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4962-2">
       <stop
          style="stop-color:#7cb87d;stop-opacity:1"
@@ -105,10 +94,8 @@
        gradientTransform="translate(18,-4.000037)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient5062"
-       xlink:href="#linearGradient4910-4"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4910-4" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4910-4">
       <stop
          style="stop-color:#ffffff;stop-opacity:0"
@@ -127,11 +114,9 @@
        gradientUnits="userSpaceOnUse"
        id="linearGradient4975-2"
        xlink:href="#linearGradient4994-4"
-       inkscape:collect="always"
        gradientTransform="translate(18,-4.000037)" />
     <linearGradient
-       id="linearGradient4994-4"
-       inkscape:collect="always">
+       id="linearGradient4994-4">
       <stop
          id="stop4996-5"
          offset="0"
@@ -149,10 +134,8 @@
        gradientTransform="translate(0,2.000063)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient4121"
-       xlink:href="#linearGradient4810"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4810" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient5057-7">
       <stop
          style="stop-color:#677da9;stop-opacity:1;"
@@ -172,10 +155,8 @@
        gradientTransform="matrix(0.43809804,0,0,0.47690359,1.974207,6.5201176)"
        gradientUnits="userSpaceOnUse"
        id="radialGradient5038-5"
-       xlink:href="#linearGradient4962-2-2"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4962-2-2" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4962-2-2">
       <stop
          style="stop-color:#7cb87d;stop-opacity:1"
@@ -194,8 +175,7 @@
        gradientTransform="translate(2,-10.0001)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient4190"
-       xlink:href="#linearGradient5057-7"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient5057-7" />
     <linearGradient
        y2="1050.8623"
        x2="11"
@@ -204,10 +184,8 @@
        gradientTransform="translate(2,-6.0000216)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient4058"
-       xlink:href="#linearGradient5057-4"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient5057-4" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient5057-4">
       <stop
          style="stop-color:#677da9;stop-opacity:1;"
@@ -227,10 +205,8 @@
        gradientTransform="matrix(0.43809804,0,0,0.47690359,1.974207,6.5201176)"
        gradientUnits="userSpaceOnUse"
        id="radialGradient5038-5-1"
-       xlink:href="#linearGradient4962-2-2-7"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4962-2-2-7" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4962-2-2-7">
       <stop
          style="stop-color:#7cb87d;stop-opacity:1"
@@ -249,10 +225,8 @@
        gradientTransform="translate(2,-10.000122)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient4190-9"
-       xlink:href="#linearGradient5057-7-4"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient5057-7-4" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient5057-7-4">
       <stop
          style="stop-color:#677da9;stop-opacity:1;"
@@ -271,11 +245,9 @@
        gradientUnits="userSpaceOnUse"
        id="linearGradient4975-2-2"
        xlink:href="#linearGradient4994-4-4"
-       inkscape:collect="always"
        gradientTransform="translate(18,-4.0000216)" />
     <linearGradient
-       id="linearGradient4994-4-4"
-       inkscape:collect="always">
+       id="linearGradient4994-4-4">
       <stop
          id="stop4996-5-5"
          offset="0"
@@ -293,10 +265,8 @@
        gradientTransform="translate(18,-4.0000216)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient5062-1"
-       xlink:href="#linearGradient4910-4-7"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4910-4-7" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4910-4-7">
       <stop
          style="stop-color:#ffffff;stop-opacity:0"
@@ -316,10 +286,8 @@
        gradientTransform="matrix(0.43809804,0,0,0.47690359,1.974207,6.5201176)"
        gradientUnits="userSpaceOnUse"
        id="radialGradient5038-52"
-       xlink:href="#linearGradient4962-2-7"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4962-2-7" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4962-2-7">
       <stop
          style="stop-color:#7cb87d;stop-opacity:1"
@@ -331,7 +299,6 @@
          id="stop4966-1-1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient5057-2"
        id="linearGradient5065-4"
        x1="6"
@@ -341,7 +308,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(2,-2.0000216)" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient5057-2">
       <stop
          style="stop-color:#677da9;stop-opacity:1;"
@@ -353,7 +319,6 @@
          id="stop5061-2" />
     </linearGradient>
     <radialGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4962-1"
        id="radialGradient4968-2"
        cx="3.5134368"
@@ -364,7 +329,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(0.43809804,0,0,0.47690359,1.974207,6.5201176)" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4962-1">
       <stop
          style="stop-color:#7cb87d;stop-opacity:1"
@@ -376,8 +340,7 @@
          id="stop4966-8" />
     </linearGradient>
     <linearGradient
-       id="linearGradient4810-7"
-       inkscape:collect="always">
+       id="linearGradient4810-7">
       <stop
          id="stop4812-6"
          offset="0"
@@ -395,10 +358,8 @@
        gradientTransform="translate(0,2.0000784)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient4132"
-       xlink:href="#linearGradient4810-7"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4810-7" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4828"
        id="linearGradient4834"
        x1="4.7883506"
@@ -407,7 +368,6 @@
        y2="2.6943195"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4828">
       <stop
          style="stop-color:#3979bd;stop-opacity:1;"
@@ -425,10 +385,8 @@
        x1="4.7883506"
        gradientUnits="userSpaceOnUse"
        id="linearGradient4851"
-       xlink:href="#linearGradient4828-8"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4828-8" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4828-8">
       <stop
          style="stop-color:#3979bd;stop-opacity:1;"
@@ -447,10 +405,8 @@
        gradientTransform="translate(-2.0043468,4.9932789)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient4148"
-       xlink:href="#linearGradient4818"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4818" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4818">
       <stop
          style="stop-color:#eb9186;stop-opacity:1;"
@@ -469,11 +425,9 @@
        gradientUnits="userSpaceOnUse"
        id="linearGradient4975-2-23"
        xlink:href="#linearGradient4994-4-3"
-       inkscape:collect="always"
        gradientTransform="translate(24.000001,-4.0000211)" />
     <linearGradient
-       id="linearGradient4994-4-3"
-       inkscape:collect="always">
+       id="linearGradient4994-4-3">
       <stop
          id="stop4996-5-4"
          offset="0"
@@ -491,10 +445,8 @@
        gradientTransform="translate(24.000001,-4.0000211)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient5062-13"
-       xlink:href="#linearGradient4910-4-8"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4910-4-8" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4910-4-8">
       <stop
          style="stop-color:#ffffff;stop-opacity:0"
@@ -506,8 +458,7 @@
          id="stop4914-8-4" />
     </linearGradient>
     <linearGradient
-       id="linearGradient4810-77"
-       inkscape:collect="always">
+       id="linearGradient4810-77">
       <stop
          id="stop4812-9"
          offset="0"
@@ -525,34 +476,8 @@
        gradientTransform="translate(-0.99999834,2.0000789)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient5043"
-       xlink:href="#linearGradient4810-77"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4810-77" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="22.627416"
-     inkscape:cx="6.5803002"
-     inkscape:cy="1.8680609"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1597"
-     inkscape:window-height="1136"
-     inkscape:window-x="75"
-     inkscape:window-y="75"
-     inkscape:window-maximized="0"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3999" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -566,8 +491,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
@@ -588,113 +511,68 @@
     <path
        style="fill:url(#linearGradient5065);fill-opacity:1;stroke:none;display:inline"
        d="m 8,1048.3622 0,0.091 0,0.9091 5,0 0,-0.9091 0,-0.091 z"
-       id="rect4816-1-1-4"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccc" />
+       id="rect4816-1-1-4" />
     <path
        style="fill:url(#linearGradient5063);fill-opacity:1;stroke:none;display:inline"
        d="m 10,1044.3622 0,0.091 0,0.9091 3,0 0,-0.9091 0,-0.091 z"
-       id="rect4816-1-1-4-2"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccc" />
+       id="rect4816-1-1-4-2" />
     <path
-       sodipodi:type="arc"
        style="fill:url(#radialGradient5038);fill-opacity:1;stroke:#379860;stroke-width:1.34009874;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
        id="path4959-6"
-       sodipodi:cx="3.5134368"
-       sodipodi:cy="12.464466"
-       sodipodi:rx="1.5026019"
-       sodipodi:ry="1.5026019"
        d="m 5.0160387,12.464466 c 0,0.829864 -0.6727378,1.502602 -1.5026019,1.502602 -0.8298641,0 -1.5026019,-0.672738 -1.5026019,-1.502602 0,-0.829864 0.6727378,-1.502602 1.5026019,-1.502602 0.8298641,0 1.5026019,0.672738 1.5026019,1.502602 z"
        transform="matrix(0.68773292,0,0,0.68773292,3.0805578,1040.2821)" />
     <path
        style="fill:url(#linearGradient5062);fill-opacity:1;stroke:none;display:inline"
        d="m 4,1039.3622 0,12 -1,0 0,-13 z"
-       id="rect4853-82-7"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+       id="rect4853-82-7" />
     <path
        style="fill:url(#linearGradient4975-2);fill-opacity:1;stroke:none;display:inline"
        d="m 4,1039.3622 10,0 0,-1 -11,0 z"
-       id="rect4853-82-0"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+       id="rect4853-82-0" />
     <path
        style="fill:url(#linearGradient4190);fill-opacity:1;stroke:none;display:inline"
        d="m 8,1040.3622 0,0.091 0,0.9091 5,0 0,-0.9091 0,-0.091 z"
-       id="rect4816-1-1-4-1"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccc" />
+       id="rect4816-1-1-4-1" />
     <path
-       sodipodi:type="arc"
        style="fill:url(#radialGradient5038-5);fill-opacity:1;stroke:#379860;stroke-width:1.34009874;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
        id="path4959-6-4"
-       sodipodi:cx="3.5134368"
-       sodipodi:cy="12.464466"
-       sodipodi:rx="1.5026019"
-       sodipodi:ry="1.5026019"
        d="m 5.0160387,12.464466 c 0,0.829864 -0.6727378,1.502602 -1.5026019,1.502602 -0.8298641,0 -1.5026019,-0.672738 -1.5026019,-1.502602 0,-0.829864 0.6727378,-1.502602 1.5026019,-1.502602 0.8298641,0 1.5026019,0.672738 1.5026019,1.502602 z"
        transform="matrix(0.68773292,0,0,0.68773292,3.0805578,1032.2821)" />
     <path
-       sodipodi:type="arc"
        style="fill:url(#radialGradient4968-2);fill-opacity:1;stroke:#379860;stroke-width:1.34009874;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
        id="path4959-9"
-       sodipodi:cx="3.5134368"
-       sodipodi:cy="12.464466"
-       sodipodi:rx="1.5026019"
-       sodipodi:ry="1.5026019"
        d="m 5.0160387,12.464466 c 0,0.829864 -0.6727378,1.502602 -1.5026019,1.502602 -0.8298641,0 -1.5026019,-0.672738 -1.5026019,-1.502602 0,-0.829864 0.6727378,-1.502602 1.5026019,-1.502602 0.8298641,0 1.5026019,0.672738 1.5026019,1.502602 z"
        transform="matrix(0.68773292,0,0,0.68773292,3.0805578,1036.2821)" />
     <path
        style="fill:url(#linearGradient5065-4);fill-opacity:1;stroke:none;display:inline"
        d="m 8,1048.3622 0,0.091 0,0.9091 5,0 0,-0.9091 0,-0.091 z"
-       id="rect4816-1-1-4-27"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccc" />
+       id="rect4816-1-1-4-27" />
     <path
-       sodipodi:type="arc"
        style="fill:url(#radialGradient5038-52);fill-opacity:1;stroke:#379860;stroke-width:1.34009874;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
        id="path4959-6-9"
-       sodipodi:cx="3.5134368"
-       sodipodi:cy="12.464466"
-       sodipodi:rx="1.5026019"
-       sodipodi:ry="1.5026019"
        d="m 5.0160387,12.464466 c 0,0.829864 -0.6727378,1.502602 -1.5026019,1.502602 -0.8298641,0 -1.5026019,-0.672738 -1.5026019,-1.502602 0,-0.829864 0.6727378,-1.502602 1.5026019,-1.502602 0.8298641,0 1.5026019,0.672738 1.5026019,1.502602 z"
        transform="matrix(0.68773292,0,0,0.68773292,3.0805578,1040.2821)" />
     <path
        style="fill:url(#linearGradient5062-1);fill-opacity:1;stroke:none;display:inline"
        d="m 4,1039.3622 0,12 -1,0 0,-13 z"
-       id="rect4853-82-7-5"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+       id="rect4853-82-7-5" />
     <path
        style="fill:url(#linearGradient4975-2-2);fill-opacity:1;stroke:none;display:inline"
        d="m 4,1039.3622 10,0 0,-1 -11,0 z"
-       id="rect4853-82-0-4"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+       id="rect4853-82-0-4" />
     <path
        style="fill:url(#linearGradient4190-9);fill-opacity:1;stroke:none;display:inline"
        d="m 8,1040.3622 0,0.091 0,0.9091 5,0 0,-0.9091 0,-0.091 z"
-       id="rect4816-1-1-4-1-3"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccc" />
+       id="rect4816-1-1-4-1-3" />
     <path
-       sodipodi:type="arc"
        style="fill:url(#radialGradient5038-5-1);fill-opacity:1;stroke:#379860;stroke-width:1.34009874;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
        id="path4959-6-4-1"
-       sodipodi:cx="3.5134368"
-       sodipodi:cy="12.464466"
-       sodipodi:rx="1.5026019"
-       sodipodi:ry="1.5026019"
        d="m 5.0160387,12.464466 c 0,0.829864 -0.6727378,1.502602 -1.5026019,1.502602 -0.8298641,0 -1.5026019,-0.672738 -1.5026019,-1.502602 0,-0.829864 0.6727378,-1.502602 1.5026019,-1.502602 0.8298641,0 1.5026019,0.672738 1.5026019,1.502602 z"
        transform="matrix(0.68773292,0,0,0.68773292,3.0805578,1032.2821)" />
     <path
        style="fill:url(#linearGradient4058);fill-opacity:1;stroke:none;display:inline"
        d="m 8,1044.3622 0,0.091 0,0.9091 5,0 0,-0.9091 0,-0.091 z"
-       id="rect4816-1-1-4-4"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccc" />
+       id="rect4816-1-1-4-4" />
     <rect
        style="fill:#f4fcff;fill-opacity:1;stroke:url(#linearGradient5043);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline"
        id="rect3997-9-1"
@@ -705,15 +583,11 @@
     <path
        style="fill:url(#linearGradient5062-13);fill-opacity:1;stroke:none;display:inline"
        d="m 10.000001,1039.3622 0,12 -0.9999993,0 0,-13 z"
-       id="rect4853-82-7-9"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+       id="rect4853-82-7-9" />
     <path
        style="fill:url(#linearGradient4975-2-23);fill-opacity:1;stroke:none;display:inline"
        d="m 10.000001,1039.3622 4,0 0,-1 -4.9999993,0 z"
-       id="rect4853-82-0-8"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+       id="rect4853-82-0-8" />
     <rect
        style="fill:url(#linearGradient4148);fill-opacity:1;stroke:none;display:inline"
        id="rect4816"
@@ -722,35 +596,13 @@
        x="9.9837475"
        y="1043.368" />
     <path
-       sodipodi:type="star"
        style="fill:url(#linearGradient4851);fill-opacity:1;stroke:none;display:inline"
        id="path4826-4"
-       sodipodi:sides="3"
-       sodipodi:cx="5.4137864"
-       sodipodi:cy="3.9570875"
-       sodipodi:r1="1.7673526"
-       sodipodi:r2="0.88367629"
-       sodipodi:arg1="-0.78539816"
-       sodipodi:arg2="0.26179939"
-       inkscape:flatsided="false"
-       inkscape:rounded="0"
-       inkscape:randomized="0"
        d="M 6.6634934,2.7073805 6.2673522,4.1857998 5.8712109,5.664219 4.7889329,4.581941 3.7066549,3.499663 5.1850742,3.1035218 z"
        transform="matrix(0.69344277,-0.80123508,0.69016627,0.80041974,5.0194,1050.5327)" />
     <path
-       sodipodi:type="star"
        style="fill:url(#linearGradient4834);fill-opacity:1;stroke:none;display:inline"
        id="path4826"
-       sodipodi:sides="3"
-       sodipodi:cx="5.4137864"
-       sodipodi:cy="3.9570875"
-       sodipodi:r1="1.7673526"
-       sodipodi:r2="0.88367629"
-       sodipodi:arg1="-0.78539816"
-       sodipodi:arg2="0.26179939"
-       inkscape:flatsided="false"
-       inkscape:rounded="0"
-       inkscape:randomized="0"
        d="M 6.6634934,2.7073805 6.2673522,4.1857998 5.8712109,5.664219 4.7889329,4.581941 3.7066549,3.499663 5.1850742,3.1035218 z"
        transform="matrix(0.69996579,-0.81479642,0.71417637,0.79858371,4.9096621,1042.5853)" />
   </g>
diff --git a/ui/org.eclipse.pde.runtime/icons/eview16/registry.svg b/ui/org.eclipse.pde.runtime/icons/eview16/registry.svg
index f294b08bc1f..ad07f307bdc 100644
--- a/ui/org.eclipse.pde.runtime/icons/eview16/registry.svg
+++ b/ui/org.eclipse.pde.runtime/icons/eview16/registry.svg
@@ -2,20 +2,16 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="restore_log.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
@@ -45,26 +41,21 @@
        maskUnits="userSpaceOnUse"
        id="mask7366">
       <path
-         sodipodi:nodetypes="ccccccc"
-         inkscape:connector-curvature="0"
          id="path7368"
          d="m -16.593048,1040.862 9.990206,0 0,10.0018 -2.983353,3.0385 -5.966213,0 c -0.53033,-0.022 -1.04064,-0.5519 -1.04064,-1.0385 z"
          style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;display:inline" />
     </mask>
     <filter
-       inkscape:collect="always"
        id="filter7378"
-       x="-0.11264625"
-       width="1.2252925"
-       y="-0.44767511"
-       height="1.8953502">
+       x="-0.23764625"
+       width="1.4752925"
+       y="-0.94444611"
+       height="2.8888922">
       <feGaussianBlur
-         inkscape:collect="always"
          stdDeviation="0.3754875"
          id="feGaussianBlur7380" />
     </filter>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient7087"
        id="linearGradient7541"
        gradientUnits="userSpaceOnUse"
@@ -104,8 +95,7 @@
        gradientTransform="translate(-18,4.7e-5)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient7117"
-       xlink:href="#linearGradient7087-7"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient7087-7" />
     <linearGradient
        id="linearGradient7087-7-4">
       <stop
@@ -137,8 +127,7 @@
        gradientTransform="translate(-16,4.7e-5)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient7160"
-       xlink:href="#linearGradient7087-7-4"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient7087-7-4" />
     <linearGradient
        id="linearGradient7087-7-4-2">
       <stop
@@ -170,8 +159,7 @@
        gradientTransform="translate(-14,4.7e-5)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient7203"
-       xlink:href="#linearGradient7087-7-4-2"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient7087-7-4-2" />
     <linearGradient
        id="linearGradient7087-7-4-2-2">
       <stop
@@ -203,30 +191,7 @@
        gradientTransform="translate(-12,4.7e-5)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient7246"
-       xlink:href="#linearGradient7087-7-4-2-2"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient7584-5">
-      <stop
-         style="stop-color:#f9cd5f;stop-opacity:1"
-         offset="0"
-         id="stop7586-4" />
-      <stop
-         style="stop-color:#fbf0b4;stop-opacity:1"
-         offset="1"
-         id="stop7588-5" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient7592-1">
-      <stop
-         style="stop-color:#bd8416;stop-opacity:1"
-         offset="0"
-         id="stop7594-6" />
-      <stop
-         style="stop-color:#a66b10;stop-opacity:1"
-         offset="1"
-         id="stop7596-9" />
-    </linearGradient>
+       xlink:href="#linearGradient7087-7-4-2-2" />
     <linearGradient
        gradientTransform="matrix(0.72293526,0,0,1,-0.03086799,-2091.7193)"
        gradientUnits="userSpaceOnUse"
@@ -235,10 +200,8 @@
        y1="1047.8571"
        x1="7.0070496"
        id="linearGradient4871"
-       xlink:href="#linearGradient5147"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient5147" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient5147">
       <stop
          style="stop-color:#91a5c7;stop-opacity:1;"
@@ -257,8 +220,7 @@
        y1="1045.8571"
        x1="7.0070496"
        id="linearGradient4869"
-       xlink:href="#linearGradient5147"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient5147" />
     <linearGradient
        gradientTransform="matrix(0.82571734,0,0,1,-0.75106699,-2091.7193)"
        gradientUnits="userSpaceOnUse"
@@ -267,10 +229,8 @@
        y1="1043.8571"
        x1="7.0070496"
        id="linearGradient4867"
-       xlink:href="#linearGradient4877"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4877" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4877">
       <stop
          style="stop-color:#91a5c7;stop-opacity:1;"
@@ -289,8 +249,7 @@
        y1="1047.8571"
        x1="7.0070496"
        id="linearGradient4871-8"
-       xlink:href="#linearGradient5147"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient5147" />
     <linearGradient
        id="linearGradient4284">
       <stop
@@ -321,21 +280,6 @@
          offset="1"
          style="stop-color:#ebb313;stop-opacity:1" />
     </linearGradient>
-    <linearGradient
-       id="linearGradient10440-1-0-0-3">
-      <stop
-         id="stop10442-43-2-0-9"
-         offset="0"
-         style="stop-color:#ae7603;stop-opacity:1;" />
-      <stop
-         style="stop-color:#e8d8a3;stop-opacity:1"
-         offset="0.5"
-         id="stop10521-1-2-5-3" />
-      <stop
-         id="stop10444-3-4-0-4"
-         offset="1"
-         style="stop-color:#bb9221;stop-opacity:1" />
-    </linearGradient>
     <linearGradient
        id="linearGradient10748-8">
       <stop
@@ -427,36 +371,6 @@
          offset="1"
          style="stop-color:#809dcb;stop-opacity:1" />
     </linearGradient>
-    <linearGradient
-       id="linearGradient10396-5">
-      <stop
-         id="stop10398-7"
-         offset="0"
-         style="stop-color:#1b3e79;stop-opacity:1;" />
-      <stop
-         style="stop-color:#728fbf;stop-opacity:1"
-         offset="0.5"
-         id="stop10404-9" />
-      <stop
-         id="stop10400-9"
-         offset="1"
-         style="stop-color:#1f4d9a;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10149-6-5-4">
-      <stop
-         id="stop10151-5-7-2"
-         offset="0"
-         style="stop-color:#1f4d9a;stop-opacity:1" />
-      <stop
-         style="stop-color:#b9c7df;stop-opacity:1"
-         offset="0.5"
-         id="stop10394-3" />
-      <stop
-         id="stop10153-8-1-2"
-         offset="1"
-         style="stop-color:#567ebc;stop-opacity:1" />
-    </linearGradient>
     <linearGradient
        y2="518.28192"
        x2="323.98331"
@@ -465,8 +379,7 @@
        gradientTransform="matrix(0.28984397,0,0,0.32432277,-81.608152,874.91954)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient10770-6"
-       xlink:href="#linearGradient10448-9-7-0-5"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient10448-9-7-0-5" />
     <linearGradient
        y2="515.53949"
        x2="324.1601"
@@ -475,8 +388,7 @@
        gradientTransform="matrix(0.29647957,0,0,0.30390146,-83.81694,885.61311)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient10774-5"
-       xlink:href="#linearGradient10748-8"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient10748-8" />
     <linearGradient
        gradientTransform="matrix(0.30039597,0,0,0.29632024,-87.12885,889.63566)"
        y2="511.66458"
@@ -485,8 +397,7 @@
        x1="324.1601"
        gradientUnits="userSpaceOnUse"
        id="linearGradient10778-6"
-       xlink:href="#linearGradient10448-90"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient10448-90" />
     <linearGradient
        gradientTransform="matrix(0.27903303,0,0,0.27903303,-80.383503,898.62929)"
        y2="519.08923"
@@ -495,8 +406,7 @@
        x1="298.34253"
        gradientUnits="userSpaceOnUse"
        id="linearGradient10782-3"
-       xlink:href="#linearGradient10414-9"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient10414-9" />
     <linearGradient
        gradientTransform="matrix(0.27903303,0,0,0.27903303,-80.383503,898.62929)"
        y2="519.36218"
@@ -505,8 +415,7 @@
        x1="289.8125"
        gradientUnits="userSpaceOnUse"
        id="linearGradient10784-2"
-       xlink:href="#linearGradient10432-3"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient10432-3" />
     <linearGradient
        gradientTransform="matrix(0.28995536,0,0,0.16531775,-83.833594,958.22386)"
        y2="514.75818"
@@ -515,8 +424,7 @@
        x1="306.05069"
        gradientUnits="userSpaceOnUse"
        id="linearGradient10786-1"
-       xlink:href="#linearGradient10157-6"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient10157-6" />
     <linearGradient
        y2="542.73901"
        x2="305"
@@ -525,8 +433,7 @@
        gradientTransform="matrix(0.27929794,0,0,0.27455303,-80.466752,901.06458)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient10790-8"
-       xlink:href="#linearGradient10157-6"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient10157-6" />
     <linearGradient
        y2="504.44818"
        x2="322.875"
@@ -535,11 +442,9 @@
        gradientTransform="matrix(0.27929794,0,0,0.27455303,-80.466752,901.06458)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient10792-6"
-       xlink:href="#linearGradient10149-39-0"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient10149-39-0" />
     <linearGradient
-       id="linearGradient10149-39-0"
-       inkscape:collect="always">
+       id="linearGradient10149-39-0">
       <stop
          id="stop10151-3-0"
          offset="0"
@@ -557,34 +462,8 @@
        gradientTransform="matrix(0.09367554,0,0,0.16487513,-23.823728,957.45703)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient10790-8-2"
-       xlink:href="#linearGradient4284"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4284" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="5.6568545"
-     inkscape:cx="2.7874265"
-     inkscape:cy="-6.4432563"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1208"
-     inkscape:window-height="847"
-     inkscape:window-x="1144"
-     inkscape:window-y="599"
-     inkscape:window-maximized="0"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid6272" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -598,8 +477,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
@@ -609,11 +486,8 @@
       <g
          transform="translate(-18.599558,-2.010247)"
          style="display:inline"
-         id="layer1-8"
-         inkscape:label="Layer 1">
+         id="layer1-8">
         <path
-           sodipodi:nodetypes="ccccccc"
-           inkscape:connector-curvature="0"
            id="rect3997-9"
            d="m 2.9043501,1039.2874 11.0066719,0 0.486136,10.5764 -2.983353,3.0385 -6.982679,0 c -0.53033,-0.022 -1.04064,-0.5519 -1.04064,-1.0385 z"
            style="display:inline;fill:#e6f8ff;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1" />
@@ -625,14 +499,10 @@
            x="2.9007957"
            y="1052.3395" />
         <path
-           sodipodi:nodetypes="cccc"
-           inkscape:connector-curvature="0"
            id="rect3997-9-4"
            d="m 10.885887,1049.3225 3.997407,0 -3.99982,4.0737 z"
            style="display:inline;fill:#e6c8ad;fill-opacity:1;stroke:none" />
         <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
            id="rect3997-9-4-5"
            d="m 11.604042,1053.3998 3.274053,-3.3145 0.0052,-0.7628 -3.99982,4.0737 z"
            style="display:inline;fill:#d4b268;fill-opacity:1;stroke:none;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
@@ -647,32 +517,22 @@
                style="display:inline;opacity:0.75;stroke:#ffffff;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;filter:url(#filter7378)"
                id="g7205-6">
               <path
-                 sodipodi:nodetypes="cc"
-                 inkscape:connector-curvature="0"
                  id="path7045-6"
                  d="m -15.584151,1041.8789 0,-2.013"
                  style="fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
               <path
-                 sodipodi:nodetypes="cc"
-                 inkscape:connector-curvature="0"
                  id="path7045-0-6"
                  d="m -13.584151,1041.8789 0,-2.013"
                  style="display:inline;fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
               <path
-                 sodipodi:nodetypes="cc"
-                 inkscape:connector-curvature="0"
                  id="path7045-3-5"
                  d="m -11.584151,1041.8789 0,-2.013"
                  style="display:inline;fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
               <path
-                 sodipodi:nodetypes="cc"
-                 inkscape:connector-curvature="0"
                  id="path7045-3-4-1"
                  d="m -9.584151,1041.8789 0,-2.013"
                  style="display:inline;fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
               <path
-                 sodipodi:nodetypes="cc"
-                 inkscape:connector-curvature="0"
                  id="path7045-3-4-7-2"
                  d="m -7.584151,1041.8789 0,-2.013"
                  style="display:inline;fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
@@ -684,33 +544,23 @@
             <path
                style="fill:none;stroke:url(#linearGradient7541);stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
                d="m -15.584151,1041.8789 0,-2.013"
-               id="path7045"
-               inkscape:connector-curvature="0"
-               sodipodi:nodetypes="cc" />
+               id="path7045" />
             <path
                style="display:inline;fill:none;stroke:url(#linearGradient7117);stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
                d="m -13.584151,1041.8789 0,-2.013"
-               id="path7045-8"
-               inkscape:connector-curvature="0"
-               sodipodi:nodetypes="cc" />
+               id="path7045-8" />
             <path
                style="display:inline;fill:none;stroke:url(#linearGradient7160);stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
                d="m -11.584151,1041.8789 0,-2.013"
-               id="path7045-8-1"
-               inkscape:connector-curvature="0"
-               sodipodi:nodetypes="cc" />
+               id="path7045-8-1" />
             <path
                style="display:inline;fill:none;stroke:url(#linearGradient7203);stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
                d="m -9.584151,1041.8789 0,-2.013"
-               id="path7045-8-1-3"
-               inkscape:connector-curvature="0"
-               sodipodi:nodetypes="cc" />
+               id="path7045-8-1-3" />
             <path
                style="display:inline;fill:none;stroke:url(#linearGradient7246);stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
                d="m -7.584151,1041.8789 0,-2.013"
-               id="path7045-8-1-3-6"
-               inkscape:connector-curvature="0"
-               sodipodi:nodetypes="cc" />
+               id="path7045-8-1-3-6" />
           </g>
         </g>
         <g
@@ -777,7 +627,6 @@
     <g
        style="display:inline"
        id="layer1-0"
-       inkscape:label="Layer 1"
        transform="translate(0.04635446,-1.9913314)">
       <rect
          ry="0"
@@ -789,18 +638,14 @@
          id="rect10007-0-74-2-7-6"
          style="fill:url(#linearGradient10770-6);fill-opacity:1;stroke:none;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
       <path
-         inkscape:connector-curvature="0"
          id="path4313-8-8"
          d="m 12.648438,1043.3652 0,1 3.351562,0 0,-1 -3.351562,0 z"
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
       <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
          id="path4313-8-8-7"
          d="m 12.981809,1043.3594 0,3.0195 1.01551,0 0,-3.0195 z"
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.94926554px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
       <path
-         inkscape:connector-curvature="0"
          id="path4313-5-1-8"
          d="m 15.992188,1045.3613 -3.359376,0.031 0.0098,1 3.359375,-0.031 -0.0098,-1 z"
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#9e7400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
@@ -814,12 +659,10 @@
          id="rect10007-0-74-2-7"
          style="fill:url(#linearGradient10774-5);fill-opacity:1;stroke:none;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
       <path
-         inkscape:connector-curvature="0"
          id="path4313-5-1"
          d="m 13.005859,1046.3711 -3.3593746,0.031 0.00977,1 3.3593746,-0.031 -0.0098,-1 z"
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#9e7400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
       <path
-         inkscape:connector-curvature="0"
          id="path4313-8"
          d="m 12.996094,1042.3633 -3.3593752,0.031 0.00977,1 3.3593742,-0.031 -0.0098,-1 z"
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
@@ -860,12 +703,10 @@
          id="rect10007-0-74"
          style="fill:url(#linearGradient10786-1);fill-opacity:1;stroke:none;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
       <path
-         inkscape:connector-curvature="0"
          id="path4313"
          d="m 10.996094,1041.3613 -3.3593752,0.031 0.00977,1 3.3593742,-0.031 -0.0098,-1 z"
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
       <path
-         inkscape:connector-curvature="0"
          id="path4313-5"
          d="m 11.001953,1047.3613 -3.3593749,0.031 0.00977,1 3.3593749,-0.031 -0.0098,-1 z"
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#9e7400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
@@ -885,8 +726,6 @@
          id="rect10007-6-6"
          style="display:inline;fill:url(#linearGradient10790-8-2);fill-opacity:1;stroke:none;stroke-width:3.58380508;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
       <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
          id="path4313-8-8-7-8"
          d="m 11.003629,1043.3647 0,3.01 1.000277,0 0,-3.01 z"
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:0.64640886;fill-rule:evenodd;stroke:none;stroke-width:0.97351193px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
diff --git a/ui/org.eclipse.pde.runtime/icons/eview16/vertical_view.svg b/ui/org.eclipse.pde.runtime/icons/eview16/vertical_view.svg
index 8bae8e88223..11df326b778 100644
--- a/ui/org.eclipse.pde.runtime/icons/eview16/vertical_view.svg
+++ b/ui/org.eclipse.pde.runtime/icons/eview16/vertical_view.svg
@@ -2,25 +2,20 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.48.0 r9654"
-   sodipodi:docname="det_pane_under.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient4810"
-       inkscape:collect="always">
+       id="linearGradient4810">
       <stop
          id="stop4812"
          offset="0"
@@ -31,7 +26,6 @@
          style="stop-color:#8694ae;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient5057"
        id="linearGradient5065"
        x1="6"
@@ -41,7 +35,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(0.8,0,0,1,3.2,-10.000137)" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient5057">
       <stop
          style="stop-color:#677da9;stop-opacity:1;"
@@ -61,10 +54,8 @@
        gradientTransform="matrix(0.43809804,0,0,0.47690359,1.974207,6.5201176)"
        gradientUnits="userSpaceOnUse"
        id="radialGradient5038"
-       xlink:href="#linearGradient4962-2"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4962-2" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4962-2">
       <stop
          style="stop-color:#7cb87d;stop-opacity:1"
@@ -76,7 +67,6 @@
          id="stop4966-1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4910-4">
       <stop
          style="stop-color:#ffffff;stop-opacity:0"
@@ -88,8 +78,7 @@
          id="stop4914-8" />
     </linearGradient>
     <linearGradient
-       id="linearGradient4994-4"
-       inkscape:collect="always">
+       id="linearGradient4994-4">
       <stop
          id="stop4996-5"
          offset="0"
@@ -100,7 +89,6 @@
          style="stop-color:#ffffff;stop-opacity:0;" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4818">
       <stop
          style="stop-color:#eb9186;stop-opacity:1;"
@@ -119,10 +107,8 @@
        gradientTransform="translate(-8.0043468,8.9932942)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient4148"
-       xlink:href="#linearGradient4818"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4818" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4994-4"
        id="linearGradient4075"
        gradientUnits="userSpaceOnUse"
@@ -132,7 +118,6 @@
        x2="-11"
        y2="1044.3622" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4910-4"
        id="linearGradient4077"
        gradientUnits="userSpaceOnUse"
@@ -142,7 +127,6 @@
        x2="-15"
        y2="1047.3622" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4810"
        id="linearGradient4079"
        gradientUnits="userSpaceOnUse"
@@ -152,7 +136,6 @@
        x2="8.0137892"
        y2="1050.0707" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient5057-4">
       <stop
          style="stop-color:#677da9;stop-opacity:1;"
@@ -171,10 +154,8 @@
        gradientTransform="matrix(0.8,0,0,1,3.2,-2.0002)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient4123"
-       xlink:href="#linearGradient5057-4"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient5057-4" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4910-4-3">
       <stop
          style="stop-color:#ffffff;stop-opacity:0"
@@ -186,7 +167,6 @@
          id="stop4914-8-2" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4994-4-6"
        id="linearGradient4075-1"
        gradientUnits="userSpaceOnUse"
@@ -196,8 +176,7 @@
        x2="-11"
        y2="1044.3622" />
     <linearGradient
-       id="linearGradient4994-4-6"
-       inkscape:collect="always">
+       id="linearGradient4994-4-6">
       <stop
          id="stop4996-5-85"
          offset="0"
@@ -215,34 +194,8 @@
        gradientTransform="translate(18.000045,3)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient4268"
-       xlink:href="#linearGradient4910-4-3"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4910-4-3" />
   </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.708346"
-     inkscape:cy="9.4756409"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1241"
-     inkscape:window-height="814"
-     inkscape:window-x="50"
-     inkscape:window-y="50"
-     inkscape:window-maximized="0"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3999" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -256,8 +209,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
@@ -271,37 +222,24 @@
     <path
        style="fill:url(#linearGradient4077);fill-opacity:1;stroke:none;display:inline"
        d="m 4.0164621,1039.3622 -0.016462,5 -1,0 0.016462,-6 z"
-       id="rect4853-82-7"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+       id="rect4853-82-7" />
     <path
        style="fill:url(#linearGradient4075);fill-opacity:1;stroke:none;display:inline"
        d="m 4.0164621,1039.3622 9.9835379,0 0,-1 -10.9835379,0 z"
-       id="rect4853-82-0"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+       id="rect4853-82-0" />
     <path
        style="fill:url(#linearGradient5065);fill-opacity:1;stroke:none;display:inline"
        d="m 8,1040.3621 0,1.0001 5,0 0,-1.0001 z"
-       id="rect4816-1-1-4"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+       id="rect4816-1-1-4" />
     <path
-       sodipodi:type="arc"
        style="fill:url(#radialGradient5038);fill-opacity:1;stroke:#379860;stroke-width:1.34009874;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
        id="path4959-6"
-       sodipodi:cx="3.5134368"
-       sodipodi:cy="12.464466"
-       sodipodi:rx="1.5026019"
-       sodipodi:ry="1.5026019"
        d="m 5.0160387,12.464466 c 0,0.829864 -0.6727378,1.502602 -1.5026019,1.502602 -0.8298641,0 -1.5026019,-0.672738 -1.5026019,-1.502602 0,-0.829864 0.6727378,-1.502602 1.5026019,-1.502602 0.8298641,0 1.5026019,0.672738 1.5026019,1.502602 z"
        transform="matrix(0.68773292,0,0,0.68773292,3.080558,1032.282)" />
     <path
        style="fill:url(#linearGradient4123);fill-opacity:1;stroke:none;display:inline"
        d="m 8,1048.3621 0,1.0001 5,0 0,-1.0001 z"
-       id="rect4816-1-1-4-4"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+       id="rect4816-1-1-4-4" />
     <rect
        style="fill:url(#linearGradient4148);fill-opacity:1;stroke:none;display:inline"
        id="rect4816"
@@ -312,20 +250,14 @@
     <path
        style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#a5a699;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
        d="m 3,1044.3622 0,1 11,0 0,-1 z"
-       id="path4246"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+       id="path4246" />
     <path
        style="fill:url(#linearGradient4268);fill-opacity:1;stroke:none;display:inline"
        d="m 4,1046.3622 0,5 -1,0 0,-6 z"
-       id="rect4853-82-7-6"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+       id="rect4853-82-7-6" />
     <path
        style="fill:url(#linearGradient4075-1);fill-opacity:1;stroke:none;display:inline"
        d="m 4,1046.3622 9.983538,0 0,-1 -10.983538,0 z"
-       id="rect4853-82-0-1"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+       id="rect4853-82-0-1" />
   </g>
 </svg>
diff --git a/ui/org.eclipse.pde.runtime/icons/obj16/attr_xml_obj.svg b/ui/org.eclipse.pde.runtime/icons/obj16/attr_xml_obj.svg
index a82b405ab9a..e6cbb74acf8 100644
--- a/ui/org.eclipse.pde.runtime/icons/obj16/attr_xml_obj.svg
+++ b/ui/org.eclipse.pde.runtime/icons/obj16/attr_xml_obj.svg
@@ -2,46 +2,18 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="att_file_obj.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
-    <linearGradient
-       y2="462.11539"
-       x2="388.63736"
-       y1="478.18777"
-       x1="388.63736"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3929-5"
-       xlink:href="#linearGradient10798-1-9-3-7-6-8-9-0-9-1"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient10798-1-9-3-7-6-8-9-0-9-1">
-      <stop
-         style="stop-color:#7564b1;stop-opacity:1"
-         offset="0"
-         id="stop10800-5-2-1-8-20-6-4-9-8-2" />
-      <stop
-         id="stop10806-6-8-5-3-9-24-8-4-3-2"
-         offset="0.5"
-         style="stop-color:#5d4aa1;stop-opacity:1" />
-      <stop
-         style="stop-color:#9283c3;stop-opacity:1"
-         offset="1"
-         id="stop10802-1-5-3-0-4-8-4-2-9-2" />
-    </linearGradient>
     <linearGradient
        gradientTransform="matrix(1.0848495,0,0,1.0848495,4.1318641,-91.791648)"
        gradientUnits="userSpaceOnUse"
@@ -50,11 +22,9 @@
        y1="1038.5779"
        x1="10.544736"
        id="linearGradient4908-2"
-       xlink:href="#linearGradient4902-3"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4902-3" />
     <linearGradient
-       id="linearGradient4902-3"
-       inkscape:collect="always">
+       id="linearGradient4902-3">
       <stop
          id="stop4904-2"
          offset="0"
@@ -72,11 +42,9 @@
        y1="1042.2307"
        x1="7.9987183"
        id="linearGradient4900-1"
-       xlink:href="#linearGradient4894-6"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4894-6" />
     <linearGradient
-       id="linearGradient4894-6"
-       inkscape:collect="always">
+       id="linearGradient4894-6">
       <stop
          id="stop4896-8"
          offset="0"
@@ -88,7 +56,6 @@
     </linearGradient>
     <linearGradient
        gradientTransform="matrix(1.0848495,0,0,1.0848495,4.1318641,-91.791648)"
-       inkscape:collect="always"
        xlink:href="#linearGradient4994-6"
        id="linearGradient4101"
        gradientUnits="userSpaceOnUse"
@@ -97,8 +64,7 @@
        x2="9.8946028"
        y2="1051.8378" />
     <linearGradient
-       id="linearGradient4994-6"
-       inkscape:collect="always">
+       id="linearGradient4994-6">
       <stop
          id="stop4996-1"
          offset="0"
@@ -109,33 +75,6 @@
          style="stop-color:#dce7f7;stop-opacity:1" />
     </linearGradient>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="15.999999"
-     inkscape:cx="-0.73627572"
-     inkscape:cy="13.519436"
-     inkscape:document-units="px"
-     inkscape:current-layer="g3353"
-     showgrid="true"
-     inkscape:window-width="1100"
-     inkscape:window-height="900"
-     inkscape:window-x="946"
-     inkscape:window-y="653"
-     inkscape:window-maximized="0"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2985"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -149,8 +88,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      transform="translate(0,-1036.3622)">
     <g
@@ -159,19 +96,14 @@
          transform="translate(-9.5563496,1.6205583)"
          id="g3353">
         <path
-           sodipodi:nodetypes="cccccc"
-           inkscape:connector-curvature="0"
            id="rect4001-3"
            d="m 10.095588,1035.2628 5.291937,-0.062 3.321871,3.2617 0,7.7367 -8.613808,0.062 z"
            style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:11.05178356px;line-height:125%;font-family:AustralianFlyingCorpsStencil;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;display:inline;fill:url(#linearGradient4101);fill-opacity:1;stroke:none;stroke-width:0.24860173;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
         <path
-           inkscape:connector-curvature="0"
            id="path4884"
            d="m 14.584943,1034.7608 0,3.9337 3.917218,0 z"
            style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:11.05178356px;line-height:125%;font-family:AustralianFlyingCorpsStencil;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;display:inline;fill:url(#linearGradient4900-1);fill-opacity:1;stroke:none;stroke-width:0.24860173;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
         <path
-           sodipodi:nodetypes="cccccc"
-           inkscape:connector-curvature="0"
            id="rect4001"
            d="m 10.095588,1035.2628 4.791937,0 3.321871,3.2617 0,7.7367 -8.113808,0 z"
            style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:11.05178356px;line-height:125%;font-family:AustralianFlyingCorpsStencil;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;display:inline;fill:none;fill-opacity:1;stroke:url(#linearGradient4908-2);stroke-width:1.08484948;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
@@ -187,24 +119,14 @@
              id="path10796-2-6-2"
              transform="matrix(1.0012483,0,0,0.88600469,0.97175283,73.294583)" />
           <path
-             sodipodi:open="true"
              d="m 24.43155,1046.9864 a 4.4886336,4.4886336 0 0 1 -1.642954,1.6429"
-             sodipodi:end="1.0471976"
-             sodipodi:start="0.52359878"
-             sodipodi:ry="4.4886336"
-             sodipodi:rx="4.4886336"
-             sodipodi:cy="1044.7421"
-             sodipodi:cx="20.544279"
-             sodipodi:type="arc"
              style="font-style:normal;font-weight:normal;font-size:13.58917427px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;display:inline;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
              id="path10796-2-6-2-2"
              transform="matrix(1.0012483,0,0,0.88600469,0.97175283,73.294583)" />
           <path
              d="m 22.620507,999.74158 0,-0.98021 -1.040788,0 c -0.401091,0 -0.699714,0.0857 -0.895868,0.25704 -0.196155,0.17135 -0.294232,0.43419 -0.294232,0.78852 0,0.32237 0.09954,0.57797 0.298623,0.76677 0.199082,0.1887 0.468428,0.2831 0.808038,0.2831 0.336682,0 0.607492,-0.1031 0.812429,-0.3093 0.207865,-0.2062 0.311798,-0.4748 0.311798,-0.80592 z m 0.808037,-1.43764 -0.01946,1.97066 1.6957,1.5699 -0.444853,0.3635 -1.601857,-1.6986 -0.459711,0.2744 c -0.244962,0.1855 -0.362864,0.285 -0.597079,0.3867 -0.234214,0.1017 -0.507951,0.1525 -0.821211,0.1525 -0.518199,0 -0.929537,-0.1365 -1.234015,-0.4095 -0.304478,-0.2731 -0.456717,-0.6419 -0.456717,-1.10657 0,-0.47921 0.174196,-0.85097 0.522589,-1.11526 0.348394,-0.26429 0.840243,-0.39644 1.475548,-0.39644 l 1.13301,0 0,-0.31802 c 0,-0.35143 -0.108324,-0.62298 -0.324973,-0.81467 -0.213719,-0.19459 -0.51527,-0.29188 -0.904651,-0.29188 -0.322044,0 -0.578215,0.0726 -0.768514,0.21782 -0.190299,0.14521 -0.308869,0.36013 -0.355712,0.64476 l -0.417193,0 0,-0.93664 c 0.281057,-0.11908 0.55333,-0.20766 0.816821,-0.26575 0.266418,-0.061 0.525517,-0.0915 0.777297,-0.0915 0.647015,0 1.138864,0.15974 1.475547,0.47921 0.33961,0.31657 0.509415,0.77836 0.509415,1.38537 z"
              style="fill:#266923;fill-opacity:1;stroke:#266923;stroke-width:0.27716896;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-             id="path4156"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="scscscscsccccccsscssscscssccccscsc" />
+             id="path4156" />
         </g>
       </g>
     </g>
diff --git a/ui/org.eclipse.pde.runtime/icons/obj16/bundle-exporter.svg b/ui/org.eclipse.pde.runtime/icons/obj16/bundle-exporter.svg
index 50ef0e081db..9ff747800df 100644
--- a/ui/org.eclipse.pde.runtime/icons/obj16/bundle-exporter.svg
+++ b/ui/org.eclipse.pde.runtime/icons/obj16/bundle-exporter.svg
@@ -2,20 +2,16 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="bundle-exporter.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
@@ -94,29 +90,6 @@
          id="stop11152-8-4-35-5-4-6" />
     </linearGradient>
     <linearGradient
-       id="linearGradient11146-7-5-30-1-1-4">
-      <stop
-         id="stop11150-9-6-9-5-6-9"
-         offset="0"
-         style="stop-color:#faefba;stop-opacity:1" />
-      <stop
-         style="stop-color:#9e6542;stop-opacity:1"
-         offset="1"
-         id="stop11152-6-7-6-3-3-3" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient11146-8-7-5-7-5-6-8">
-      <stop
-         id="stop11150-7-8-3-8-7-0-6"
-         offset="0"
-         style="stop-color:#faefba;stop-opacity:1" />
-      <stop
-         style="stop-color:#9e6542;stop-opacity:1"
-         offset="1"
-         id="stop11152-8-8-6-3-2-5-1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10507"
        id="linearGradient4895"
        gradientUnits="userSpaceOnUse"
@@ -126,7 +99,6 @@
        y2="449.88141"
        gradientTransform="matrix(0,1,-1,0,824.74991,74.781558)" />
     <radialGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient11146-8-3-2-6-1-7"
        id="radialGradient10503"
        gradientUnits="userSpaceOnUse"
@@ -175,10 +147,8 @@
        gradientTransform="matrix(-1,0,0,-1,749.87676,899.67118)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient10544"
-       xlink:href="#linearGradient10507-2"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient10507-2" />
     <radialGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4192"
        id="radialGradient10503-3"
        gradientUnits="userSpaceOnUse"
@@ -189,7 +159,6 @@
        fy="442.99802"
        r="6.1875" />
     <radialGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient11146-4-4-4-6-2"
        id="radialGradient10503-5"
        gradientUnits="userSpaceOnUse"
@@ -200,7 +169,6 @@
        fy="447.11966"
        r="6.1875" />
     <radialGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4198"
        id="radialGradient10503-3-2"
        gradientUnits="userSpaceOnUse"
@@ -211,14 +179,12 @@
        fy="446.32083"
        r="6.1875" />
     <filter
-       inkscape:collect="always"
        id="filter3854"
-       x="-0.17271166"
-       width="1.3454233"
-       y="-0.18946901"
-       height="1.378938">
+       x="-0.25070617"
+       width="1.501411"
+       y="-0.27503093"
+       height="1.5500619">
       <feGaussianBlur
-         inkscape:collect="always"
          stdDeviation="0.79164101"
          id="feGaussianBlur3856" />
     </filter>
@@ -230,8 +196,7 @@
        gradientTransform="translate(15.825436,0)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient6032"
-       xlink:href="#linearGradient4738"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4738" />
     <linearGradient
        id="linearGradient4738">
       <stop
@@ -255,11 +220,9 @@
        gradientTransform="translate(-5.4895565,0)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient6034"
-       xlink:href="#linearGradient4741"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4741" />
     <linearGradient
-       id="linearGradient4741"
-       inkscape:collect="always">
+       id="linearGradient4741">
       <stop
          id="stop4743"
          offset="0"
@@ -270,31 +233,6 @@
          style="stop-color:#106643;stop-opacity:1" />
     </linearGradient>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#c7c7c7"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="66.547156"
-     inkscape:cx="17.829597"
-     inkscape:cy="7.9999969"
-     inkscape:document-units="px"
-     inkscape:current-layer="g11260-4-2"
-     showgrid="true"
-     inkscape:window-width="2560"
-     inkscape:window-height="1391"
-     inkscape:window-x="0"
-     inkscape:window-y="1"
-     inkscape:window-maximized="1"
-     inkscape:snap-global="true"
-     inkscape:snap-bbox="true"
-     inkscape:bbox-nodes="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3947" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -303,13 +241,11 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
@@ -320,8 +256,7 @@
       <g
          transform="matrix(3.5838051,0,0,3.5838051,511.44753,-3423.3167)"
          style="font-style:normal;font-weight:normal;font-size:13.58917427px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;display:inline;fill:#ffffff;fill-opacity:1;stroke:none"
-         id="layer1-9"
-         inkscape:label="Layer 1">
+         id="layer1-9">
         <g
            id="g11260-4-2"
            transform="matrix(0.27903303,0,0,0.27903303,-109.29986,933.62804)"
@@ -329,36 +264,24 @@
           <path
              style="font-style:normal;font-weight:normal;font-size:13.58917427px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;display:inline;fill:url(#radialGradient10503-5);fill-opacity:1;stroke:none;stroke-width:3.58380508;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
              d="m 375.04584,467.87065 12.70006,-4.27794 5.26516,-13.68728 -17.96522,0 z"
-             id="rect10961-9-0-4-7"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccc" />
+             id="rect10961-9-0-4-7" />
           <path
              style="font-style:normal;font-weight:normal;font-size:13.58917427px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;display:inline;fill:url(#radialGradient10503-3-2);fill-opacity:1;stroke:none;stroke-width:3.58380508;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
              d="m 374.583,467.87065 -12.70006,-4.27794 -5.26516,-13.68728 17.96522,0 z"
-             id="rect10961-9-0-4-6-0"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccc" />
+             id="rect10961-9-0-4-6-0" />
           <path
              style="display:inline;fill:url(#radialGradient10503);fill-opacity:1;stroke:none;stroke-width:3.58380508;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
              d="m 375.04584,431.97098 12.70006,4.27794 5.26516,13.68728 -17.96522,0 z"
-             id="rect10961-9-0-4"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccc" />
+             id="rect10961-9-0-4" />
           <path
              style="font-style:normal;font-weight:normal;font-size:13.58917427px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;display:inline;fill:url(#radialGradient10503-3);fill-opacity:1;stroke:none;stroke-width:3.58380508;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
              d="m 374.583,431.97098 -12.70006,4.27794 -5.26516,13.68728 17.96522,0 z"
-             id="rect10961-9-0-4-6"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccc" />
+             id="rect10961-9-0-4-6" />
           <path
-             sodipodi:nodetypes="cc"
-             inkscape:connector-curvature="0"
              id="path11108-6-7-5"
              d="m 374.86851,426.49505 0,46.58947"
              style="display:inline;fill:#915323;fill-opacity:1;stroke:url(#linearGradient4895);stroke-width:3.58380508;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
           <path
-             sodipodi:nodetypes="cc"
-             inkscape:connector-curvature="0"
              id="path11108-6-7-5-6"
              d="m 398.16325,449.78978 -46.58947,0"
              style="font-style:normal;font-weight:normal;font-size:13.58917427px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;display:inline;fill:#915323;fill-opacity:1;stroke:url(#linearGradient10544);stroke-width:3.58380508;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
@@ -373,14 +296,7 @@
              y="422.91125"
              x="401.74704"
              id="image4263"
-             xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAASxJREFU
-OI2lk9GN20AMRJ9SCTtZpo77kIDUEZip5NaAr45w+0gQdjL5kC3bsuEckAH4IWn5djirnSTxP/ry
-6uPi/k/6tHdQlaoeZEGW4Va4gS2BmU8vHWSGegRmEAsYRYRjBj2CzHhwtAGqUtlza6gCM6ByA/ZI
-qlLPAT1YfG14pipYfF33FJDnHauuddt8ee47/iSJxV2FYdRqe4OuIX79/gOA928HjmMwt0bPXAOV
-hCQOc5P+HKSfbavLOwIRqL035a/UpUfSdQQ3qLz620Y4Z9JaAwM/Od5d4/fQXQa2xDbf7fx77UFX
-gPnki7PEfZCvYOTuR3KPKc7H1BOOYxD9vmeMAR26ncieE7eB7GtuTZLYQpybej/dhfhwF57pePwQ
-wDy/PdyFTwFe6S8tfOXxEgqHGgAAAABJRU5ErkJggg==
-"
+             xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAASxJREFU OI2lk9GN20AMRJ9SCTtZpo77kIDUEZip5NaAr45w+0gQdjL5kC3bsuEckAH4IWn5djirnSTxP/ry 6uPi/k/6tHdQlaoeZEGW4Va4gS2BmU8vHWSGegRmEAsYRYRjBj2CzHhwtAGqUtlza6gCM6ByA/ZI qlLPAT1YfG14pipYfF33FJDnHauuddt8ee47/iSJxV2FYdRqe4OuIX79/gOA928HjmMwt0bPXAOV hCQOc5P+HKSfbavLOwIRqL035a/UpUfSdQQ3qLz620Y4Z9JaAwM/Od5d4/fQXQa2xDbf7fx77UFX gPnki7PEfZCvYOTuR3KPKc7H1BOOYxD9vmeMAR26ncieE7eB7GtuTZLYQpybej/dhfhwF57pePwQ wDy/PdyFTwFe6S8tfOXxEgqHGgAAAABJRU5ErkJggg== "
              style="image-rendering:optimizeSpeed"
              preserveAspectRatio="none"
              height="57.340881"
@@ -388,11 +304,8 @@ wDy/PdyFTwFe6S8tfOXxEgqHGgAAAABJRU5ErkJggg==
           <g
              style="display:inline;fill:#ffffff;stroke:#ffffff;stroke-width:0.77931756;filter:url(#filter3854)"
              id="layer1-6-4"
-             inkscape:label="Layer 1"
              transform="matrix(2.187253,0,0,1.9941877,384.42509,-1621.3023)">
             <path
-               sodipodi:nodetypes="ccccccccc"
-               inkscape:connector-curvature="0"
                id="rect3968-5"
                d="m -1.6770565,1039.8618 0,2.0277 0,5 0,3 0.99999995,0 9.54668705,-4.5273 c 0.59227,-0.3746 0.618127,-0.6299 0,-1 l -9.12684205,-4.5004 z"
                style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1.71597862;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
@@ -400,11 +313,8 @@ wDy/PdyFTwFe6S8tfOXxEgqHGgAAAABJRU5ErkJggg==
           <g
              style="display:inline"
              id="layer1-6"
-             inkscape:label="Layer 1"
              transform="matrix(1.9421191,0,0,1.8087665,385.36232,-1427.5602)">
             <path
-               sodipodi:nodetypes="ccccccccc"
-               inkscape:connector-curvature="0"
                id="rect3968"
                d="m -1.6770565,1039.8618 0,2.0277 0,5 0,3 0.99999995,0 9.54668705,-4.5273 c 0.59227,-0.3746 0.618127,-0.6299 0,-1 l -9.12684205,-4.5004 z"
                style="fill:url(#linearGradient6032);fill-opacity:1;stroke:url(#linearGradient6034);stroke-width:1.91212034;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
diff --git a/ui/org.eclipse.pde.runtime/icons/obj16/bundle-importer-exporter.svg b/ui/org.eclipse.pde.runtime/icons/obj16/bundle-importer-exporter.svg
index b135cce3ade..890740ff3ef 100644
--- a/ui/org.eclipse.pde.runtime/icons/obj16/bundle-importer-exporter.svg
+++ b/ui/org.eclipse.pde.runtime/icons/obj16/bundle-importer-exporter.svg
@@ -2,20 +2,16 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="bundle-importer-exporter.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
@@ -109,29 +105,6 @@
          id="stop11152-8-4-35-5-4-6" />
     </linearGradient>
     <linearGradient
-       id="linearGradient11146-7-5-30-1-1-4">
-      <stop
-         id="stop11150-9-6-9-5-6-9"
-         offset="0"
-         style="stop-color:#faefba;stop-opacity:1" />
-      <stop
-         style="stop-color:#9e6542;stop-opacity:1"
-         offset="1"
-         id="stop11152-6-7-6-3-3-3" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient11146-8-7-5-7-5-6-8">
-      <stop
-         id="stop11150-7-8-3-8-7-0-6"
-         offset="0"
-         style="stop-color:#faefba;stop-opacity:1" />
-      <stop
-         style="stop-color:#9e6542;stop-opacity:1"
-         offset="1"
-         id="stop11152-8-8-6-3-2-5-1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10507"
        id="linearGradient4895"
        gradientUnits="userSpaceOnUse"
@@ -141,7 +114,6 @@
        y2="449.88141"
        gradientTransform="matrix(0,1,-1,0,824.74991,74.781558)" />
     <radialGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient11146-8-3-2-6-1-7"
        id="radialGradient10503"
        gradientUnits="userSpaceOnUse"
@@ -190,10 +162,8 @@
        gradientTransform="matrix(-1,0,0,-1,749.87676,899.67118)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient10544"
-       xlink:href="#linearGradient10507-2"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient10507-2" />
     <radialGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4192"
        id="radialGradient10503-3"
        gradientUnits="userSpaceOnUse"
@@ -204,7 +174,6 @@
        fy="442.99802"
        r="6.1875" />
     <radialGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient11146-4-4-4-6-2"
        id="radialGradient10503-5"
        gradientUnits="userSpaceOnUse"
@@ -215,7 +184,6 @@
        fy="447.11966"
        r="6.1875" />
     <radialGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4198"
        id="radialGradient10503-3-2"
        gradientUnits="userSpaceOnUse"
@@ -226,14 +194,12 @@
        fy="446.32083"
        r="6.1875" />
     <filter
-       inkscape:collect="always"
        id="filter3854"
-       x="-0.17271166"
-       width="1.3454233"
-       y="-0.18946901"
-       height="1.378938">
+       x="-0.25070617"
+       width="1.501411"
+       y="-0.27503093"
+       height="1.5500619">
       <feGaussianBlur
-         inkscape:collect="always"
          stdDeviation="0.79164101"
          id="feGaussianBlur3856" />
     </filter>
@@ -245,8 +211,7 @@
        gradientTransform="translate(15.825436,0)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient6032"
-       xlink:href="#linearGradient4738"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4738" />
     <linearGradient
        id="linearGradient4738">
       <stop
@@ -270,11 +235,9 @@
        gradientTransform="translate(-5.4895565,0)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient6034"
-       xlink:href="#linearGradient4741"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4741" />
     <linearGradient
-       id="linearGradient4741"
-       inkscape:collect="always">
+       id="linearGradient4741">
       <stop
          id="stop4743"
          offset="0"
@@ -285,19 +248,16 @@
          style="stop-color:#106643;stop-opacity:1" />
     </linearGradient>
     <filter
-       inkscape:collect="always"
        id="filter3854-2"
-       x="-0.17271166"
-       width="1.3454233"
-       y="-0.18946901"
-       height="1.378938">
+       x="-0.24561919"
+       width="1.4912371"
+       y="-0.26945039"
+       height="1.5389008">
       <feGaussianBlur
-         inkscape:collect="always"
          stdDeviation="0.79164101"
          id="feGaussianBlur3856-1" />
     </filter>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4353"
        id="linearGradient4348"
        gradientUnits="userSpaceOnUse"
@@ -307,31 +267,6 @@
        x2="-13.936629"
        y2="1040.053" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#c7c7c7"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="66.466675"
-     inkscape:cx="11.989401"
-     inkscape:cy="7.9999969"
-     inkscape:document-units="px"
-     inkscape:current-layer="g11260-4-2"
-     showgrid="true"
-     inkscape:window-width="2560"
-     inkscape:window-height="1391"
-     inkscape:window-x="0"
-     inkscape:window-y="1"
-     inkscape:window-maximized="1"
-     inkscape:snap-global="true"
-     inkscape:snap-bbox="true"
-     inkscape:bbox-nodes="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3947" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -340,13 +275,11 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
@@ -357,8 +290,7 @@
       <g
          transform="matrix(3.5838051,0,0,3.5838051,511.44753,-3423.3167)"
          style="font-style:normal;font-weight:normal;font-size:13.58917427px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;display:inline;fill:#ffffff;fill-opacity:1;stroke:none"
-         id="layer1-9"
-         inkscape:label="Layer 1">
+         id="layer1-9">
         <g
            id="g11260-4-2"
            transform="matrix(0.27903303,0,0,0.27903303,-109.29986,933.62804)"
@@ -366,36 +298,24 @@
           <path
              style="font-style:normal;font-weight:normal;font-size:13.58917427px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;display:inline;fill:url(#radialGradient10503-5);fill-opacity:1;stroke:none;stroke-width:3.58380508;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
              d="m 375.04584,467.87065 12.70006,-4.27794 5.26516,-13.68728 -17.96522,0 z"
-             id="rect10961-9-0-4-7"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccc" />
+             id="rect10961-9-0-4-7" />
           <path
              style="font-style:normal;font-weight:normal;font-size:13.58917427px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;display:inline;fill:url(#radialGradient10503-3-2);fill-opacity:1;stroke:none;stroke-width:3.58380508;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
              d="m 374.583,467.87065 -12.70006,-4.27794 -5.26516,-13.68728 17.96522,0 z"
-             id="rect10961-9-0-4-6-0"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccc" />
+             id="rect10961-9-0-4-6-0" />
           <path
              style="display:inline;fill:url(#radialGradient10503);fill-opacity:1;stroke:none;stroke-width:3.58380508;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
              d="m 375.04584,431.97098 12.70006,4.27794 5.26516,13.68728 -17.96522,0 z"
-             id="rect10961-9-0-4"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccc" />
+             id="rect10961-9-0-4" />
           <path
              style="font-style:normal;font-weight:normal;font-size:13.58917427px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;display:inline;fill:url(#radialGradient10503-3);fill-opacity:1;stroke:none;stroke-width:3.58380508;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
              d="m 374.583,431.97098 -12.70006,4.27794 -5.26516,13.68728 17.96522,0 z"
-             id="rect10961-9-0-4-6"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccc" />
+             id="rect10961-9-0-4-6" />
           <path
-             sodipodi:nodetypes="cc"
-             inkscape:connector-curvature="0"
              id="path11108-6-7-5"
              d="m 374.86851,426.49505 0,46.58947"
              style="display:inline;fill:#915323;fill-opacity:1;stroke:url(#linearGradient4895);stroke-width:3.58380508;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
           <path
-             sodipodi:nodetypes="cc"
-             inkscape:connector-curvature="0"
              id="path11108-6-7-5-6"
              d="m 398.16325,449.78978 -46.58947,0"
              style="font-style:normal;font-weight:normal;font-size:13.58917427px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;display:inline;fill:#915323;fill-opacity:1;stroke:url(#linearGradient10544);stroke-width:3.58380508;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
@@ -409,11 +329,8 @@
           <g
              style="display:inline;fill:#ffffff;stroke:#ffffff;stroke-width:0.77931756;filter:url(#filter3854)"
              id="layer1-6-4"
-             inkscape:label="Layer 1"
              transform="matrix(2.187253,0,0,1.9941877,384.42509,-1621.3023)">
             <path
-               sodipodi:nodetypes="ccccccccc"
-               inkscape:connector-curvature="0"
                id="rect3968-5"
                d="m -1.6770565,1039.8618 0,2.0277 0,5 0,3 0.99999995,0 9.54668705,-4.5273 c 0.59227,-0.3746 0.618127,-0.6299 0,-1 l -9.12684205,-4.5004 z"
                style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1.71597862;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
@@ -421,11 +338,8 @@
           <g
              style="display:inline"
              id="layer1-6"
-             inkscape:label="Layer 1"
              transform="matrix(1.9421191,0,0,1.8087665,385.36232,-1427.5602)">
             <path
-               sodipodi:nodetypes="ccccccccc"
-               inkscape:connector-curvature="0"
                id="rect3968"
                d="m -1.6770565,1039.8618 0,2.0277 0,5 0,3 0.99999995,0 9.54668705,-4.5273 c 0.59227,-0.3746 0.618127,-0.6299 0,-1 l -9.12684205,-4.5004 z"
                style="fill:url(#linearGradient6032);fill-opacity:1;stroke:url(#linearGradient6034);stroke-width:1.91212034;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
@@ -434,15 +348,7 @@
              y="422.91125"
              x="401.74704"
              id="image4297"
-             xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAUZJREFU
-OI2dk9FNxDAQRJ9pBEvQh5c6+Egk6kDx1cFH9qSjCj5u3QcId7J8+JI7hwMhRlpFdrTjmVk72Ls5
-QLpLgf8hO2Qnu9u7ubuz1JBSt75WN40DYIfcG2GHl4/ieRSvRPIoblm81qZ0i9BO34pqnyEdURWq
-GWogoyCSO6s3PzubiBGoRoyQR9BsbJX0BLmV6j2ft9L9qhVGgaq93IsMptY4H0n+Qq1987JW64UG
-1YMDzPMbkdpkn2A1IrHy8LwDYH6a2JfCkBJq1rJYxjENyf1zcj+mtZY9Mk7G05y+jXrNQCJUO+tb
-LdS2l1KCCHIQRMXLR/EuxDjm1d+l/y22RGeCKEFGYczn0C7DuwrbjFEkh3wakxrsSyFr31NKAQWN
-B0wt/HrPl7ewhjgkVz10IQb3q1e8w37/6gDD8Pjtxf6J4Dd8ATk4Ca6BxTRTAAAAAElFTkSuQmCC
-
-"
+             xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAUZJREFU OI2dk9FNxDAQRJ9pBEvQh5c6+Egk6kDx1cFH9qSjCj5u3QcId7J8+JI7hwMhRlpFdrTjmVk72Ls5 QLpLgf8hO2Qnu9u7ubuz1JBSt75WN40DYIfcG2GHl4/ieRSvRPIoblm81qZ0i9BO34pqnyEdURWq GWogoyCSO6s3PzubiBGoRoyQR9BsbJX0BLmV6j2ft9L9qhVGgaq93IsMptY4H0n+Qq1987JW64UG 1YMDzPMbkdpkn2A1IrHy8LwDYH6a2JfCkBJq1rJYxjENyf1zcj+mtZY9Mk7G05y+jXrNQCJUO+tb LdS2l1KCCHIQRMXLR/EuxDjm1d+l/y22RGeCKEFGYczn0C7DuwrbjFEkh3wakxrsSyFr31NKAQWN B0wt/HrPl7ewhjgkVz10IQb3q1e8w37/6gDD8Pjtxf6J4Dd8ATk4Ca6BxTRTAAAAAElFTkSuQmCC  "
              style="image-rendering:optimizeSpeed"
              preserveAspectRatio="none"
              height="57.340881"
@@ -450,11 +356,8 @@ B0wt/HrPl7ewhjgkVz10IQb3q1e8w37/6gDD8Pjtxf6J4Dd8ATk4Ca6BxTRTAAAAAElFTkSuQmCC
           <g
              style="font-style:normal;font-weight:normal;font-size:13.58917427px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;display:inline;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:0.72848868;filter:url(#filter3854-2)"
              id="layer1-6-4-7"
-             inkscape:label="Layer 1"
              transform="matrix(2.5031236,0,0,1.9941877,349.13959,-1646.385)">
             <path
-               sodipodi:nodetypes="ccccccccc"
-               inkscape:connector-curvature="0"
                id="rect3968-5-2"
                d="m -1.6770565,1039.8618 0,2.0277 0,5 0,3 0.99999995,0 9.54668705,-4.5273 c 0.59227,-0.3746 0.618127,-0.6299 0,-1 l -9.12684205,-4.5004 z"
                style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1.60405862;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
@@ -462,9 +365,7 @@ B0wt/HrPl7ewhjgkVz10IQb3q1e8w37/6gDD8Pjtxf6J4Dd8ATk4Ca6BxTRTAAAAAElFTkSuQmCC
           <path
              style="font-style:normal;font-weight:normal;font-size:medium;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;fill:url(#linearGradient4348);fill-opacity:1;stroke:#000080;stroke-width:3.58380532;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
              d="m 346.19807,428.28695 0,3.62341 0,8.93475 0,5.36087 2.28047,0 21.77095,-8.09008 c 1.35065,-0.66939 1.40962,-1.1256 0,-1.78694 l -20.8135,-8.04201 z"
-             id="rect3968-2"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccccccc" />
+             id="rect3968-2" />
         </g>
         <g
            id="g11331-3"
diff --git a/ui/org.eclipse.pde.runtime/icons/obj16/bundle-importer.svg b/ui/org.eclipse.pde.runtime/icons/obj16/bundle-importer.svg
index bc6c2854100..b498e56e101 100644
--- a/ui/org.eclipse.pde.runtime/icons/obj16/bundle-importer.svg
+++ b/ui/org.eclipse.pde.runtime/icons/obj16/bundle-importer.svg
@@ -2,20 +2,16 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="bundle-importer.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
@@ -109,29 +105,6 @@
          id="stop11152-8-4-35-5-4-6" />
     </linearGradient>
     <linearGradient
-       id="linearGradient11146-7-5-30-1-1-4">
-      <stop
-         id="stop11150-9-6-9-5-6-9"
-         offset="0"
-         style="stop-color:#faefba;stop-opacity:1" />
-      <stop
-         style="stop-color:#9e6542;stop-opacity:1"
-         offset="1"
-         id="stop11152-6-7-6-3-3-3" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient11146-8-7-5-7-5-6-8">
-      <stop
-         id="stop11150-7-8-3-8-7-0-6"
-         offset="0"
-         style="stop-color:#faefba;stop-opacity:1" />
-      <stop
-         style="stop-color:#9e6542;stop-opacity:1"
-         offset="1"
-         id="stop11152-8-8-6-3-2-5-1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10507"
        id="linearGradient4895"
        gradientUnits="userSpaceOnUse"
@@ -141,7 +114,6 @@
        y2="449.88141"
        gradientTransform="matrix(0,1,-1,0,824.74991,74.781558)" />
     <radialGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient11146-8-3-2-6-1-7"
        id="radialGradient10503"
        gradientUnits="userSpaceOnUse"
@@ -190,10 +162,8 @@
        gradientTransform="matrix(-1,0,0,-1,749.87676,899.67118)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient10544"
-       xlink:href="#linearGradient10507-2"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient10507-2" />
     <radialGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4192"
        id="radialGradient10503-3"
        gradientUnits="userSpaceOnUse"
@@ -204,7 +174,6 @@
        fy="442.99802"
        r="6.1875" />
     <radialGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient11146-4-4-4-6-2"
        id="radialGradient10503-5"
        gradientUnits="userSpaceOnUse"
@@ -215,7 +184,6 @@
        fy="447.11966"
        r="6.1875" />
     <radialGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4198"
        id="radialGradient10503-3-2"
        gradientUnits="userSpaceOnUse"
@@ -225,35 +193,17 @@
        fx="391.4928"
        fy="446.32083"
        r="6.1875" />
-    <linearGradient
-       id="linearGradient4738">
-      <stop
-         id="stop4740"
-         offset="0"
-         style="stop-color:#8cc861;stop-opacity:1" />
-      <stop
-         style="stop-color:#4aa766;stop-opacity:1"
-         offset="0.43753415"
-         id="stop4746" />
-      <stop
-         id="stop4742"
-         offset="1"
-         style="stop-color:#c2dd97;stop-opacity:1" />
-    </linearGradient>
     <filter
-       inkscape:collect="always"
        id="filter3854-2"
-       x="-0.17271166"
-       width="1.3454233"
-       y="-0.18946901"
-       height="1.378938">
+       x="-0.24561919"
+       width="1.4912371"
+       y="-0.26945039"
+       height="1.5389008">
       <feGaussianBlur
-         inkscape:collect="always"
          stdDeviation="0.79164101"
          id="feGaussianBlur3856-1" />
     </filter>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4353"
        id="linearGradient4348"
        gradientUnits="userSpaceOnUse"
@@ -263,31 +213,6 @@
        x2="-13.936629"
        y2="1040.053" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#c7c7c7"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="70.375001"
-     inkscape:cx="12.114581"
-     inkscape:cy="7.9999969"
-     inkscape:document-units="px"
-     inkscape:current-layer="g11260-4-2"
-     showgrid="true"
-     inkscape:window-width="2560"
-     inkscape:window-height="1391"
-     inkscape:window-x="0"
-     inkscape:window-y="1"
-     inkscape:window-maximized="1"
-     inkscape:snap-global="true"
-     inkscape:snap-bbox="true"
-     inkscape:bbox-nodes="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3947" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -296,13 +221,11 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
@@ -313,8 +236,7 @@
       <g
          transform="matrix(3.5838051,0,0,3.5838051,511.44753,-3423.3167)"
          style="font-style:normal;font-weight:normal;font-size:13.58917427px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;display:inline;fill:#ffffff;fill-opacity:1;stroke:none"
-         id="layer1-9"
-         inkscape:label="Layer 1">
+         id="layer1-9">
         <g
            id="g11260-4-2"
            transform="matrix(0.27903303,0,0,0.27903303,-109.29986,933.62804)"
@@ -322,36 +244,24 @@
           <path
              style="font-style:normal;font-weight:normal;font-size:13.58917427px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;display:inline;fill:url(#radialGradient10503-5);fill-opacity:1;stroke:none;stroke-width:3.58380508;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
              d="m 375.04584,467.87065 12.70006,-4.27794 5.26516,-13.68728 -17.96522,0 z"
-             id="rect10961-9-0-4-7"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccc" />
+             id="rect10961-9-0-4-7" />
           <path
              style="font-style:normal;font-weight:normal;font-size:13.58917427px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;display:inline;fill:url(#radialGradient10503-3-2);fill-opacity:1;stroke:none;stroke-width:3.58380508;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
              d="m 374.583,467.87065 -12.70006,-4.27794 -5.26516,-13.68728 17.96522,0 z"
-             id="rect10961-9-0-4-6-0"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccc" />
+             id="rect10961-9-0-4-6-0" />
           <path
              style="display:inline;fill:url(#radialGradient10503);fill-opacity:1;stroke:none;stroke-width:3.58380508;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
              d="m 375.04584,431.97098 12.70006,4.27794 5.26516,13.68728 -17.96522,0 z"
-             id="rect10961-9-0-4"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccc" />
+             id="rect10961-9-0-4" />
           <path
              style="font-style:normal;font-weight:normal;font-size:13.58917427px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;display:inline;fill:url(#radialGradient10503-3);fill-opacity:1;stroke:none;stroke-width:3.58380508;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
              d="m 374.583,431.97098 -12.70006,4.27794 -5.26516,13.68728 17.96522,0 z"
-             id="rect10961-9-0-4-6"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccc" />
+             id="rect10961-9-0-4-6" />
           <path
-             sodipodi:nodetypes="cc"
-             inkscape:connector-curvature="0"
              id="path11108-6-7-5"
              d="m 374.86851,426.49505 0,46.58947"
              style="display:inline;fill:#915323;fill-opacity:1;stroke:url(#linearGradient4895);stroke-width:3.58380508;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
           <path
-             sodipodi:nodetypes="cc"
-             inkscape:connector-curvature="0"
              id="path11108-6-7-5-6"
              d="m 398.16325,449.78978 -46.58947,0"
              style="font-style:normal;font-weight:normal;font-size:13.58917427px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;display:inline;fill:#915323;fill-opacity:1;stroke:url(#linearGradient10544);stroke-width:3.58380508;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
@@ -365,11 +275,8 @@
           <g
              style="font-style:normal;font-weight:normal;font-size:13.58917427px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;display:inline;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:0.72848868;filter:url(#filter3854-2)"
              id="layer1-6-4-7"
-             inkscape:label="Layer 1"
              transform="matrix(2.5031236,0,0,1.9941877,349.13959,-1646.385)">
             <path
-               sodipodi:nodetypes="ccccccccc"
-               inkscape:connector-curvature="0"
                id="rect3968-5-2"
                d="m -1.6770565,1039.8618 0,2.0277 0,5 0,3 0.99999995,0 9.54668705,-4.5273 c 0.59227,-0.3746 0.618127,-0.6299 0,-1 l -9.12684205,-4.5004 z"
                style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1.60405862;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
@@ -377,9 +284,7 @@
           <path
              style="font-style:normal;font-weight:normal;font-size:medium;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;fill:url(#linearGradient4348);fill-opacity:1;stroke:#000080;stroke-width:3.58380532;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
              d="m 346.19807,428.28695 0,3.62341 0,8.93475 0,5.36087 2.28047,0 21.77095,-8.09008 c 1.35065,-0.66939 1.40962,-1.1256 0,-1.78694 l -20.8135,-8.04201 z"
-             id="rect3968-2"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccccccc" />
+             id="rect3968-2" />
         </g>
         <g
            id="g11331-3"
diff --git a/ui/org.eclipse.pde.runtime/icons/obj16/class_obj.svg b/ui/org.eclipse.pde.runtime/icons/obj16/class_obj.svg
index b7322a04d80..b6706d4575c 100644
--- a/ui/org.eclipse.pde.runtime/icons/obj16/class_obj.svg
+++ b/ui/org.eclipse.pde.runtime/icons/obj16/class_obj.svg
@@ -2,37 +2,18 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="class_obj.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
-    <linearGradient
-       id="linearGradient3827">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="0"
-         id="stop3829" />
-      <stop
-         id="stop3835"
-         offset="0.60149658"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop3831" />
-    </linearGradient>
     <linearGradient
        id="linearGradient10798-1-9-3-7-6-8-9-0-9-1">
       <stop
@@ -49,7 +30,6 @@
          id="stop10802-1-5-3-0-4-8-4-2-9-2" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10798-1-9-3-7-6-8-9-0-9-1"
        id="linearGradient4293"
        gradientUnits="userSpaceOnUse"
@@ -58,43 +38,6 @@
        x2="388.63736"
        y2="462.11539" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="11.313709"
-     inkscape:cx="1.2407203"
-     inkscape:cy="19.988601"
-     inkscape:document-units="px"
-     inkscape:current-layer="g3025"
-     showgrid="true"
-     inkscape:window-width="925"
-     inkscape:window-height="862"
-     inkscape:window-x="1633"
-     inkscape:window-y="287"
-     inkscape:window-maximized="0"
-     inkscape:snap-global="false"
-     showguides="true"
-     inkscape:guide-bbox="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3950" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="5,3.25"
-       id="guide3797" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="6.4375,3.75"
-       id="guide3801" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="12.0625,5.3125"
-       id="guide3803" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -108,8 +51,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
@@ -155,9 +96,7 @@
         <path
            d="m 9.9582435,1043.4532 c -0.2897069,-0.3986 -0.2258257,-0.3177 -0.4712765,-0.5307 -0.2405524,-0.2129 -0.5547364,-0.3192 -0.9425527,-0.3192 -0.5154625,0 -0.927829,0.185 -1.2371006,0.5551 -0.3043689,0.3648 -0.4565517,0.6031 -0.4565489,1.4648 -2.8e-6,0.958 0.1546346,1.3845 0.4639127,1.7799 0.3141807,0.3954 0.8001884,0.593 1.2591915,0.593 0.4590031,0 0.7078193,-0.1439 0.9646439,-0.3422 0.2568246,-0.1983 0.2834574,-0.2 0.5301861,-0.7297 l 2.032379,-0.017 c -0.211101,0.9629 -0.616102,1.6013 -1.215009,2.093 -0.598921,0.4917 -1.401562,0.7374 -2.407928,0.7374 -1.1438303,0 -2.0569271,-0.3724 -2.7392935,-1.1176 -0.6774613,-0.7449 -1.0161905,-1.5264 -1.0161905,-2.8443 0,-1.333 0.3411837,-1.9946 1.0235539,-2.7344 0.6823664,-0.7452 1.6052818,-1.1177 2.7687486,-1.1177 0.9523657,0 1.7083715,0.2129 2.2680175,0.6387 0.564543,0.4205 1.032045,0.9883 1.277509,1.8547 z"
            style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:15.56941891px;line-height:125%;font-family:Arial;letter-spacing:0px;word-spacing:0px;display:inline;fill:#ffffff;fill-opacity:1;stroke:none"
-           id="path3817-0"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccscsczzccsscscsccc" />
+           id="path3817-0" />
       </g>
     </g>
   </g>
diff --git a/ui/org.eclipse.pde.runtime/icons/obj16/contextid_obj.svg b/ui/org.eclipse.pde.runtime/icons/obj16/contextid_obj.svg
index 94a01735310..d6561876d08 100644
--- a/ui/org.eclipse.pde.runtime/icons/obj16/contextid_obj.svg
+++ b/ui/org.eclipse.pde.runtime/icons/obj16/contextid_obj.svg
@@ -2,48 +2,19 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="contextid_obj.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       inkscape:collect="always"
-       id="linearGradient9354">
-      <stop
-         style="stop-color:#1b639e;stop-opacity:1;"
-         offset="0"
-         id="stop9356" />
-      <stop
-         style="stop-color:#6f8db9;stop-opacity:1"
-         offset="1"
-         id="stop9358" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient8562">
-      <stop
-         style="stop-color:#6994ad;stop-opacity:1"
-         offset="0"
-         id="stop8564" />
-      <stop
-         style="stop-color:#005596;stop-opacity:1"
-         offset="1"
-         id="stop8566" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        id="linearGradient4902-3">
       <stop
          style="stop-color:#b28a30;stop-opacity:1"
@@ -55,7 +26,6 @@
          id="stop4906-2" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4894-6">
       <stop
          style="stop-color:#e0c88f;stop-opacity:1"
@@ -67,7 +37,6 @@
          id="stop4898-5" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4994-6">
       <stop
          style="stop-color:#f9fafc;stop-opacity:1;"
@@ -79,7 +48,6 @@
          id="stop4998-89" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4994-6"
        id="linearGradient4084"
        gradientUnits="userSpaceOnUse"
@@ -89,7 +57,6 @@
        x2="9.8946028"
        y2="1051.8378" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4894-6"
        id="linearGradient4086"
        gradientUnits="userSpaceOnUse"
@@ -99,7 +66,6 @@
        x2="9.9874563"
        y2="1040.3303" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4902-3"
        id="linearGradient4088"
        gradientUnits="userSpaceOnUse"
@@ -108,215 +74,6 @@
        y1="1038.5779"
        x2="10.544736"
        y2="1052.3228" />
-    <linearGradient
-       id="linearGradient5103-3-7">
-      <stop
-         style="stop-color:#c1ebca;stop-opacity:1"
-         offset="0"
-         id="stop5105-5-4" />
-      <stop
-         id="stop7550-07-0"
-         offset="0.26694915"
-         style="stop-color:#b3dac7;stop-opacity:1" />
-      <stop
-         id="stop7548-6-9"
-         offset="0.51694918"
-         style="stop-color:#9ec2c3;stop-opacity:1" />
-      <stop
-         style="stop-color:#7a99bb;stop-opacity:1"
-         offset="1"
-         id="stop5107-7-48" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient9354"
-       id="linearGradient9369"
-       gradientUnits="userSpaceOnUse"
-       x1="-1045.2971"
-       y1="-34.1688"
-       x2="-1045.2971"
-       y2="-39.1688" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5103-3-7"
-       id="linearGradient9563"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(19.911612,-20)"
-       x1="13.706096"
-       y1="1045.2537"
-       x2="8.8684521"
-       y2="1045.2537" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8562"
-       id="linearGradient9565"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(19.911612,-40)"
-       x1="13.537925"
-       y1="1065.152"
-       x2="8.7441578"
-       y2="1065.152" />
-    <mask
-       maskUnits="userSpaceOnUse"
-       id="mask9640">
-      <g
-         transform="translate(-3.5400399e-7,-20)"
-         id="g9642"
-         style="fill:#ffffff;display:inline">
-        <rect
-           style="fill:#ffffff;fill-opacity:1;stroke:none"
-           id="rect9644"
-           width="9"
-           height="5"
-           x="-1049.2971"
-           y="-39.1688"
-           transform="matrix(0,-1,-1,0,0,0)" />
-        <rect
-           style="fill:#ffffff;fill-opacity:1;stroke:none"
-           id="rect9646"
-           width="7"
-           height="3"
-           x="-1048.2971"
-           y="-38.1688"
-           transform="matrix(0,-1,-1,0,0,0)" />
-        <rect
-           style="fill:#ffffff;fill-opacity:1;stroke:none"
-           id="rect9648"
-           width="1"
-           height="1"
-           x="-1047.2971"
-           y="-37.1688"
-           transform="matrix(0,-1,-1,0,0,0)" />
-        <rect
-           style="fill:#ffffff;fill-opacity:1;stroke:none"
-           id="rect9650"
-           width="1"
-           height="1"
-           x="-1045.2971"
-           y="-37.1688"
-           transform="matrix(0,-1,-1,0,0,0)" />
-        <rect
-           style="fill:#ffffff;fill-opacity:1;stroke:none"
-           id="rect9652"
-           width="1"
-           height="1"
-           x="-1043.2971"
-           y="-37.1688"
-           transform="matrix(0,-1,-1,0,0,0)" />
-        <g
-           style="fill:#ffffff;stroke:#ffffff;display:inline"
-           id="g9654"
-           transform="matrix(0,-1,-1,0,1074.4897,1048.3882)">
-          <path
-             sodipodi:nodetypes="cccccc"
-             inkscape:connector-curvature="0"
-             id="path9656"
-             d="m 3.5193795,1037.8597 7.0096695,0 3.062057,3.0066 0,9.9546 -10.0717265,0 z"
-             style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;display:inline" />
-          <path
-             inkscape:connector-curvature="0"
-             id="path9658"
-             d="m 9.998718,1037.397 0,3.9112 3.977478,0 z"
-             style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;display:inline" />
-          <path
-             sodipodi:nodetypes="cccccc"
-             inkscape:connector-curvature="0"
-             id="path9660"
-             d="m 3.5193795,1037.8597 7.0096695,0 3.062057,3.0066 0,9.9546 -10.0717265,0 z"
-             style="fill:#ffffff;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;display:inline" />
-        </g>
-      </g>
-    </mask>
-    <linearGradient
-       gradientTransform="translate(-20,0)"
-       gradientUnits="userSpaceOnUse"
-       y2="1044.8622"
-       x2="32.031251"
-       y1="1044.8622"
-       x1="22"
-       id="linearGradient3804"
-       xlink:href="#linearGradient3798"
-       inkscape:collect="always" />
-    <linearGradient
-       gradientTransform="translate(-20,0)"
-       gradientUnits="userSpaceOnUse"
-       y2="1043.3622"
-       x2="32.03125"
-       y1="1043.3622"
-       x1="22.03125"
-       id="linearGradient3794"
-       xlink:href="#linearGradient3788"
-       inkscape:collect="always" />
-    <linearGradient
-       gradientTransform="translate(-20,0)"
-       gradientUnits="userSpaceOnUse"
-       y2="1040.4054"
-       x2="31.388678"
-       y1="1040.4054"
-       x1="22.377558"
-       id="linearGradient3786"
-       xlink:href="#linearGradient3780"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient10798-1-9-3-7-6-8-9-0-9-1">
-      <stop
-         id="stop10800-5-2-1-8-20-6-4-9-8-2"
-         offset="0"
-         style="stop-color:#7564b1;stop-opacity:1" />
-      <stop
-         style="stop-color:#5d4aa1;stop-opacity:1"
-         offset="0.5"
-         id="stop10806-6-8-5-3-9-24-8-4-3-2" />
-      <stop
-         id="stop10802-1-5-3-0-4-8-4-2-9-2"
-         offset="1"
-         style="stop-color:#9283c3;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient10798-1-9-3-7-6-8-9-0-9-1"
-       id="linearGradient3929-5"
-       gradientUnits="userSpaceOnUse"
-       x1="388.63736"
-       y1="478.18777"
-       x2="388.63736"
-       y2="462.11539" />
-    <linearGradient
-       id="linearGradient3780"
-       inkscape:collect="always">
-      <stop
-         id="stop3782"
-         offset="0"
-         style="stop-color:#fdf2d0;stop-opacity:1;" />
-      <stop
-         id="stop3784"
-         offset="1"
-         style="stop-color:#fffdf9;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3788"
-       inkscape:collect="always">
-      <stop
-         id="stop3790"
-         offset="0"
-         style="stop-color:#d8bb8c;stop-opacity:1" />
-      <stop
-         id="stop3792"
-         offset="1"
-         style="stop-color:#dfc38d;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3798"
-       inkscape:collect="always">
-      <stop
-         id="stop3800"
-         offset="0"
-         style="stop-color:#3f3f9f;stop-opacity:1" />
-      <stop
-         id="stop3802"
-         offset="1"
-         style="stop-color:#3f5fbf;stop-opacity:1" />
-    </linearGradient>
     <linearGradient
        xlink:href="#linearGradient4877"
        id="linearGradient4118"
@@ -338,33 +95,6 @@
          id="stop4881" />
     </linearGradient>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="40.465362"
-     inkscape:cx="13.697059"
-     inkscape:cy="8.3299123"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="2560"
-     inkscape:window-height="1391"
-     inkscape:window-x="0"
-     inkscape:window-y="1"
-     inkscape:window-maximized="1"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="true"
-     inkscape:snap-bbox="true"
-     inkscape:bbox-nodes="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3999" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -373,64 +103,43 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
     <path
        style="display:inline;fill:url(#linearGradient4084);fill-opacity:1;stroke:none"
        d="m 5,1038.3622 6.3912,0 2.6088,2.6496 0,9.3504 -9,0 z"
-       id="rect4001-3"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccc" />
+       id="rect4001-3" />
     <path
        style="display:inline;fill:url(#linearGradient4086);fill-opacity:1;stroke:none"
        d="m 11,1037.451 0,3.9112 3.977478,0 z"
-       id="path4884"
-       inkscape:connector-curvature="0" />
+       id="path4884" />
     <path
        style="display:inline;fill:none;stroke:url(#linearGradient4088);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1"
        d="m 4.5,1037.8622 6.952575,0 3.047425,3.0066 0,10.0245 -10,0 z"
-       id="rect4001"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccc" />
+       id="rect4001" />
     <path
        style="display:inline;fill:none;stroke:#29486b;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
        d="m 7.0000001,1047.8622 2.0000001,0"
-       id="path3057-8"
-       inkscape:connector-curvature="0" />
+       id="path3057-8" />
     <path
        style="fill:#29486b;fill-opacity:1;stroke:#29486b;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
        d="m 7.9853587,1047.8878 3.0219623,-6.0439"
-       id="path3116"
-       inkscape:connector-curvature="0" />
+       id="path3116" />
     <path
        style="display:inline;fill:#29486b;fill-opacity:1;stroke:#29486b;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
        d="m 11.007321,1047.8878 -3.0219623,-6.0439"
-       id="path3116-5"
-       inkscape:connector-curvature="0" />
+       id="path3116-5" />
     <image
        y="1036.3622"
        x="16"
        id="image4388"
-       xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAfRJREFU
-OI2lkz1oU1EUx3/32Tqkg0PBVfxYIhKclEzGLIlYMSkiUpqa6iBtkCiahI4uakyLFhcLDdRGpKCk
-sYg0ICG4RBeH0E3wAwTRzaExmvfucXh5ry+xTr1w4H6d3/mf/+UqEWEnY8C7+PLugRSqPmqNJuFg
-gEykxcbbck/C6fQb5V0rR8GdhecCkE7G3cP5pVUAblyy9z6sX+Xzx40eiOFUdpKz+aIbDuzb+4cA
-7B4aZv+BI6zdPyE9gELVRzoZ58fPDgD3cpddBelknELVhxYbMDg0zMFDhynPhWyIiOCPpmSzbbpx
-+9Ez8UdT8un7L9lsm+KPpiR1a0Gce622KSuFkyIitonhYKDHqFKlzqvHs+zdM4hzXms0ScRCaG0X
-7lhqq4VMpOUa5iQ4yfNLq9zNTAIwPX4WS4OlhY5lbAH2Hb+mvK57X2EsPsKx0eskYiEsLd2A314A
-wMyVc2rs6Fey+SK1RpNsvsj46AinLt4kEQtRqtSxtHIhnX6AoyQTaVFdniU3NcGT8ksAJs+fAWBx
-5UW3BfijtwEAPF17jWEodhkGpUqdcDCApRXhYMBWIY4C28SBfoBpGWgNIKwvz6EUaK3JTU+QnbJb
-QBQd/T+AVlieD6a6UxEFCAgoBLPbwj8ASxSLhQv929sM1S2ww+/8FxcE/XLCnfmoAAAAAElFTkSu
-QmCC
-"
+       xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAfRJREFU OI2lkz1oU1EUx3/32Tqkg0PBVfxYIhKclEzGLIlYMSkiUpqa6iBtkCiahI4uakyLFhcLDdRGpKCk sYg0ICG4RBeH0E3wAwTRzaExmvfucXh5ry+xTr1w4H6d3/mf/+UqEWEnY8C7+PLugRSqPmqNJuFg gEykxcbbck/C6fQb5V0rR8GdhecCkE7G3cP5pVUAblyy9z6sX+Xzx40eiOFUdpKz+aIbDuzb+4cA 7B4aZv+BI6zdPyE9gELVRzoZ58fPDgD3cpddBelknELVhxYbMDg0zMFDhynPhWyIiOCPpmSzbbpx +9Ez8UdT8un7L9lsm+KPpiR1a0Gce622KSuFkyIitonhYKDHqFKlzqvHs+zdM4hzXms0ScRCaG0X 7lhqq4VMpOUa5iQ4yfNLq9zNTAIwPX4WS4OlhY5lbAH2Hb+mvK57X2EsPsKx0eskYiEsLd2A314A wMyVc2rs6Fey+SK1RpNsvsj46AinLt4kEQtRqtSxtHIhnX6AoyQTaVFdniU3NcGT8ksAJs+fAWBx 5UW3BfijtwEAPF17jWEodhkGpUqdcDCApRXhYMBWIY4C28SBfoBpGWgNIKwvz6EUaK3JTU+QnbJb QBQd/T+AVlieD6a6UxEFCAgoBLPbwj8ASxSLhQv929sM1S2ww+/8FxcE/XLCnfmoAAAAAElFTkSu QmCC "
        style="image-rendering:optimizeSpeed"
        preserveAspectRatio="none"
        height="16"
@@ -438,18 +147,15 @@ QmCC
     <path
        style="display:inline;fill:none;stroke:#29486b;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
        d="m 10,1047.8622 2,0"
-       id="path3057-8-1"
-       inkscape:connector-curvature="0" />
+       id="path3057-8-1" />
     <path
        style="display:inline;fill:none;stroke:#29486b;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
        d="m 10,1041.8622 2,0"
-       id="path3057-8-7"
-       inkscape:connector-curvature="0" />
+       id="path3057-8-7" />
     <path
        style="display:inline;fill:none;stroke:#29486b;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
        d="m 7,1041.8622 2.0000001,0"
-       id="path3057-8-4"
-       inkscape:connector-curvature="0" />
+       id="path3057-8-4" />
     <g
        id="layer1-2"
        style="display:inline"
@@ -464,18 +170,15 @@ QmCC
           <path
              d="m -7.154226,1066.2953 a 5.7367152,5.7367152 0 0 1 -5.736715,5.7366 5.7367152,5.7367152 0 0 1 -5.736714,-5.7366 5.7367152,5.7367152 0 0 1 5.736714,-5.7367 5.7367152,5.7367152 0 0 1 5.736715,5.7367 z"
              id="path4110"
-             style="fill:url(#linearGradient4118);fill-opacity:1;stroke:#304b8a;stroke-width:1.428527;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-             inkscape:connector-curvature="0" />
+             style="fill:url(#linearGradient4118);fill-opacity:1;stroke:#304b8a;stroke-width:1.428527;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
           <g
              id="g4234"
              transform="matrix(0.67482559,0,0,0.66166238,-6.6079452,355.46025)">
             <path
-               inkscape:connector-curvature="0"
                style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:20.03678703px;line-height:125%;font-family:Reznor;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#2a4484;fill-opacity:1;stroke:none"
                d="m -9.4357617,1068.2736 c -1.2738953,10e-5 -2.2909443,0.3542 -3.0669773,1.0668 -0.776035,0.7126 -1.180487,1.6995 -1.22679,2.9336 l 2.106879,0.2667 c 0.06927,-1.5258 0.767628,-2.2669 2.0535413,-2.2669 0.544332,0 0.986005,0.1392 1.333468,0.4534 0.347451,0.3142 0.50671,0.7177 0.506718,1.2001 -8e-6,0.4489 -0.155573,0.8368 -0.480048,1.1734 -0.173559,0.1795 -0.518749,0.4482 -1.040106,0.7735 -0.47471,0.2917 -0.7828553,0.6247 -0.9334273,1.04 -0.13927,0.348 -0.21336,0.8822 -0.213355,1.6002 l 0,0.9601 1.9468633,0 0,-0.6134 c -6e-6,-0.7067 0.304445,-1.2494 0.906758,-1.6534 0.787868,-0.5387 1.32567,-1.0168 1.626831,-1.3868 0.416727,-0.5387 0.640055,-1.1881 0.640064,-1.9736 -9e-6,-1.0772 -0.431305,-1.9671 -1.253459,-2.6403 -0.787883,-0.6283 -1.760322,-0.9333 -2.90696,-0.9334 z"
                id="text4882" />
             <path
-               inkscape:connector-curvature="0"
                style="display:inline;fill:#294384;fill-opacity:1;stroke:none"
                id="path4908-1"
                d="m -8.0758489,1079.7271 a 1.472991,1.2557853 0 0 1 -1.4729931,1.2558 1.472991,1.2557853 0 0 1 -1.472991,-1.2558 1.472991,1.2557853 0 0 1 1.472991,-1.2558 1.472991,1.2557853 0 0 1 1.4729931,1.2558 z" />
diff --git a/ui/org.eclipse.pde.runtime/icons/obj16/ext_point_obj.svg b/ui/org.eclipse.pde.runtime/icons/obj16/ext_point_obj.svg
index 01f127aa4a9..1ff4157461e 100644
--- a/ui/org.eclipse.pde.runtime/icons/obj16/ext_point_obj.svg
+++ b/ui/org.eclipse.pde.runtime/icons/obj16/ext_point_obj.svg
@@ -2,20 +2,16 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="ext_point_obj.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
@@ -34,113 +30,6 @@
          style="stop-color:#809dcb;stop-opacity:0" />
     </linearGradient>
     <linearGradient
-       id="linearGradient10448-9-7-0-5">
-      <stop
-         style="stop-color:#cf9307;stop-opacity:1"
-         offset="0"
-         id="stop10450-3-5-6-7" />
-      <stop
-         id="stop10456-4-1-5-3"
-         offset="0.5"
-         style="stop-color:#f7d87b;stop-opacity:1" />
-      <stop
-         style="stop-color:#ebb313;stop-opacity:1"
-         offset="1"
-         id="stop10452-22-7-8-4" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10440-1-0-0-3">
-      <stop
-         style="stop-color:#ae7603;stop-opacity:1;"
-         offset="0"
-         id="stop10442-43-2-0-9" />
-      <stop
-         id="stop10521-1-2-5-3"
-         offset="0.5"
-         style="stop-color:#e8d8a3;stop-opacity:1" />
-      <stop
-         style="stop-color:#bb9221;stop-opacity:1"
-         offset="1"
-         id="stop10444-3-4-0-4" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10748-8">
-      <stop
-         id="stop10750-5"
-         offset="0"
-         style="stop-color:#ecac18;stop-opacity:1" />
-      <stop
-         style="stop-color:#f1ce66;stop-opacity:1"
-         offset="0.25"
-         id="stop10752-8" />
-      <stop
-         style="stop-color:#f6e5a6;stop-opacity:1"
-         offset="0.5"
-         id="stop10754-8" />
-      <stop
-         id="stop10756-4"
-         offset="0.75"
-         style="stop-color:#f1cf6c;stop-opacity:1" />
-      <stop
-         id="stop10758-7"
-         offset="1"
-         style="stop-color:#e5b630;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10440-1-3-4">
-      <stop
-         style="stop-color:#ae7603;stop-opacity:1;"
-         offset="0"
-         id="stop10442-43-0-5" />
-      <stop
-         id="stop10521-1-4-7"
-         offset="0.5"
-         style="stop-color:#e8d8a3;stop-opacity:1" />
-      <stop
-         style="stop-color:#bb9221;stop-opacity:1"
-         offset="1"
-         id="stop10444-3-2-0" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10448-90">
-      <stop
-         style="stop-color:#ecac18;stop-opacity:1"
-         offset="0"
-         id="stop10450-0" />
-      <stop
-         id="stop10458-2"
-         offset="0.25"
-         style="stop-color:#ffe38d;stop-opacity:1" />
-      <stop
-         id="stop10456-96"
-         offset="0.5"
-         style="stop-color:#fdf5d2;stop-opacity:1" />
-      <stop
-         style="stop-color:#ffeba7;stop-opacity:1"
-         offset="0.75"
-         id="stop10460-3" />
-      <stop
-         style="stop-color:#e5b630;stop-opacity:1"
-         offset="1"
-         id="stop10452-1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10440-18">
-      <stop
-         style="stop-color:#ae7603;stop-opacity:1;"
-         offset="0"
-         id="stop10442-8" />
-      <stop
-         id="stop10521-7"
-         offset="0.5"
-         style="stop-color:#e8d8a3;stop-opacity:1" />
-      <stop
-         style="stop-color:#bb9221;stop-opacity:1"
-         offset="1"
-         id="stop10444-0" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10414-9"
        id="linearGradient10782-3"
        gradientUnits="userSpaceOnUse"
@@ -165,7 +54,6 @@
          id="stop10418-4" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10432-3"
        id="linearGradient10784-2"
        gradientUnits="userSpaceOnUse"
@@ -190,7 +78,6 @@
          style="stop-color:#567ebc;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10157-6"
        id="linearGradient10786-1"
        gradientUnits="userSpaceOnUse"
@@ -215,22 +102,6 @@
          id="stop10161-55" />
     </linearGradient>
     <linearGradient
-       id="linearGradient10396-5">
-      <stop
-         style="stop-color:#1b3e79;stop-opacity:1;"
-         offset="0"
-         id="stop10398-7" />
-      <stop
-         id="stop10404-9"
-         offset="0.5"
-         style="stop-color:#728fbf;stop-opacity:1" />
-      <stop
-         style="stop-color:#1f4d9a;stop-opacity:1"
-         offset="1"
-         id="stop10400-9" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10157-2-5"
        id="linearGradient10790-8"
        gradientUnits="userSpaceOnUse"
@@ -255,7 +126,6 @@
          id="stop10161-5-0" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10149-39-0"
        id="linearGradient10792-6"
        gradientUnits="userSpaceOnUse"
@@ -265,7 +135,6 @@
        x2="322.875"
        y2="504.44818" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient10149-39-0">
       <stop
          style="stop-color:#1d4d9d;stop-opacity:1"
@@ -277,22 +146,6 @@
          id="stop10153-72-3" />
     </linearGradient>
     <linearGradient
-       id="linearGradient10149-6-5-4">
-      <stop
-         style="stop-color:#1f4d9a;stop-opacity:1"
-         offset="0"
-         id="stop10151-5-7-2" />
-      <stop
-         id="stop10394-3"
-         offset="0.5"
-         style="stop-color:#b9c7df;stop-opacity:1" />
-      <stop
-         style="stop-color:#567ebc;stop-opacity:1"
-         offset="1"
-         id="stop10153-8-1-2" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4284"
        id="linearGradient10790-8-2"
        gradientUnits="userSpaceOnUse"
@@ -302,29 +155,6 @@
        x2="305"
        y2="545.35248" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="32"
-     inkscape:cx="20.60795"
-     inkscape:cy="7.0519948"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="941"
-     inkscape:window-height="855"
-     inkscape:window-x="1268"
-     inkscape:window-y="608"
-     inkscape:window-maximized="0"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid4210" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -338,8 +168,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
diff --git a/ui/org.eclipse.pde.runtime/icons/obj16/ext_points_obj.svg b/ui/org.eclipse.pde.runtime/icons/obj16/ext_points_obj.svg
index 43cd6f7222a..c64426115ae 100644
--- a/ui/org.eclipse.pde.runtime/icons/obj16/ext_points_obj.svg
+++ b/ui/org.eclipse.pde.runtime/icons/obj16/ext_points_obj.svg
@@ -2,20 +2,16 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="ext_points_obj.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
@@ -34,113 +30,6 @@
          style="stop-color:#809dcb;stop-opacity:0" />
     </linearGradient>
     <linearGradient
-       id="linearGradient10448-9-7-0-5">
-      <stop
-         style="stop-color:#cf9307;stop-opacity:1"
-         offset="0"
-         id="stop10450-3-5-6-7" />
-      <stop
-         id="stop10456-4-1-5-3"
-         offset="0.5"
-         style="stop-color:#f7d87b;stop-opacity:1" />
-      <stop
-         style="stop-color:#ebb313;stop-opacity:1"
-         offset="1"
-         id="stop10452-22-7-8-4" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10440-1-0-0-3">
-      <stop
-         style="stop-color:#ae7603;stop-opacity:1;"
-         offset="0"
-         id="stop10442-43-2-0-9" />
-      <stop
-         id="stop10521-1-2-5-3"
-         offset="0.5"
-         style="stop-color:#e8d8a3;stop-opacity:1" />
-      <stop
-         style="stop-color:#bb9221;stop-opacity:1"
-         offset="1"
-         id="stop10444-3-4-0-4" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10748-8">
-      <stop
-         id="stop10750-5"
-         offset="0"
-         style="stop-color:#ecac18;stop-opacity:1" />
-      <stop
-         style="stop-color:#f1ce66;stop-opacity:1"
-         offset="0.25"
-         id="stop10752-8" />
-      <stop
-         style="stop-color:#f6e5a6;stop-opacity:1"
-         offset="0.5"
-         id="stop10754-8" />
-      <stop
-         id="stop10756-4"
-         offset="0.75"
-         style="stop-color:#f1cf6c;stop-opacity:1" />
-      <stop
-         id="stop10758-7"
-         offset="1"
-         style="stop-color:#e5b630;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10440-1-3-4">
-      <stop
-         style="stop-color:#ae7603;stop-opacity:1;"
-         offset="0"
-         id="stop10442-43-0-5" />
-      <stop
-         id="stop10521-1-4-7"
-         offset="0.5"
-         style="stop-color:#e8d8a3;stop-opacity:1" />
-      <stop
-         style="stop-color:#bb9221;stop-opacity:1"
-         offset="1"
-         id="stop10444-3-2-0" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10448-90">
-      <stop
-         style="stop-color:#ecac18;stop-opacity:1"
-         offset="0"
-         id="stop10450-0" />
-      <stop
-         id="stop10458-2"
-         offset="0.25"
-         style="stop-color:#ffe38d;stop-opacity:1" />
-      <stop
-         id="stop10456-96"
-         offset="0.5"
-         style="stop-color:#fdf5d2;stop-opacity:1" />
-      <stop
-         style="stop-color:#ffeba7;stop-opacity:1"
-         offset="0.75"
-         id="stop10460-3" />
-      <stop
-         style="stop-color:#e5b630;stop-opacity:1"
-         offset="1"
-         id="stop10452-1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10440-18">
-      <stop
-         style="stop-color:#ae7603;stop-opacity:1;"
-         offset="0"
-         id="stop10442-8" />
-      <stop
-         id="stop10521-7"
-         offset="0.5"
-         style="stop-color:#e8d8a3;stop-opacity:1" />
-      <stop
-         style="stop-color:#bb9221;stop-opacity:1"
-         offset="1"
-         id="stop10444-0" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10414-9"
        id="linearGradient10782-3"
        gradientUnits="userSpaceOnUse"
@@ -165,7 +54,6 @@
          id="stop10418-4" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10432-3"
        id="linearGradient10784-2"
        gradientUnits="userSpaceOnUse"
@@ -190,7 +78,6 @@
          style="stop-color:#567ebc;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10157-6"
        id="linearGradient10786-1"
        gradientUnits="userSpaceOnUse"
@@ -215,22 +102,6 @@
          id="stop10161-55" />
     </linearGradient>
     <linearGradient
-       id="linearGradient10396-5">
-      <stop
-         style="stop-color:#1b3e79;stop-opacity:1;"
-         offset="0"
-         id="stop10398-7" />
-      <stop
-         id="stop10404-9"
-         offset="0.5"
-         style="stop-color:#728fbf;stop-opacity:1" />
-      <stop
-         style="stop-color:#1f4d9a;stop-opacity:1"
-         offset="1"
-         id="stop10400-9" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10157-2-5"
        id="linearGradient10790-8"
        gradientUnits="userSpaceOnUse"
@@ -255,7 +126,6 @@
          id="stop10161-5-0" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10149-39-0"
        id="linearGradient10792-6"
        gradientUnits="userSpaceOnUse"
@@ -265,7 +135,6 @@
        x2="322.875"
        y2="504.44818" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient10149-39-0">
       <stop
          style="stop-color:#1d4d9d;stop-opacity:1"
@@ -277,22 +146,6 @@
          id="stop10153-72-3" />
     </linearGradient>
     <linearGradient
-       id="linearGradient10149-6-5-4">
-      <stop
-         style="stop-color:#1f4d9a;stop-opacity:1"
-         offset="0"
-         id="stop10151-5-7-2" />
-      <stop
-         id="stop10394-3"
-         offset="0.5"
-         style="stop-color:#b9c7df;stop-opacity:1" />
-      <stop
-         style="stop-color:#567ebc;stop-opacity:1"
-         offset="1"
-         id="stop10153-8-1-2" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4284"
        id="linearGradient10790-8-2"
        gradientUnits="userSpaceOnUse"
@@ -302,7 +155,6 @@
        x2="305"
        y2="545.35248" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10414-9"
        id="linearGradient4353"
        gradientUnits="userSpaceOnUse"
@@ -312,7 +164,6 @@
        x2="298.34253"
        y2="519.08923" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10432-3"
        id="linearGradient4355"
        gradientUnits="userSpaceOnUse"
@@ -322,7 +173,6 @@
        x2="289.8125"
        y2="519.36218" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10157-6"
        id="linearGradient4357"
        gradientUnits="userSpaceOnUse"
@@ -332,7 +182,6 @@
        x2="306.05069"
        y2="514.75818" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10157-2-5"
        id="linearGradient4359"
        gradientUnits="userSpaceOnUse"
@@ -342,7 +191,6 @@
        x2="305"
        y2="542.73901" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10149-39-0"
        id="linearGradient4361"
        gradientUnits="userSpaceOnUse"
@@ -352,7 +200,6 @@
        x2="322.875"
        y2="504.44818" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4284"
        id="linearGradient4363"
        gradientUnits="userSpaceOnUse"
@@ -362,29 +209,6 @@
        x2="305"
        y2="545.35248" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="32.000001"
-     inkscape:cx="12.50382"
-     inkscape:cy="9.4155735"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="917"
-     inkscape:window-height="656"
-     inkscape:window-x="1346"
-     inkscape:window-y="605"
-     inkscape:window-maximized="0"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid4210" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -398,8 +222,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
diff --git a/ui/org.eclipse.pde.runtime/icons/obj16/extension_obj.svg b/ui/org.eclipse.pde.runtime/icons/obj16/extension_obj.svg
index 410d8e62973..80562add19b 100644
--- a/ui/org.eclipse.pde.runtime/icons/obj16/extension_obj.svg
+++ b/ui/org.eclipse.pde.runtime/icons/obj16/extension_obj.svg
@@ -2,20 +2,16 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="extension_obj.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
@@ -80,7 +76,6 @@
          id="stop10452-1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10448-9-7-0-5"
        id="linearGradient10770-6"
        gradientUnits="userSpaceOnUse"
@@ -90,7 +85,6 @@
        x2="323.98331"
        y2="518.28192" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10748-8"
        id="linearGradient10774-5"
        gradientUnits="userSpaceOnUse"
@@ -100,7 +94,6 @@
        x2="324.1601"
        y2="515.53949" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10448-90"
        id="linearGradient10778-6"
        gradientUnits="userSpaceOnUse"
@@ -110,31 +103,6 @@
        y2="511.66458"
        gradientTransform="matrix(0.30039597,0,0,0.29632024,-93.823234,870.37106)" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="5.656854"
-     inkscape:cx="4.0882847"
-     inkscape:cy="10.907925"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1006"
-     inkscape:window-height="814"
-     inkscape:window-x="1420"
-     inkscape:window-y="641"
-     inkscape:window-maximized="0"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3999" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -148,8 +116,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
@@ -162,18 +128,14 @@
          style="display:inline"
          id="g4386">
         <path
-           sodipodi:nodetypes="ccccc"
            style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#9e7400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
            d="m 2.3385061,1041.3342 -3.4062511,0.031 0.0098,1 3.4062501,-0.031 z"
-           id="path4313-5-1-8-6"
-           inkscape:connector-curvature="0" />
+           id="path4313-5-1-8-6" />
       </g>
       <path
-         inkscape:connector-curvature="0"
          id="path4313-5-1-8-6-0"
          d="m 20.608712,1042.3225 3.421876,0.031 -0.0098,1 -3.421875,-0.031 z"
-         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#9e7400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-         sodipodi:nodetypes="ccccc" />
+         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#9e7400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
       <g
          style="display:inline"
          id="g4239"
@@ -188,23 +150,17 @@
            id="rect10007-0-74-2-7-6"
            style="display:inline;fill:url(#linearGradient10770-6);fill-opacity:1;stroke:none;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
         <path
-           inkscape:connector-curvature="0"
            id="path4313-8-8"
            d="m 5.9540546,1024.1006 0,1 8.2734374,0 0,-1 z"
-           style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-           sodipodi:nodetypes="ccccc" />
+           style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
         <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
            id="path4313-8-8-7"
            d="m 6.2874256,1024.0948 0,3.0195 1.01551,0 0,-3.0195 z"
            style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.94926554px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
         <path
-           inkscape:connector-curvature="0"
            id="path4313-5-1-8"
            d="m 14.275248,1026.0967 -8.0937514,0.031 0.0098,1 8.0937504,-0.031 z"
-           style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#9e7400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-           sodipodi:nodetypes="ccccc" />
+           style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#9e7400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
         <rect
            ry="0"
            rx="0"
@@ -215,12 +171,10 @@
            id="rect10007-0-74-2-7"
            style="display:inline;fill:url(#linearGradient10774-5);fill-opacity:1;stroke:none;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
         <path
-           inkscape:connector-curvature="0"
            id="path4313-5-1"
            d="m 6.3114756,1027.1065 -3.3593746,0.031 0.00977,1 3.3593746,-0.031 -0.0098,-1 z"
            style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#9e7400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
         <path
-           inkscape:connector-curvature="0"
            id="path4313-8"
            d="m 6.3017106,1023.0987 -3.3593752,0.031 0.00977,1 3.3593742,-0.031 -0.0098,-1 z"
            style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
@@ -234,26 +188,18 @@
            id="rect10007-0-74-2"
            style="display:inline;fill:url(#linearGradient10778-6);fill-opacity:1;stroke:none;stroke-width:1.50161433;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
         <path
-           inkscape:connector-curvature="0"
            id="path4313"
            d="m 4.3017106,1022.0967 -2.0335499,0.031 0.00977,1 2.0335489,-0.031 -0.0098,-1 z"
-           style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-           sodipodi:nodetypes="cccccc" />
+           style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
         <path
-           inkscape:connector-curvature="0"
            id="path4313-5"
            d="m 4.3075696,1028.0967 -1.9999998,0.031 0.00977,1 1.9999998,-0.031 -0.0098,-1 z"
-           style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#9e7400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-           sodipodi:nodetypes="cccccc" />
+           style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#9e7400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
         <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
            id="path4313-8-8-7-8"
            d="m 4.3092456,1024.1001 0,3.01 1.000277,0 0,-3.01 z"
            style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:0.64640886;fill-rule:evenodd;stroke:none;stroke-width:0.97351193px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
         <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
            id="path4313-8-8-7-8-8"
            d="m 1.3092454,1023.0922 0,5.0101 1.000277,0 0,-5.0101 z"
            style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.97351193px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
diff --git a/ui/org.eclipse.pde.runtime/icons/obj16/extensions_obj.svg b/ui/org.eclipse.pde.runtime/icons/obj16/extensions_obj.svg
index 8a3283cc3e2..2b2d332f2dd 100644
--- a/ui/org.eclipse.pde.runtime/icons/obj16/extensions_obj.svg
+++ b/ui/org.eclipse.pde.runtime/icons/obj16/extensions_obj.svg
@@ -2,20 +2,16 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="extensions_obj.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
@@ -80,7 +76,6 @@
          id="stop10452-1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10448-9-7-0-5"
        id="linearGradient10770-6"
        gradientUnits="userSpaceOnUse"
@@ -90,7 +85,6 @@
        x2="323.98331"
        y2="518.28192" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10748-8"
        id="linearGradient10774-5"
        gradientUnits="userSpaceOnUse"
@@ -100,7 +94,6 @@
        x2="324.1601"
        y2="515.53949" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10448-90"
        id="linearGradient10778-6"
        gradientUnits="userSpaceOnUse"
@@ -110,7 +103,6 @@
        y2="511.66458"
        gradientTransform="matrix(0.30039597,0,0,0.29632024,-93.823234,870.37106)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10448-9-7-0-5"
        id="linearGradient4291"
        gradientUnits="userSpaceOnUse"
@@ -120,7 +112,6 @@
        x2="323.98331"
        y2="518.28192" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10748-8"
        id="linearGradient4293"
        gradientUnits="userSpaceOnUse"
@@ -130,7 +121,6 @@
        x2="324.1601"
        y2="515.53949" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10448-90"
        id="linearGradient4295"
        gradientUnits="userSpaceOnUse"
@@ -140,31 +130,6 @@
        x2="324.1601"
        y2="511.66458" />
   </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="13.031454"
-     inkscape:cy="12.308121"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1006"
-     inkscape:window-height="814"
-     inkscape:window-x="1420"
-     inkscape:window-y="641"
-     inkscape:window-maximized="0"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3999" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -178,8 +143,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
@@ -192,18 +155,14 @@
          style="display:inline"
          id="g4386">
         <path
-           sodipodi:nodetypes="ccccc"
            style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#9e7400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
            d="m 2.3385061,1041.3342 -3.4062511,0.031 0.0098,1 3.4062501,-0.031 z"
-           id="path4313-5-1-8-6"
-           inkscape:connector-curvature="0" />
+           id="path4313-5-1-8-6" />
       </g>
       <path
-         inkscape:connector-curvature="0"
          id="path4313-5-1-8-6-0"
          d="m 20.608712,1042.3225 3.421876,0.031 -0.0098,1 -3.421875,-0.031 z"
-         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#9e7400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-         sodipodi:nodetypes="ccccc" />
+         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#9e7400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
       <g
          style="display:inline"
          id="g4239"
@@ -218,23 +177,17 @@
            id="rect10007-0-74-2-7-6"
            style="display:inline;fill:url(#linearGradient10770-6);fill-opacity:1;stroke:none;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
         <path
-           inkscape:connector-curvature="0"
            id="path4313-8-8"
            d="m 5.9540546,1024.1006 0,1 5.4296874,0 0,-1 z"
-           style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-           sodipodi:nodetypes="ccccc" />
+           style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
         <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
            id="path4313-8-8-7"
            d="m 6.2874256,1024.0948 0,3.0195 1.01551,0 0,-3.0195 z"
            style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.94926554px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
         <path
-           inkscape:connector-curvature="0"
            id="path4313-5-1-8"
            d="m 11.337748,1026.0967 -5.1562514,0.031 0.0098,1 5.1562504,-0.031 z"
-           style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#9e7400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-           sodipodi:nodetypes="ccccc" />
+           style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#9e7400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
         <rect
            ry="0"
            rx="0"
@@ -245,12 +198,10 @@
            id="rect10007-0-74-2-7"
            style="display:inline;fill:url(#linearGradient10774-5);fill-opacity:1;stroke:none;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
         <path
-           inkscape:connector-curvature="0"
            id="path4313-5-1"
            d="m 6.3114756,1027.1065 -3.3593746,0.031 0.00977,1 3.3593746,-0.031 -0.0098,-1 z"
            style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#9e7400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
         <path
-           inkscape:connector-curvature="0"
            id="path4313-8"
            d="m 6.3017106,1023.0987 -3.3593752,0.031 0.00977,1 3.3593742,-0.031 -0.0098,-1 z"
            style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
@@ -264,26 +215,18 @@
            id="rect10007-0-74-2"
            style="display:inline;fill:url(#linearGradient10778-6);fill-opacity:1;stroke:none;stroke-width:1.50161433;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
         <path
-           inkscape:connector-curvature="0"
            id="path4313"
            d="m 4.3017106,1022.0967 -2.0335499,0.031 0.00977,1 2.0335489,-0.031 -0.0098,-1 z"
-           style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-           sodipodi:nodetypes="cccccc" />
+           style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
         <path
-           inkscape:connector-curvature="0"
            id="path4313-5"
            d="m 4.3075696,1028.0967 -1.9999998,0.031 0.00977,1 1.9999998,-0.031 -0.0098,-1 z"
-           style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#9e7400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-           sodipodi:nodetypes="cccccc" />
+           style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#9e7400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
         <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
            id="path4313-8-8-7-8"
            d="m 4.3092456,1024.1001 0,3.01 1.000277,0 0,-3.01 z"
            style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:0.64640886;fill-rule:evenodd;stroke:none;stroke-width:0.97351193px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
         <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
            id="path4313-8-8-7-8-8"
            d="m 1.3092454,1023.0922 0,5.0101 1.000277,0 0,-5.0101 z"
            style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.97351193px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
@@ -298,18 +241,14 @@
          style="display:inline"
          id="g4386-4">
         <path
-           sodipodi:nodetypes="ccccc"
            style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#9e7400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
            d="m 2.3385061,1041.3342 -3.4062511,0.031 0.0098,1 3.4062501,-0.031 z"
-           id="path4313-5-1-8-6-5"
-           inkscape:connector-curvature="0" />
+           id="path4313-5-1-8-6-5" />
       </g>
       <path
-         inkscape:connector-curvature="0"
          id="path4313-5-1-8-6-0-6"
          d="m 20.608712,1042.3225 3.421876,0.031 -0.0098,1 -3.421875,-0.031 z"
-         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#9e7400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-         sodipodi:nodetypes="ccccc" />
+         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#9e7400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
       <g
          style="display:inline"
          id="g4239-3"
@@ -324,23 +263,17 @@
            id="rect10007-0-74-2-7-6-9"
            style="display:inline;fill:url(#linearGradient4291);fill-opacity:1;stroke:none;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
         <path
-           inkscape:connector-curvature="0"
            id="path4313-8-8-3"
            d="m 5.9540546,1024.1006 0,1 5.4296874,0 0,-1 z"
-           style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-           sodipodi:nodetypes="ccccc" />
+           style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
         <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
            id="path4313-8-8-7-3"
            d="m 6.2874256,1024.0948 0,3.0195 1.01551,0 0,-3.0195 z"
            style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.94926554px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
         <path
-           inkscape:connector-curvature="0"
            id="path4313-5-1-8-8"
            d="m 11.337748,1026.0967 -5.1562514,0.031 0.0098,1 5.1562504,-0.031 z"
-           style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#9e7400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-           sodipodi:nodetypes="ccccc" />
+           style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#9e7400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
         <rect
            ry="0"
            rx="0"
@@ -351,12 +284,10 @@
            id="rect10007-0-74-2-7-1"
            style="display:inline;fill:url(#linearGradient4293);fill-opacity:1;stroke:none;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
         <path
-           inkscape:connector-curvature="0"
            id="path4313-5-1-0"
            d="m 6.3114756,1027.1065 -3.3593746,0.031 0.00977,1 3.3593746,-0.031 -0.0098,-1 z"
            style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#9e7400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
         <path
-           inkscape:connector-curvature="0"
            id="path4313-8-5"
            d="m 6.3017106,1023.0987 -3.3593752,0.031 0.00977,1 3.3593742,-0.031 -0.0098,-1 z"
            style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
@@ -370,26 +301,18 @@
            id="rect10007-0-74-2-1"
            style="display:inline;fill:url(#linearGradient4295);fill-opacity:1;stroke:none;stroke-width:1.50161433;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
         <path
-           inkscape:connector-curvature="0"
            id="path4313-2"
            d="m 4.3017106,1022.0967 -2.0335499,0.031 0.00977,1 2.0335489,-0.031 -0.0098,-1 z"
-           style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-           sodipodi:nodetypes="cccccc" />
+           style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
         <path
-           inkscape:connector-curvature="0"
            id="path4313-5-0"
            d="m 4.3075696,1028.0967 -1.9999998,0.031 0.00977,1 1.9999998,-0.031 -0.0098,-1 z"
-           style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#9e7400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-           sodipodi:nodetypes="cccccc" />
+           style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#9e7400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
         <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
            id="path4313-8-8-7-8-5"
            d="m 4.3092456,1024.1001 0,3.01 1.000277,0 0,-3.01 z"
            style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:0.64640886;fill-rule:evenodd;stroke:none;stroke-width:0.97351193px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
         <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
            id="path4313-8-8-7-8-8-0"
            d="m 1.3092454,1023.0922 0,5.0101 1.000277,0 0,-5.0101 z"
            style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.97351193px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
diff --git a/ui/org.eclipse.pde.runtime/icons/obj16/frgmt_obj.svg b/ui/org.eclipse.pde.runtime/icons/obj16/frgmt_obj.svg
index 87758e9fcb5..88b9b1fc152 100644
--- a/ui/org.eclipse.pde.runtime/icons/obj16/frgmt_obj.svg
+++ b/ui/org.eclipse.pde.runtime/icons/obj16/frgmt_obj.svg
@@ -2,20 +2,16 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="frgmt_obj.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
@@ -34,7 +30,6 @@
          style="stop-color:#763db7;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10448-9-7-0-5"
        id="linearGradient10770-6"
        gradientUnits="userSpaceOnUse"
@@ -59,22 +54,6 @@
          id="stop10452-22-7-8-4" />
     </linearGradient>
     <linearGradient
-       id="linearGradient10440-1-0-0-3">
-      <stop
-         style="stop-color:#ae7603;stop-opacity:1;"
-         offset="0"
-         id="stop10442-43-2-0-9" />
-      <stop
-         id="stop10521-1-2-5-3"
-         offset="0.5"
-         style="stop-color:#e8d8a3;stop-opacity:1" />
-      <stop
-         style="stop-color:#bb9221;stop-opacity:1"
-         offset="1"
-         id="stop10444-3-4-0-4" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10748-8"
        id="linearGradient10774-5"
        gradientUnits="userSpaceOnUse"
@@ -107,22 +86,6 @@
          style="stop-color:#e5b630;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       id="linearGradient10440-1-3-4">
-      <stop
-         style="stop-color:#ae7603;stop-opacity:1;"
-         offset="0"
-         id="stop10442-43-0-5" />
-      <stop
-         id="stop10521-1-4-7"
-         offset="0.5"
-         style="stop-color:#e8d8a3;stop-opacity:1" />
-      <stop
-         style="stop-color:#bb9221;stop-opacity:1"
-         offset="1"
-         id="stop10444-3-2-0" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10448-90"
        id="linearGradient10778-6"
        gradientUnits="userSpaceOnUse"
@@ -155,52 +118,6 @@
          id="stop10452-1" />
     </linearGradient>
     <linearGradient
-       id="linearGradient10440-18">
-      <stop
-         style="stop-color:#ae7603;stop-opacity:1;"
-         offset="0"
-         id="stop10442-8" />
-      <stop
-         id="stop10521-7"
-         offset="0.5"
-         style="stop-color:#e8d8a3;stop-opacity:1" />
-      <stop
-         style="stop-color:#bb9221;stop-opacity:1"
-         offset="1"
-         id="stop10444-0" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10414-9">
-      <stop
-         style="stop-color:#5078b9;stop-opacity:1;"
-         offset="0"
-         id="stop10416-3" />
-      <stop
-         id="stop10422-8"
-         offset="0.5"
-         style="stop-color:#6d8cbd;stop-opacity:1" />
-      <stop
-         style="stop-color:#5f88c9;stop-opacity:1"
-         offset="1"
-         id="stop10418-4" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10432-3">
-      <stop
-         id="stop10434-4"
-         offset="0"
-         style="stop-color:#1f4d9a;stop-opacity:1" />
-      <stop
-         style="stop-color:#4e6da1;stop-opacity:1"
-         offset="0.5"
-         id="stop10436-2" />
-      <stop
-         id="stop10438-9"
-         offset="1"
-         style="stop-color:#567ebc;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10157-6"
        id="linearGradient10786-1"
        gradientUnits="userSpaceOnUse"
@@ -225,22 +142,6 @@
          id="stop10161-55" />
     </linearGradient>
     <linearGradient
-       id="linearGradient10396-5">
-      <stop
-         style="stop-color:#1b3e79;stop-opacity:1;"
-         offset="0"
-         id="stop10398-7" />
-      <stop
-         id="stop10404-9"
-         offset="0.5"
-         style="stop-color:#728fbf;stop-opacity:1" />
-      <stop
-         style="stop-color:#1f4d9a;stop-opacity:1"
-         offset="1"
-         id="stop10400-9" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10157-2-5"
        id="linearGradient10790-8"
        gradientUnits="userSpaceOnUse"
@@ -265,7 +166,6 @@
          id="stop10161-5-0" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10149-39-0"
        id="linearGradient10792-6"
        gradientUnits="userSpaceOnUse"
@@ -275,7 +175,6 @@
        x2="322.875"
        y2="504.44818" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient10149-39-0">
       <stop
          style="stop-color:#6936ae;stop-opacity:1"
@@ -287,22 +186,6 @@
          id="stop10153-72-3" />
     </linearGradient>
     <linearGradient
-       id="linearGradient10149-6-5-4">
-      <stop
-         style="stop-color:#1f4d9a;stop-opacity:1"
-         offset="0"
-         id="stop10151-5-7-2" />
-      <stop
-         id="stop10394-3"
-         offset="0.5"
-         style="stop-color:#b9c7df;stop-opacity:1" />
-      <stop
-         style="stop-color:#567ebc;stop-opacity:1"
-         offset="1"
-         id="stop10153-8-1-2" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4284"
        id="linearGradient10790-8-2"
        gradientUnits="userSpaceOnUse"
@@ -312,29 +195,6 @@
        x2="305"
        y2="545.35248" />
   </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="8.0832705"
-     inkscape:cy="12.606498"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1349"
-     inkscape:window-height="978"
-     inkscape:window-x="979"
-     inkscape:window-y="516"
-     inkscape:window-maximized="0"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid4210" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -348,8 +208,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
@@ -366,18 +224,14 @@
          id="rect10007-0-74-2-7-6"
          style="fill:url(#linearGradient10770-6);fill-opacity:1;stroke:none;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
       <path
-         inkscape:connector-curvature="0"
          id="path4313-8-8"
          d="m 12.648438,1043.3652 0,1 3.351562,0 0,-1 -3.351562,0 z"
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
       <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
          id="path4313-8-8-7"
          d="m 12.981809,1043.3594 0,3.0195 1.01551,0 0,-3.0195 z"
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.94926554px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
       <path
-         inkscape:connector-curvature="0"
          id="path4313-5-1-8"
          d="m 15.992188,1045.3613 -3.359376,0.031 0.0098,1 3.359375,-0.031 -0.0098,-1 z"
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#9e7400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
@@ -391,12 +245,10 @@
          id="rect10007-0-74-2-7"
          style="fill:url(#linearGradient10774-5);fill-opacity:1;stroke:none;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
       <path
-         inkscape:connector-curvature="0"
          id="path4313-5-1"
          d="m 13.005859,1046.3711 -3.3593746,0.031 0.00977,1 3.3593746,-0.031 -0.0098,-1 z"
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#9e7400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
       <path
-         inkscape:connector-curvature="0"
          id="path4313-8"
          d="m 11.991204,1043.3634 -2.3544852,0.028 0.00685,0.9091 2.3544842,-0.028 -0.0069,-0.909 z"
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
@@ -437,18 +289,14 @@
          id="rect10007-0-74"
          style="fill:url(#linearGradient10786-1);fill-opacity:1;stroke:none;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
       <path
-         inkscape:connector-curvature="0"
          id="path4313"
          d="m 11.042833,1043.3647 -3.4061142,0.029 0.00991,0.9204 3.4061132,-0.028 -0.0099,-0.9205 z"
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
       <path
-         inkscape:connector-curvature="0"
          id="path4313-5"
          d="m 11.001953,1047.3613 -3.3593749,0.031 0.00977,1 3.3593749,-0.031 -0.0098,-1 z"
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#9e7400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
       <path
-         sodipodi:nodetypes="cssssc"
-         inkscape:connector-curvature="0"
          id="rect10007-6"
          d="m 6.4755132,1043.9833 c 1.0259795,0 2.0241511,-0.1891 2.0241511,0.834 l 0,3.5451 c 0,0.8271 -0.6658339,1.4929 -1.4929011,1.4929 -0.8270672,0 -1.4929011,-0.6658 -1.4929011,-1.4929 l 0,-3.5537"
          style="fill:url(#linearGradient10790-8);fill-opacity:1;stroke:url(#linearGradient10792-6);stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
@@ -460,14 +308,10 @@
          id="rect10007-6-6"
          style="display:inline;fill:url(#linearGradient10790-8-2);fill-opacity:1;stroke:none;stroke-width:3.58380508;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
       <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
          id="path4313-8-8-7-8"
          d="m 11.003629,1043.3647 0,3.01 1.000277,0 0,-3.01 z"
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:0.64640886;fill-rule:evenodd;stroke:none;stroke-width:0.97351193px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
       <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
          id="path4313-8-8-7-5"
          d="m 11.992245,1042.3524 0,1.0351 1.01551,0 0,-1.0351 z"
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.94926554px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
diff --git a/ui/org.eclipse.pde.runtime/icons/obj16/generic_xml_obj.svg b/ui/org.eclipse.pde.runtime/icons/obj16/generic_xml_obj.svg
index 76c6056e068..d2b9d022cca 100644
--- a/ui/org.eclipse.pde.runtime/icons/obj16/generic_xml_obj.svg
+++ b/ui/org.eclipse.pde.runtime/icons/obj16/generic_xml_obj.svg
@@ -2,48 +2,19 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="generic_obj.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       inkscape:collect="always"
-       id="linearGradient9354">
-      <stop
-         style="stop-color:#1b639e;stop-opacity:1;"
-         offset="0"
-         id="stop9356" />
-      <stop
-         style="stop-color:#6f8db9;stop-opacity:1"
-         offset="1"
-         id="stop9358" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient8562">
-      <stop
-         style="stop-color:#6994ad;stop-opacity:1"
-         offset="0"
-         id="stop8564" />
-      <stop
-         style="stop-color:#005596;stop-opacity:1"
-         offset="1"
-         id="stop8566" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        id="linearGradient4902-3">
       <stop
          style="stop-color:#b28a30;stop-opacity:1"
@@ -55,7 +26,6 @@
          id="stop4906-2" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4894-6">
       <stop
          style="stop-color:#e0c88f;stop-opacity:1"
@@ -67,7 +37,6 @@
          id="stop4898-5" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4994-6">
       <stop
          style="stop-color:#f9fafc;stop-opacity:1;"
@@ -79,7 +48,6 @@
          id="stop4998-89" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4994-6"
        id="linearGradient4084"
        gradientUnits="userSpaceOnUse"
@@ -89,7 +57,6 @@
        x2="9.8946028"
        y2="1051.8378" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4894-6"
        id="linearGradient4086"
        gradientUnits="userSpaceOnUse"
@@ -99,7 +66,6 @@
        x2="9.9874563"
        y2="1040.3303" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4902-3"
        id="linearGradient4088"
        gradientUnits="userSpaceOnUse"
@@ -108,241 +74,7 @@
        y1="1038.5779"
        x2="10.544736"
        y2="1052.3228" />
-    <linearGradient
-       id="linearGradient5103-3-7">
-      <stop
-         style="stop-color:#c1ebca;stop-opacity:1"
-         offset="0"
-         id="stop5105-5-4" />
-      <stop
-         id="stop7550-07-0"
-         offset="0.26694915"
-         style="stop-color:#b3dac7;stop-opacity:1" />
-      <stop
-         id="stop7548-6-9"
-         offset="0.51694918"
-         style="stop-color:#9ec2c3;stop-opacity:1" />
-      <stop
-         style="stop-color:#7a99bb;stop-opacity:1"
-         offset="1"
-         id="stop5107-7-48" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient9354"
-       id="linearGradient9369"
-       gradientUnits="userSpaceOnUse"
-       x1="-1045.2971"
-       y1="-34.1688"
-       x2="-1045.2971"
-       y2="-39.1688" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5103-3-7"
-       id="linearGradient9563"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(19.911612,-20)"
-       x1="13.706096"
-       y1="1045.2537"
-       x2="8.8684521"
-       y2="1045.2537" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8562"
-       id="linearGradient9565"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(19.911612,-40)"
-       x1="13.537925"
-       y1="1065.152"
-       x2="8.7441578"
-       y2="1065.152" />
-    <mask
-       maskUnits="userSpaceOnUse"
-       id="mask9640">
-      <g
-         transform="translate(-3.5400399e-7,-20)"
-         id="g9642"
-         style="fill:#ffffff;display:inline">
-        <rect
-           style="fill:#ffffff;fill-opacity:1;stroke:none"
-           id="rect9644"
-           width="9"
-           height="5"
-           x="-1049.2971"
-           y="-39.1688"
-           transform="matrix(0,-1,-1,0,0,0)" />
-        <rect
-           style="fill:#ffffff;fill-opacity:1;stroke:none"
-           id="rect9646"
-           width="7"
-           height="3"
-           x="-1048.2971"
-           y="-38.1688"
-           transform="matrix(0,-1,-1,0,0,0)" />
-        <rect
-           style="fill:#ffffff;fill-opacity:1;stroke:none"
-           id="rect9648"
-           width="1"
-           height="1"
-           x="-1047.2971"
-           y="-37.1688"
-           transform="matrix(0,-1,-1,0,0,0)" />
-        <rect
-           style="fill:#ffffff;fill-opacity:1;stroke:none"
-           id="rect9650"
-           width="1"
-           height="1"
-           x="-1045.2971"
-           y="-37.1688"
-           transform="matrix(0,-1,-1,0,0,0)" />
-        <rect
-           style="fill:#ffffff;fill-opacity:1;stroke:none"
-           id="rect9652"
-           width="1"
-           height="1"
-           x="-1043.2971"
-           y="-37.1688"
-           transform="matrix(0,-1,-1,0,0,0)" />
-        <g
-           style="fill:#ffffff;stroke:#ffffff;display:inline"
-           id="g9654"
-           transform="matrix(0,-1,-1,0,1074.4897,1048.3882)">
-          <path
-             sodipodi:nodetypes="cccccc"
-             inkscape:connector-curvature="0"
-             id="path9656"
-             d="m 3.5193795,1037.8597 7.0096695,0 3.062057,3.0066 0,9.9546 -10.0717265,0 z"
-             style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;display:inline" />
-          <path
-             inkscape:connector-curvature="0"
-             id="path9658"
-             d="m 9.998718,1037.397 0,3.9112 3.977478,0 z"
-             style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;display:inline" />
-          <path
-             sodipodi:nodetypes="cccccc"
-             inkscape:connector-curvature="0"
-             id="path9660"
-             d="m 3.5193795,1037.8597 7.0096695,0 3.062057,3.0066 0,9.9546 -10.0717265,0 z"
-             style="fill:#ffffff;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;display:inline" />
-        </g>
-      </g>
-    </mask>
-    <linearGradient
-       gradientTransform="translate(-20,0)"
-       gradientUnits="userSpaceOnUse"
-       y2="1044.8622"
-       x2="32.031251"
-       y1="1044.8622"
-       x1="22"
-       id="linearGradient3804"
-       xlink:href="#linearGradient3798"
-       inkscape:collect="always" />
-    <linearGradient
-       gradientTransform="translate(-20,0)"
-       gradientUnits="userSpaceOnUse"
-       y2="1043.3622"
-       x2="32.03125"
-       y1="1043.3622"
-       x1="22.03125"
-       id="linearGradient3794"
-       xlink:href="#linearGradient3788"
-       inkscape:collect="always" />
-    <linearGradient
-       gradientTransform="translate(-20,0)"
-       gradientUnits="userSpaceOnUse"
-       y2="1040.4054"
-       x2="31.388678"
-       y1="1040.4054"
-       x1="22.377558"
-       id="linearGradient3786"
-       xlink:href="#linearGradient3780"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient10798-1-9-3-7-6-8-9-0-9-1">
-      <stop
-         id="stop10800-5-2-1-8-20-6-4-9-8-2"
-         offset="0"
-         style="stop-color:#7564b1;stop-opacity:1" />
-      <stop
-         style="stop-color:#5d4aa1;stop-opacity:1"
-         offset="0.5"
-         id="stop10806-6-8-5-3-9-24-8-4-3-2" />
-      <stop
-         id="stop10802-1-5-3-0-4-8-4-2-9-2"
-         offset="1"
-         style="stop-color:#9283c3;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient10798-1-9-3-7-6-8-9-0-9-1"
-       id="linearGradient3929-5"
-       gradientUnits="userSpaceOnUse"
-       x1="388.63736"
-       y1="478.18777"
-       x2="388.63736"
-       y2="462.11539" />
-    <linearGradient
-       id="linearGradient3780"
-       inkscape:collect="always">
-      <stop
-         id="stop3782"
-         offset="0"
-         style="stop-color:#fdf2d0;stop-opacity:1;" />
-      <stop
-         id="stop3784"
-         offset="1"
-         style="stop-color:#fffdf9;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3788"
-       inkscape:collect="always">
-      <stop
-         id="stop3790"
-         offset="0"
-         style="stop-color:#d8bb8c;stop-opacity:1" />
-      <stop
-         id="stop3792"
-         offset="1"
-         style="stop-color:#dfc38d;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3798"
-       inkscape:collect="always">
-      <stop
-         id="stop3800"
-         offset="0"
-         style="stop-color:#3f3f9f;stop-opacity:1" />
-      <stop
-         id="stop3802"
-         offset="1"
-         style="stop-color:#3f5fbf;stop-opacity:1" />
-    </linearGradient>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="21.34375"
-     inkscape:cx="12.378283"
-     inkscape:cy="4.3958542"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="900"
-     inkscape:window-x="81"
-     inkscape:window-y="25"
-     inkscape:window-maximized="0"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3999" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -356,8 +88,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
@@ -365,19 +95,14 @@
        id="g4078"
        transform="translate(-1.0640915,-0.97334116)">
       <path
-         sodipodi:nodetypes="cccccc"
-         inkscape:connector-curvature="0"
          id="rect4001-3"
          d="m 3.0274322,1037.8597 7.5016168,0 3.062057,3.0066 0,10.6105 -10.5636738,0 z"
          style="fill:url(#linearGradient4084);fill-opacity:1;stroke:none;display:inline" />
       <path
-         inkscape:connector-curvature="0"
          id="path4884"
          d="m 9.998718,1038.4734 0,3.9112 3.977478,0 z"
          style="fill:url(#linearGradient4086);fill-opacity:1;stroke:none;display:inline" />
       <path
-         sodipodi:nodetypes="cccccc"
-         inkscape:connector-curvature="0"
          id="rect4001"
          d="m 3.5430912,1038.8205 6.9859578,0 3.062057,3.0066 0,10.0245 -10.0480148,0 z"
          style="fill:none;stroke:url(#linearGradient4088);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;display:inline" />
@@ -385,33 +110,27 @@
     <path
        style="fill:none;stroke:#29486b;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
        d="m 5.001464,1041.8555 1.9912152,0"
-       id="path3057"
-       inkscape:connector-curvature="0" />
+       id="path3057" />
     <path
        style="fill:none;stroke:#29486b;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
        d="m 8.005859,1041.8555 1.991215,0"
-       id="path3057-7"
-       inkscape:connector-curvature="0" />
+       id="path3057-7" />
     <path
        style="fill:none;stroke:#29486b;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
        d="m 5.001464,1047.8555 1.9912152,0"
-       id="path3057-8"
-       inkscape:connector-curvature="0" />
+       id="path3057-8" />
     <path
        style="fill:none;stroke:#29486b;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
        d="m 8.005859,1047.8555 1.991215,0"
-       id="path3057-7-9"
-       inkscape:connector-curvature="0" />
+       id="path3057-7-9" />
     <path
        style="fill:#29486b;stroke:#29486b;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1"
        d="M 5.9853587,11.525622 9.0073206,5.4816985"
        id="path3116"
-       inkscape:connector-curvature="0"
        transform="translate(0,1036.3622)" />
     <path
        style="fill:#29486b;stroke:#29486b;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline;fill-opacity:1"
        d="m 9.0073206,1047.8878 -3.0219619,-6.0439"
-       id="path3116-5"
-       inkscape:connector-curvature="0" />
+       id="path3116-5" />
   </g>
 </svg>
diff --git a/ui/org.eclipse.pde.runtime/icons/obj16/int_obj.svg b/ui/org.eclipse.pde.runtime/icons/obj16/int_obj.svg
index f9e84b00dd5..e84c6411d94 100644
--- a/ui/org.eclipse.pde.runtime/icons/obj16/int_obj.svg
+++ b/ui/org.eclipse.pde.runtime/icons/obj16/int_obj.svg
@@ -2,73 +2,18 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.48.5 r10040"
-   sodipodi:docname="int_obj.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
-    <linearGradient
-       y2="462.11539"
-       x2="388.63736"
-       y1="478.18777"
-       x1="388.63736"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3929-5"
-       xlink:href="#linearGradient10798-1-9-3-7-6-8-9-0-9-1"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient10798-1-9-3-7-6-8-9-0-9-1">
-      <stop
-         style="stop-color:#7564b1;stop-opacity:1"
-         offset="0"
-         id="stop10800-5-2-1-8-20-6-4-9-8-2" />
-      <stop
-         id="stop10806-6-8-5-3-9-24-8-4-3-2"
-         offset="0.5"
-         style="stop-color:#5d4aa1;stop-opacity:1" />
-      <stop
-         style="stop-color:#9283c3;stop-opacity:1"
-         offset="1"
-         id="stop10802-1-5-3-0-4-8-4-2-9-2" />
-    </linearGradient>
-    <filter
-       color-interpolation-filters="sRGB"
-       inkscape:collect="always"
-       id="filter8047">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="0.13789128"
-         id="feGaussianBlur8049" />
-    </filter>
-    <linearGradient
-       y2="462.11539"
-       x2="388.63736"
-       y1="478.18777"
-       x1="388.63736"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient7188"
-       xlink:href="#linearGradient10798-1-9-3-7-6-8-9-0-9-1"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="462.11539"
-       x2="388.63736"
-       y1="478.18777"
-       x1="388.63736"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3046"
-       xlink:href="#linearGradient10798-1-9-3-7-6-8-9-0-9-1-9"
-       inkscape:collect="always" />
     <linearGradient
        id="linearGradient10798-1-9-3-7-6-8-9-0-9-1-9">
       <stop
@@ -91,35 +36,8 @@
        x1="388.63736"
        gradientUnits="userSpaceOnUse"
        id="linearGradient3016"
-       xlink:href="#linearGradient10798-1-9-3-7-6-8-9-0-9-1-9"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient10798-1-9-3-7-6-8-9-0-9-1-9" />
   </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.9148766"
-     inkscape:cy="12.16319"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="925"
-     inkscape:window-height="1055"
-     inkscape:window-x="414"
-     inkscape:window-y="438"
-     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>
@@ -133,25 +51,16 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      transform="translate(0,-1036.3622)">
     <path
-       sodipodi:type="arc"
        style="font-size:13.58917427px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:url(#linearGradient3016);fill-opacity:1;stroke:#55429f;stroke-width:2.16621375;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline;font-family:Sans"
        id="path10796-2-6-2"
-       sodipodi:cx="388.125"
-       sodipodi:cy="468.23718"
-       sodipodi:rx="10.625"
-       sodipodi:ry="10.625"
        d="m 398.75,468.23718 a 10.625,10.625 0 1 1 -21.25,0 10.625,10.625 0 1 1 21.25,0 z"
        transform="matrix(0.55482947,0,0,0.55482947,-207.83019,783.15705)" />
     <path
        style="font-size:13.58917427px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;display:inline;font-family:Sans"
        d="m 5.0513836,1039.3735 0,1.0313 0.8880662,0 0,4.9687 -0.9322604,0 0,1.0313 4.789695,0 0,-1.0313 -1.2858115,0 0,-4.9687 1.2858115,0 0,-1.0313 z"
-       id="rect7222"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccccccccc" />
+       id="rect7222" />
   </g>
 </svg>
diff --git a/ui/org.eclipse.pde.runtime/icons/obj16/java_lib_obj.svg b/ui/org.eclipse.pde.runtime/icons/obj16/java_lib_obj.svg
index 428952820ce..a14533133f5 100644
--- a/ui/org.eclipse.pde.runtime/icons/obj16/java_lib_obj.svg
+++ b/ui/org.eclipse.pde.runtime/icons/obj16/java_lib_obj.svg
@@ -2,24 +2,19 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="java_lib_obj.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4918-5"
        id="linearGradient4975-9"
        gradientUnits="userSpaceOnUse"
@@ -40,7 +35,6 @@
          id="stop4922-9" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4907-9"
        id="linearGradient4977-3"
        gradientUnits="userSpaceOnUse"
@@ -61,7 +55,6 @@
          id="stop4911-0" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4928-4"
        id="linearGradient4979-8"
        gradientUnits="userSpaceOnUse"
@@ -104,17 +97,6 @@
          id="stop4965-3" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4961-6"
-       id="linearGradient9855"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-4.625,0)"
-       x1="15.073242"
-       y1="1040.0764"
-       x2="18.744612"
-       y2="1049.2014" />
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4938-8"
        id="linearGradient9955"
        x1="-0.81249988"
@@ -131,36 +113,8 @@
        gradientTransform="matrix(0.99991713,0,0,1,-4.3453016,0.18909977)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient5020-3"
-       xlink:href="#linearGradient4961-6"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4961-6" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="36.875"
-     inkscape:cx="8"
-     inkscape:cy="8"
-     inkscape:document-units="px"
-     inkscape:current-layer="g4969"
-     showgrid="true"
-     inkscape:window-width="1440"
-     inkscape:window-height="855"
-     inkscape:window-x="0"
-     inkscape:window-y="1"
-     inkscape:window-maximized="1"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-bbox="true"
-     inkscape:bbox-nodes="true"
-     inkscape:snap-global="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3948" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -174,8 +128,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
@@ -212,7 +164,6 @@
          id="rect4161"
          style="fill:#0595d3;fill-opacity:1;stroke:none;stroke-width:0.83589131;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
       <path
-         inkscape:connector-curvature="0"
          id="path4949-4"
          d="m 9.9142586,1039.7792 c 0.088382,-0.044 1.5695284,-0.9063 1.5695284,-0.9063 l 3.976381,10.3859 -1.956272,0.5243 z"
          style="display:inline;fill:#f0c028;fill-opacity:1;stroke:url(#linearGradient5020-3);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
diff --git a/ui/org.eclipse.pde.runtime/icons/obj16/layoutspy_obj.svg b/ui/org.eclipse.pde.runtime/icons/obj16/layoutspy_obj.svg
index 4c054d76411..aae86b91f7c 100644
--- a/ui/org.eclipse.pde.runtime/icons/obj16/layoutspy_obj.svg
+++ b/ui/org.eclipse.pde.runtime/icons/obj16/layoutspy_obj.svg
@@ -2,48 +2,19 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="layoutspy_obj.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient5147"
-       inkscape:collect="always">
-      <stop
-         id="stop5149"
-         offset="0"
-         style="stop-color:#91a5c7;stop-opacity:1;" />
-      <stop
-         id="stop5151"
-         offset="1"
-         style="stop-color:#637aa7;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5141"
-       inkscape:collect="always">
-      <stop
-         id="stop5143"
-         offset="0"
-         style="stop-color:#91a5c7;stop-opacity:1;" />
-      <stop
-         id="stop5145"
-         offset="1"
-         style="stop-color:#637aa7;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        id="linearGradient4994">
       <stop
          style="stop-color:#f9fafc;stop-opacity:1;"
@@ -55,7 +26,6 @@
          id="stop4998" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4902">
       <stop
          style="stop-color:#bfb688;stop-opacity:1"
@@ -67,27 +37,6 @@
          id="stop4906" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5147"
-       id="linearGradient4871"
-       x1="7.0070496"
-       y1="1047.857"
-       x2="14"
-       y2="1047.857"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-2,-3.0091529)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5141"
-       id="linearGradient4875"
-       x1="7.0070496"
-       y1="1049.857"
-       x2="14"
-       y2="1049.857"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-2,-3.0091529)" />
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4902"
        id="linearGradient4908"
        x1="10.544736"
@@ -97,7 +46,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1,0,0,0.9258402,-3.9972455,75.004823)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4994"
        id="linearGradient5000"
        x1="9.8946028"
@@ -106,105 +54,7 @@
        y2="1051.8378"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1,0,0,0.88726352,-3.9972455,115.08221)" />
-    <linearGradient
-       id="linearGradient4852-7-8"
-       inkscape:collect="always">
-      <stop
-         id="stop4854-4-1"
-         offset="0"
-         style="stop-color:#707070;stop-opacity:1" />
-      <stop
-         id="stop4856-0-2"
-         offset="1"
-         style="stop-color:#a0a0a0;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4844-4-1"
-       inkscape:collect="always">
-      <stop
-         id="stop4846-8-4"
-         offset="0"
-         style="stop-color:#606060;stop-opacity:1" />
-      <stop
-         id="stop4848-8-9"
-         offset="1"
-         style="stop-color:#787878;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       y2="1038.5814"
-       x2="4.7528968"
-       y1="1051.0466"
-       x1="4.7528968"
-       gradientTransform="translate(1.9961442e-6,-9.9830355e-5)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient6120"
-       xlink:href="#linearGradient4852-7-8"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="1037.7"
-       x2="8.6566515"
-       y1="1050.7386"
-       x1="8.6566515"
-       gradientTransform="translate(1.9961442e-6,-9.9830355e-5)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient6122"
-       xlink:href="#linearGradient4844-4-1"
-       inkscape:collect="always" />
-    <mask
-       maskUnits="userSpaceOnUse"
-       id="mask6204">
-      <path
-         style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-         d="m 1,1036.3935 0,0.5 0,12.9687 0,0.5 0.5,0 10.0625,0 0.5,0 0,-0.5 0,-9.9687 0,-0.2188 -0.15625,-0.125 -3.0625,-3 -0.125,-0.1562 -0.21875,0 -7,0 -0.5,0 z"
-         id="path6206"
-         inkscape:connector-curvature="0" />
-    </mask>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4861-5"
-       id="linearGradient4869-6"
-       x1="7.0070496"
-       y1="1045.8571"
-       x2="14"
-       y2="1045.8571"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-2,-3.0091529)" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient4861-5">
-      <stop
-         style="stop-color:#acbcd5;stop-opacity:1"
-         offset="0"
-         id="stop4863-1" />
-      <stop
-         style="stop-color:#869abe;stop-opacity:1"
-         offset="1"
-         id="stop4865-2" />
-    </linearGradient>
-    <linearGradient
-       y2="1045.8571"
-       x2="14"
-       y1="1045.8571"
-       x1="7.0070496"
-       gradientTransform="translate(-2,-1.0091316)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3066-1"
-       xlink:href="#linearGradient4861-5-1"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient4861-5-1">
-      <stop
-         style="stop-color:#acbcd5;stop-opacity:1"
-         offset="0"
-         id="stop4863-1-6" />
-      <stop
-         style="stop-color:#869abe;stop-opacity:1"
-         offset="1"
-         id="stop4865-2-2" />
-    </linearGradient>
     <radialGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4177"
        id="radialGradient4245"
        cx="14.311938"
@@ -215,7 +65,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(0.56661847,0,0,0.70718173,-0.07816061,309.04807)" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4177">
       <stop
          style="stop-color:#ffffff;stop-opacity:1"
@@ -227,7 +76,6 @@
          id="stop4181" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4167"
        id="linearGradient4173"
        x1="22.69014"
@@ -237,7 +85,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(0.70710673,0,0,0.70718173,-7.1682751,309.04807)" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4167">
       <stop
          style="stop-color:#acaa94;stop-opacity:1"
@@ -249,33 +96,6 @@
          id="stop4171" />
     </linearGradient>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#c9c9c9"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="35.182747"
-     inkscape:cx="8.5008808"
-     inkscape:cy="7.9989192"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="2560"
-     inkscape:window-height="1391"
-     inkscape:window-x="0"
-     inkscape:window-y="1"
-     inkscape:window-maximized="1"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="true"
-     inkscape:snap-bbox="true"
-     inkscape:bbox-nodes="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3999" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -284,47 +104,31 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
     <path
        style="display:inline;fill:url(#linearGradient5000);fill-opacity:1;stroke:none"
        d="m 1.5000365,1036.8622 9.9999995,0 c 0,0 0.0054,6.7618 0.0054,11.5 l -10.0054345,0 z"
-       id="rect4001-3"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+       id="rect4001-3" />
     <path
        style="fill:none;stroke:url(#linearGradient4908);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1"
        d="m 1.5000365,1036.8622 9.9999995,0 c 0,0 0.0054,7.143 0.0054,12 l -10.0054345,0 z"
-       id="rect4001"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+       id="rect4001" />
     <path
-       inkscape:connector-curvature="0"
        id="path4185"
        d="m 15.6438,1052.0064 0,-1.0287 -3.980969,-4.0836 -1.102083,1.0311 4.054422,4.0812 z"
-       style="fill:#677da9;fill-opacity:1;fill-rule:evenodd;stroke:#677da9;stroke-width:0.71592331;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       sodipodi:nodetypes="cccccc" />
+       style="fill:#677da9;fill-opacity:1;fill-rule:evenodd;stroke:#677da9;stroke-width:0.71592331;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
     <image
        y="1036.3622"
        x="16"
        id="image4287"
-       xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAMAAAAoLQ9TAAAAilBMVEVsgq1nfal3jLWGk66Klatx
-h7F9krmDmL2HnMCNmKny9vzs8vqTm6Xn7/nx9vzv9Pry9vvo8Pnq8fnt8/rn8Pns8/ry9/z3+v36
-/P74+vz8/f7n8Pjy9/v1+fz3+vyZnqH0+fz3+/37/f76/P37/f39/v78/f2gop2mppmsqpSyrpG3
-sY2/toi8tIpAuRh9AAAAAXRSTlMAQObYZgAAAAFiS0dEAIgFHUgAAAAJcEhZcwAACxMAAAsTAQCa
-nBgAAAAHdElNRQfgBxMWJwTvHzz9AAAAHXRFWHRDb21tZW50AENyZWF0ZWQgd2l0aCBUaGUgR0lN
-UO9kJW4AAAB8SURBVBjTjc3dCsIwDIbhBoUPUYgUtLDKLDK3dD/3f3vrkrqd+tKTPDTEufnIaTN+
-VVjwtbAYTOia5tP3HSaDcV8ZDTLaEILkLNlAkFLKkTlWGPB6DvFeiqLwBjOxRgo3PK7EvlThAu8l
-arZy3i7SNpP9OGlCVJ7J0X+yAvwHDN8iK2w9AAAAAElFTkSuQmCC
-"
+       xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAMAAAAoLQ9TAAAAilBMVEVsgq1nfal3jLWGk66Klatx h7F9krmDmL2HnMCNmKny9vzs8vqTm6Xn7/nx9vzv9Pry9vvo8Pnq8fnt8/rn8Pns8/ry9/z3+v36 /P74+vz8/f7n8Pjy9/v1+fz3+vyZnqH0+fz3+/37/f76/P37/f39/v78/f2gop2mppmsqpSyrpG3 sY2/toi8tIpAuRh9AAAAAXRSTlMAQObYZgAAAAFiS0dEAIgFHUgAAAAJcEhZcwAACxMAAAsTAQCa nBgAAAAHdElNRQfgBxMWJwTvHzz9AAAAHXRFWHRDb21tZW50AENyZWF0ZWQgd2l0aCBUaGUgR0lN UO9kJW4AAAB8SURBVBjTjc3dCsIwDIbhBoUPUYgUtLDKLDK3dD/3f3vrkrqd+tKTPDTEufnIaTN+ VVjwtbAYTOia5tP3HSaDcV8ZDTLaEILkLNlAkFLKkTlWGPB6DvFeiqLwBjOxRgo3PK7EvlThAu8l arZy3i7SNpP9OGlCVJ7J0X+yAvwHDN8iK2w9AAAAAElFTkSuQmCC "
        style="image-rendering:optimizeSpeed"
        preserveAspectRatio="none"
        height="16"
@@ -332,14 +136,11 @@ arZy3i7SNpP9OGlCVJ7J0X+yAvwHDN8iK2w9AAAAAElFTkSuQmCC
     <path
        style="display:inline;fill:none;stroke:#8398bd;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1"
        d="m 2.5000153,1037.8622 7.9956537,0 c 0,0 0.0043,5.9525 0.0043,10 l -7.9999992,0 z"
-       id="rect4001-36"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+       id="rect4001-36" />
     <path
        style="fill:none;fill-rule:evenodd;stroke:#8398bd;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
        d="m 2,1040.8622 9,0"
-       id="path4314"
-       inkscape:connector-curvature="0" />
+       id="path4314" />
     <ellipse
        cy="1045.3625"
        cx="9"
diff --git a/ui/org.eclipse.pde.runtime/icons/obj16/location_obj.svg b/ui/org.eclipse.pde.runtime/icons/obj16/location_obj.svg
index eaf3f9953b6..8dd7e5e624a 100644
--- a/ui/org.eclipse.pde.runtime/icons/obj16/location_obj.svg
+++ b/ui/org.eclipse.pde.runtime/icons/obj16/location_obj.svg
@@ -2,46 +2,17 @@
 <!-- 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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="loacation_obj.svg">
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#888888"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="70.375"
-     inkscape:cx="8"
-     inkscape:cy="8"
-     inkscape:document-units="px"
-     inkscape:current-layer="text3909-7-7-1"
-     showgrid="true"
-     inkscape:window-width="2560"
-     inkscape:window-height="1391"
-     inkscape:window-x="0"
-     inkscape:window-y="1"
-     inkscape:window-maximized="1"
-     inkscape:snap-global="true"
-     inkscape:snap-bbox="true"
-     inkscape:bbox-nodes="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3896" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -50,13 +21,11 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
@@ -64,7 +33,6 @@
        style="fill:#ffffff;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1"
        d="m 11.828126,11.46875 0.04687,-1.9687503 c 0,0 0.375,-0.5625 0.390625,-0.65625 0.01563,-0.09375 0.25,-2.0156251 0.25,-2.0156251 l -0.46875,-1.6093751 -1.375001,-1.2343751 -2.2499996,-0.375 -1.0625001,0.109375 c 0,0 -1.203125,0.5156251 -1.296875,0.5625001 -0.09375,0.046875 -1.1250001,0.796875 -1.1250001,0.796875 l -0.390625,0.71875 c 0,0 -0.5625,1.4687501 -0.578125,1.7187501 -0.015625,0.25 -0.25,2.0937501 -0.25,2.1718751 0,0.078125 0.53125,0.9687503 0.75,1.1875003 0.21875,0.21875 0.25,0.765625 0.59375,0.90625 0.3437501,0.140625 1.9531251,0.65625 1.9531251,0.65625 L 8.7187504,12.640625 10.375,12.21875 z"
        id="path2987"
-       inkscape:connector-curvature="0"
        transform="translate(0,1036.3622)" />
     <g
        style="font-size:11.05178356px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#005597;fill-opacity:1;stroke:#005597;stroke-width:0.1;stroke-miterlimit:4;stroke-opacity:1;display:inline;font-family:AustralianFlyingCorpsStencil;-inkscape-font-specification:AustralianFlyingCorpsStencil"
@@ -73,7 +41,6 @@
       <path
          d="m -7.2191854,1043.532 c -9.8e-6,0.8694 -0.2357809,1.6504 -0.7073142,2.343 -0.5231262,0.7883 -1.2009683,1.1825 -2.0335281,1.1825 -0.3315603,0 -0.6115383,-0.085 -0.8399353,-0.2542 -0.250513,-0.1916 -0.379451,-0.4494 -0.386813,-0.7736 -0.397869,0.6778 -0.902567,1.0167 -1.514094,1.0167 -0.552593,0 -0.987296,-0.1694 -1.304111,-0.5083 -0.31682,-0.3463 -0.475229,-0.7995 -0.475226,-1.3594 -3e-6,-0.7736 0.279976,-1.4699 0.839935,-2.0888 0.559953,-0.6189 1.219376,-0.9283 1.97827,-0.9283 0.729411,0 1.123591,0.3094 1.18254,0.9283 l 0.24314,-0.8068 1.259903,0 c -0.2063077,0.6558 -0.4089236,1.3115 -0.6078481,1.9672 -0.2799856,0.9358 -0.4199749,1.5657 -0.4199679,1.8899 -7e-6,0.3389 0.1215627,0.5084 0.364709,0.5084 0.1105104,0 0.2615513,-0.059 0.4531231,-0.1769 1.0167553,-0.6262 1.5251368,-1.6025 1.5251461,-2.9287 -9.3e-6,-1.0241 -0.3462981,-1.8382 -1.0388676,-2.4424 -0.6631146,-0.5673 -1.5141016,-0.851 -2.5529616,-0.851 -1.304115,0 -2.379821,0.4605 -3.227121,1.3815 -0.817834,0.8915 -1.226749,1.9967 -1.226748,3.3155 -10e-7,1.201 0.372075,2.144 1.11623,2.8293 0.714679,0.6557 1.679867,0.9836 2.895567,0.9836 1.090437,0 2.232453,-0.3721 3.4260531,-1.1163 l 0.2431393,0.3537 c -1.0757148,0.8252 -2.2914094,1.2378 -3.6470884,1.2378 -1.473575,0 -2.674534,-0.361 -3.602882,-1.0831 -1.009397,-0.7957 -1.514094,-1.9119 -1.514094,-3.3487 0,-1.4514 0.545221,-2.6598 1.635664,-3.625 1.0536,-0.9357 2.313503,-1.4035 3.77971,-1.4035 1.200954,0 2.1808775,0.3205 2.9397744,0.9615 0.8104548,0.6926 1.2156864,1.6246 1.2156962,2.7961 m -3.6139336,-0.3537 c -6e-6,-0.361 -0.162098,-0.5415 -0.486278,-0.5415 -0.456812,0 -0.869412,0.4236 -1.2378,1.2709 -0.32419,0.7295 -0.486282,1.3594 -0.486278,1.8899 -4e-6,0.5084 0.198928,0.7626 0.596796,0.7626 0.397859,0 0.780987,-0.4716 1.149385,-1.4147 0.309444,-0.8104 0.464169,-1.4662 0.464175,-1.9672"
          id="path4719"
-         inkscape:connector-curvature="0"
          style="stroke:none" />
     </g>
   </g>
diff --git a/ui/org.eclipse.pde.runtime/icons/obj16/menu_obj.svg b/ui/org.eclipse.pde.runtime/icons/obj16/menu_obj.svg
index da43eb942de..ccc2dc6554e 100644
--- a/ui/org.eclipse.pde.runtime/icons/obj16/menu_obj.svg
+++ b/ui/org.eclipse.pde.runtime/icons/obj16/menu_obj.svg
@@ -2,48 +2,19 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="menu_obj.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient5147"
-       inkscape:collect="always">
-      <stop
-         id="stop5149"
-         offset="0"
-         style="stop-color:#91a5c7;stop-opacity:1;" />
-      <stop
-         id="stop5151"
-         offset="1"
-         style="stop-color:#637aa7;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5141"
-       inkscape:collect="always">
-      <stop
-         id="stop5143"
-         offset="0"
-         style="stop-color:#91a5c7;stop-opacity:1;" />
-      <stop
-         id="stop5145"
-         offset="1"
-         style="stop-color:#637aa7;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        id="linearGradient4994">
       <stop
          style="stop-color:#f9fafc;stop-opacity:1;"
@@ -55,7 +26,6 @@
          id="stop4998" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4902">
       <stop
          style="stop-color:#bfb688;stop-opacity:1"
@@ -67,7 +37,6 @@
          id="stop4906" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4861">
       <stop
          style="stop-color:#acbcd5;stop-opacity:1"
@@ -79,7 +48,6 @@
          id="stop4865" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4861"
        id="linearGradient4869"
        x1="7.0070496"
@@ -89,27 +57,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1.0010081,0,0,0.98973073,-2.0141133,7.7453706)" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5147"
-       id="linearGradient4871"
-       x1="7.0070496"
-       y1="1047.857"
-       x2="14"
-       y2="1047.857"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-2,-3.0091529)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5141"
-       id="linearGradient4875"
-       x1="7.0070496"
-       y1="1049.857"
-       x2="14"
-       y2="1049.857"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-2,-3.0091529)" />
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4902"
        id="linearGradient4908"
        x1="10.544736"
@@ -119,7 +66,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1,0,0,0.9258402,-1.997282,77.004823)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4994"
        id="linearGradient5000"
        x1="9.8946028"
@@ -129,104 +75,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1,0,0,0.88726352,-1.997282,117.08221)" />
     <linearGradient
-       id="linearGradient4852-7-8"
-       inkscape:collect="always">
-      <stop
-         id="stop4854-4-1"
-         offset="0"
-         style="stop-color:#707070;stop-opacity:1" />
-      <stop
-         id="stop4856-0-2"
-         offset="1"
-         style="stop-color:#a0a0a0;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4844-4-1"
-       inkscape:collect="always">
-      <stop
-         id="stop4846-8-4"
-         offset="0"
-         style="stop-color:#606060;stop-opacity:1" />
-      <stop
-         id="stop4848-8-9"
-         offset="1"
-         style="stop-color:#787878;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       y2="1038.5814"
-       x2="4.7528968"
-       y1="1051.0466"
-       x1="4.7528968"
-       gradientTransform="translate(1.9961442e-6,-9.9830355e-5)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient6120"
-       xlink:href="#linearGradient4852-7-8"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="1037.7"
-       x2="8.6566515"
-       y1="1050.7386"
-       x1="8.6566515"
-       gradientTransform="translate(1.9961442e-6,-9.9830355e-5)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient6122"
-       xlink:href="#linearGradient4844-4-1"
-       inkscape:collect="always" />
-    <mask
-       maskUnits="userSpaceOnUse"
-       id="mask6204">
-      <path
-         style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-         d="m 1,1036.3935 0,0.5 0,12.9687 0,0.5 0.5,0 10.0625,0 0.5,0 0,-0.5 0,-9.9687 0,-0.2188 -0.15625,-0.125 -3.0625,-3 -0.125,-0.1562 -0.21875,0 -7,0 -0.5,0 z"
-         id="path6206"
-         inkscape:connector-curvature="0" />
-    </mask>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4861-5"
-       id="linearGradient4869-6"
-       x1="7.0070496"
-       y1="1045.8571"
-       x2="14"
-       y2="1045.8571"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-2,-3.0091529)" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient4861-5">
-      <stop
-         style="stop-color:#acbcd5;stop-opacity:1"
-         offset="0"
-         id="stop4863-1" />
-      <stop
-         style="stop-color:#869abe;stop-opacity:1"
-         offset="1"
-         id="stop4865-2" />
-    </linearGradient>
-    <linearGradient
-       y2="1045.8571"
-       x2="14"
-       y1="1045.8571"
-       x1="7.0070496"
-       gradientTransform="translate(-2,-1.0091316)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3066-1"
-       xlink:href="#linearGradient4861-5-1"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient4861-5-1">
-      <stop
-         style="stop-color:#acbcd5;stop-opacity:1"
-         offset="0"
-         id="stop4863-1-6" />
-      <stop
-         style="stop-color:#869abe;stop-opacity:1"
-         offset="1"
-         id="stop4865-2-2" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4861"
        id="linearGradient4869-8"
        x1="7.0070496"
@@ -236,7 +84,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1.0010081,0,0,0.98973073,-2.0141133,5.7454178)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4861"
        id="linearGradient4869-3"
        x1="7.0070496"
@@ -246,7 +93,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1.0010081,0,0,0.98973073,-2.0141133,9.7454004)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4861"
        id="linearGradient4869-5"
        x1="7.0070496"
@@ -256,7 +102,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1.0010081,0,0,0.98973073,-2.0141133,11.7454)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4861"
        id="linearGradient4869-56"
        x1="7.0070496"
@@ -266,33 +111,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1.0010081,0,0,0.98973073,-2.0141133,13.7454)" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#c9c9c9"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="49.749289"
-     inkscape:cx="10.836219"
-     inkscape:cy="5.2605186"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="2560"
-     inkscape:window-height="1391"
-     inkscape:window-x="0"
-     inkscape:window-y="1"
-     inkscape:window-maximized="1"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="true"
-     inkscape:snap-bbox="true"
-     inkscape:bbox-nodes="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3999" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -301,28 +119,22 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
     <path
        style="display:inline;fill:url(#linearGradient5000);fill-opacity:1;stroke:none"
        d="m 3.5,1038.8622 10,0 c 0,0 0.0054,6.7618 0.0054,11.5 l -10.005435,0 z"
-       id="rect4001-3"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+       id="rect4001-3" />
     <path
        style="fill:none;stroke:url(#linearGradient4908);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1"
        d="m 3.5,1038.8622 10,0 c 0,0 0.0054,7.143 0.0054,12 l -10.005435,0 z"
-       id="rect4001"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+       id="rect4001" />
     <rect
        style="display:inline;fill:url(#linearGradient4869);fill-opacity:1;stroke:none"
        id="rect4001-1-7"
diff --git a/ui/org.eclipse.pde.runtime/icons/obj16/menuspy_obj.svg b/ui/org.eclipse.pde.runtime/icons/obj16/menuspy_obj.svg
index 6847a114413..d64f82ed3ae 100644
--- a/ui/org.eclipse.pde.runtime/icons/obj16/menuspy_obj.svg
+++ b/ui/org.eclipse.pde.runtime/icons/obj16/menuspy_obj.svg
@@ -2,48 +2,19 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="menuspy_obj.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient5147"
-       inkscape:collect="always">
-      <stop
-         id="stop5149"
-         offset="0"
-         style="stop-color:#91a5c7;stop-opacity:1;" />
-      <stop
-         id="stop5151"
-         offset="1"
-         style="stop-color:#637aa7;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5141"
-       inkscape:collect="always">
-      <stop
-         id="stop5143"
-         offset="0"
-         style="stop-color:#91a5c7;stop-opacity:1;" />
-      <stop
-         id="stop5145"
-         offset="1"
-         style="stop-color:#637aa7;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        id="linearGradient4994">
       <stop
          style="stop-color:#f9fafc;stop-opacity:1;"
@@ -55,7 +26,6 @@
          id="stop4998" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4902">
       <stop
          style="stop-color:#bfb688;stop-opacity:1"
@@ -67,7 +37,6 @@
          id="stop4906" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4861">
       <stop
          style="stop-color:#acbcd5;stop-opacity:1"
@@ -79,7 +48,6 @@
          id="stop4865" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4861"
        id="linearGradient4869"
        x1="7.0070496"
@@ -89,27 +57,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1.0010081,0,0,0.98973073,-4.0140768,5.7453706)" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5147"
-       id="linearGradient4871"
-       x1="7.0070496"
-       y1="1047.857"
-       x2="14"
-       y2="1047.857"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-2,-3.0091529)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5141"
-       id="linearGradient4875"
-       x1="7.0070496"
-       y1="1049.857"
-       x2="14"
-       y2="1049.857"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-2,-3.0091529)" />
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4902"
        id="linearGradient4908"
        x1="10.544736"
@@ -119,7 +66,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1,0,0,0.9258402,-3.9972455,75.004823)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4994"
        id="linearGradient5000"
        x1="9.8946028"
@@ -129,104 +75,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1,0,0,0.88726352,-3.9972455,115.08221)" />
     <linearGradient
-       id="linearGradient4852-7-8"
-       inkscape:collect="always">
-      <stop
-         id="stop4854-4-1"
-         offset="0"
-         style="stop-color:#707070;stop-opacity:1" />
-      <stop
-         id="stop4856-0-2"
-         offset="1"
-         style="stop-color:#a0a0a0;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4844-4-1"
-       inkscape:collect="always">
-      <stop
-         id="stop4846-8-4"
-         offset="0"
-         style="stop-color:#606060;stop-opacity:1" />
-      <stop
-         id="stop4848-8-9"
-         offset="1"
-         style="stop-color:#787878;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       y2="1038.5814"
-       x2="4.7528968"
-       y1="1051.0466"
-       x1="4.7528968"
-       gradientTransform="translate(1.9961442e-6,-9.9830355e-5)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient6120"
-       xlink:href="#linearGradient4852-7-8"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="1037.7"
-       x2="8.6566515"
-       y1="1050.7386"
-       x1="8.6566515"
-       gradientTransform="translate(1.9961442e-6,-9.9830355e-5)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient6122"
-       xlink:href="#linearGradient4844-4-1"
-       inkscape:collect="always" />
-    <mask
-       maskUnits="userSpaceOnUse"
-       id="mask6204">
-      <path
-         style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-         d="m 1,1036.3935 0,0.5 0,12.9687 0,0.5 0.5,0 10.0625,0 0.5,0 0,-0.5 0,-9.9687 0,-0.2188 -0.15625,-0.125 -3.0625,-3 -0.125,-0.1562 -0.21875,0 -7,0 -0.5,0 z"
-         id="path6206"
-         inkscape:connector-curvature="0" />
-    </mask>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4861-5"
-       id="linearGradient4869-6"
-       x1="7.0070496"
-       y1="1045.8571"
-       x2="14"
-       y2="1045.8571"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-2,-3.0091529)" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient4861-5">
-      <stop
-         style="stop-color:#acbcd5;stop-opacity:1"
-         offset="0"
-         id="stop4863-1" />
-      <stop
-         style="stop-color:#869abe;stop-opacity:1"
-         offset="1"
-         id="stop4865-2" />
-    </linearGradient>
-    <linearGradient
-       y2="1045.8571"
-       x2="14"
-       y1="1045.8571"
-       x1="7.0070496"
-       gradientTransform="translate(-2,-1.0091316)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3066-1"
-       xlink:href="#linearGradient4861-5-1"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient4861-5-1">
-      <stop
-         style="stop-color:#acbcd5;stop-opacity:1"
-         offset="0"
-         id="stop4863-1-6" />
-      <stop
-         style="stop-color:#869abe;stop-opacity:1"
-         offset="1"
-         id="stop4865-2-2" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4861"
        id="linearGradient4869-8"
        x1="7.0070496"
@@ -236,7 +84,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1.0010081,0,0,0.98973073,-4.0140768,3.7454178)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4861"
        id="linearGradient4869-3"
        x1="7.0070496"
@@ -246,7 +93,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1.0010081,0,0,0.98973073,-4.0140768,7.7454004)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4861"
        id="linearGradient4869-5"
        x1="7.0070496"
@@ -256,7 +102,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1.0010081,0,0,0.98973073,-4.0140768,9.7454)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4861"
        id="linearGradient4869-56"
        x1="7.0070496"
@@ -266,7 +111,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1.0010081,0,0,0.98973073,-4.0140768,11.7454)" />
     <radialGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4177"
        id="radialGradient4245"
        cx="14.311938"
@@ -277,7 +121,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(0.56661847,0,0,0.70718173,-0.07816061,309.04807)" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4177">
       <stop
          style="stop-color:#ffffff;stop-opacity:1"
@@ -289,7 +132,6 @@
          id="stop4181" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4167"
        id="linearGradient4173"
        x1="22.69014"
@@ -299,7 +141,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(0.70710673,0,0,0.70718173,-7.1682751,309.04807)" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4167">
       <stop
          style="stop-color:#acaa94;stop-opacity:1"
@@ -311,33 +152,6 @@
          id="stop4171" />
     </linearGradient>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#c9c9c9"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="35.1875"
-     inkscape:cx="13.050041"
-     inkscape:cy="6.5058804"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="2560"
-     inkscape:window-height="1391"
-     inkscape:window-x="0"
-     inkscape:window-y="1"
-     inkscape:window-maximized="1"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="true"
-     inkscape:snap-bbox="true"
-     inkscape:bbox-nodes="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3999" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -346,28 +160,22 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
     <path
        style="display:inline;fill:url(#linearGradient5000);fill-opacity:1;stroke:none"
        d="m 1.5000365,1036.8622 9.9999995,0 c 0,0 0.0054,6.7618 0.0054,11.5 l -10.0054345,0 z"
-       id="rect4001-3"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+       id="rect4001-3" />
     <path
        style="fill:none;stroke:url(#linearGradient4908);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1"
        d="m 1.5000365,1036.8622 9.9999995,0 c 0,0 0.0054,7.143 0.0054,12 l -10.0054345,0 z"
-       id="rect4001"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+       id="rect4001" />
     <rect
        style="display:inline;fill:url(#linearGradient4869);fill-opacity:1;stroke:none"
        id="rect4001-1-7"
@@ -404,11 +212,9 @@
        x="3.0000365"
        y="1046.3622" />
     <path
-       inkscape:connector-curvature="0"
        id="path4185"
        d="m 15.6438,1052.0064 0,-1.0287 -3.980969,-4.0836 -1.102083,1.0311 4.054422,4.0812 z"
-       style="fill:#677da9;fill-opacity:1;fill-rule:evenodd;stroke:#677da9;stroke-width:0.71592331;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       sodipodi:nodetypes="cccccc" />
+       style="fill:#677da9;fill-opacity:1;fill-rule:evenodd;stroke:#677da9;stroke-width:0.71592331;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
     <ellipse
        cy="1045.3625"
        cx="9"
diff --git a/ui/org.eclipse.pde.runtime/icons/obj16/package_obj.svg b/ui/org.eclipse.pde.runtime/icons/obj16/package_obj.svg
index b70d20b4500..e39554e0ae9 100644
--- a/ui/org.eclipse.pde.runtime/icons/obj16/package_obj.svg
+++ b/ui/org.eclipse.pde.runtime/icons/obj16/package_obj.svg
@@ -2,24 +2,19 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.48.0 r9654"
-   sodipodi:docname="package_obj.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient10573">
       <stop
          style="stop-color:#c18965;stop-opacity:1;"
@@ -106,7 +101,6 @@
          id="stop11152-8-8-6-3-2-5-1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10507"
        id="linearGradient4895"
        gradientUnits="userSpaceOnUse"
@@ -116,7 +110,6 @@
        y2="449.88141"
        gradientTransform="matrix(0,1,-1,0,824.88775,74.875059)" />
     <radialGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient11146-7-5-30-1-1-4"
        id="radialGradient10499"
        gradientUnits="userSpaceOnUse"
@@ -127,7 +120,6 @@
        fy="442.57816"
        r="6.1875" />
     <radialGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient11146-8-7-5-7-5-6-8"
        id="radialGradient10501"
        gradientUnits="userSpaceOnUse"
@@ -138,7 +130,6 @@
        fy="442.57816"
        r="6.1875" />
     <radialGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient11146-8-3-2-6-1-7"
        id="radialGradient10503"
        gradientUnits="userSpaceOnUse"
@@ -149,7 +140,6 @@
        fy="442.57816"
        r="6.1875" />
     <radialGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient11146-4-4-4-6-2"
        id="radialGradient10505"
        gradientUnits="userSpaceOnUse"
@@ -198,10 +188,8 @@
        gradientTransform="matrix(-1,0,0,-1,750.01459,899.76468)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient10544"
-       xlink:href="#linearGradient10507-2"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient10507-2" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10573"
        id="linearGradient10579"
        x1="366.04819"
@@ -210,29 +198,6 @@
        y2="466.01041"
        gradientUnits="userSpaceOnUse" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="30.80334"
-     inkscape:cx="1.2064551"
-     inkscape:cy="10.646745"
-     inkscape:document-units="px"
-     inkscape:current-layer="g13862"
-     showgrid="true"
-     inkscape:window-width="1920"
-     inkscape:window-height="1138"
-     inkscape:window-x="-8"
-     inkscape:window-y="-8"
-     inkscape:window-maximized="1"
-     inkscape:snap-global="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3947" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -246,8 +211,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
@@ -258,8 +221,7 @@
       <g
          transform="matrix(3.5838051,0,0,3.5838051,511.21484,-3419.8264)"
          style="font-size:13.58917427px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;display:inline;font-family:Sans"
-         id="layer1-9"
-         inkscape:label="Layer 1">
+         id="layer1-9">
         <g
            id="g11260-4-2"
            transform="matrix(0.27903303,0,0,0.27903303,-109.29986,933.62804)"
@@ -279,31 +241,22 @@
              x="375.04584"
              y="431.97098" />
           <path
-             sodipodi:nodetypes="ccccc"
-             inkscape:connector-curvature="0"
              id="rect10961-3-9-1"
              d="m 357.08057,449.75837 17.96523,0 0,18.13262 -17.96523,0 z"
              style="fill:url(#radialGradient10499);fill-opacity:1;stroke:#a45d2b;stroke-width:3.58380508;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline" />
           <path
-             sodipodi:nodetypes="ccccc"
-             inkscape:connector-curvature="0"
              id="rect10961-9-6-4-1"
              d="m 375.0458,449.75837 17.96522,0 0,18.13262 -17.96522,0 z"
              style="fill:url(#radialGradient10501);fill-opacity:1;stroke:#a45d2b;stroke-width:3.58380508;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline" />
           <path
              style="font-size:13.58917427px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:none;stroke:url(#linearGradient10579);stroke-width:3.58380508;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline;font-family:Sans"
              d="m 357.27589,432.15148 0,17.71804 0,17.85756 17.71805,0 17.85755,0 0,-17.85756 0,-0.13951 0,-17.57853 -17.85755,0 -17.71805,0 z"
-             id="rect10961-8-3-6"
-             inkscape:connector-curvature="0" />
+             id="rect10961-8-3-6" />
           <path
-             sodipodi:nodetypes="cc"
-             inkscape:connector-curvature="0"
              id="path11108-6-7-5"
              d="m 375.00635,426.58855 0,46.58947"
              style="fill:#915323;fill-opacity:1;stroke:url(#linearGradient4895);stroke-width:3.58380508;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
           <path
-             sodipodi:nodetypes="cc"
-             inkscape:connector-curvature="0"
              id="path11108-6-7-5-6"
              d="m 398.30108,449.88328 -46.58947,0"
              style="font-size:13.58917427px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#915323;fill-opacity:1;stroke:url(#linearGradient10544);stroke-width:3.58380508;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline;font-family:Sans" />
diff --git a/ui/org.eclipse.pde.runtime/icons/obj16/pdespy_obj.svg b/ui/org.eclipse.pde.runtime/icons/obj16/pdespy_obj.svg
index ade198760c8..b6dca404de3 100644
--- a/ui/org.eclipse.pde.runtime/icons/obj16/pdespy_obj.svg
+++ b/ui/org.eclipse.pde.runtime/icons/obj16/pdespy_obj.svg
@@ -2,20 +2,16 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="pdespy_obj.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
@@ -44,36 +40,6 @@
          offset="1"
          style="stop-color:#809dcb;stop-opacity:0" />
     </linearGradient>
-    <linearGradient
-       id="linearGradient10448-9-7-0-5">
-      <stop
-         style="stop-color:#cf9307;stop-opacity:1"
-         offset="0"
-         id="stop10450-3-5-6-7" />
-      <stop
-         id="stop10456-4-1-5-3"
-         offset="0.5"
-         style="stop-color:#f7d87b;stop-opacity:1" />
-      <stop
-         style="stop-color:#ebb313;stop-opacity:1"
-         offset="1"
-         id="stop10452-22-7-8-4" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10440-1-0-0-3">
-      <stop
-         style="stop-color:#ae7603;stop-opacity:1;"
-         offset="0"
-         id="stop10442-43-2-0-9" />
-      <stop
-         id="stop10521-1-2-5-3"
-         offset="0.5"
-         style="stop-color:#e8d8a3;stop-opacity:1" />
-      <stop
-         style="stop-color:#bb9221;stop-opacity:1"
-         offset="1"
-         id="stop10444-3-4-0-4" />
-    </linearGradient>
     <linearGradient
        id="linearGradient10748-8">
       <stop
@@ -97,21 +63,6 @@
          offset="1"
          style="stop-color:#e5b630;stop-opacity:1" />
     </linearGradient>
-    <linearGradient
-       id="linearGradient10440-1-3-4">
-      <stop
-         style="stop-color:#ae7603;stop-opacity:1;"
-         offset="0"
-         id="stop10442-43-0-5" />
-      <stop
-         id="stop10521-1-4-7"
-         offset="0.5"
-         style="stop-color:#e8d8a3;stop-opacity:1" />
-      <stop
-         style="stop-color:#bb9221;stop-opacity:1"
-         offset="1"
-         id="stop10444-3-2-0" />
-    </linearGradient>
     <linearGradient
        id="linearGradient10448-90">
       <stop
@@ -135,51 +86,6 @@
          offset="1"
          id="stop10452-1" />
     </linearGradient>
-    <linearGradient
-       id="linearGradient10440-18">
-      <stop
-         style="stop-color:#ae7603;stop-opacity:1;"
-         offset="0"
-         id="stop10442-8" />
-      <stop
-         id="stop10521-7"
-         offset="0.5"
-         style="stop-color:#e8d8a3;stop-opacity:1" />
-      <stop
-         style="stop-color:#bb9221;stop-opacity:1"
-         offset="1"
-         id="stop10444-0" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10414-9">
-      <stop
-         style="stop-color:#5078b9;stop-opacity:1;"
-         offset="0"
-         id="stop10416-3" />
-      <stop
-         id="stop10422-8"
-         offset="0.5"
-         style="stop-color:#6d8cbd;stop-opacity:1" />
-      <stop
-         style="stop-color:#5f88c9;stop-opacity:1"
-         offset="1"
-         id="stop10418-4" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10432-3">
-      <stop
-         id="stop10434-4"
-         offset="0"
-         style="stop-color:#1f4d9a;stop-opacity:1" />
-      <stop
-         style="stop-color:#4e6da1;stop-opacity:1"
-         offset="0.5"
-         id="stop10436-2" />
-      <stop
-         id="stop10438-9"
-         offset="1"
-         style="stop-color:#567ebc;stop-opacity:1" />
-    </linearGradient>
     <linearGradient
        id="linearGradient10157-6">
       <stop
@@ -195,21 +101,6 @@
          offset="1"
          id="stop10161-55" />
     </linearGradient>
-    <linearGradient
-       id="linearGradient10396-5">
-      <stop
-         style="stop-color:#1b3e79;stop-opacity:1;"
-         offset="0"
-         id="stop10398-7" />
-      <stop
-         id="stop10404-9"
-         offset="0.5"
-         style="stop-color:#728fbf;stop-opacity:1" />
-      <stop
-         style="stop-color:#1f4d9a;stop-opacity:1"
-         offset="1"
-         id="stop10400-9" />
-    </linearGradient>
     <linearGradient
        id="linearGradient10157-2-5">
       <stop
@@ -226,7 +117,6 @@
          id="stop10161-5-0" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient10149-39-0">
       <stop
          style="stop-color:#1d4d9d;stop-opacity:1"
@@ -238,42 +128,6 @@
          id="stop10153-72-3" />
     </linearGradient>
     <linearGradient
-       id="linearGradient10149-6-5-4">
-      <stop
-         style="stop-color:#1f4d9a;stop-opacity:1"
-         offset="0"
-         id="stop10151-5-7-2" />
-      <stop
-         id="stop10394-3"
-         offset="0.5"
-         style="stop-color:#b9c7df;stop-opacity:1" />
-      <stop
-         style="stop-color:#567ebc;stop-opacity:1"
-         offset="1"
-         id="stop10153-8-1-2" />
-    </linearGradient>
-    <linearGradient
-       gradientTransform="translate(-4.8923401,-0.9816688)"
-       gradientUnits="userSpaceOnUse"
-       y2="1039.3397"
-       x2="8.3145638"
-       y1="1040.4003"
-       x1="8.3145638"
-       id="linearGradient4212"
-       xlink:href="#linearGradient4158" />
-    <linearGradient
-       id="linearGradient4158">
-      <stop
-         id="stop4160"
-         offset="0"
-         style="stop-color:#fdae35;stop-opacity:1;" />
-      <stop
-         id="stop4162"
-         offset="1"
-         style="stop-color:#fef0db;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10748-8"
        id="linearGradient4634"
        gradientUnits="userSpaceOnUse"
@@ -283,7 +137,6 @@
        x2="324.1601"
        y2="515.53949" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10448-90"
        id="linearGradient4636"
        gradientUnits="userSpaceOnUse"
@@ -293,7 +146,6 @@
        x2="324.1601"
        y2="511.66458" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4908"
        id="linearGradient4638"
        gradientUnits="userSpaceOnUse"
@@ -303,7 +155,6 @@
        x2="298.9845"
        y2="523.9743" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10157-6"
        id="linearGradient4640"
        gradientUnits="userSpaceOnUse"
@@ -313,7 +164,6 @@
        x2="306.05069"
        y2="514.75818" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10157-2-5"
        id="linearGradient4642"
        gradientUnits="userSpaceOnUse"
@@ -323,7 +173,6 @@
        x2="305"
        y2="542.73901" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10149-39-0"
        id="linearGradient4644"
        gradientUnits="userSpaceOnUse"
@@ -333,7 +182,6 @@
        x2="322.875"
        y2="504.44818" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4284"
        id="linearGradient4646"
        gradientUnits="userSpaceOnUse"
@@ -343,7 +191,6 @@
        x2="305"
        y2="545.35248" />
     <radialGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4177"
        id="radialGradient4245"
        cx="14.311938"
@@ -354,7 +201,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(0.56661847,0,0,0.70718173,-0.07816032,309.04811)" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4177">
       <stop
          style="stop-color:#ffffff;stop-opacity:1"
@@ -366,7 +212,6 @@
          id="stop4181" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4167"
        id="linearGradient4173"
        x1="22.69014"
@@ -376,7 +221,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(0.70710673,0,0,0.70718173,-7.1682748,309.04811)" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4167">
       <stop
          style="stop-color:#acaa94;stop-opacity:1"
@@ -388,31 +232,6 @@
          id="stop4171" />
     </linearGradient>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="56.971429"
-     inkscape:cx="14.5"
-     inkscape:cy="7.9989279"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="2560"
-     inkscape:window-height="1391"
-     inkscape:window-x="0"
-     inkscape:window-y="1"
-     inkscape:window-maximized="1"
-     inkscape:snap-global="true"
-     inkscape:snap-bbox="true"
-     inkscape:bbox-nodes="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid4210" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -421,13 +240,11 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
@@ -435,15 +252,7 @@
        y="1036.3622"
        x="16"
        id="image4506"
-       xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAXpJREFU
-OI2dkstLAlEUxr+RAWESgqxFuFDbuGtliwiCgjZtCoUQxMBIaOGq2gXtjKTaVAupNkEv8AEteoD9
-BVrbMIh0EeSQmOArbZjTIpxmnFtSHxy499z7/TjnngsiQnv41tPEyrOCIyKoNRu+JXsvIVvg4Ov2
-YmLhgcMvMrDMFrOAZlPCuDuMZMRByYiDfgLwMytXBAAEIOgeVA4u0q+oC2MY9qUAAOebAwpkavlJ
-qYrPvlQV01vlXVlXaw0Y6vdfGwI4AojRjOYNhuZiNDlihcUs4PD6EZejG7jJPQMAPvpC8AS8ekT7
-qzr9UVo9SJHTH6VYyErlSonKlRKJeZF2Fqd102GOxumPkpgXFbMacrp3pIEYdCUBsPd3QTAZdXnB
-ZEQi16PJMQF/Ec9KumxF1CoNpsFlK3auwBPwcsHtO8jy94RkmXCyNo9CJq65q/vKap3tH1OrZ5et
-iEImDkmSwPM8glsJriOApd0lF6khfwa0Q/4FaEEA4BOuyBDzX7LFqAAAAABJRU5ErkJggg==
-"
+       xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAXpJREFU OI2dkstLAlEUxr+RAWESgqxFuFDbuGtliwiCgjZtCoUQxMBIaOGq2gXtjKTaVAupNkEv8AEteoD9 BVrbMIh0EeSQmOArbZjTIpxmnFtSHxy499z7/TjnngsiQnv41tPEyrOCIyKoNRu+JXsvIVvg4Ov2 YmLhgcMvMrDMFrOAZlPCuDuMZMRByYiDfgLwMytXBAAEIOgeVA4u0q+oC2MY9qUAAOebAwpkavlJ qYrPvlQV01vlXVlXaw0Y6vdfGwI4AojRjOYNhuZiNDlihcUs4PD6EZejG7jJPQMAPvpC8AS8ekT7 qzr9UVo9SJHTH6VYyErlSonKlRKJeZF2Fqd102GOxumPkpgXFbMacrp3pIEYdCUBsPd3QTAZdXnB ZEQi16PJMQF/Ec9KumxF1CoNpsFlK3auwBPwcsHtO8jy94RkmXCyNo9CJq65q/vKap3tH1OrZ5et iEImDkmSwPM8glsJriOApd0lF6khfwa0Q/4FaEEA4BOuyBDzX7LFqAAAAABJRU5ErkJggg== "
        style="image-rendering:optimizeSpeed"
        preserveAspectRatio="none"
        height="16"
@@ -498,12 +307,10 @@ iEImDkmSwPM8glsJriOApd0lF6khfwa0Q/4FaEEA4BOuyBDzX7LFqAAAAABJRU5ErkJggg==
          id="rect10007-0-74-22"
          style="fill:url(#linearGradient4640);fill-opacity:1;stroke:none;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
       <path
-         inkscape:connector-curvature="0"
          id="path4864-2-92-3"
          d="m 13,1049.8622 -2,0"
          style="display:inline;fill:none;fill-rule:evenodd;stroke:#c18e00;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
       <path
-         inkscape:connector-curvature="0"
          id="path4864-2-9-7"
          d="m 13,1044.8622 -2,0"
          style="display:inline;fill:none;fill-rule:evenodd;stroke:#c18e00;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
@@ -523,27 +330,22 @@ iEImDkmSwPM8glsJriOApd0lF6khfwa0Q/4FaEEA4BOuyBDzX7LFqAAAAABJRU5ErkJggg==
          id="rect10007-6-6-3"
          style="display:inline;fill:url(#linearGradient4646);fill-opacity:1;stroke:none;stroke-width:3.58380508;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
       <path
-         inkscape:connector-curvature="0"
          id="path4864-1"
          d="m 15,1048.8622 -2,0"
          style="fill:none;fill-rule:evenodd;stroke:#c18e00;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
       <path
-         inkscape:connector-curvature="0"
          id="path4864-2-5"
          d="m 15,1045.8622 -2,0"
          style="display:inline;fill:none;fill-rule:evenodd;stroke:#c18e00;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
       <path
-         inkscape:connector-curvature="0"
          id="path4864-2-1-7"
          d="m 15.5,1046.3622 0,2"
          style="display:inline;fill:none;fill-rule:evenodd;stroke:#c18e00;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
     </g>
     <path
-       inkscape:connector-curvature="0"
        id="path4185"
        d="m 15.6438,1052.0064 0,-1.0287 -3.980969,-4.0836 -1.102083,1.0311 4.054422,4.0812 z"
-       style="display:inline;fill:#8f6e4d;fill-opacity:1;fill-rule:evenodd;stroke:#8f6e4d;stroke-width:0.71592331;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       sodipodi:nodetypes="cccccc" />
+       style="display:inline;fill:#8f6e4d;fill-opacity:1;fill-rule:evenodd;stroke:#8f6e4d;stroke-width:0.71592331;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
     <ellipse
        cy="1045.3625"
        cx="9"
diff --git a/ui/org.eclipse.pde.runtime/icons/obj16/plugin_obj.svg b/ui/org.eclipse.pde.runtime/icons/obj16/plugin_obj.svg
index 6741d827a52..9e20febec4f 100644
--- a/ui/org.eclipse.pde.runtime/icons/obj16/plugin_obj.svg
+++ b/ui/org.eclipse.pde.runtime/icons/obj16/plugin_obj.svg
@@ -2,20 +2,16 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="plugins.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
@@ -34,7 +30,6 @@
          style="stop-color:#809dcb;stop-opacity:0" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10448-9-7-0-5"
        id="linearGradient10770-6"
        gradientUnits="userSpaceOnUse"
@@ -59,22 +54,6 @@
          id="stop10452-22-7-8-4" />
     </linearGradient>
     <linearGradient
-       id="linearGradient10440-1-0-0-3">
-      <stop
-         style="stop-color:#ae7603;stop-opacity:1;"
-         offset="0"
-         id="stop10442-43-2-0-9" />
-      <stop
-         id="stop10521-1-2-5-3"
-         offset="0.5"
-         style="stop-color:#e8d8a3;stop-opacity:1" />
-      <stop
-         style="stop-color:#bb9221;stop-opacity:1"
-         offset="1"
-         id="stop10444-3-4-0-4" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10748-8"
        id="linearGradient10774-5"
        gradientUnits="userSpaceOnUse"
@@ -107,22 +86,6 @@
          style="stop-color:#e5b630;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       id="linearGradient10440-1-3-4">
-      <stop
-         style="stop-color:#ae7603;stop-opacity:1;"
-         offset="0"
-         id="stop10442-43-0-5" />
-      <stop
-         id="stop10521-1-4-7"
-         offset="0.5"
-         style="stop-color:#e8d8a3;stop-opacity:1" />
-      <stop
-         style="stop-color:#bb9221;stop-opacity:1"
-         offset="1"
-         id="stop10444-3-2-0" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10448-90"
        id="linearGradient10778-6"
        gradientUnits="userSpaceOnUse"
@@ -155,22 +118,6 @@
          id="stop10452-1" />
     </linearGradient>
     <linearGradient
-       id="linearGradient10440-18">
-      <stop
-         style="stop-color:#ae7603;stop-opacity:1;"
-         offset="0"
-         id="stop10442-8" />
-      <stop
-         id="stop10521-7"
-         offset="0.5"
-         style="stop-color:#e8d8a3;stop-opacity:1" />
-      <stop
-         style="stop-color:#bb9221;stop-opacity:1"
-         offset="1"
-         id="stop10444-0" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10414-9"
        id="linearGradient10782-3"
        gradientUnits="userSpaceOnUse"
@@ -195,7 +142,6 @@
          id="stop10418-4" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10432-3"
        id="linearGradient10784-2"
        gradientUnits="userSpaceOnUse"
@@ -220,7 +166,6 @@
          style="stop-color:#567ebc;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10157-6"
        id="linearGradient10786-1"
        gradientUnits="userSpaceOnUse"
@@ -245,22 +190,6 @@
          id="stop10161-55" />
     </linearGradient>
     <linearGradient
-       id="linearGradient10396-5">
-      <stop
-         style="stop-color:#1b3e79;stop-opacity:1;"
-         offset="0"
-         id="stop10398-7" />
-      <stop
-         id="stop10404-9"
-         offset="0.5"
-         style="stop-color:#728fbf;stop-opacity:1" />
-      <stop
-         style="stop-color:#1f4d9a;stop-opacity:1"
-         offset="1"
-         id="stop10400-9" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10157-2-5"
        id="linearGradient10790-8"
        gradientUnits="userSpaceOnUse"
@@ -285,7 +214,6 @@
          id="stop10161-5-0" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10149-39-0"
        id="linearGradient10792-6"
        gradientUnits="userSpaceOnUse"
@@ -295,7 +223,6 @@
        x2="322.875"
        y2="504.44818" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient10149-39-0">
       <stop
          style="stop-color:#1d4d9d;stop-opacity:1"
@@ -307,22 +234,6 @@
          id="stop10153-72-3" />
     </linearGradient>
     <linearGradient
-       id="linearGradient10149-6-5-4">
-      <stop
-         style="stop-color:#1f4d9a;stop-opacity:1"
-         offset="0"
-         id="stop10151-5-7-2" />
-      <stop
-         id="stop10394-3"
-         offset="0.5"
-         style="stop-color:#b9c7df;stop-opacity:1" />
-      <stop
-         style="stop-color:#567ebc;stop-opacity:1"
-         offset="1"
-         id="stop10153-8-1-2" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4284"
        id="linearGradient10790-8-2"
        gradientUnits="userSpaceOnUse"
@@ -332,29 +243,6 @@
        x2="305"
        y2="545.35248" />
   </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="47.607658"
-     inkscape:cy="-9.9169213"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1609"
-     inkscape:window-height="978"
-     inkscape:window-x="719"
-     inkscape:window-y="519"
-     inkscape:window-maximized="0"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid4210" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -368,8 +256,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
@@ -385,19 +271,15 @@
     <path
        style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
        d="m 12.648438,1043.3652 0,1 3.351562,0 0,-1 -3.351562,0 z"
-       id="path4313-8-8"
-       inkscape:connector-curvature="0" />
+       id="path4313-8-8" />
     <path
        style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.94926554px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
        d="m 12.981809,1043.3594 0,3.0195 1.01551,0 0,-3.0195 z"
-       id="path4313-8-8-7"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+       id="path4313-8-8-7" />
     <path
        style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#9e7400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
        d="m 15.992188,1045.3613 -3.359376,0.031 0.0098,1 3.359375,-0.031 -0.0098,-1 z"
-       id="path4313-5-1-8"
-       inkscape:connector-curvature="0" />
+       id="path4313-5-1-8" />
     <rect
        style="fill:url(#linearGradient10774-5);fill-opacity:1;stroke:none;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        id="rect10007-0-74-2-7"
@@ -410,13 +292,11 @@
     <path
        style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#9e7400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
        d="m 13.005859,1046.3711 -3.3593746,0.031 0.00977,1 3.359375,-0.031 -0.0098,-1 z"
-       id="path4313-5-1"
-       inkscape:connector-curvature="0" />
+       id="path4313-5-1" />
     <path
        style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
        d="m 12.996094,1042.3633 -3.3593752,0.031 0.00977,1 3.3593746,-0.031 -0.0098,-1 z"
-       id="path4313-8"
-       inkscape:connector-curvature="0" />
+       id="path4313-8" />
     <rect
        style="fill:url(#linearGradient10778-6);fill-opacity:1;stroke:none;stroke-width:1.50161433;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        id="rect10007-0-74-2"
@@ -456,13 +336,11 @@
     <path
        style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
        d="m 10.996094,1041.3613 -3.3593752,0.031 0.00977,1 3.3593746,-0.031 -0.0098,-1 z"
-       id="path4313"
-       inkscape:connector-curvature="0" />
+       id="path4313" />
     <path
        style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#9e7400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
        d="m 11.001953,1047.3613 -3.3593749,0.031 0.00977,1 3.3593752,-0.031 -0.0098,-1 z"
-       id="path4313-5"
-       inkscape:connector-curvature="0" />
+       id="path4313-5" />
     <rect
        ry="1.0288811"
        style="fill:url(#linearGradient10790-8);fill-opacity:1;stroke:url(#linearGradient10792-6);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
@@ -482,8 +360,6 @@
     <path
        style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:0.64640886;fill-rule:evenodd;stroke:none;stroke-width:0.97351193px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
        d="m 11.003629,1043.3647 0,3.01 1.000277,0 0,-3.01 z"
-       id="path4313-8-8-7-8"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+       id="path4313-8-8-7-8" />
   </g>
 </svg>
diff --git a/ui/org.eclipse.pde.runtime/icons/obj16/plugins_obj.svg b/ui/org.eclipse.pde.runtime/icons/obj16/plugins_obj.svg
index 625837c375c..bad1df32e07 100644
--- a/ui/org.eclipse.pde.runtime/icons/obj16/plugins_obj.svg
+++ b/ui/org.eclipse.pde.runtime/icons/obj16/plugins_obj.svg
@@ -2,24 +2,19 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="plugin_depend.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4368">
       <stop
          style="stop-color:#fbdf89;stop-opacity:1"
@@ -39,7 +34,6 @@
          id="stop4372" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4344">
       <stop
          style="stop-color:#7e9cca;stop-opacity:1"
@@ -63,7 +57,6 @@
          id="stop4348" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4336">
       <stop
          style="stop-color:#3461ab;stop-opacity:1"
@@ -75,248 +68,6 @@
          id="stop4340" />
     </linearGradient>
     <linearGradient
-       id="linearGradient3955">
-      <stop
-         id="stop3957"
-         offset="0"
-         style="stop-color:#c38536;stop-opacity:1" />
-      <stop
-         style="stop-color:#f2dc91;stop-opacity:1"
-         offset="0.15381166"
-         id="stop3959" />
-      <stop
-         style="stop-color:#fbdc8b;stop-opacity:1"
-         offset="0.5"
-         id="stop3961" />
-      <stop
-         id="stop3963"
-         offset="0.75"
-         style="stop-color:#e6bd7a;stop-opacity:1" />
-      <stop
-         id="stop3965"
-         offset="1"
-         style="stop-color:#ba772f;stop-opacity:1" />
-    </linearGradient>
-    <mask
-       maskUnits="userSpaceOnUse"
-       id="mask4917">
-      <path
-         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;display:inline"
-         d="m 462.77563,373.22885 29.11636,0 c 1.45425,0 2.625,1.17075 2.625,2.625 l 0,18.76896 c 0,1.45425 -1.17412,2.52598 -2.625,2.625 l -29.11636,1.98708 c -1.45088,0.099 -2.625,-1.17075 -2.625,-2.625 l 0,-20.75604 c 0,-1.45425 1.17075,-2.625 2.625,-2.625 z"
-         id="path4919"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="sssssssss" />
-    </mask>
-    <linearGradient
-       id="linearGradient4284">
-      <stop
-         id="stop4286"
-         offset="0"
-         style="stop-color:#6588c1;stop-opacity:0" />
-      <stop
-         style="stop-color:#becce3;stop-opacity:1"
-         offset="0.49999967"
-         id="stop4288" />
-      <stop
-         id="stop4290"
-         offset="1"
-         style="stop-color:#809dcb;stop-opacity:0" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10157-2-5">
-      <stop
-         style="stop-color:#6588c1;stop-opacity:1"
-         offset="0"
-         id="stop10159-8-3" />
-      <stop
-         id="stop10165-3-9"
-         offset="0.5"
-         style="stop-color:#becce3;stop-opacity:1" />
-      <stop
-         style="stop-color:#809dcb;stop-opacity:1"
-         offset="1"
-         id="stop10161-5-0" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10414-9">
-      <stop
-         style="stop-color:#5078b9;stop-opacity:1;"
-         offset="0"
-         id="stop10416-3" />
-      <stop
-         id="stop10422-8"
-         offset="0.5"
-         style="stop-color:#6d8cbd;stop-opacity:1" />
-      <stop
-         style="stop-color:#5f88c9;stop-opacity:1"
-         offset="1"
-         id="stop10418-4" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10432-3">
-      <stop
-         id="stop10434-4"
-         offset="0"
-         style="stop-color:#1f4d9a;stop-opacity:1" />
-      <stop
-         style="stop-color:#4e6da1;stop-opacity:1"
-         offset="0.5"
-         id="stop10436-2" />
-      <stop
-         id="stop10438-9"
-         offset="1"
-         style="stop-color:#567ebc;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10448-90">
-      <stop
-         style="stop-color:#ecac18;stop-opacity:1"
-         offset="0"
-         id="stop10450-0" />
-      <stop
-         id="stop10458-2"
-         offset="0.25"
-         style="stop-color:#ffe38d;stop-opacity:1" />
-      <stop
-         id="stop10456-96"
-         offset="0.5"
-         style="stop-color:#fdf5d2;stop-opacity:1" />
-      <stop
-         style="stop-color:#ffeba7;stop-opacity:1"
-         offset="0.75"
-         id="stop10460-3" />
-      <stop
-         style="stop-color:#e5b630;stop-opacity:1"
-         offset="1"
-         id="stop10452-1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10748-8">
-      <stop
-         id="stop10750-5"
-         offset="0"
-         style="stop-color:#ecac18;stop-opacity:1" />
-      <stop
-         style="stop-color:#f1ce66;stop-opacity:1"
-         offset="0.25"
-         id="stop10752-8" />
-      <stop
-         style="stop-color:#f6e5a6;stop-opacity:1"
-         offset="0.5"
-         id="stop10754-8" />
-      <stop
-         id="stop10756-4"
-         offset="0.75"
-         style="stop-color:#f1cf6c;stop-opacity:1" />
-      <stop
-         id="stop10758-7"
-         offset="1"
-         style="stop-color:#e5b630;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10448-9-7-0-5">
-      <stop
-         style="stop-color:#cf9307;stop-opacity:1"
-         offset="0"
-         id="stop10450-3-5-6-7" />
-      <stop
-         id="stop10456-4-1-5-3"
-         offset="0.5"
-         style="stop-color:#f7d87b;stop-opacity:1" />
-      <stop
-         style="stop-color:#ebb313;stop-opacity:1"
-         offset="1"
-         id="stop10452-22-7-8-4" />
-    </linearGradient>
-    <linearGradient
-       gradientTransform="matrix(3.5838051,0,0,3.5838051,446.6247,-3372.1684)"
-       gradientUnits="userSpaceOnUse"
-       y2="1039.3397"
-       x2="8.3145638"
-       y1="1040.4003"
-       x1="8.3145638"
-       id="linearGradient4212"
-       xlink:href="#linearGradient4158" />
-    <linearGradient
-       id="linearGradient4158">
-      <stop
-         id="stop4160"
-         offset="0"
-         style="stop-color:#fdae35;stop-opacity:1;" />
-      <stop
-         id="stop4162"
-         offset="1"
-         style="stop-color:#fef0db;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10440-1-0-0-3">
-      <stop
-         id="stop10442-43-2-0-9"
-         offset="0"
-         style="stop-color:#ae7603;stop-opacity:1;" />
-      <stop
-         style="stop-color:#e8d8a3;stop-opacity:1"
-         offset="0.5"
-         id="stop10521-1-2-5-3" />
-      <stop
-         id="stop10444-3-4-0-4"
-         offset="1"
-         style="stop-color:#bb9221;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10396-5">
-      <stop
-         id="stop10398-7"
-         offset="0"
-         style="stop-color:#1b3e79;stop-opacity:1;" />
-      <stop
-         style="stop-color:#728fbf;stop-opacity:1"
-         offset="0.5"
-         id="stop10404-9" />
-      <stop
-         id="stop10400-9"
-         offset="1"
-         style="stop-color:#1f4d9a;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10149-6-5-4">
-      <stop
-         id="stop10151-5-7-2"
-         offset="0"
-         style="stop-color:#1f4d9a;stop-opacity:1" />
-      <stop
-         style="stop-color:#b9c7df;stop-opacity:1"
-         offset="0.5"
-         id="stop10394-3" />
-      <stop
-         id="stop10153-8-1-2"
-         offset="1"
-         style="stop-color:#567ebc;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4528-9-5-7-9-7">
-      <stop
-         style="stop-color:#e0c576;stop-opacity:1;"
-         offset="0"
-         id="stop4530-0-5-0-5-8" />
-      <stop
-         style="stop-color:#9e7916;stop-opacity:1"
-         offset="1"
-         id="stop4532-7-9-3-3-6" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient6281-8-0-1-6-6-4-2-8">
-      <stop
-         id="stop6283-0-2-2-1-2-0-1-6"
-         offset="0"
-         style="stop-color:#f7f9fb;stop-opacity:1" />
-      <stop
-         id="stop6285-5-0-9-7-6-9-9-1"
-         offset="1"
-         style="stop-color:#ffd680;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4336"
        id="linearGradient4342"
        x1="509.96674"
@@ -326,7 +77,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1.0106162,0,0,0.96711322,-26.641878,12.017452)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4344"
        id="linearGradient4350"
        x1="505.37363"
@@ -336,7 +86,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1.0106162,0,0,0.96711322,-26.641878,12.017452)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4368"
        id="linearGradient4374"
        x1="494.33554"
@@ -345,7 +94,6 @@
        y2="358.83438"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4344"
        id="linearGradient4455"
        gradientUnits="userSpaceOnUse"
@@ -355,7 +103,6 @@
        x2="505.37363"
        y2="349.91144" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4336"
        id="linearGradient4457"
        gradientUnits="userSpaceOnUse"
@@ -365,7 +112,6 @@
        x2="509.96674"
        y2="350.06982" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4368"
        id="linearGradient4301"
        gradientUnits="userSpaceOnUse"
@@ -374,29 +120,6 @@
        x2="494.33554"
        y2="358.83438" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="4"
-     inkscape:cx="26.593415"
-     inkscape:cy="-6.0189443"
-     inkscape:document-units="px"
-     inkscape:current-layer="g4247-6"
-     showgrid="true"
-     inkscape:window-width="1086"
-     inkscape:window-height="934"
-     inkscape:window-x="503"
-     inkscape:window-y="589"
-     inkscape:window-maximized="0"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3947" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -410,8 +133,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
@@ -430,9 +151,7 @@
           <path
              style="fill:url(#linearGradient4374);fill-opacity:1;fill-rule:evenodd;stroke:#b08b21;stroke-width:3.58380508px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
              d="m 494.79147,354.51004 3.60322,3.57383 3.60322,0 3.42504,2.69707 0,5.48733 -3.85069,2.56276 -3.69232,0 -3.34089,3.62088 -3.46959,0 -0.002,-17.95827 z"
-             id="path4366"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccccccccc" />
+             id="path4366" />
           <rect
              style="opacity:1;fill:#b08b21;fill-opacity:1;stroke:none;stroke-width:1.79190254;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
              id="rect4380"
@@ -446,9 +165,7 @@
           <path
              style="fill:url(#linearGradient4350);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4342);stroke-width:3.54304099px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
              d="m 487.40807,351.09688 c 1.22716,-1.17433 3.68149,1.86226 3.68149,3.52302 0,5.94129 0,12.02914 0,17.4619 0,2.60379 -2.50768,4.79948 -3.76152,3.5996 -4.2413,-4.05871 -10.72434,-10.26269 -10.72434,-10.26269 l 0,-3.5996 c 0,0 6.01931,-6.14314 10.80437,-10.72223 z"
-             id="path4326"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ssssccs" />
+             id="path4326" />
           <rect
              style="opacity:1;fill:#547fc4;fill-opacity:1;stroke:none;stroke-width:1.79190254;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
              id="rect4358"
@@ -469,9 +186,7 @@
           <path
              style="fill:url(#linearGradient4301);fill-opacity:1;fill-rule:evenodd;stroke:#b08b21;stroke-width:3.58380508px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
              d="m 494.79147,354.51004 3.60322,3.57383 3.60322,0 3.42504,2.69707 0,5.48733 -3.85069,2.56276 -3.69232,0 -3.34089,3.62088 -3.46959,0 -0.002,-17.95827 z"
-             id="path4366-2"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccccccccc" />
+             id="path4366-2" />
           <rect
              style="opacity:1;fill:#b08b21;fill-opacity:1;stroke:none;stroke-width:1.79190254;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
              id="rect4380-9"
@@ -485,9 +200,7 @@
           <path
              style="fill:url(#linearGradient4455);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4457);stroke-width:3.54304099px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
              d="m 487.40807,351.09688 c 1.22716,-1.17433 3.68149,1.86226 3.68149,3.52302 0,5.94129 0,12.02914 0,17.4619 0,2.60379 -2.50768,4.79948 -3.76152,3.5996 -4.2413,-4.05871 -10.72434,-10.26269 -10.72434,-10.26269 l 0,-3.5996 c 0,0 6.01931,-6.14314 10.80437,-10.72223 z"
-             id="path4326-2"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ssssccs" />
+             id="path4326-2" />
           <rect
              style="opacity:1;fill:#547fc4;fill-opacity:1;stroke:none;stroke-width:1.79190254;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
              id="rect4358-7"
diff --git a/ui/org.eclipse.pde.runtime/icons/obj16/property_obj.svg b/ui/org.eclipse.pde.runtime/icons/obj16/property_obj.svg
index dd43b527a6d..09520894daa 100644
--- a/ui/org.eclipse.pde.runtime/icons/obj16/property_obj.svg
+++ b/ui/org.eclipse.pde.runtime/icons/obj16/property_obj.svg
@@ -2,24 +2,19 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="property_obj.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3902">
       <stop
          style="stop-color:#5b6c89;stop-opacity:1"
@@ -31,7 +26,6 @@
          id="stop3906" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3876">
       <stop
          style="stop-color:#a4b0c0;stop-opacity:1"
@@ -43,18 +37,6 @@
          id="stop3880" />
     </linearGradient>
     <linearGradient
-       id="linearGradient6799">
-      <stop
-         style="stop-color:#a6bacf;stop-opacity:1;"
-         offset="0"
-         id="stop6801" />
-      <stop
-         style="stop-color:#798da2;stop-opacity:1;"
-         offset="1"
-         id="stop6803" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient3876"
        id="linearGradient3882"
        x1="10.499375"
@@ -64,7 +46,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-4,0)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient3902"
        id="linearGradient3908"
        x1="8.2036867"
@@ -73,31 +54,6 @@
        y2="1040.6931"
        gradientUnits="userSpaceOnUse" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="32"
-     inkscape:cx="7.5378558"
-     inkscape:cy="7.7308252"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1600"
-     inkscape:window-height="851"
-     inkscape:window-x="0"
-     inkscape:window-y="25"
-     inkscape:window-maximized="1"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3026" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -111,8 +67,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
@@ -127,24 +81,19 @@
     <path
        style="fill:#b7c2d0;fill-opacity:1;stroke:#b7c2d0;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
        d="m 5.5625,1043.8622 4.84375,0"
-       id="path3812-1"
-       inkscape:connector-curvature="0" />
+       id="path3812-1" />
     <path
        style="fill:#b7c2d0;fill-opacity:1;stroke:#b7c2d0;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
        d="m 5.5625,1045.8622 4.84375,0"
-       id="path3812-1-7"
-       inkscape:connector-curvature="0" />
+       id="path3812-1-7" />
     <path
        style="fill:#b7c2d0;fill-opacity:1;stroke:#b7c2d0;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
        d="m 7.50929,1041.1543 0,6.8438"
-       id="path3812-1-7-5"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc" />
+       id="path3812-1-7-5" />
     <path
        style="fill:none;stroke:url(#linearGradient3882);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
        d="m 5.5625,1041.8622 4.84375,0"
-       id="path3812"
-       inkscape:connector-curvature="0" />
+       id="path3812" />
     <rect
        style="fill:none;stroke:url(#linearGradient3908);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
        id="rect3031-0"
@@ -155,26 +104,18 @@
     <path
        style="fill:none;stroke:#81a3c9;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;display:inline"
        d="m 12.5,1041.8622 2.03125,2.0156 -2,1.9844"
-       id="path3910-0"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccc" />
+       id="path3910-0" />
     <path
        style="fill:none;stroke:#47698f;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
        d="m 12.5,1040.8622 3.0625,3.0156 -3.03125,2.9844"
-       id="path3910"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccc" />
+       id="path3910" />
     <path
        style="fill:none;stroke:#81a3c9;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;display:inline"
        d="m 3.59375,1041.8622 -2.078125,2.0156 2.03125,1.9844"
-       id="path3910-0-3"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccc" />
+       id="path3910-0-3" />
     <path
        style="fill:none;stroke:#47698f;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;display:inline"
        d="m 3.59375,1040.8622 -3.109375,3.0156 3.0625,2.9844"
-       id="path3910-02"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccc" />
+       id="path3910-02" />
   </g>
 </svg>
diff --git a/ui/org.eclipse.pde.runtime/icons/obj16/req_plugin_obj.svg b/ui/org.eclipse.pde.runtime/icons/obj16/req_plugin_obj.svg
index ca091f7b04c..57d6c83d18e 100644
--- a/ui/org.eclipse.pde.runtime/icons/obj16/req_plugin_obj.svg
+++ b/ui/org.eclipse.pde.runtime/icons/obj16/req_plugin_obj.svg
@@ -2,20 +2,16 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="req_plugin_obj.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
@@ -34,7 +30,6 @@
          style="stop-color:#809dcb;stop-opacity:0" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10448-9-7-0-5"
        id="linearGradient10770-6"
        gradientUnits="userSpaceOnUse"
@@ -59,22 +54,6 @@
          id="stop10452-22-7-8-4" />
     </linearGradient>
     <linearGradient
-       id="linearGradient10440-1-0-0-3">
-      <stop
-         style="stop-color:#ae7603;stop-opacity:1;"
-         offset="0"
-         id="stop10442-43-2-0-9" />
-      <stop
-         id="stop10521-1-2-5-3"
-         offset="0.5"
-         style="stop-color:#e8d8a3;stop-opacity:1" />
-      <stop
-         style="stop-color:#bb9221;stop-opacity:1"
-         offset="1"
-         id="stop10444-3-4-0-4" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10748-8"
        id="linearGradient10774-5"
        gradientUnits="userSpaceOnUse"
@@ -107,22 +86,6 @@
          style="stop-color:#e5b630;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       id="linearGradient10440-1-3-4">
-      <stop
-         style="stop-color:#ae7603;stop-opacity:1;"
-         offset="0"
-         id="stop10442-43-0-5" />
-      <stop
-         id="stop10521-1-4-7"
-         offset="0.5"
-         style="stop-color:#e8d8a3;stop-opacity:1" />
-      <stop
-         style="stop-color:#bb9221;stop-opacity:1"
-         offset="1"
-         id="stop10444-3-2-0" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10448-90"
        id="linearGradient10778-6"
        gradientUnits="userSpaceOnUse"
@@ -155,22 +118,6 @@
          id="stop10452-1" />
     </linearGradient>
     <linearGradient
-       id="linearGradient10440-18">
-      <stop
-         style="stop-color:#ae7603;stop-opacity:1;"
-         offset="0"
-         id="stop10442-8" />
-      <stop
-         id="stop10521-7"
-         offset="0.5"
-         style="stop-color:#e8d8a3;stop-opacity:1" />
-      <stop
-         style="stop-color:#bb9221;stop-opacity:1"
-         offset="1"
-         id="stop10444-0" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10414-9"
        id="linearGradient10782-3"
        gradientUnits="userSpaceOnUse"
@@ -195,7 +142,6 @@
          id="stop10418-4" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10432-3"
        id="linearGradient10784-2"
        gradientUnits="userSpaceOnUse"
@@ -220,7 +166,6 @@
          style="stop-color:#567ebc;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10157-6"
        id="linearGradient10786-1"
        gradientUnits="userSpaceOnUse"
@@ -245,22 +190,6 @@
          id="stop10161-55" />
     </linearGradient>
     <linearGradient
-       id="linearGradient10396-5">
-      <stop
-         style="stop-color:#1b3e79;stop-opacity:1;"
-         offset="0"
-         id="stop10398-7" />
-      <stop
-         id="stop10404-9"
-         offset="0.5"
-         style="stop-color:#728fbf;stop-opacity:1" />
-      <stop
-         style="stop-color:#1f4d9a;stop-opacity:1"
-         offset="1"
-         id="stop10400-9" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10157-2-5"
        id="linearGradient10790-8"
        gradientUnits="userSpaceOnUse"
@@ -285,7 +214,6 @@
          id="stop10161-5-0" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10149-39-0"
        id="linearGradient10792-6"
        gradientUnits="userSpaceOnUse"
@@ -295,7 +223,6 @@
        x2="322.875"
        y2="504.44818" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient10149-39-0">
       <stop
          style="stop-color:#1d4d9d;stop-opacity:1"
@@ -307,22 +234,6 @@
          id="stop10153-72-3" />
     </linearGradient>
     <linearGradient
-       id="linearGradient10149-6-5-4">
-      <stop
-         style="stop-color:#1f4d9a;stop-opacity:1"
-         offset="0"
-         id="stop10151-5-7-2" />
-      <stop
-         id="stop10394-3"
-         offset="0.5"
-         style="stop-color:#b9c7df;stop-opacity:1" />
-      <stop
-         style="stop-color:#567ebc;stop-opacity:1"
-         offset="1"
-         id="stop10153-8-1-2" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4284"
        id="linearGradient10790-8-2"
        gradientUnits="userSpaceOnUse"
@@ -352,29 +263,6 @@
          style="stop-color:#fef0db;stop-opacity:1" />
     </linearGradient>
   </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="7.9335324"
-     inkscape:cy="11.29823"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="828"
-     inkscape:window-height="900"
-     inkscape:window-x="1633"
-     inkscape:window-y="607"
-     inkscape:window-maximized="0"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid4210" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -388,8 +276,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
@@ -406,18 +292,14 @@
          id="rect10007-0-74-2-7-6"
          style="fill:url(#linearGradient10770-6);fill-opacity:1;stroke:none;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
       <path
-         inkscape:connector-curvature="0"
          id="path4313-8-8"
          d="m 12.648438,1045.3027 0,1 3.351562,0 0,-1 -3.351562,0 z"
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
       <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
          id="path4313-8-8-7"
          d="m 12.981809,1045.2969 0,3.0195 1.01551,0 0,-3.0195 z"
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.94926554px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
       <path
-         inkscape:connector-curvature="0"
          id="path4313-5-1-8"
          d="m 15.992188,1047.2988 -3.359376,0.031 0.0098,1 3.359375,-0.031 -0.0098,-1 z"
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#9e7400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
@@ -431,12 +313,10 @@
          id="rect10007-0-74-2-7"
          style="fill:url(#linearGradient10774-5);fill-opacity:1;stroke:none;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
       <path
-         inkscape:connector-curvature="0"
          id="path4313-5-1"
          d="m 13.005859,1048.3086 -3.3593746,0.031 0.00977,1 3.3593746,-0.031 -0.0098,-1 z"
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#9e7400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
       <path
-         inkscape:connector-curvature="0"
          id="path4313-8"
          d="m 12.996094,1044.3008 -3.3593752,0.031 0.00977,1 3.3593742,-0.031 -0.0098,-1 z"
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
@@ -477,12 +357,10 @@
          id="rect10007-0-74"
          style="fill:url(#linearGradient10786-1);fill-opacity:1;stroke:none;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
       <path
-         inkscape:connector-curvature="0"
          id="path4313"
          d="m 10.996094,1043.2988 -3.3593752,0.031 0.00977,1 3.3593742,-0.031 -0.0098,-1 z"
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
       <path
-         inkscape:connector-curvature="0"
          id="path4313-5"
          d="m 11.001953,1049.2988 -3.3593749,0.031 0.00977,1 3.3593749,-0.031 -0.0098,-1 z"
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#9e7400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
@@ -502,8 +380,6 @@
          id="rect10007-6-6"
          style="display:inline;fill:url(#linearGradient10790-8-2);fill-opacity:1;stroke:none;stroke-width:3.58380508;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
       <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
          id="path4313-8-8-7-8"
          d="m 11.003629,1045.3022 0,3.01 1.000277,0 0,-3.01 z"
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:0.64640886;fill-rule:evenodd;stroke:none;stroke-width:0.97351193px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
diff --git a/ui/org.eclipse.pde.runtime/icons/obj16/req_plugins_obj.svg b/ui/org.eclipse.pde.runtime/icons/obj16/req_plugins_obj.svg
index ab4c7a9a3ed..422994655fc 100644
--- a/ui/org.eclipse.pde.runtime/icons/obj16/req_plugins_obj.svg
+++ b/ui/org.eclipse.pde.runtime/icons/obj16/req_plugins_obj.svg
@@ -2,20 +2,16 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="req_plugins_obj.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
@@ -45,37 +41,6 @@
          style="stop-color:#809dcb;stop-opacity:0" />
     </linearGradient>
     <linearGradient
-       id="linearGradient10448-9-7-0-5">
-      <stop
-         style="stop-color:#cf9307;stop-opacity:1"
-         offset="0"
-         id="stop10450-3-5-6-7" />
-      <stop
-         id="stop10456-4-1-5-3"
-         offset="0.5"
-         style="stop-color:#f7d87b;stop-opacity:1" />
-      <stop
-         style="stop-color:#ebb313;stop-opacity:1"
-         offset="1"
-         id="stop10452-22-7-8-4" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10440-1-0-0-3">
-      <stop
-         style="stop-color:#ae7603;stop-opacity:1;"
-         offset="0"
-         id="stop10442-43-2-0-9" />
-      <stop
-         id="stop10521-1-2-5-3"
-         offset="0.5"
-         style="stop-color:#e8d8a3;stop-opacity:1" />
-      <stop
-         style="stop-color:#bb9221;stop-opacity:1"
-         offset="1"
-         id="stop10444-3-4-0-4" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10748-8"
        id="linearGradient10774-5"
        gradientUnits="userSpaceOnUse"
@@ -108,22 +73,6 @@
          style="stop-color:#e5b630;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       id="linearGradient10440-1-3-4">
-      <stop
-         style="stop-color:#ae7603;stop-opacity:1;"
-         offset="0"
-         id="stop10442-43-0-5" />
-      <stop
-         id="stop10521-1-4-7"
-         offset="0.5"
-         style="stop-color:#e8d8a3;stop-opacity:1" />
-      <stop
-         style="stop-color:#bb9221;stop-opacity:1"
-         offset="1"
-         id="stop10444-3-2-0" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10448-90"
        id="linearGradient10778-6"
        gradientUnits="userSpaceOnUse"
@@ -156,22 +105,6 @@
          id="stop10452-1" />
     </linearGradient>
     <linearGradient
-       id="linearGradient10440-18">
-      <stop
-         style="stop-color:#ae7603;stop-opacity:1;"
-         offset="0"
-         id="stop10442-8" />
-      <stop
-         id="stop10521-7"
-         offset="0.5"
-         style="stop-color:#e8d8a3;stop-opacity:1" />
-      <stop
-         style="stop-color:#bb9221;stop-opacity:1"
-         offset="1"
-         id="stop10444-0" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4908"
        id="linearGradient10782-3"
        gradientUnits="userSpaceOnUse"
@@ -181,37 +114,6 @@
        y2="523.9743"
        gradientTransform="matrix(0.6051909,0,0,0.21393153,-174.94269,935.26757)" />
     <linearGradient
-       id="linearGradient10414-9">
-      <stop
-         style="stop-color:#5078b9;stop-opacity:1;"
-         offset="0"
-         id="stop10416-3" />
-      <stop
-         id="stop10422-8"
-         offset="0.5"
-         style="stop-color:#6d8cbd;stop-opacity:1" />
-      <stop
-         style="stop-color:#5f88c9;stop-opacity:1"
-         offset="1"
-         id="stop10418-4" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10432-3">
-      <stop
-         id="stop10434-4"
-         offset="0"
-         style="stop-color:#1f4d9a;stop-opacity:1" />
-      <stop
-         style="stop-color:#4e6da1;stop-opacity:1"
-         offset="0.5"
-         id="stop10436-2" />
-      <stop
-         id="stop10438-9"
-         offset="1"
-         style="stop-color:#567ebc;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10157-6"
        id="linearGradient10786-1"
        gradientUnits="userSpaceOnUse"
@@ -236,22 +138,6 @@
          id="stop10161-55" />
     </linearGradient>
     <linearGradient
-       id="linearGradient10396-5">
-      <stop
-         style="stop-color:#1b3e79;stop-opacity:1;"
-         offset="0"
-         id="stop10398-7" />
-      <stop
-         id="stop10404-9"
-         offset="0.5"
-         style="stop-color:#728fbf;stop-opacity:1" />
-      <stop
-         style="stop-color:#1f4d9a;stop-opacity:1"
-         offset="1"
-         id="stop10400-9" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10157-2-5"
        id="linearGradient10790-8"
        gradientUnits="userSpaceOnUse"
@@ -276,7 +162,6 @@
          id="stop10161-5-0" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10149-39-0"
        id="linearGradient10792-6"
        gradientUnits="userSpaceOnUse"
@@ -286,7 +171,6 @@
        x2="322.875"
        y2="504.44818" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient10149-39-0">
       <stop
          style="stop-color:#1d4d9d;stop-opacity:1"
@@ -298,22 +182,6 @@
          id="stop10153-72-3" />
     </linearGradient>
     <linearGradient
-       id="linearGradient10149-6-5-4">
-      <stop
-         style="stop-color:#1f4d9a;stop-opacity:1"
-         offset="0"
-         id="stop10151-5-7-2" />
-      <stop
-         id="stop10394-3"
-         offset="0.5"
-         style="stop-color:#b9c7df;stop-opacity:1" />
-      <stop
-         style="stop-color:#567ebc;stop-opacity:1"
-         offset="1"
-         id="stop10153-8-1-2" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4284"
        id="linearGradient10790-8-2"
        gradientUnits="userSpaceOnUse"
@@ -343,7 +211,6 @@
          style="stop-color:#fef0db;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10748-8"
        id="linearGradient5055"
        gradientUnits="userSpaceOnUse"
@@ -353,7 +220,6 @@
        x2="324.1601"
        y2="515.53949" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10448-90"
        id="linearGradient5057"
        gradientUnits="userSpaceOnUse"
@@ -363,7 +229,6 @@
        x2="324.1601"
        y2="511.66458" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4908"
        id="linearGradient5059"
        gradientUnits="userSpaceOnUse"
@@ -373,7 +238,6 @@
        x2="298.9845"
        y2="523.9743" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10157-6"
        id="linearGradient5061"
        gradientUnits="userSpaceOnUse"
@@ -383,7 +247,6 @@
        x2="306.05069"
        y2="514.75818" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10157-2-5"
        id="linearGradient5063"
        gradientUnits="userSpaceOnUse"
@@ -393,7 +256,6 @@
        x2="305"
        y2="542.73901" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10149-39-0"
        id="linearGradient5065"
        gradientUnits="userSpaceOnUse"
@@ -403,7 +265,6 @@
        x2="322.875"
        y2="504.44818" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4284"
        id="linearGradient5067"
        gradientUnits="userSpaceOnUse"
@@ -413,31 +274,6 @@
        x2="305"
        y2="545.35248" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="45.482933"
-     inkscape:cx="16.5"
-     inkscape:cy="8.0000174"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="2560"
-     inkscape:window-height="1391"
-     inkscape:window-x="0"
-     inkscape:window-y="1"
-     inkscape:window-maximized="1"
-     inkscape:snap-global="true"
-     inkscape:snap-bbox="true"
-     inkscape:bbox-nodes="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid4210" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -446,13 +282,11 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
@@ -504,13 +338,11 @@
     <path
        style="display:inline;fill:none;fill-rule:evenodd;stroke:#c18e00;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
        d="m 12,1045.8622 -2,0"
-       id="path4864-2-92-2"
-       inkscape:connector-curvature="0" />
+       id="path4864-2-92-2" />
     <path
        style="display:inline;fill:none;fill-rule:evenodd;stroke:#c18e00;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
        d="m 12,1040.8622 -2,0"
-       id="path4864-2-9-2"
-       inkscape:connector-curvature="0" />
+       id="path4864-2-9-2" />
     <rect
        ry="1.0466173"
        style="fill:url(#linearGradient5063);fill-opacity:1;stroke:url(#linearGradient5065);stroke-width:1.00000012;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
@@ -529,31 +361,20 @@
     <path
        style="fill:none;fill-rule:evenodd;stroke:#c18e00;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
        d="m 14,1044.8622 -2,0"
-       id="path4864-5"
-       inkscape:connector-curvature="0" />
+       id="path4864-5" />
     <path
        style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
        d="m 12,1041.3622 0,1 2,0 0,-1 -2,0 z"
-       id="path4864-2-8"
-       inkscape:connector-curvature="0" />
+       id="path4864-2-8" />
     <path
        style="display:inline;fill:none;fill-rule:evenodd;stroke:#c18e00;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
        d="m 15.5,1044.3622 0,0"
-       id="path4864-2-1-3"
-       inkscape:connector-curvature="0" />
+       id="path4864-2-1-3" />
     <image
        y="1036.3622"
        x="16"
        id="image4495"
-       xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAXhJREFU
-OI2Nk71LQlEYxn/XJC43pMGgIULyD4gGK6KlhpbWoiUM+oKw9qCgrUGwJaihoq0Wk3LQNqEl6GOo
-hKBFa8kowUGv97r0tuhN6Zr3gWc4h3N+55znfY8iIgAcrg5LsWzi0VSW924UnEpEOAgNibxfWD4I
-DYmI4MRugGLZRD4fAEGpjp3KBeDRVCSTgEyS70wSj6YCMBe+l1YApVkGc+F76esSsnmFYOcsEysv
-trlYgHrVNvd4NVLpIicrH6Ri6wB/QG6Amc1LiyLA2lS/tSBx94WhjTO2lKZSMYhH/A0nugCyOd3y
-a06nUDIt6+UKapvJ4s4TapvJwMR26ycMLpzJ5KiPHq9Gt7eD2HWeZnnYAgDOrzLS2+1hN/7Gf3m4
-axvqc2iVx0jwFoB4xC8WIJvTbW9SKP02lV6u4DKeLboi1SoA3B1P29a5Pg/DMGkvPRI/3QdgauNV
-cdTvgfmobB3dSmA+KmfbvoZ/4ghQg9jNN62CU/0A2vI9Oqk3DVUAAAAASUVORK5CYII=
-"
+       xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAXhJREFU OI2Nk71LQlEYxn/XJC43pMGgIULyD4gGK6KlhpbWoiUM+oKw9qCgrUGwJaihoq0Wk3LQNqEl6GOo hKBFa8kowUGv97r0tuhN6Zr3gWc4h3N+55znfY8iIgAcrg5LsWzi0VSW924UnEpEOAgNibxfWD4I DYmI4MRugGLZRD4fAEGpjp3KBeDRVCSTgEyS70wSj6YCMBe+l1YApVkGc+F76esSsnmFYOcsEysv trlYgHrVNvd4NVLpIicrH6Ri6wB/QG6Amc1LiyLA2lS/tSBx94WhjTO2lKZSMYhH/A0nugCyOd3y a06nUDIt6+UKapvJ4s4TapvJwMR26ycMLpzJ5KiPHq9Gt7eD2HWeZnnYAgDOrzLS2+1hN/7Gf3m4 axvqc2iVx0jwFoB4xC8WIJvTbW9SKP02lV6u4DKeLboi1SoA3B1P29a5Pg/DMGkvPRI/3QdgauNV cdTvgfmobB3dSmA+KmfbvoZ/4ghQg9jNN62CU/0A2vI9Oqk3DVUAAAAASUVORK5CYII= "
        style="image-rendering:optimizeSpeed"
        preserveAspectRatio="none"
        height="16"
@@ -615,12 +436,10 @@ cdTvgfmobB3dSmA+KmfbvoZ/4ghQg9jNN62CU/0A2vI9Oqk3DVUAAAAASUVORK5CYII=
          id="rect10007-0-74"
          style="fill:url(#linearGradient10786-1);fill-opacity:1;stroke:none;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
       <path
-         inkscape:connector-curvature="0"
          id="path4864-2-92"
          d="m 13,1049.8622 -2,0"
          style="display:inline;fill:none;fill-rule:evenodd;stroke:#c18e00;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
       <path
-         inkscape:connector-curvature="0"
          id="path4864-2-9"
          d="m 13,1044.8622 -2,0"
          style="display:inline;fill:none;fill-rule:evenodd;stroke:#c18e00;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
@@ -640,17 +459,14 @@ cdTvgfmobB3dSmA+KmfbvoZ/4ghQg9jNN62CU/0A2vI9Oqk3DVUAAAAASUVORK5CYII=
          id="rect10007-6-6"
          style="display:inline;fill:url(#linearGradient10790-8-2);fill-opacity:1;stroke:none;stroke-width:3.58380508;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
       <path
-         inkscape:connector-curvature="0"
          id="path4864"
          d="m 15,1048.8622 -2,0"
          style="fill:none;fill-rule:evenodd;stroke:#c18e00;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
       <path
-         inkscape:connector-curvature="0"
          id="path4864-2"
          d="m 15,1045.8622 -2,0"
          style="display:inline;fill:none;fill-rule:evenodd;stroke:#c18e00;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
       <path
-         inkscape:connector-curvature="0"
          id="path4864-2-1"
          d="m 15.5,1046.3622 0,2"
          style="display:inline;fill:none;fill-rule:evenodd;stroke:#c18e00;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
@@ -658,7 +474,6 @@ cdTvgfmobB3dSmA+KmfbvoZ/4ghQg9jNN62CU/0A2vI9Oqk3DVUAAAAASUVORK5CYII=
     <path
        style="fill:none;fill-rule:evenodd;stroke:#c18e00;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
        d="m 14,1043.3622 2,0"
-       id="path5096"
-       inkscape:connector-curvature="0" />
+       id="path5096" />
   </g>
 </svg>
diff --git a/ui/org.eclipse.pde.runtime/icons/obj16/rsvcproxy_obj.svg b/ui/org.eclipse.pde.runtime/icons/obj16/rsvcproxy_obj.svg
index ab6179ddb69..627c43859fd 100644
--- a/ui/org.eclipse.pde.runtime/icons/obj16/rsvcproxy_obj.svg
+++ b/ui/org.eclipse.pde.runtime/icons/obj16/rsvcproxy_obj.svg
@@ -2,20 +2,16 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="rsvcproxy_obj.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
@@ -33,53 +29,6 @@
          offset="1"
          style="stop-color:#ffff00;stop-opacity:1" />
     </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4738"
-       id="linearGradient4744"
-       x1="-13.936629"
-       y1="1049.9579"
-       x2="-13.936629"
-       y2="1040.053"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(20,0)" />
-    <linearGradient
-       id="linearGradient4738">
-      <stop
-         style="stop-color:#8cc861;stop-opacity:1"
-         offset="0"
-         id="stop4740" />
-      <stop
-         id="stop4746"
-         offset="0.43753415"
-         style="stop-color:#4aa766;stop-opacity:1" />
-      <stop
-         style="stop-color:#c2dd97;stop-opacity:1"
-         offset="1"
-         id="stop4742" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4741"
-       id="linearGradient4747"
-       x1="11.0625"
-       y1="1038.5497"
-       x2="11.0625"
-       y2="1049.912"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-1.314993,0)" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient4741">
-      <stop
-         style="stop-color:#30825a;stop-opacity:1"
-         offset="0"
-         id="stop4743" />
-      <stop
-         style="stop-color:#106643;stop-opacity:1"
-         offset="1"
-         id="stop4745" />
-    </linearGradient>
     <linearGradient
        y2="1040.053"
        x2="-13.936629"
@@ -88,35 +37,8 @@
        gradientTransform="matrix(-1,0,0,-1,-4.0043483,2089.7513)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient3980"
-       xlink:href="#linearGradient4314"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4314" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#cdcdcd"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="51.053257"
-     inkscape:cx="10.057584"
-     inkscape:cy="7.48655"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="2560"
-     inkscape:window-height="1391"
-     inkscape:window-x="0"
-     inkscape:window-y="1"
-     inkscape:window-maximized="1">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2985"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -125,13 +47,11 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      transform="translate(0,-1036.3622)">
     <rect
@@ -145,11 +65,7 @@
        y="1036.3622"
        x="16"
        id="image4311"
-       xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAHVJREFU
-OI29k1EOgCAMQ1vjabz/VfA69ccJzkmcGJeQ8LHXlHVQkjBQ0wj8icCcaSZ53O3ljwQMtGk1On0B
-DwIAVtekoABod1lPqfcWQxcsV1jlRiAEf3XwdgZhCpbxKYUlToGy7kScZHKRvKO2UqscmR3+TBtu
-eg5pFx6grAAAAABJRU5ErkJggg==
-"
+       xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAHVJREFU OI29k1EOgCAMQ1vjabz/VfA69ccJzkmcGJeQ8LHXlHVQkjBQ0wj8icCcaSZ53O3ljwQMtGk1On0B DwIAVtekoABod1lPqfcWQxcsV1jlRiAEf3XwdgZhCpbxKYUlToGy7kScZHKRvKO2UqscmR3+TBtu eg5pFx6grAAAAABJRU5ErkJggg== "
        style="image-rendering:optimizeSpeed"
        preserveAspectRatio="none"
        height="16"
@@ -157,8 +73,6 @@ eg5pFx6grAAAAABJRU5ErkJggg==
     <path
        style="display:inline;fill:url(#linearGradient3980);fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        d="m 13.498152,1049.8895 0,-2.0277 0,-5 0,-3 -1,0 -9.5467003,4.5273 c -0.5923,0.3746 -0.6181,0.6299 0,1 l 9.1268003,4.5004 z"
-       id="rect3968"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccccc" />
+       id="rect3968" />
   </g>
 </svg>
diff --git a/ui/org.eclipse.pde.runtime/icons/obj16/runtime_obj.svg b/ui/org.eclipse.pde.runtime/icons/obj16/runtime_obj.svg
index 91a22b257f3..6deae24c097 100644
--- a/ui/org.eclipse.pde.runtime/icons/obj16/runtime_obj.svg
+++ b/ui/org.eclipse.pde.runtime/icons/obj16/runtime_obj.svg
@@ -2,25 +2,20 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="runtime_obj.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient3973"
-       inkscape:collect="always">
+       id="linearGradient3973">
       <stop
          id="stop3975"
          offset="0"
@@ -31,8 +26,7 @@
          style="stop-color:#f8f0c8;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       id="linearGradient3967"
-       inkscape:collect="always">
+       id="linearGradient3967">
       <stop
          id="stop3969"
          offset="0"
@@ -66,7 +60,6 @@
          style="stop-color:#ba772f;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3949">
       <stop
          style="stop-color:#9e6627;stop-opacity:1"
@@ -78,7 +71,6 @@
          id="stop3953" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient3967"
        id="linearGradient3939"
        gradientUnits="userSpaceOnUse"
@@ -88,7 +80,6 @@
        x2="531.09253"
        y2="371.17883" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient3955"
        id="linearGradient3945"
        gradientUnits="userSpaceOnUse"
@@ -97,18 +88,7 @@
        x2="543.91406"
        y2="373.2294"
        gradientTransform="translate(-60.558598,0.88353259)" />
-    <mask
-       maskUnits="userSpaceOnUse"
-       id="mask4917">
-      <path
-         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;display:inline"
-         d="m 462.77563,373.22885 29.11636,0 c 1.45425,0 2.625,1.17075 2.625,2.625 l 0,18.76896 c 0,1.45425 -1.17412,2.52598 -2.625,2.625 l -29.11636,1.98708 c -1.45088,0.099 -2.625,-1.17075 -2.625,-2.625 l 0,-20.75604 c 0,-1.45425 1.17075,-2.625 2.625,-2.625 z"
-         id="path4919"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="sssssssss" />
-    </mask>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient3973"
        id="linearGradient4933"
        gradientUnits="userSpaceOnUse"
@@ -118,7 +98,6 @@
        x2="538.00562"
        y2="374.21222" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient3949"
        id="linearGradient4935"
        gradientUnits="userSpaceOnUse"
@@ -128,128 +107,6 @@
        x2="548.45923"
        y2="373.77069" />
     <linearGradient
-       id="linearGradient4284">
-      <stop
-         id="stop4286"
-         offset="0"
-         style="stop-color:#6588c1;stop-opacity:0" />
-      <stop
-         style="stop-color:#becce3;stop-opacity:1"
-         offset="0.49999967"
-         id="stop4288" />
-      <stop
-         id="stop4290"
-         offset="1"
-         style="stop-color:#809dcb;stop-opacity:0" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10157-2-5">
-      <stop
-         style="stop-color:#6588c1;stop-opacity:1"
-         offset="0"
-         id="stop10159-8-3" />
-      <stop
-         id="stop10165-3-9"
-         offset="0.5"
-         style="stop-color:#becce3;stop-opacity:1" />
-      <stop
-         style="stop-color:#809dcb;stop-opacity:1"
-         offset="1"
-         id="stop10161-5-0" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10414-9">
-      <stop
-         style="stop-color:#5078b9;stop-opacity:1;"
-         offset="0"
-         id="stop10416-3" />
-      <stop
-         id="stop10422-8"
-         offset="0.5"
-         style="stop-color:#6d8cbd;stop-opacity:1" />
-      <stop
-         style="stop-color:#5f88c9;stop-opacity:1"
-         offset="1"
-         id="stop10418-4" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10432-3">
-      <stop
-         id="stop10434-4"
-         offset="0"
-         style="stop-color:#1f4d9a;stop-opacity:1" />
-      <stop
-         style="stop-color:#4e6da1;stop-opacity:1"
-         offset="0.5"
-         id="stop10436-2" />
-      <stop
-         id="stop10438-9"
-         offset="1"
-         style="stop-color:#567ebc;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10448-90">
-      <stop
-         style="stop-color:#ecac18;stop-opacity:1"
-         offset="0"
-         id="stop10450-0" />
-      <stop
-         id="stop10458-2"
-         offset="0.25"
-         style="stop-color:#ffe38d;stop-opacity:1" />
-      <stop
-         id="stop10456-96"
-         offset="0.5"
-         style="stop-color:#fdf5d2;stop-opacity:1" />
-      <stop
-         style="stop-color:#ffeba7;stop-opacity:1"
-         offset="0.75"
-         id="stop10460-3" />
-      <stop
-         style="stop-color:#e5b630;stop-opacity:1"
-         offset="1"
-         id="stop10452-1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10748-8">
-      <stop
-         id="stop10750-5"
-         offset="0"
-         style="stop-color:#ecac18;stop-opacity:1" />
-      <stop
-         style="stop-color:#f1ce66;stop-opacity:1"
-         offset="0.25"
-         id="stop10752-8" />
-      <stop
-         style="stop-color:#f6e5a6;stop-opacity:1"
-         offset="0.5"
-         id="stop10754-8" />
-      <stop
-         id="stop10756-4"
-         offset="0.75"
-         style="stop-color:#f1cf6c;stop-opacity:1" />
-      <stop
-         id="stop10758-7"
-         offset="1"
-         style="stop-color:#e5b630;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10448-9-7-0-5">
-      <stop
-         style="stop-color:#cf9307;stop-opacity:1"
-         offset="0"
-         id="stop10450-3-5-6-7" />
-      <stop
-         id="stop10456-4-1-5-3"
-         offset="0.5"
-         style="stop-color:#f7d87b;stop-opacity:1" />
-      <stop
-         style="stop-color:#ebb313;stop-opacity:1"
-         offset="1"
-         id="stop10452-22-7-8-4" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4907-9"
        id="linearGradient26910"
        gradientUnits="userSpaceOnUse"
@@ -270,7 +127,6 @@
          id="stop4911-0" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4747-9"
        id="linearGradient26912"
        gradientUnits="userSpaceOnUse"
@@ -280,7 +136,6 @@
        x2="3.1875"
        y2="1046.3622" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4747-9">
       <stop
          style="stop-color:#058048;stop-opacity:1"
@@ -292,7 +147,6 @@
          id="stop4751" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4790"
        id="linearGradient26914"
        gradientUnits="userSpaceOnUse"
@@ -302,8 +156,7 @@
        x2="3.1875"
        y2="1046.3622" />
     <linearGradient
-       id="linearGradient4790"
-       inkscape:collect="always">
+       id="linearGradient4790">
       <stop
          id="stop4792"
          offset="0"
@@ -314,7 +167,6 @@
          style="stop-color:#40a5da;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4830"
        id="linearGradient26916"
        gradientUnits="userSpaceOnUse"
@@ -324,7 +176,6 @@
        x2="938.37811"
        y2="473.21918" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4830">
       <stop
          style="stop-color:#e0a010;stop-opacity:1"
@@ -336,29 +187,6 @@
          id="stop4834" />
     </linearGradient>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="5.6568545"
-     inkscape:cx="-35.828726"
-     inkscape:cy="14.689617"
-     inkscape:document-units="px"
-     inkscape:current-layer="g26748"
-     showgrid="true"
-     inkscape:window-width="1327"
-     inkscape:window-height="864"
-     inkscape:window-x="728"
-     inkscape:window-y="544"
-     inkscape:window-maximized="0"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3947" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -372,8 +200,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
@@ -396,14 +222,11 @@
         <path
            style="fill:url(#linearGradient4933);fill-opacity:1;stroke:url(#linearGradient4935);stroke-width:3.02792978;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
            d="m 463.24874,374.11292 30.75185,0 c 1.45425,0 2.625,1.17075 2.625,2.625 l 0,18.92132 c 0,1.45425 -1.17075,2.62773 -2.625,2.625 l -30.75185,-0.0577 c -1.45425,-0.003 -2.625,-1.17075 -2.625,-2.625 l 0,-18.86359 c 0,-1.45425 1.17075,-2.625 2.625,-2.625 z"
-           id="rect13693"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="sssssssss" />
+           id="rect13693" />
         <path
            style="fill:none;stroke:url(#linearGradient3945);stroke-width:3.02792978;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
            d="m 462.26171,374.11292 20.09375,0"
-           id="path13797"
-           inkscape:connector-curvature="0" />
+           id="path13797" />
       </g>
       <g
          style="display:inline"
diff --git a/ui/org.eclipse.pde.runtime/icons/obj16/save_image_as_obj.svg b/ui/org.eclipse.pde.runtime/icons/obj16/save_image_as_obj.svg
index d8d794090ef..4ddb3899e80 100644
--- a/ui/org.eclipse.pde.runtime/icons/obj16/save_image_as_obj.svg
+++ b/ui/org.eclipse.pde.runtime/icons/obj16/save_image_as_obj.svg
@@ -2,24 +2,19 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="save_image_as_obj.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4450">
       <stop
          style="stop-color:#718386;stop-opacity:1"
@@ -50,7 +45,6 @@
          id="stop4991" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4893">
       <stop
          style="stop-color:#b7c9e3;stop-opacity:1;"
@@ -77,8 +71,7 @@
          id="stop4887" />
     </linearGradient>
     <linearGradient
-       id="linearGradient4780"
-       inkscape:collect="always">
+       id="linearGradient4780">
       <stop
          id="stop4782"
          offset="0"
@@ -89,7 +82,6 @@
          style="stop-color:#8a9b9e;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4738">
       <stop
          style="stop-color:#8a9b9e;stop-opacity:1"
@@ -101,7 +93,6 @@
          id="stop4742" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4738"
        id="linearGradient4744"
        x1="29.586615"
@@ -111,7 +102,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(0.7853072,0,0,0.78570998,23.618744,220.40334)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4780"
        id="linearGradient4858"
        gradientUnits="userSpaceOnUse"
@@ -121,7 +111,6 @@
        y2="1044.8586"
        gradientTransform="matrix(0.88888894,0,0,0.75001475,20.666665,257.32508)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4883"
        id="linearGradient4889"
        x1="29"
@@ -131,7 +120,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(0.85175096,0,0,0.57876124,21.68863,435.68751)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4893"
        id="linearGradient4899"
        x1="32.663635"
@@ -141,7 +129,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(0.7853072,0,0,0.78570998,23.618744,220.40334)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4987"
        id="linearGradient4993"
        x1="48"
@@ -151,7 +138,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(0.79994349,0,0,0.79994347,7.4223832,205.95673)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4450"
        id="linearGradient4456"
        x1="48"
@@ -160,33 +146,6 @@
        y2="1049.3621"
        gradientUnits="userSpaceOnUse" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="13.659091"
-     inkscape:cx="17.488353"
-     inkscape:cy="5.0715172"
-     inkscape:document-units="px"
-     inkscape:current-layer="g4953"
-     showgrid="true"
-     inkscape:window-width="2369"
-     inkscape:window-height="1181"
-     inkscape:window-x="116"
-     inkscape:window-y="87"
-     inkscape:window-maximized="0"
-     showguides="false"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="true"
-     inkscape:snap-bbox="true"
-     inkscape:bbox-nodes="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3952" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -195,13 +154,11 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
@@ -224,16 +181,7 @@
          y="1035.3621"
          x="57"
          id="image4409"
-         xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAbZJREFU
-OI2Nkr9rFEEYhp9Z1urgCKl2yRVCQC6QQsQiHgau0VhZWYSQKp21FvoPWIiVCCmEFB6cFgFBsBAl
-BCJnipAEDsJAGiEJu4VIsuHwdnd2xmJul/sZfZsd5p3vmXe+b8VBW5qvuy0AgjCkXrtDv7ZbP/A9
-D4B7CzWOfh6Jfl+8fLthHq8s833/kKXabcbpS2uPu7dust78wIw3NQBwtBaozNCWkosuRF1D1IUo
-NlzEdt2WEpUZtB6Fu0pDqqxz/kdhDIjeHQYQGMCeSTNnFJAqhyS1gGsn78c+AQSJ0qhMjDiuygSx
-0lSrizT3dsaWV6uLxOmEBIly6CYZs5VpZisPC+Pzt0/FWsodpISpEpyF5ybfD8IQN1GCONXku+vN
-LQBuzMDTtdUJT7J68uIVrlIOcWIBG5vbvHn2CIDXjXfFIaD4F3LlcDfJbAJ6/Tk81UXncw0XD/RA
-KYc00+Q1lctGz7LEICoRRJeTAcsP5mh8bPVm7vB8s4wA5q/bIr/cIYhKA9/+RO6v38diacEdIZ+F
-NpPvefgeBGEHv9zhfr0+mGBitiENF/434F+jvBKQj/Aq/QUXT78zBB56ogAAAABJRU5ErkJggg==
-"
+         xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAbZJREFU OI2Nkr9rFEEYhp9Z1urgCKl2yRVCQC6QQsQiHgau0VhZWYSQKp21FvoPWIiVCCmEFB6cFgFBsBAl BCJnipAEDsJAGiEJu4VIsuHwdnd2xmJul/sZfZsd5p3vmXe+b8VBW5qvuy0AgjCkXrtDv7ZbP/A9 D4B7CzWOfh6Jfl+8fLthHq8s833/kKXabcbpS2uPu7dust78wIw3NQBwtBaozNCWkosuRF1D1IUo NlzEdt2WEpUZtB6Fu0pDqqxz/kdhDIjeHQYQGMCeSTNnFJAqhyS1gGsn78c+AQSJ0qhMjDiuygSx 0lSrizT3dsaWV6uLxOmEBIly6CYZs5VpZisPC+Pzt0/FWsodpISpEpyF5ybfD8IQN1GCONXku+vN LQBuzMDTtdUJT7J68uIVrlIOcWIBG5vbvHn2CIDXjXfFIaD4F3LlcDfJbAJ6/Tk81UXncw0XD/RA KYc00+Q1lctGz7LEICoRRJeTAcsP5mh8bPVm7vB8s4wA5q/bIr/cIYhKA9/+RO6v38diacEdIZ+F NpPvefgeBGEHv9zhfr0+mGBitiENF/434F+jvBKQj/Aq/QUXT78zBB56ogAAAABJRU5ErkJggg== "
          style="image-rendering:optimizeSpeed"
          preserveAspectRatio="none"
          height="16"
@@ -250,17 +198,12 @@ NpPvefgeBGEHv9zhfr0+mGBitiENF/434F+jvBKQj/Aq/QUXT78zBB56ogAAAABJRU5ErkJggg==
       <path
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient4858);fill-opacity:1;stroke:none;stroke-width:1;marker:none;enable-background:accumulate"
          d="m 42,1035.362 0,5.0157 c 0,0.5388 0.528022,0.9843 1.166667,0.9843 l 5.666667,0 c 0.638645,0 1.166666,-0.4455 1.166666,-0.9843 l 0,-5.0157 z m 7,1 0,3.807 c 0,0.1362 -0.02825,0.193 -0.189825,0.193 l -5.666667,0 C 42.981931,1040.362 43,1040.3053 43,1040.169 l 0,-3.807 z"
-         id="rect3968-9"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="csssscccsssscc" />
+         id="rect3968-9" />
       <path
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient4993);fill-opacity:1;stroke:none;stroke-width:1;marker:none;enable-background:accumulate"
          d="m 48.439285,1046.362 0,-3.2571 c 0,-0.1614 -0.116066,-0.2774 -0.277455,-0.2774 l -3.884375,0 c -0.16139,0 -0.277455,0.116 -0.277455,0.2774 l 0,3.2571 z"
-         id="rect3968-9-6-8"
-         inkscape:connector-curvature="0" />
+         id="rect3968-9-6-8" />
       <path
-         sodipodi:nodetypes="csssscccsssscc"
-         inkscape:connector-curvature="0"
          id="rect3968-9-6"
          d="m 43,1047.362 0,-3.9028 c 0,-0.6006 0.509164,-1.0972 1.125,-1.0972 l 3.75,0 c 0.615836,0 1.125,0.4966 1.125,1.0972 l 0,3.9028 z m 5,-1 0,-2.764 c 0,-0.1519 0.03081,-0.236 -0.125,-0.236 l -3.75,0 c -0.155806,0 -0.125,0.084 -0.125,0.236 l 0,2.764 z"
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#5b7aaa;fill-opacity:1;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" />
@@ -281,18 +224,15 @@ NpPvefgeBGEHv9zhfr0+mGBitiENF/434F+jvBKQj/Aq/QUXT78zBB56ogAAAABJRU5ErkJggg==
       <path
          style="fill:none;fill-rule:evenodd;stroke:#587591;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
          d="m 48,1045.862 6,0"
-         id="path4458"
-         inkscape:connector-curvature="0" />
+         id="path4458" />
       <path
          style="display:inline;fill:none;fill-rule:evenodd;stroke:#587591;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
          d="m 51.5,1045.362 0,2"
-         id="path4458-2"
-         inkscape:connector-curvature="0" />
+         id="path4458-2" />
       <path
          style="display:inline;fill:none;fill-rule:evenodd;stroke:#587591;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
          d="m 49.5,1045.362 0,2"
-         id="path4458-2-6"
-         inkscape:connector-curvature="0" />
+         id="path4458-2-6" />
     </g>
   </g>
 </svg>
diff --git a/ui/org.eclipse.pde.runtime/icons/ovr16/default_co.svg b/ui/org.eclipse.pde.runtime/icons/ovr16/default_co.svg
index f081bdbeddf..0f215d179c8 100644
--- a/ui/org.eclipse.pde.runtime/icons/ovr16/default_co.svg
+++ b/ui/org.eclipse.pde.runtime/icons/ovr16/default_co.svg
@@ -2,24 +2,19 @@
 <!-- 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="7"
    height="8"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="default_co.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4298">
       <stop
          style="stop-color:#9ad16d;stop-opacity:1"
@@ -31,7 +26,6 @@
          id="stop4302" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4290">
       <stop
          style="stop-color:#6c4fc2;stop-opacity:1"
@@ -43,22 +37,6 @@
          id="stop4294" />
     </linearGradient>
     <linearGradient
-       id="linearGradient4838">
-      <stop
-         style="stop-color:#4177af;stop-opacity:1;"
-         offset="0"
-         id="stop4840" />
-      <stop
-         id="stop4846"
-         offset="0.47625124"
-         style="stop-color:#14518f;stop-opacity:1;" />
-      <stop
-         style="stop-color:#6ea2d8;stop-opacity:1;"
-         offset="1"
-         id="stop4842" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4290"
        id="linearGradient4296"
        x1="3"
@@ -68,7 +46,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(0.96650546,0.01501324,0,1,0.99412372,8.1219071)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4298"
        id="linearGradient4304"
        x1="2"
@@ -78,30 +55,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(0.96650546,0.01501324,0,1,0.99412372,8.1219071)" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#b6b6b6"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="37.101547"
-     inkscape:cx="7.8223686"
-     inkscape:cy="8.3967933"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1441"
-     inkscape:window-height="1076"
-     inkscape:window-x="1028"
-     inkscape:window-y="61"
-     inkscape:window-maximized="0"
-     inkscape:snap-bbox="true"
-     inkscape:bbox-nodes="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid4141" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -110,28 +63,22 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1044.3622)">
     <path
        style="display:inline;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
        d="M -1.5687511,1050.3622 8.6765633,1050.3352 3.5,1043.3622 Z"
-       id="path4288-2"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccc" />
+       id="path4288-2" />
     <path
        style="fill:url(#linearGradient4304);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4296);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
        d="m 1,1048.8622 5,0 -2.5,-3.5 z"
-       id="path4288"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccc" />
+       id="path4288" />
     <g
        transform="matrix(0.27903303,0,0,0.27903303,-100.53208,912.07901)"
        style="display:inline"
diff --git a/ui/org.eclipse.pde.runtime/icons/ovr16/error_co.svg b/ui/org.eclipse.pde.runtime/icons/ovr16/error_co.svg
index 1b2a9282bff..1b139709a95 100644
--- a/ui/org.eclipse.pde.runtime/icons/ovr16/error_co.svg
+++ b/ui/org.eclipse.pde.runtime/icons/ovr16/error_co.svg
@@ -2,47 +2,17 @@
 <!-- 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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="7"
    height="8"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="error_co.svg">
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1"
-     inkscape:cx="1.7591406"
-     inkscape:cy="1.7730252"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="1107"
-     inkscape:window-height="870"
-     inkscape:window-x="350"
-     inkscape:window-y="350"
-     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>
@@ -56,8 +26,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      transform="translate(0,-1044.3622)">
     <rect
@@ -68,10 +36,8 @@
        x="-1.1130133e-007"
        y="1044.3622" />
     <path
-       inkscape:connector-curvature="0"
        style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:7.68999243px;line-height:125%;font-family:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:0px;word-spacing:0px;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.27519909;marker:none;enable-background:accumulate"
        d="m 1.0021364,1046.3608 0,0.1184 0,0.7609 0,0.1184 0.1384548,0 0.4153647,0 1.3153211,1.0447 -1.3499348,0.9579 -0.380751,0 -0.1384548,0 0,0.1184 0,0.7561 0,0.1184 0.1384548,0 1.7277497,0 0.1384542,0 0,-0.1184 0,-0.7561 0,-0.1184 -0.1384542,0 0.6259832,-0.3067 0.64808,0.3067 -0.138455,0 0,0.1184 0,0.7561 0,0.1184 0.138455,0 1.705653,0 0.138454,0 0,-0.1184 0,-0.7561 0,-0.1184 -0.138454,0 -0.346138,0 -1.384549,-0.9876 1.280708,-1.015 0.449979,0 0.138454,0 0,-0.1184 0,-0.7609 0,-0.1184 -0.138454,0 -1.705653,0 -0.138455,0 0,0.1184 0,0.7609 0,0.1184 0.06923,0 -0.578853,0.3935 -0.5678034,-0.3935 0.069227,0 0,-0.1184 0,-0.7609 0,-0.1184 -0.1384531,0 -1.7167011,0 z"
-       id="path4187-6"
-       sodipodi:nodetypes="ccccccccccccccccccccccccccccccccccccccccccccccccccccccccc" />
+       id="path4187-6" />
   </g>
 </svg>
diff --git a/ui/org.eclipse.pde.runtime/icons/ovr16/export_co.svg b/ui/org.eclipse.pde.runtime/icons/ovr16/export_co.svg
index b289550c451..05377688cec 100644
--- a/ui/org.eclipse.pde.runtime/icons/ovr16/export_co.svg
+++ b/ui/org.eclipse.pde.runtime/icons/ovr16/export_co.svg
@@ -2,48 +2,17 @@
 <!-- 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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="7"
    height="8"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="export_co.svg">
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="44.8"
-     inkscape:cx="1.3795181"
-     inkscape:cy="3.5201148"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1288"
-     inkscape:window-height="951"
-     inkscape:window-x="656"
-     inkscape:window-y="413"
-     inkscape:window-maximized="0"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2985"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -57,19 +26,15 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      transform="translate(0,-1044.3622)">
     <path
        style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
        d="m 0.46875,1044.8622 4.0401786,0 1.9754464,1.9754 0,2.1541 -2.9631696,2.9631 -1.0881697,-1.0881 -1.94196427,0 z"
-       id="path4146"
-       inkscape:connector-curvature="0" />
+       id="path4146" />
     <path
        style="fill:#808080;fill-opacity:1;fill-rule:evenodd;stroke:#3f3f5f;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
        d="m 3.5661438,1044.8362 3.0304576,3.062 -3.0620248,3.0147 -0.9785853,-1.0575 -1.0575035,0 0,-3.9933 1.1048544,0 z"
-       id="path4149"
-       inkscape:connector-curvature="0" />
+       id="path4149" />
   </g>
 </svg>
diff --git a/ui/org.eclipse.pde.runtime/icons/ovr16/run_co.svg b/ui/org.eclipse.pde.runtime/icons/ovr16/run_co.svg
index ae9307bd71a..9e2fd01f69a 100644
--- a/ui/org.eclipse.pde.runtime/icons/ovr16/run_co.svg
+++ b/ui/org.eclipse.pde.runtime/icons/ovr16/run_co.svg
@@ -2,32 +2,18 @@
 <!-- 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="7"
    height="8"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="run_co.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
-    <linearGradient
-       gradientTransform="translate(20,0)"
-       gradientUnits="userSpaceOnUse"
-       y2="1040.053"
-       x2="-13.936629"
-       y1="1049.9579"
-       x1="-13.936629"
-       id="linearGradient4744"
-       xlink:href="#linearGradient4738"
-       inkscape:collect="always" />
     <linearGradient
        id="linearGradient4738">
       <stop
@@ -44,18 +30,7 @@
          style="stop-color:#c2dd97;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       gradientTransform="translate(-1.314993,0)"
-       gradientUnits="userSpaceOnUse"
-       y2="1049.912"
-       x2="11.0625"
-       y1="1038.5497"
-       x1="11.0625"
-       id="linearGradient4747"
-       xlink:href="#linearGradient4741"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient4741"
-       inkscape:collect="always">
+       id="linearGradient4741">
       <stop
          id="stop4743"
          offset="0"
@@ -73,8 +48,7 @@
        gradientTransform="translate(15.825436,0)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient6032"
-       xlink:href="#linearGradient4738"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4738" />
     <linearGradient
        y2="1049.912"
        x2="11.0625"
@@ -83,95 +57,18 @@
        gradientTransform="translate(-5.4895565,0)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient6034"
-       xlink:href="#linearGradient4741"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="1040.053"
-       x2="-13.936629"
-       y1="1049.9579"
-       x1="-13.936629"
-       gradientTransform="translate(15.825436,0)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient6032-1"
-       xlink:href="#linearGradient4738-7"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient4738-7">
-      <stop
-         id="stop4740-4"
-         offset="0"
-         style="stop-color:#8cc861;stop-opacity:1" />
-      <stop
-         style="stop-color:#4aa766;stop-opacity:1"
-         offset="0.43753415"
-         id="stop4746-0" />
-      <stop
-         id="stop4742-9"
-         offset="1"
-         style="stop-color:#c2dd97;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       y2="1049.912"
-       x2="11.0625"
-       y1="1038.5497"
-       x1="11.0625"
-       gradientTransform="translate(-5.4895565,0)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient6034-4"
-       xlink:href="#linearGradient4741-8"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient4741-8"
-       inkscape:collect="always">
-      <stop
-         id="stop4743-8"
-         offset="0"
-         style="stop-color:#30825a;stop-opacity:1" />
-      <stop
-         id="stop4745-2"
-         offset="1"
-         style="stop-color:#106643;stop-opacity:1" />
-    </linearGradient>
+       xlink:href="#linearGradient4741" />
     <filter
-       inkscape:collect="always"
        id="filter3854"
-       x="-0.17271166"
-       width="1.3454233"
-       y="-0.18946901"
-       height="1.378938">
+       x="-0.27279218"
+       width="1.5455826"
+       y="-0.29925984"
+       height="1.5985197">
       <feGaussianBlur
-         inkscape:collect="always"
          stdDeviation="0.79164101"
          id="feGaussianBlur3856" />
     </filter>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="22.4"
-     inkscape:cx="4.5306353"
-     inkscape:cy="0.17979497"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="831"
-     inkscape:window-height="877"
-     inkscape:window-x="650"
-     inkscape:window-y="517"
-     inkscape:window-maximized="0"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2985"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -185,24 +82,17 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      transform="translate(0,-1044.3622)">
     <path
        style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
        d="m 9.000617,1047.4682 -6.9803119,-2.1139 -2.05187237,0 0,7.0079 2.02030507,0 7.0118792,-1.9721"
-       id="path3360"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccc" />
+       id="path3360" />
     <g
        style="display:inline;fill:#ffffff;stroke:#ffffff;filter:url(#filter3854)"
        id="layer1-6-4"
-       inkscape:label="Layer 1"
        transform="matrix(0.479092,0,0,0.43051303,2.2977699,599.01177)">
       <path
-         sodipodi:nodetypes="ccccccccc"
-         inkscape:connector-curvature="0"
          id="rect3968-5"
          d="m -1.6770565,1039.8618 0,2.0277 0,5 0,3 0.99999995,0 9.54668705,-4.5273 c 0.59227,-0.3746 0.618127,-0.6299 0,-1 l -9.12684205,-4.5004 z"
          style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:2.20189905000000020;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
@@ -210,11 +100,8 @@
     <g
        style="display:inline"
        id="layer1-6"
-       inkscape:label="Layer 1"
        transform="matrix(0.479092,0,0,0.43051303,2.2977699,599.01177)">
       <path
-         sodipodi:nodetypes="ccccccccc"
-         inkscape:connector-curvature="0"
          id="rect3968"
          d="m -1.6770565,1039.8618 0,2.0277 0,5 0,3 0.99999995,0 9.54668705,-4.5273 c 0.59227,-0.3746 0.618127,-0.6299 0,-1 l -9.12684205,-4.5004 z"
          style="fill:url(#linearGradient6032);fill-opacity:1;stroke:url(#linearGradient6034);stroke-width:2.20189905;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
diff --git a/ui/org.eclipse.pde.spy.bundle/icons/osgi.svg b/ui/org.eclipse.pde.spy.bundle/icons/osgi.svg
index dcd7a8b3553..1e83646698d 100644
--- a/ui/org.eclipse.pde.spy.bundle/icons/osgi.svg
+++ b/ui/org.eclipse.pde.spy.bundle/icons/osgi.svg
@@ -2,94 +2,18 @@
 <!-- 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="16"
    height="15"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="osgi.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient7584-5">
-      <stop
-         style="stop-color:#f9cd5f;stop-opacity:1;"
-         offset="0"
-         id="stop7586-4" />
-      <stop
-         style="stop-color:#ffebb7;stop-opacity:1;"
-         offset="1"
-         id="stop7588-5" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient7592-1">
-      <stop
-         style="stop-color:#ad7212;stop-opacity:1;"
-         offset="0"
-         id="stop7594-6" />
-      <stop
-         style="stop-color:#875f1e;stop-opacity:1;"
-         offset="1"
-         id="stop7596-9" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient7584-9-3">
-      <stop
-         style="stop-color:#f9cd5f;stop-opacity:1;"
-         offset="0"
-         id="stop7586-6-3" />
-      <stop
-         style="stop-color:#ffebb7;stop-opacity:1;"
-         offset="1"
-         id="stop7588-9-9" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient7592-0-5">
-      <stop
-         style="stop-color:#ad7212;stop-opacity:1;"
-         offset="0"
-         id="stop7594-8-9" />
-      <stop
-         style="stop-color:#875f1e;stop-opacity:1;"
-         offset="1"
-         id="stop7596-5-6" />
-    </linearGradient>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="11.26"
-     inkscape:cx="16.886402"
-     inkscape:cy="-30.570165"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="2560"
-     inkscape:window-height="1391"
-     inkscape:window-x="0"
-     inkscape:window-y="1"
-     inkscape:window-maximized="1"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-bbox="true"
-     inkscape:bbox-nodes="true"
-     inkscape:snap-global="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid4074" />
-  </sodipodi:namedview>
+     id="defs4" />
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -98,13 +22,11 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1037.3622)">
@@ -112,79 +34,7 @@
        y="1037.3622"
        x="18"
        id="image4296"
-       xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAPCAYAAADtc08vAAAKQWlDQ1BJQ0MgUHJvZmlsZQAASA2d
-lndUU9kWh8+9N73QEiIgJfQaegkg0jtIFQRRiUmAUAKGhCZ2RAVGFBEpVmRUwAFHhyJjRRQLg4Ji
-1wnyEFDGwVFEReXdjGsJ7601896a/cdZ39nnt9fZZ+9917oAUPyCBMJ0WAGANKFYFO7rwVwSE8vE
-9wIYEAEOWAHA4WZmBEf4RALU/L09mZmoSMaz9u4ugGS72yy/UCZz1v9/kSI3QyQGAApF1TY8fiYX
-5QKUU7PFGTL/BMr0lSkyhjEyFqEJoqwi48SvbPan5iu7yZiXJuShGlnOGbw0noy7UN6aJeGjjASh
-XJgl4GejfAdlvVRJmgDl9yjT0/icTAAwFJlfzOcmoWyJMkUUGe6J8gIACJTEObxyDov5OWieAHim
-Z+SKBIlJYqYR15hp5ejIZvrxs1P5YjErlMNN4Yh4TM/0tAyOMBeAr2+WRQElWW2ZaJHtrRzt7VnW
-5mj5v9nfHn5T/T3IevtV8Sbsz55BjJ5Z32zsrC+9FgD2JFqbHbO+lVUAtG0GQOXhrE/vIADyBQC0
-3pzzHoZsXpLE4gwnC4vs7GxzAZ9rLivoN/ufgm/Kv4Y595nL7vtWO6YXP4EjSRUzZUXlpqemS0TM
-zAwOl89k/fcQ/+PAOWnNycMsnJ/AF/GF6FVR6JQJhIlou4U8gViQLmQKhH/V4X8YNicHGX6daxRo
-dV8AfYU5ULhJB8hvPQBDIwMkbj96An3rWxAxCsi+vGitka9zjzJ6/uf6Hwtcim7hTEEiU+b2DI9k
-ciWiLBmj34RswQISkAd0oAo0gS4wAixgDRyAM3AD3iAAhIBIEAOWAy5IAmlABLJBPtgACkEx2AF2
-g2pwANSBetAEToI2cAZcBFfADXALDIBHQAqGwUswAd6BaQiC8BAVokGqkBakD5lC1hAbWgh5Q0FQ
-OBQDxUOJkBCSQPnQJqgYKoOqoUNQPfQjdBq6CF2D+qAH0CA0Bv0BfYQRmALTYQ3YALaA2bA7HAhH
-wsvgRHgVnAcXwNvhSrgWPg63whfhG/AALIVfwpMIQMgIA9FGWAgb8URCkFgkAREha5EipAKpRZqQ
-DqQbuY1IkXHkAwaHoWGYGBbGGeOHWYzhYlZh1mJKMNWYY5hWTBfmNmYQM4H5gqVi1bGmWCesP3YJ
-NhGbjS3EVmCPYFuwl7ED2GHsOxwOx8AZ4hxwfrgYXDJuNa4Etw/XjLuA68MN4SbxeLwq3hTvgg/B
-c/BifCG+Cn8cfx7fjx/GvyeQCVoEa4IPIZYgJGwkVBAaCOcI/YQRwjRRgahPdCKGEHnEXGIpsY7Y
-QbxJHCZOkxRJhiQXUiQpmbSBVElqIl0mPSa9IZPJOmRHchhZQF5PriSfIF8lD5I/UJQoJhRPShxF
-QtlOOUq5QHlAeUOlUg2obtRYqpi6nVpPvUR9Sn0vR5Mzl/OX48mtk6uRa5Xrl3slT5TXl3eXXy6f
-J18hf0r+pvy4AlHBQMFTgaOwVqFG4bTCPYVJRZqilWKIYppiiWKD4jXFUSW8koGStxJPqUDpsNIl
-pSEaQtOledK4tE20Otpl2jAdRzek+9OT6cX0H+i99AllJWVb5SjlHOUa5bPKUgbCMGD4M1IZpYyT
-jLuMj/M05rnP48/bNq9pXv+8KZX5Km4qfJUilWaVAZWPqkxVb9UU1Z2qbapP1DBqJmphatlq+9Uu
-q43Pp893ns+dXzT/5PyH6rC6iXq4+mr1w+o96pMamhq+GhkaVRqXNMY1GZpumsma5ZrnNMe0aFoL
-tQRa5VrntV4wlZnuzFRmJbOLOaGtru2nLdE+pN2rPa1jqLNYZ6NOs84TXZIuWzdBt1y3U3dCT0sv
-WC9fr1HvoT5Rn62fpL9Hv1t/ysDQINpgi0GbwaihiqG/YZ5ho+FjI6qRq9Eqo1qjO8Y4Y7ZxivE+
-41smsImdSZJJjclNU9jU3lRgus+0zwxr5mgmNKs1u8eisNxZWaxG1qA5wzzIfKN5m/krCz2LWIud
-Ft0WXyztLFMt6ywfWSlZBVhttOqw+sPaxJprXWN9x4Zq42Ozzqbd5rWtqS3fdr/tfTuaXbDdFrtO
-u8/2DvYi+yb7MQc9h3iHvQ732HR2KLuEfdUR6+jhuM7xjOMHJ3snsdNJp9+dWc4pzg3OowsMF/AX
-1C0YctFx4bgccpEuZC6MX3hwodRV25XjWuv6zE3Xjed2xG3E3dg92f24+ysPSw+RR4vHlKeT5xrP
-C16Il69XkVevt5L3Yu9q76c+Oj6JPo0+E752vqt9L/hh/QL9dvrd89fw5/rX+08EOASsCegKpARG
-BFYHPgsyCRIFdQTDwQHBu4IfL9JfJFzUFgJC/EN2hTwJNQxdFfpzGC4sNKwm7Hm4VXh+eHcELWJF
-REPEu0iPyNLIR4uNFksWd0bJR8VF1UdNRXtFl0VLl1gsWbPkRoxajCCmPRYfGxV7JHZyqffS3UuH
-4+ziCuPuLjNclrPs2nK15anLz66QX8FZcSoeGx8d3xD/iRPCqeVMrvRfuXflBNeTu4f7kufGK+eN
-8V34ZfyRBJeEsoTRRJfEXYljSa5JFUnjAk9BteB1sl/ygeSplJCUoykzqdGpzWmEtPi000IlYYqw
-K10zPSe9L8M0ozBDuspp1e5VE6JA0ZFMKHNZZruYjv5M9UiMJJslg1kLs2qy3mdHZZ/KUcwR5vTk
-muRuyx3J88n7fjVmNXd1Z752/ob8wTXuaw6thdauXNu5Tnddwbrh9b7rj20gbUjZ8MtGy41lG99u
-it7UUaBRsL5gaLPv5sZCuUJR4b0tzlsObMVsFWzt3WazrWrblyJe0fViy+KK4k8l3JLr31l9V/nd
-zPaE7b2l9qX7d+B2CHfc3em681iZYlle2dCu4F2t5czyovK3u1fsvlZhW3FgD2mPZI+0MqiyvUqv
-akfVp+qk6oEaj5rmvep7t+2d2sfb17/fbX/TAY0DxQc+HhQcvH/I91BrrUFtxWHc4azDz+ui6rq/
-Z39ff0TtSPGRz0eFR6XHwo911TvU1zeoN5Q2wo2SxrHjccdv/eD1Q3sTq+lQM6O5+AQ4ITnx4sf4
-H++eDDzZeYp9qukn/Z/2ttBailqh1tzWibakNml7THvf6YDTnR3OHS0/m/989Iz2mZqzymdLz5HO
-FZybOZ93fvJCxoXxi4kXhzpXdD66tOTSna6wrt7LgZevXvG5cqnbvfv8VZerZ645XTt9nX297Yb9
-jdYeu56WX+x+aem172296XCz/ZbjrY6+BX3n+l37L972un3ljv+dGwOLBvruLr57/17cPel93v3R
-B6kPXj/Mejj9aP1j7OOiJwpPKp6qP6391fjXZqm99Oyg12DPs4hnj4a4Qy//lfmvT8MFz6nPK0a0
-RupHrUfPjPmM3Xqx9MXwy4yX0+OFvyn+tveV0auffnf7vWdiycTwa9HrmT9K3qi+OfrW9m3nZOjk
-03dp76anit6rvj/2gf2h+2P0x5Hp7E/4T5WfjT93fAn88ngmbWbm3/eE8/syOll+AAAACXBIWXMA
-ABYlAAAWJQFJUiTwAAACb2lUWHRYTUw6Y29tLmFkb2JlLnhtcAAAAAAAPHg6eG1wbWV0YSB4bWxu
-czp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iWE1QIENvcmUgNS40LjAiPgogICA8cmRmOlJE
-RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMi
-PgogICAgICA8cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIgogICAgICAgICAgICB4bWxuczp0
-aWZmPSJodHRwOi8vbnMuYWRvYmUuY29tL3RpZmYvMS4wLyI+CiAgICAgICAgIDx0aWZmOlhSZXNv
-bHV0aW9uPjE0NDwvdGlmZjpYUmVzb2x1dGlvbj4KICAgICAgICAgPHRpZmY6WVJlc29sdXRpb24+
-MTQ0PC90aWZmOllSZXNvbHV0aW9uPgogICAgICAgICA8dGlmZjpSZXNvbHV0aW9uVW5pdD4yPC90
-aWZmOlJlc29sdXRpb25Vbml0PgogICAgICAgICA8dGlmZjpDb21wcmVzc2lvbj41PC90aWZmOkNv
-bXByZXNzaW9uPgogICAgICAgICA8dGlmZjpPcmllbnRhdGlvbj4xPC90aWZmOk9yaWVudGF0aW9u
-PgogICAgICAgICA8dGlmZjpQaG90b21ldHJpY0ludGVycHJldGF0aW9uPjI8L3RpZmY6UGhvdG9t
-ZXRyaWNJbnRlcnByZXRhdGlvbj4KICAgICAgPC9yZGY6RGVzY3JpcHRpb24+CiAgIDwvcmRmOlJE
-Rj4KPC94OnhtcG1ldGE+Cka1WbsAAALpSURBVCgVbVJbSFRRFN3nnnvuXHVm1Cl1LPvRyl4ElqiV
-SoYfZmZYWJEKJolFf/1MfgTzFYQfEaS9KJOKYoz6CCqswSgVjakwyyIfI6PZzMjkvGzmzuOe7hmb
-CvHAvey9zlpr77PZAMscajRyS+HlsKWcWE5NtZgFs5ZrifZrhWenrxcZ7MNtSQyL37F42ROvYlHE
-ro6CfnpZRWm7hs515L/ppb08E8U5cQMUDygFhBBQlruuFz/ScX01Ub/yEioD1gLMy4V3dc1DDQqB
-U0RyXPfPwAQYHYbo7IXqk8m8+UpIzH4hJ2aNIox5zmfL5QJfyr3RssYsQ08X/cNlJrG2WNDdzf6K
-NU07ElpveJVSda5CaelvJffjVjP9/OOYQumC0cVOGT/WgVFpS/liZKvVmqJ3P/uEQwE9Bf65QlHw
-yD7gxUmz9tSWynVIYsK4BrGhIKNRHjOc3ixmq+vTi3I/StHQFIFQEx+WDyi2cgTzT35h1U01ITn2
-gdHNv0bmb29sv/HNVFuLUXwo9rYdZpyQI6TsKsmWJX+GpEot1eY1DbBq3g93dwkhx2tI0Dr9g+/n
-I663E/rWd/sVLY5N9PvDQ3kZKx17BDLSQ/JaVgPCTg230O8d6lqxMHonU0PcfQjhGXFrc6YgTD7J
-SPdU2R40bFHeH41tnOiaaYTwpDIZXTWrCDh5DySoQMD+ej7wswEEAkE5rZxdRQMLuyE8DkmeqSaW
-xwyQ5CsOewAEaTzfaTraqMo//jXiXvjOAcqTKd4kuYP25KK6MfuDgyeEsK0g6FPWQ/KXMoPF7cLq
-SaJL2kY80wCOoU5X514ig2ijlLNQxIscJ2+Yu1XRonYOXlVFZgGlasEXVk38NfCu2tQsO4iVE3xl
-JOzTy84vF+023WfP9sp7icRLsOVtnYbYLkkqcSZAtjqjcvJL39qd5wEGAf2/wsyx19opwtOnPH+/
-h5T0eeYZNmysSUfrcsP+0vTgzjVnAgxjh2l/AwuRO/N8h5vlAAAAAElFTkSuQmCC
-"
+       xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAPCAYAAADtc08vAAAKQWlDQ1BJQ0MgUHJvZmlsZQAASA2d lndUU9kWh8+9N73QEiIgJfQaegkg0jtIFQRRiUmAUAKGhCZ2RAVGFBEpVmRUwAFHhyJjRRQLg4Ji 1wnyEFDGwVFEReXdjGsJ7601896a/cdZ39nnt9fZZ+9917oAUPyCBMJ0WAGANKFYFO7rwVwSE8vE 9wIYEAEOWAHA4WZmBEf4RALU/L09mZmoSMaz9u4ugGS72yy/UCZz1v9/kSI3QyQGAApF1TY8fiYX 5QKUU7PFGTL/BMr0lSkyhjEyFqEJoqwi48SvbPan5iu7yZiXJuShGlnOGbw0noy7UN6aJeGjjASh XJgl4GejfAdlvVRJmgDl9yjT0/icTAAwFJlfzOcmoWyJMkUUGe6J8gIACJTEObxyDov5OWieAHim Z+SKBIlJYqYR15hp5ejIZvrxs1P5YjErlMNN4Yh4TM/0tAyOMBeAr2+WRQElWW2ZaJHtrRzt7VnW 5mj5v9nfHn5T/T3IevtV8Sbsz55BjJ5Z32zsrC+9FgD2JFqbHbO+lVUAtG0GQOXhrE/vIADyBQC0 3pzzHoZsXpLE4gwnC4vs7GxzAZ9rLivoN/ufgm/Kv4Y595nL7vtWO6YXP4EjSRUzZUXlpqemS0TM zAwOl89k/fcQ/+PAOWnNycMsnJ/AF/GF6FVR6JQJhIlou4U8gViQLmQKhH/V4X8YNicHGX6daxRo dV8AfYU5ULhJB8hvPQBDIwMkbj96An3rWxAxCsi+vGitka9zjzJ6/uf6Hwtcim7hTEEiU+b2DI9k ciWiLBmj34RswQISkAd0oAo0gS4wAixgDRyAM3AD3iAAhIBIEAOWAy5IAmlABLJBPtgACkEx2AF2 g2pwANSBetAEToI2cAZcBFfADXALDIBHQAqGwUswAd6BaQiC8BAVokGqkBakD5lC1hAbWgh5Q0FQ OBQDxUOJkBCSQPnQJqgYKoOqoUNQPfQjdBq6CF2D+qAH0CA0Bv0BfYQRmALTYQ3YALaA2bA7HAhH wsvgRHgVnAcXwNvhSrgWPg63whfhG/AALIVfwpMIQMgIA9FGWAgb8URCkFgkAREha5EipAKpRZqQ DqQbuY1IkXHkAwaHoWGYGBbGGeOHWYzhYlZh1mJKMNWYY5hWTBfmNmYQM4H5gqVi1bGmWCesP3YJ NhGbjS3EVmCPYFuwl7ED2GHsOxwOx8AZ4hxwfrgYXDJuNa4Etw/XjLuA68MN4SbxeLwq3hTvgg/B c/BifCG+Cn8cfx7fjx/GvyeQCVoEa4IPIZYgJGwkVBAaCOcI/YQRwjRRgahPdCKGEHnEXGIpsY7Y QbxJHCZOkxRJhiQXUiQpmbSBVElqIl0mPSa9IZPJOmRHchhZQF5PriSfIF8lD5I/UJQoJhRPShxF QtlOOUq5QHlAeUOlUg2obtRYqpi6nVpPvUR9Sn0vR5Mzl/OX48mtk6uRa5Xrl3slT5TXl3eXXy6f J18hf0r+pvy4AlHBQMFTgaOwVqFG4bTCPYVJRZqilWKIYppiiWKD4jXFUSW8koGStxJPqUDpsNIl pSEaQtOledK4tE20Otpl2jAdRzek+9OT6cX0H+i99AllJWVb5SjlHOUa5bPKUgbCMGD4M1IZpYyT jLuMj/M05rnP48/bNq9pXv+8KZX5Km4qfJUilWaVAZWPqkxVb9UU1Z2qbapP1DBqJmphatlq+9Uu q43Pp893ns+dXzT/5PyH6rC6iXq4+mr1w+o96pMamhq+GhkaVRqXNMY1GZpumsma5ZrnNMe0aFoL tQRa5VrntV4wlZnuzFRmJbOLOaGtru2nLdE+pN2rPa1jqLNYZ6NOs84TXZIuWzdBt1y3U3dCT0sv WC9fr1HvoT5Rn62fpL9Hv1t/ysDQINpgi0GbwaihiqG/YZ5ho+FjI6qRq9Eqo1qjO8Y4Y7ZxivE+ 41smsImdSZJJjclNU9jU3lRgus+0zwxr5mgmNKs1u8eisNxZWaxG1qA5wzzIfKN5m/krCz2LWIud Ft0WXyztLFMt6ywfWSlZBVhttOqw+sPaxJprXWN9x4Zq42Ozzqbd5rWtqS3fdr/tfTuaXbDdFrtO u8/2DvYi+yb7MQc9h3iHvQ732HR2KLuEfdUR6+jhuM7xjOMHJ3snsdNJp9+dWc4pzg3OowsMF/AX 1C0YctFx4bgccpEuZC6MX3hwodRV25XjWuv6zE3Xjed2xG3E3dg92f24+ysPSw+RR4vHlKeT5xrP C16Il69XkVevt5L3Yu9q76c+Oj6JPo0+E752vqt9L/hh/QL9dvrd89fw5/rX+08EOASsCegKpARG BFYHPgsyCRIFdQTDwQHBu4IfL9JfJFzUFgJC/EN2hTwJNQxdFfpzGC4sNKwm7Hm4VXh+eHcELWJF REPEu0iPyNLIR4uNFksWd0bJR8VF1UdNRXtFl0VLl1gsWbPkRoxajCCmPRYfGxV7JHZyqffS3UuH 4+ziCuPuLjNclrPs2nK15anLz66QX8FZcSoeGx8d3xD/iRPCqeVMrvRfuXflBNeTu4f7kufGK+eN 8V34ZfyRBJeEsoTRRJfEXYljSa5JFUnjAk9BteB1sl/ygeSplJCUoykzqdGpzWmEtPi000IlYYqw K10zPSe9L8M0ozBDuspp1e5VE6JA0ZFMKHNZZruYjv5M9UiMJJslg1kLs2qy3mdHZZ/KUcwR5vTk muRuyx3J88n7fjVmNXd1Z752/ob8wTXuaw6thdauXNu5Tnddwbrh9b7rj20gbUjZ8MtGy41lG99u it7UUaBRsL5gaLPv5sZCuUJR4b0tzlsObMVsFWzt3WazrWrblyJe0fViy+KK4k8l3JLr31l9V/nd zPaE7b2l9qX7d+B2CHfc3em681iZYlle2dCu4F2t5czyovK3u1fsvlZhW3FgD2mPZI+0MqiyvUqv akfVp+qk6oEaj5rmvep7t+2d2sfb17/fbX/TAY0DxQc+HhQcvH/I91BrrUFtxWHc4azDz+ui6rq/ Z39ff0TtSPGRz0eFR6XHwo911TvU1zeoN5Q2wo2SxrHjccdv/eD1Q3sTq+lQM6O5+AQ4ITnx4sf4 H++eDDzZeYp9qukn/Z/2ttBailqh1tzWibakNml7THvf6YDTnR3OHS0/m/989Iz2mZqzymdLz5HO FZybOZ93fvJCxoXxi4kXhzpXdD66tOTSna6wrt7LgZevXvG5cqnbvfv8VZerZ645XTt9nX297Yb9 jdYeu56WX+x+aem172296XCz/ZbjrY6+BX3n+l37L972un3ljv+dGwOLBvruLr57/17cPel93v3R B6kPXj/Mejj9aP1j7OOiJwpPKp6qP6391fjXZqm99Oyg12DPs4hnj4a4Qy//lfmvT8MFz6nPK0a0 RupHrUfPjPmM3Xqx9MXwy4yX0+OFvyn+tveV0auffnf7vWdiycTwa9HrmT9K3qi+OfrW9m3nZOjk 03dp76anit6rvj/2gf2h+2P0x5Hp7E/4T5WfjT93fAn88ngmbWbm3/eE8/syOll+AAAACXBIWXMA ABYlAAAWJQFJUiTwAAACb2lUWHRYTUw6Y29tLmFkb2JlLnhtcAAAAAAAPHg6eG1wbWV0YSB4bWxu czp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iWE1QIENvcmUgNS40LjAiPgogICA8cmRmOlJE RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMi PgogICAgICA8cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIgogICAgICAgICAgICB4bWxuczp0 aWZmPSJodHRwOi8vbnMuYWRvYmUuY29tL3RpZmYvMS4wLyI+CiAgICAgICAgIDx0aWZmOlhSZXNv bHV0aW9uPjE0NDwvdGlmZjpYUmVzb2x1dGlvbj4KICAgICAgICAgPHRpZmY6WVJlc29sdXRpb24+ MTQ0PC90aWZmOllSZXNvbHV0aW9uPgogICAgICAgICA8dGlmZjpSZXNvbHV0aW9uVW5pdD4yPC90 aWZmOlJlc29sdXRpb25Vbml0PgogICAgICAgICA8dGlmZjpDb21wcmVzc2lvbj41PC90aWZmOkNv bXByZXNzaW9uPgogICAgICAgICA8dGlmZjpPcmllbnRhdGlvbj4xPC90aWZmOk9yaWVudGF0aW9u PgogICAgICAgICA8dGlmZjpQaG90b21ldHJpY0ludGVycHJldGF0aW9uPjI8L3RpZmY6UGhvdG9t ZXRyaWNJbnRlcnByZXRhdGlvbj4KICAgICAgPC9yZGY6RGVzY3JpcHRpb24+CiAgIDwvcmRmOlJE Rj4KPC94OnhtcG1ldGE+Cka1WbsAAALpSURBVCgVbVJbSFRRFN3nnnvuXHVm1Cl1LPvRyl4ElqiV SoYfZmZYWJEKJolFf/1MfgTzFYQfEaS9KJOKYoz6CCqswSgVjakwyyIfI6PZzMjkvGzmzuOe7hmb CvHAvey9zlpr77PZAMscajRyS+HlsKWcWE5NtZgFs5ZrifZrhWenrxcZ7MNtSQyL37F42ROvYlHE ro6CfnpZRWm7hs515L/ppb08E8U5cQMUDygFhBBQlruuFz/ScX01Ub/yEioD1gLMy4V3dc1DDQqB U0RyXPfPwAQYHYbo7IXqk8m8+UpIzH4hJ2aNIox5zmfL5QJfyr3RssYsQ08X/cNlJrG2WNDdzf6K NU07ElpveJVSda5CaelvJffjVjP9/OOYQumC0cVOGT/WgVFpS/liZKvVmqJ3P/uEQwE9Bf65QlHw yD7gxUmz9tSWynVIYsK4BrGhIKNRHjOc3ixmq+vTi3I/StHQFIFQEx+WDyi2cgTzT35h1U01ITn2 gdHNv0bmb29sv/HNVFuLUXwo9rYdZpyQI6TsKsmWJX+GpEot1eY1DbBq3g93dwkhx2tI0Dr9g+/n I663E/rWd/sVLY5N9PvDQ3kZKx17BDLSQ/JaVgPCTg230O8d6lqxMHonU0PcfQjhGXFrc6YgTD7J SPdU2R40bFHeH41tnOiaaYTwpDIZXTWrCDh5DySoQMD+ej7wswEEAkE5rZxdRQMLuyE8DkmeqSaW xwyQ5CsOewAEaTzfaTraqMo//jXiXvjOAcqTKd4kuYP25KK6MfuDgyeEsK0g6FPWQ/KXMoPF7cLq SaJL2kY80wCOoU5X514ig2ijlLNQxIscJ2+Yu1XRonYOXlVFZgGlasEXVk38NfCu2tQsO4iVE3xl JOzTy84vF+023WfP9sp7icRLsOVtnYbYLkkqcSZAtjqjcvJL39qd5wEGAf2/wsyx19opwtOnPH+/ h5T0eeYZNmysSUfrcsP+0vTgzjVnAgxjh2l/AwuRO/N8h5vlAAAAAElFTkSuQmCC "
        style="image-rendering:optimizeSpeed"
        preserveAspectRatio="none"
        height="15.000017"
@@ -197,20 +47,14 @@ h5T0eeYZNmysSUfrcsP+0vTgzjVnAgxjh2l/AwuRO/N8h5vlAAAAAElFTkSuQmCC
        id="g4480"
        transform="matrix(0.16938299,0,0,0.17276709,-2.8505255,863.69032)">
       <path
-         sodipodi:nodetypes="cccc"
-         inkscape:connector-curvature="0"
          id="path4301-9"
          d="m 22.732658,1077.7291 c 4.288186,11.2649 34.94152,9.0209 36.881304,7.4317 -16.372848,-4.4414 -26.807883,-20.9667 -22.255315,-37.4308 -9.63195,2.0884 -13.577938,20.691 -14.625989,29.9991 z"
          style="display:inline;opacity:1;fill:#f18a01;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1" />
       <path
-         sodipodi:nodetypes="cccc"
-         inkscape:connector-curvature="0"
          id="path4301-9-1"
          d="m 105.38559,1077.9068 c -4.28819,11.2649 -34.94152,9.0209 -36.881304,7.4317 16.372848,-4.4414 26.807883,-20.9667 22.255315,-37.4308 9.631949,2.0884 13.577939,20.691 14.625989,29.9991 z"
          style="display:inline;opacity:1;fill:#f18a01;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1" />
       <path
-         sodipodi:nodetypes="cccc"
-         inkscape:connector-curvature="0"
          id="path4301-9-0"
          d="m 65.007174,1011.129 c -9.184577,-1.9509 -23.373859,24.2204 -23.23639,26.6815 12.652709,-11.3007 32.10625,-12.2771 43.422785,0.5185 3.19585,-9.8074 -16.019525,-27.1798 -20.186395,-27.2 z"
          style="display:inline;opacity:1;fill:#f18a01;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1" />
@@ -218,18 +62,15 @@ h5T0eeYZNmysSUfrcsP+0vTgzjVnAgxjh2l/AwuRO/N8h5vlAAAAAElFTkSuQmCC
          id="path4429"
          transform="translate(0,1037.3622)"
          d="m 39.966797,10.722656 -1.636719,6.833985 a 24.55595,23.801065 0 0 1 15.087891,21.953125 24.55595,23.801065 0 0 1 -0.226563,3.035156 L 59.234375,45.0625 A 24.55595,23.801065 0 0 0 61.900391,34.359375 24.55595,23.801065 0 0 0 39.966797,10.722656 Z"
-         style="opacity:1;fill:#f6c88c;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         inkscape:connector-curvature="0" />
+         style="opacity:1;fill:#f6c88c;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
       <path
          id="path4429-3"
          d="m 88.21238,1047.8032 1.636719,6.834 a 24.55595,23.801065 0 0 0 -15.08789,21.9531 24.55595,23.801065 0 0 0 0.226563,3.0352 l -6.042969,2.5175 a 24.55595,23.801065 0 0 1 -2.666016,-10.7031 24.55595,23.801065 0 0 1 21.933593,-23.6367 z"
-         style="display:inline;opacity:1;fill:#f6c88c;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         inkscape:connector-curvature="0" />
+         style="display:inline;opacity:1;fill:#f6c88c;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
       <path
          id="path4429-8"
          d="m 83.512769,1041.2655 -4.826643,-5.1075 a 23.801065,24.55595 33.150625 0 1 -26.630615,0.6273 23.801065,24.55595 33.150625 0 1 -2.417284,-1.8495 l -5.41229,3.6828 a 23.801065,24.55595 33.150625 0 0 7.50313,8.0849 23.801065,24.55595 33.150625 0 0 31.783702,-5.438 z"
-         style="display:inline;opacity:1;fill:#f6c88c;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         inkscape:connector-curvature="0" />
+         style="display:inline;opacity:1;fill:#f6c88c;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
     </g>
   </g>
 </svg>
diff --git a/ui/org.eclipse.pde.spy.bundle/icons/refresh.svg b/ui/org.eclipse.pde.spy.bundle/icons/refresh.svg
index e9a2093b028..b90934a9b7f 100644
--- a/ui/org.eclipse.pde.spy.bundle/icons/refresh.svg
+++ b/ui/org.eclipse.pde.spy.bundle/icons/refresh.svg
@@ -2,24 +2,19 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.48.0 r9654"
-   sodipodi:docname="refresh.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient7584-5"
        id="linearGradient7608-3"
        gradientUnits="userSpaceOnUse"
@@ -40,7 +35,6 @@
          id="stop7588-5" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient7592-1"
        id="linearGradient7610-5"
        gradientUnits="userSpaceOnUse"
@@ -61,7 +55,6 @@
          id="stop7596-9" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient7584-9-3"
        id="linearGradient7608-9-7"
        gradientUnits="userSpaceOnUse"
@@ -81,7 +74,6 @@
          id="stop7588-9-9" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient7592-0-5"
        id="linearGradient7610-7-6"
        gradientUnits="userSpaceOnUse"
@@ -101,30 +93,6 @@
          id="stop7596-5-6" />
     </linearGradient>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="22.627416"
-     inkscape:cx="12.871772"
-     inkscape:cy="11.737298"
-     inkscape:document-units="px"
-     inkscape:current-layer="g7604"
-     showgrid="true"
-     inkscape:window-width="1171"
-     inkscape:window-height="959"
-     inkscape:window-x="150"
-     inkscape:window-y="150"
-     inkscape:window-maximized="0"
-     showguides="true"
-     inkscape:guide-bbox="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid4074" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -138,8 +106,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
@@ -148,14 +114,10 @@
        id="g7604"
        transform="translate(-12.551145,-2.6983344e-7)">
       <path
-         sodipodi:nodetypes="ccssscscsssszcc"
-         inkscape:connector-curvature="0"
          id="path7582"
          d="m 23.231602,1038.8387 0,-1.591 c 0,0 -0.353553,-0.8397 -1.370019,-0.044 -1.016466,0.7955 -2.209709,2.0772 -2.386486,2.4307 -0.176776,0.3536 -0.928077,0.9723 0.08839,1.9446 1.016466,0.9722 2.121321,1.9887 2.121321,1.9887 0,0 1.546796,1.4584 1.546796,0.088 0,-1.37 0,-1.812 0,-1.812 1.366404,-0.063 1.694788,0.3552 2.039845,0.6884 0.345482,0.3336 0.8125,1.9687 1.21875,2.0937 0.40625,0.125 0.625,-2.1875 0.625,-2.625 0,-0.4375 -0.174793,-1.2439 -0.71875,-1.9687 -0.293544,-0.3911 -1.006571,-0.9555 -1.53125,-1.0998 -0.524679,-0.1444 -1.633595,-0.094 -1.633595,-0.094 z"
          style="fill:url(#linearGradient7608-3);fill-opacity:1;stroke:url(#linearGradient7610-5);stroke-width:0.80000001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
       <path
-         sodipodi:nodetypes="ccssscc"
-         inkscape:connector-curvature="0"
          id="path7602"
          d="m 22.715806,1038.5073 0,-0.5966 c 0,0 0.110485,-0.3756 -0.220971,-0.2431 -0.331456,0.1326 -0.972272,0.6629 -1.038563,0.7734 -0.06629,0.1105 -0.751301,0.5967 -0.596622,0.8176 0.15468,0.221 1.458408,0.066 1.458408,0.066 z"
          style="opacity:0.85714285;fill:#ffffff;fill-opacity:1;stroke:none" />
@@ -165,14 +127,10 @@
        id="g7604-6"
        transform="matrix(-1,0,0,-1,29.009738,2088.8723)">
       <path
-         sodipodi:nodetypes="ccssscsscsssszcc"
-         inkscape:connector-curvature="0"
          id="path7582-7"
          d="m 23.585155,1039.3249 0,-1.591 c 0,0 -0.353553,-0.8397 -1.370019,-0.044 -1.016466,0.7955 -2.209709,2.0772 -2.386486,2.4307 -0.176776,0.3536 -0.928077,0.9723 0.08839,1.9446 1.016466,0.9722 2.121321,1.9887 2.121321,1.9887 0,0 0.404271,0.3812 0.799458,0.5707 0.37782,0.1811 0.747338,0.1871 0.747338,-0.4827 0,-1.37 0,-1.812 0,-1.812 1.366404,-0.063 1.727345,0.3446 2.039845,0.6884 0.3125,0.3437 0.8125,1.9687 1.21875,2.0937 0.40625,0.125 0.625,-2.1875 0.625,-2.625 0,-0.4375 -0.09375,-1.3125 -0.71875,-1.9687 -0.625,-0.6563 -1.006571,-0.9555 -1.53125,-1.0998 -0.524679,-0.1444 -1.633595,-0.094 -1.633595,-0.094 z"
          style="fill:url(#linearGradient7608-9-7);fill-opacity:1;stroke:url(#linearGradient7610-7-6);stroke-width:0.80000001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
       <path
-         sodipodi:nodetypes="ccssscc"
-         inkscape:connector-curvature="0"
          id="path7602-2"
          d="m 23.069359,1042.9731 0,0.5966 c 0,0 0.110485,0.3757 -0.220971,0.2431 -0.331456,-0.1326 -0.972272,-0.6629 -1.038563,-0.7734 -0.06629,-0.1105 -0.751301,-0.5966 -0.596622,-0.8176 0.15468,-0.221 1.458408,-0.066 1.458408,-0.066 z"
          style="opacity:0.85714285;fill:#ffffff;fill-opacity:1;stroke:none" />
diff --git a/ui/org.eclipse.pde.spy.bundle/icons/start.svg b/ui/org.eclipse.pde.spy.bundle/icons/start.svg
index a37efceb78a..c1e06821f3c 100644
--- a/ui/org.eclipse.pde.spy.bundle/icons/start.svg
+++ b/ui/org.eclipse.pde.spy.bundle/icons/start.svg
@@ -6,10 +6,6 @@
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="1.3.2 (091e20e, 2023-11-25, custom)"
-   sodipodi:docname="start.svg"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:svg="http://www.w3.org/2000/svg"
@@ -19,7 +15,6 @@
   <defs
      id="defs4">
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10798-1-9-3-7-1-15-1-7-6-1"
        id="linearGradient8163-2"
        gradientUnits="userSpaceOnUse"
@@ -44,40 +39,6 @@
          id="stop10802-1-5-3-0-2-0-9-8-4-3" />
     </linearGradient>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="90.509664"
-     inkscape:cx="8.4134662"
-     inkscape:cy="1.3092525"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="1920"
-     inkscape:window-height="991"
-     inkscape:window-x="-9"
-     inkscape:window-y="-9"
-     inkscape:window-maximized="1"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:showpageshadow="2"
-     inkscape:pagecheckerboard="0"
-     inkscape:deskcolor="#d1d1d1">
-    <sodipodi:guide
-       position="0.98332041,11.735262"
-       orientation="1,0"
-       id="guide1"
-       inkscape:locked="false" />
-    <sodipodi:guide
-       position="7.0600196,15.01668"
-       orientation="0,-1"
-       id="guide2"
-       inkscape:locked="false" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -91,8 +52,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
@@ -107,8 +66,6 @@
          cy="1057.767"
          r="7.0294762" />
       <path
-         sodipodi:nodetypes="cccc"
-         inkscape:connector-curvature="0"
          id="path8117"
          d="m 14.220116,1052.2669 6,5.567 -5.938144,5.433 z"
          style="display:inline;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.03057" />
diff --git a/ui/org.eclipse.pde.spy.bundle/icons/state_active.svg b/ui/org.eclipse.pde.spy.bundle/icons/state_active.svg
index e69941d40ce..82fa821def0 100644
--- a/ui/org.eclipse.pde.spy.bundle/icons/state_active.svg
+++ b/ui/org.eclipse.pde.spy.bundle/icons/state_active.svg
@@ -2,20 +2,16 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.48.0 r9654"
-   sodipodi:docname="methpub_obj.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
@@ -34,7 +30,6 @@
          id="stop10802-1-5-3-0-4-8-4-2-9-2" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10798-1-9-3-7-6-8-9-0-9-1"
        id="linearGradient9837"
        gradientUnits="userSpaceOnUse"
@@ -43,31 +38,6 @@
        x2="388.63736"
        y2="462.11539" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="16"
-     inkscape:cx="8.1831043"
-     inkscape:cy="7.2601498"
-     inkscape:document-units="px"
-     inkscape:current-layer="g6438"
-     showgrid="true"
-     inkscape:window-width="1287"
-     inkscape:window-height="862"
-     inkscape:window-x="623"
-     inkscape:window-y="113"
-     inkscape:window-maximized="0"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3960" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -81,8 +51,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
@@ -107,13 +75,8 @@
          style="font-size:13.58917427px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;display:inline;font-family:Sans"
          id="g6438">
         <path
-           sodipodi:type="arc"
            style="fill:url(#linearGradient9837);fill-opacity:1;stroke:#058149;stroke-width:3.17967892;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline"
            id="path10796-2-6-2"
-           sodipodi:cx="388.125"
-           sodipodi:cy="468.23718"
-           sodipodi:rx="10.625"
-           sodipodi:ry="10.625"
            d="m 398.75,468.23718 c 0,5.86803 -4.75697,10.625 -10.625,10.625 -5.86803,0 -10.625,-4.75697 -10.625,-10.625 0,-5.86802 4.75697,-10.625 10.625,-10.625 5.86803,0 10.625,4.75698 10.625,10.625 z"
            transform="matrix(0.32984735,0,0,0.32984735,-136.12701,882.92787)" />
       </g>
diff --git a/ui/org.eclipse.pde.spy.bundle/icons/state_installed.svg b/ui/org.eclipse.pde.spy.bundle/icons/state_installed.svg
index f732ea8de83..524e9b43748 100644
--- a/ui/org.eclipse.pde.spy.bundle/icons/state_installed.svg
+++ b/ui/org.eclipse.pde.spy.bundle/icons/state_installed.svg
@@ -2,20 +2,16 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="import_wiz.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
@@ -41,7 +37,6 @@
          id="stop4917" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4913"
        id="linearGradient4919"
        x1="1.860189"
@@ -51,7 +46,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1.0224167,0,0,1.0224167,-17.402778,-24.047507)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4921"
        id="linearGradient4927"
        x1="1.860189"
@@ -79,49 +73,8 @@
        gradientTransform="matrix(0.72295781,-0.72295781,0.72295781,0.72295781,-747.11893,286.63871)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient3924"
-       xlink:href="#linearGradient4789"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4789" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="64"
-     inkscape:cx="3.8401431"
-     inkscape:cy="8.4256951"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1652"
-     inkscape:window-height="1174"
-     inkscape:window-x="827"
-     inkscape:window-y="130"
-     inkscape:window-maximized="0"
-     showguides="true"
-     inkscape:guide-bbox="true">
-    <sodipodi:guide
-       position="0,0"
-       orientation="0,16"
-       id="guide4039" />
-    <sodipodi:guide
-       position="16,0"
-       orientation="-16,0"
-       id="guide4041" />
-    <sodipodi:guide
-       position="16,16"
-       orientation="0,-16"
-       id="guide4043" />
-    <sodipodi:guide
-       position="0,16"
-       orientation="16,0"
-       id="guide4045" />
-    <inkscape:grid
-       type="xygrid"
-       id="grid4047" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -135,8 +88,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
@@ -146,14 +97,11 @@
       <path
          style="fill:url(#linearGradient4927);fill-opacity:1;stroke:url(#linearGradient4919);stroke-width:0.71569169;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
          d="m -17.306927,1043.9175 0,7.0931 7.124966,0 7.1249674,0 0,-7.0931 -3.0033491,0 0,2.013 0.9265651,0 0,3.0672 -5.0481834,0 -5.048182,0 0,-3.0672 0.926565,0 0,-2.013 z"
-         id="path4143"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccccccccccccc" />
+         id="path4143" />
     </g>
     <path
        style="fill:url(#linearGradient3924);fill-opacity:1;stroke:none;display:inline"
        d="m 1.7208163,1039.5526 0.6549857,-0.6549 6.2783105,6.2782 1.3099712,-1.3099 0.3354433,3.4985 -3.4985427,-0.3034 1.2300951,-1.2302 z"
-       id="path3986"
-       inkscape:connector-curvature="0" />
+       id="path3986" />
   </g>
 </svg>
diff --git a/ui/org.eclipse.pde.spy.bundle/icons/state_resolved.svg b/ui/org.eclipse.pde.spy.bundle/icons/state_resolved.svg
index 0a8783f76d1..2b82e2fdb30 100644
--- a/ui/org.eclipse.pde.spy.bundle/icons/state_resolved.svg
+++ b/ui/org.eclipse.pde.spy.bundle/icons/state_resolved.svg
@@ -2,24 +2,19 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.48.0 r9654"
-   sodipodi:docname="methpro_obj.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient9800">
       <stop
          style="stop-color:#be9c28;stop-opacity:1;"
@@ -31,16 +26,14 @@
          id="stop9804" />
     </linearGradient>
     <filter
-       height="1.24"
-       y="-0.12"
-       width="1.24"
-       x="-0.12"
-       id="filter5785-5"
-       inkscape:collect="always">
+       height="1.4108484"
+       y="-0.20542419"
+       width="1.4108484"
+       x="-0.20542419"
+       id="filter5785-5">
       <feGaussianBlur
          id="feGaussianBlur5787-1"
-         stdDeviation="0.19985704"
-         inkscape:collect="always" />
+         stdDeviation="0.19985704" />
     </filter>
     <linearGradient
        y2="1033.6897"
@@ -50,8 +43,7 @@
        gradientTransform="matrix(1.1934266,0,0,1.1934266,11.623455,-194.18756)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient5742-5"
-       xlink:href="#linearGradient5789-2"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient5789-2" />
     <linearGradient
        id="linearGradient5789-2">
       <stop
@@ -68,7 +60,6 @@
          id="stop5795-5" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient9800"
        id="linearGradient9806"
        x1="-10.452695"
@@ -77,31 +68,6 @@
        y2="1040.7603"
        gradientUnits="userSpaceOnUse" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="11.313709"
-     inkscape:cx="8.0945725"
-     inkscape:cy="6.4399446"
-     inkscape:document-units="px"
-     inkscape:current-layer="g6438"
-     showgrid="true"
-     inkscape:window-width="1287"
-     inkscape:window-height="862"
-     inkscape:window-x="175"
-     inkscape:window-y="175"
-     inkscape:window-maximized="0"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3960" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -115,8 +81,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
@@ -143,8 +107,7 @@
         <g
            transform="matrix(0.70710678,0.70710678,-0.70710678,0.70710678,725.39235,291.80106)"
            style="display:inline"
-           id="layer1-8"
-           inkscape:label="Layer 1">
+           id="layer1-8">
           <g
              id="g11331-3-1-1-8"
              style="display:inline"
diff --git a/ui/org.eclipse.pde.spy.bundle/icons/state_starting.svg b/ui/org.eclipse.pde.spy.bundle/icons/state_starting.svg
index 1faf803af31..efb0325cd96 100644
--- a/ui/org.eclipse.pde.spy.bundle/icons/state_starting.svg
+++ b/ui/org.eclipse.pde.spy.bundle/icons/state_starting.svg
@@ -2,24 +2,19 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.48.0 r9654"
-   sodipodi:docname="prev_nav.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4749">
       <stop
          style="stop-color:#fbdd83;stop-opacity:1"
@@ -31,7 +26,6 @@
          id="stop4753" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4741">
       <stop
          style="stop-color:#a66b10;stop-opacity:1"
@@ -43,7 +37,6 @@
          id="stop4745" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4741"
        id="linearGradient4747"
        x1="1.0625"
@@ -53,7 +46,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(0,-1,1,0,-1036.3626,1052.3618)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4749"
        id="linearGradient4755"
        x1="1.6861235"
@@ -63,29 +55,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(0,-1,1,0,-1036.3626,1052.3618)" />
   </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.5683281"
-     inkscape:cy="9.6786205"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1164"
-     inkscape:window-height="982"
-     inkscape:window-x="104"
-     inkscape:window-y="89"
-     inkscape:window-maximized="0"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3966" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -99,15 +68,12 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
     <path
        style="fill:url(#linearGradient4755);fill-opacity:1;stroke:url(#linearGradient4747);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
        d="m 2.5,1043.8618 3,0 0,5.7812 c 0,0.6679 0.5509,1.2188 1.2188,1.2188 l 2.5625,0 c 0.6678,0 1.2187,-0.5508 1.2187,-1.2188 l 0,-5.7812 3,0 0,-1 -5.5,-5.5 -5.5,5.5 0,1 z"
-       id="rect3968"
-       inkscape:connector-curvature="0" />
+       id="rect3968" />
   </g>
 </svg>
diff --git a/ui/org.eclipse.pde.spy.bundle/icons/state_stopping.svg b/ui/org.eclipse.pde.spy.bundle/icons/state_stopping.svg
index 973c4eda7b6..1560e53e656 100644
--- a/ui/org.eclipse.pde.spy.bundle/icons/state_stopping.svg
+++ b/ui/org.eclipse.pde.spy.bundle/icons/state_stopping.svg
@@ -2,24 +2,19 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.48.0 r9654"
-   sodipodi:docname="next_nav.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4749">
       <stop
          style="stop-color:#ffffee;stop-opacity:1"
@@ -31,7 +26,6 @@
          id="stop4753" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4741">
       <stop
          style="stop-color:#bd8416;stop-opacity:1"
@@ -43,7 +37,6 @@
          id="stop4745" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4741"
        id="linearGradient4747"
        x1="1.0625"
@@ -53,7 +46,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(0,1,1,0,-1036.3626,1036.3626)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4749"
        id="linearGradient4755"
        x1="1.6861235"
@@ -63,29 +55,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(0,1,1,0,-1036.3626,1036.3626)" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="16"
-     inkscape:cx="-7.4627612"
-     inkscape:cy="10.319471"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1164"
-     inkscape:window-height="982"
-     inkscape:window-x="104"
-     inkscape:window-y="89"
-     inkscape:window-maximized="0"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3966" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -99,15 +68,12 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
     <path
        style="fill:url(#linearGradient4755);fill-opacity:1;stroke:url(#linearGradient4747);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
        d="m 2.5,1044.8626 3,0 0,-5.7812 c 0,-0.6679 0.5509,-1.2188 1.2188,-1.2188 l 2.5625,0 c 0.6678,0 1.2187,0.5508 1.2187,1.2188 l 0,5.7812 3,0 0,1 -5.5,5.5 -5.5,-5.5 0,-1 z"
-       id="rect3968"
-       inkscape:connector-curvature="0" />
+       id="rect3968" />
   </g>
 </svg>
diff --git a/ui/org.eclipse.pde.spy.bundle/icons/state_uninstalled.svg b/ui/org.eclipse.pde.spy.bundle/icons/state_uninstalled.svg
index af19368e447..b98614787f0 100644
--- a/ui/org.eclipse.pde.spy.bundle/icons/state_uninstalled.svg
+++ b/ui/org.eclipse.pde.spy.bundle/icons/state_uninstalled.svg
@@ -2,20 +2,16 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="export_wiz.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
@@ -59,10 +55,8 @@
        gradientTransform="matrix(0.72371262,0.72371262,0.72371262,-0.72371262,-744.90513,1800.3892)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient3924"
-       xlink:href="#linearGradient4789"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4789" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4921"
        id="linearGradient4927-4"
        x1="1.860189"
@@ -72,7 +66,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1.0224167,0,0,1.0224167,0.28579018,-24.0306)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4913"
        id="linearGradient4919-2"
        x1="1.860189"
@@ -82,30 +75,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1.0224167,0,0,1.0224167,0.28579018,-24.0306)" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="32"
-     inkscape:cx="10.915889"
-     inkscape:cy="2.2744826"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1600"
-     inkscape:window-height="900"
-     inkscape:window-x="168"
-     inkscape:window-y="264"
-     inkscape:window-maximized="0"
-     showguides="true"
-     inkscape:guide-bbox="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid4039" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -114,26 +83,21 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
     <path
        style="fill:url(#linearGradient3924);fill-opacity:1;stroke:none;display:inline"
        d="m 4.7164468,1046.6891 0.6556696,0.6556 6.2848656,-6.2848 1.311339,1.3113 0.335794,-3.5021 -3.5021962,0.3037 1.2313792,1.2315 z"
-       id="path3986"
-       inkscape:connector-curvature="0" />
+       id="path3986" />
     <path
        style="display:inline;fill:url(#linearGradient4927-4);fill-opacity:1;stroke:url(#linearGradient4919-2);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="m 0.50664118,1043.8719 0,7.0072 13.98682682,-9e-4 0.01105,-6.9992 -3.001291,0.01 0.0078,1.9974 1.00469,0 0,2.9969 -9.9948038,0.01 -0.01563,-3.0125 1.00469,0 0,-2.0052 z"
-       id="path4143-2"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccccccccc" />
+       id="path4143-2" />
   </g>
 </svg>
diff --git a/ui/org.eclipse.pde.spy.bundle/icons/stop.svg b/ui/org.eclipse.pde.spy.bundle/icons/stop.svg
index aec77285d31..e076dadbb5c 100644
--- a/ui/org.eclipse.pde.spy.bundle/icons/stop.svg
+++ b/ui/org.eclipse.pde.spy.bundle/icons/stop.svg
@@ -2,20 +2,16 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="stop.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
@@ -45,7 +41,6 @@
          id="stop6646" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient6642"
        id="linearGradient6648"
        x1="8.2203207"
@@ -55,7 +50,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1.005663,0,0,1.0056668,0.58040404,-5.5217527)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4729"
        id="linearGradient4735"
        x1="7.5007138"
@@ -65,30 +59,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1.0453671,0,0,1.0453894,0.30030882,-47.005053)" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="49.76264"
-     inkscape:cx="10.713081"
-     inkscape:cy="8.588225"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="2560"
-     inkscape:window-height="1391"
-     inkscape:window-x="0"
-     inkscape:window-y="1"
-     inkscape:window-maximized="1"
-     inkscape:snap-bbox="true"
-     inkscape:bbox-nodes="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid4227" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -97,13 +67,11 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
@@ -111,12 +79,7 @@
        y="1036.3622"
        x="16"
        id="image4288"
-       xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAMtJREFU
-OI3Fk6EOwjAQhr8RxORJZB1IHoFHmETiNonkUcAhJ5FIJBKLq6w8eW4IQmjZCgIS/qTicvd//du0
-Rdd1fKPRV+5fAMZxcd3tOj0dPppkUTGt66IH0GPLfNV8BFz2W6jrfgIADLRt87svl0mdAtTwqojl
-d/eqoM+BfgIAe0N4UXoHBjPvMdWsYeI9cbefQC2JONSP2wlAFJDyvnKS8j43BLAQCM4hZR4QnMNC
-GAYAOBFY59+CACGq0yNUFedmkzXHcw8Vf/+NN+VVQ/03dcEqAAAAAElFTkSuQmCC
-"
+       xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAMtJREFU OI3Fk6EOwjAQhr8RxORJZB1IHoFHmETiNonkUcAhJ5FIJBKLq6w8eW4IQmjZCgIS/qTicvd//du0 Rdd1fKPRV+5fAMZxcd3tOj0dPppkUTGt66IH0GPLfNV8BFz2W6jrfgIADLRt87svl0mdAtTwqojl d/eqoM+BfgIAe0N4UXoHBjPvMdWsYeI9cbefQC2JONSP2wlAFJDyvnKS8j43BLAQCM4hZR4QnMNC GAYAOBFY59+CACGq0yNUFedmkzXHcw8Vf/+NN+VVQ/03dcEqAAAAAElFTkSuQmCC "
        style="image-rendering:optimizeSpeed"
        preserveAspectRatio="none"
        height="16"
diff --git a/ui/org.eclipse.pde.spy.context/icons/annotation_obj.svg b/ui/org.eclipse.pde.spy.context/icons/annotation_obj.svg
index ed205f3e64e..5bdcee33028 100644
--- a/ui/org.eclipse.pde.spy.context/icons/annotation_obj.svg
+++ b/ui/org.eclipse.pde.spy.context/icons/annotation_obj.svg
@@ -2,41 +2,18 @@
 <!-- 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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="16"
    height="16"
    viewBox="0 0 16 16"
    id="svg4061"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="annotation_obj.svg">
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4063" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="33.3125"
-     inkscape:cx="4.4577862"
-     inkscape:cy="8"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     units="px"
-     inkscape:window-width="1132"
-     inkscape:window-height="873"
-     inkscape:window-x="834"
-     inkscape:window-y="441"
-     inkscape:window-maximized="0" />
   <metadata
      id="metadata4066">
     <rdf:RDF>
@@ -50,21 +27,15 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      transform="translate(0,-1036.3622)">
     <path
        style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
        d="m 11.458315,1046.4119 0,-2.7842 0.0042,-0.8839 c 0,0 -0.0617,-1.9004 -0.105904,-2.1213 -0.04419,-0.221 -0.88388,-2.2915 -0.88388,-2.2915 l -1.137373,-0.9547 -1.1932427,-0.442 -1.0589922,-0.1941 -1.8228007,0.3344 -1.3458363,0.8147 -1.5501319,1.5559 -1.065664,2.3265 0.088388,1.812 0.7071068,1.6352 1.016466,1.5468 c 0,0 1.0681638,1.2741 1.3333289,1.2299 0.265165,-0.044 2.1972011,0.6346 2.1972011,0.6346 l 2.0079171,-0.1293 2.2347239,-1.5143 z"
-       id="path3840"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccccccccccccccccc" />
+       id="path3840" />
     <path
        style="font-size:11.05178356px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#236298;fill-opacity:1;stroke:#236298;stroke-width:0.28257138;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline;font-family:AustralianFlyingCorpsStencil;-inkscape-font-specification:AustralianFlyingCorpsStencil"
        d="m 11.309169,1039.7124 c -0.09375,-0.4062 -0.177236,-0.9956 -0.552237,-1.4332 -0.374998,-0.4374 -0.614324,-0.6075 -1.022557,-0.8389 -0.4082332,-0.2314 -1.6921375,-0.7905 -2.890625,-0.8594 -0.3994958,-0.023 -0.8168984,0.026 -1.1875,0.125 -1.8098211,0.485 -2.6365843,1.3182 -3.59375,2.8125 -0.991819,1.5427 -1.18883707,3.5664 -0.65625,5.3438 0.5272319,1.7597 1.555815,2.9531 3.09375,3.5937 1.4108866,0.5774 2.6810837,0.7061 4.5,0.2188 1.67339,-0.4485 2.016965,-0.7867 3.21875,-1.8438 l -0.4375,-0.3437 c -1.553801,1.2177 -1.622762,1.2331 -2.96875,1.5937 -1.5005895,0.4027 -3.1035995,0.1737 -4.25,-0.4062 -1.1463954,-0.5798 -1.9388113,-1.5074 -2.4375,-3.0938 -0.4986887,-1.5864 -0.022863,-3.5209 0.5625,-4.5312 0.5853631,-1.0103 1.2965074,-2.1937 2.90625,-2.625 1.282323,-0.3436 2.8157521,0.1597 3.788182,0.7279 0.97243,0.5683 1.292239,1.6525 1.258042,2.5824 -0.0342,0.9298 -0.664674,1.9656 -1.133042,2.368 -0.4683686,0.4027 -1.475682,0.4154 -1.475682,0.4154 0,0 0.1240658,-0.6578 0.125,-1.4687 0.030258,-0.6627 -0.1295408,-1.6952 -0.59375,-2.125 -0.4642092,-0.431 -1.2172197,-0.4323 -1.6875,-0.4063 -0.5523523,0.031 -0.932751,0.349 -1.34375,1.125 -0.4594324,0.8674 -0.5953852,2.7605 -0.4375,3.4688 0.1578852,0.7083 0.2457352,0.8707 0.65625,1.2812 0.4105148,0.4103 1.4233638,0.4191 1.96875,0.094 0.8226727,-0.5067 0.5968097,-1.091 1.21875,-1.125 0,0 1.2730873,-0.2595 2.067862,-0.8125 0.815373,-0.5226 1.093629,-1.2093 1.265854,-1.9429 0.172226,-0.7335 0.131703,-1.4881 0.03795,-1.8944 z M 6,1040.2997 c 0.1214058,0 0.264899,0.01 0.40625,0.031 0.5654037,0.1018 0.65625,1.125 0.65625,1.125 0,0 0.075363,0.6862 0.03125,1.5938 -0.044113,0.9079 -0.00335,1.2628 -0.34375,1.5312 -0.3403969,0.2684 -1.2509038,0.4278 -1.6875,-0.2812 -0.4365972,-0.7089 -0.3169368,-2.8026 0.0625,-3.4375 0.238137,-0.4 0.5107825,-0.5487 0.875,-0.5625 z"
-       id="path4719-2"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cczscccccccccssczzccccccscccczcssccsccs" />
+       id="path4719-2" />
   </g>
 </svg>
diff --git a/ui/org.eclipse.pde.spy.context/icons/collapseall.svg b/ui/org.eclipse.pde.spy.context/icons/collapseall.svg
index be071f93029..699e12e67f0 100644
--- a/ui/org.eclipse.pde.spy.context/icons/collapseall.svg
+++ b/ui/org.eclipse.pde.spy.context/icons/collapseall.svg
@@ -2,24 +2,19 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.48.0 r9654"
-   sodipodi:docname="collapseall.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4883-4"
        id="linearGradient4889-2"
        x1="28"
@@ -29,7 +24,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(0.9,0,0,0.9,-17.7,103.93622)" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4883-4">
       <stop
          style="stop-color:#ebf9ff;stop-opacity:1"
@@ -48,10 +42,8 @@
        gradientTransform="translate(18,-3)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient5062-9"
-       xlink:href="#linearGradient4910-4-4"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4910-4-4" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4910-4-4">
       <stop
          style="stop-color:#ffffff;stop-opacity:0"
@@ -70,11 +62,9 @@
        gradientUnits="userSpaceOnUse"
        id="linearGradient4975-2-1"
        xlink:href="#linearGradient4994-4-7-7"
-       inkscape:collect="always"
        gradientTransform="translate(18,-3)" />
     <linearGradient
-       id="linearGradient4994-4-7-7"
-       inkscape:collect="always">
+       id="linearGradient4994-4-7-7">
       <stop
          id="stop4996-5-4"
          offset="0"
@@ -85,7 +75,6 @@
          style="stop-color:#ffffff;stop-opacity:0;" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4883-4-7"
        id="linearGradient4889-2-1"
        x1="28"
@@ -95,7 +84,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(0.9,0,0,0.9,-15.7,105.93622)" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4883-4-7">
       <stop
          style="stop-color:#ebf9ff;stop-opacity:1"
@@ -114,8 +102,7 @@
        gradientTransform="translate(22,4)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient4970"
-       xlink:href="#linearGradient4989"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4989" />
     <linearGradient
        id="linearGradient4989">
       <stop
@@ -139,10 +126,8 @@
        gradientTransform="translate(20,-1)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient5062-9-5"
-       xlink:href="#linearGradient4910-4-4-2"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4910-4-4-2" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4910-4-4-2">
       <stop
          style="stop-color:#ffffff;stop-opacity:0"
@@ -161,11 +146,9 @@
        gradientUnits="userSpaceOnUse"
        id="linearGradient4975-2-1-1"
        xlink:href="#linearGradient4994-4-7-4"
-       inkscape:collect="always"
        gradientTransform="translate(20,-1)" />
     <linearGradient
-       id="linearGradient4994-4-7-4"
-       inkscape:collect="always">
+       id="linearGradient4994-4-7-4">
       <stop
          id="stop4996-5-4-2"
          offset="0"
@@ -176,31 +159,6 @@
          style="stop-color:#ffffff;stop-opacity:0;" />
     </linearGradient>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="16"
-     inkscape:cx="9.8506072"
-     inkscape:cy="9.9346296"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1241"
-     inkscape:window-height="809"
-     inkscape:window-x="1159"
-     inkscape:window-y="450"
-     inkscape:window-maximized="0"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3999" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -214,69 +172,45 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
     <path
        style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#a6afc4;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
        d="m 2,1038.3622 0,11 11,0 0,-11 z m 1,1 9,0 0,9 -9,0 z"
-       id="rect3997-9-1"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccccccc"
-       inkscape:export-filename="C:\Users\jmietling\Documents\rect3997-9-1.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
+       id="rect3997-9-1" />
     <path
        style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:url(#linearGradient4889-2);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
        d="m 3,1039.3622 8.971875,0 0.02812,9 -8.971875,0 z"
-       id="rect3997-9-1-1"
-       inkscape:connector-curvature="0" />
+       id="rect3997-9-1-1" />
     <path
        style="fill:url(#linearGradient5062-9);fill-opacity:1;stroke:none;display:inline"
        d="m 5,1041.3622 0,7 -2,0 0,-9 z"
-       id="rect4853-82-7-6"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+       id="rect4853-82-7-6" />
     <path
        style="fill:url(#linearGradient4975-2-1);fill-opacity:1;stroke:none;display:inline"
        d="m 5,1041.3622 7,0 0,-2 -9,0 z"
-       id="rect4853-82-0-1"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+       id="rect4853-82-0-1" />
     <path
        style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#8b96ab;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
        d="m 4,1040.3622 0,11 11,0 0,-11 z m 1,1 9,0 0,9 -9,0 z"
-       id="rect3997-9-1-2"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccccccc"
-       inkscape:export-filename="C:\Users\jmietling\Documents\rect3997-9-1.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
+       id="rect3997-9-1-2" />
     <path
        style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:url(#linearGradient4889-2-1);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
        d="m 5,1041.3622 8.971875,0 0.02812,9 -8.971875,0 z"
-       id="rect3997-9-1-1-2"
-       inkscape:connector-curvature="0" />
+       id="rect3997-9-1-1-2" />
     <path
        style="fill:url(#linearGradient4970);fill-opacity:1;stroke:none;display:inline"
        d="m 8,1047.3622 5,0 c 1,0 1,-1 0,-1 l -5,0 c -1,0 -1,1 0,1 z"
-       id="rect4853-82-0-6-8"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+       id="rect4853-82-0-6-8" />
     <path
        style="fill:url(#linearGradient5062-9-5);fill-opacity:1;stroke:none;display:inline"
        d="m 7,1043.3622 0,7 -2,0 0,-9 z"
-       id="rect4853-82-7-1"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+       id="rect4853-82-7-1" />
     <path
        style="fill:url(#linearGradient4975-2-1-1);fill-opacity:1;stroke:none;display:inline"
        d="m 7,1043.3622 7,0 0,-2 -9,0 z"
-       id="rect4853-82-0-6"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+       id="rect4853-82-0-6" />
     <rect
        style="fill:#01467a;fill-opacity:1;stroke:none;display:inline"
        id="rect4167-8"
diff --git a/ui/org.eclipse.pde.spy.context/icons/contextfunction.svg b/ui/org.eclipse.pde.spy.context/icons/contextfunction.svg
index 8d51c641b0f..d544d24656d 100644
--- a/ui/org.eclipse.pde.spy.context/icons/contextfunction.svg
+++ b/ui/org.eclipse.pde.spy.context/icons/contextfunction.svg
@@ -2,46 +2,17 @@
 <!-- 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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="variable_tab.svg">
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="11.313708"
-     inkscape:cx="11.27237"
-     inkscape:cy="7.2292042"
-     inkscape:document-units="px"
-     inkscape:current-layer="g8159"
-     showgrid="true"
-     inkscape:window-width="746"
-     inkscape:window-height="536"
-     inkscape:window-x="1054"
-     inkscape:window-y="913"
-     inkscape:window-maximized="0"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid4092" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -55,8 +26,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
@@ -68,14 +37,10 @@
          id="g3348"
          transform="matrix(1,0,0,1.0390149,0,-41.095587)">
         <path
-           sodipodi:nodetypes="cccscccsssccssscccscccccccccccccccc"
-           inkscape:connector-curvature="0"
            id="text4105-1-1-4"
            d="m 17.407616,1053.3294 -1.181219,0.5938 c 0.49154,0.5175 0.887698,1.1305 1.15625,1.8125 0.268557,0.6819 0.406252,1.3776 0.40625,2.0937 2e-6,0.7324 -0.142576,1.4297 -0.40625,2.0938 -0.27669,0.6901 -0.673174,1.2617 -1.1875,1.75 l 1.212469,0.6562 c 0.615237,-0.5762 1.089195,-1.2715 1.4375,-2.0625 0.348309,-0.791 0.531251,-1.5977 0.53125,-2.4375 10e-7,-0.8333 -0.182941,-1.6465 -0.53125,-2.4375 -0.348305,-0.791 -0.822263,-1.4896 -1.4375,-2.0625 z m -7.09375,0.062 c -0.6152366,0.5729 -1.0891944,1.2715 -1.4374997,2.0625 -0.3483086,0.791 -0.5312511,1.6042 -0.53125,2.4375 -1.1e-6,0.8398 0.1829414,1.6465 0.53125,2.4375 0.3483053,0.791 0.8222631,1.4863 1.4374997,2.0625 l 0.991498,-0.7004 c -0.514326,-0.4883 -0.91081,-1.0599 -1.1875,-1.75 -0.2636742,-0.6641 -0.4062522,-1.3614 -0.4062501,-2.0938 -2.1e-6,-0.7161 0.1376931,-1.4118 0.4062501,-2.0937 0.268552,-0.682 0.633461,-1.295 1.125,-1.8125 z m 0.517655,1.875 1.6875,2.4063 -1.84375,2.5625 1.888595,0 1.25,-1.9375 1.21875,1.9375 1.899318,0 -1.84375,-2.5625 1.6875,-2.4063 -1.868068,0 -1.09375,1.75 -1.09375,-1.75 z"
            style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10px;line-height:125%;font-family:Gautami;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;display:inline;fill:#334c6f;fill-opacity:1;stroke:none" />
         <path
-           sodipodi:nodetypes="cccccccccc"
-           inkscape:connector-curvature="0"
            id="text4105-1-1-4-4"
            d="m 20.214429,1056.2608 0,1.0224 4.018306,0 0,-1.0224 z m 0,2.0018 0,1.006 4.018306,0 0,-1.006 z"
            style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10px;line-height:125%;font-family:Gautami;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;display:inline;fill:#334c6f;fill-opacity:1;stroke:none" />
diff --git a/ui/org.eclipse.pde.spy.context/icons/expandall.svg b/ui/org.eclipse.pde.spy.context/icons/expandall.svg
index 62cde2723c1..9def5249cd3 100644
--- a/ui/org.eclipse.pde.spy.context/icons/expandall.svg
+++ b/ui/org.eclipse.pde.spy.context/icons/expandall.svg
@@ -2,23 +2,16 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.48.0 r9654"
-   sodipodi:docname="expandall.svg"
-   inkscape:export-filename="C:\Users\jmietling\Documents\rect3997-9-1.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
@@ -44,11 +37,9 @@
        gradientUnits="userSpaceOnUse"
        id="linearGradient4975-2-1"
        xlink:href="#linearGradient4994-4-7"
-       inkscape:collect="always"
        gradientTransform="translate(18,-3)" />
     <linearGradient
-       id="linearGradient4994-4-7"
-       inkscape:collect="always">
+       id="linearGradient4994-4-7">
       <stop
          id="stop4996-5-4"
          offset="0"
@@ -66,10 +57,8 @@
        gradientTransform="translate(18,-3)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient5062-9"
-       xlink:href="#linearGradient4910-4-4"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4910-4-4" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4910-4-4">
       <stop
          style="stop-color:#ffffff;stop-opacity:0"
@@ -81,7 +70,6 @@
          id="stop4914-8-8" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4883-4"
        id="linearGradient4889-2"
        x1="28"
@@ -91,7 +79,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(0.9,0,0,0.9,-17.7,103.93622)" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4883-4">
       <stop
          style="stop-color:#ebf9ff;stop-opacity:1"
@@ -103,7 +90,6 @@
          id="stop4887-5" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4883-4-7"
        id="linearGradient4889-2-1"
        x1="28"
@@ -113,7 +99,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(0.9,0,0,0.9,-15.7,105.93622)" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4883-4-7">
       <stop
          style="stop-color:#ebf9ff;stop-opacity:1"
@@ -132,10 +117,8 @@
        gradientTransform="translate(20,-1)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient5062-9-5"
-       xlink:href="#linearGradient4910-4-4-2"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4910-4-4-2" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4910-4-4-2">
       <stop
          style="stop-color:#ffffff;stop-opacity:0"
@@ -154,11 +137,9 @@
        gradientUnits="userSpaceOnUse"
        id="linearGradient4975-2-1-1"
        xlink:href="#linearGradient4994-4-7-4"
-       inkscape:collect="always"
        gradientTransform="translate(20,-1)" />
     <linearGradient
-       id="linearGradient4994-4-7-4"
-       inkscape:collect="always">
+       id="linearGradient4994-4-7-4">
       <stop
          id="stop4996-5-4-2"
          offset="0"
@@ -176,8 +157,7 @@
        gradientTransform="translate(22,4)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient4970"
-       xlink:href="#linearGradient4989"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4989" />
     <linearGradient
        id="linearGradient4989-1">
       <stop
@@ -201,38 +181,8 @@
        gradientTransform="matrix(0,1,-1,0,1053.3622,1058.3622)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient5050"
-       xlink:href="#linearGradient4989-1"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4989-1" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="3.9999998"
-     inkscape:cx="1.5251501"
-     inkscape:cy="27.213599"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1241"
-     inkscape:window-height="814"
-     inkscape:window-x="75"
-     inkscape:window-y="75"
-     inkscape:window-maximized="0"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3999"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -246,75 +196,49 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
     <path
        style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#8b96ab;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
        d="m 2,1038.3622 0,11 11,0 0,-11 z m 1,1 9,0 0,9 -9,0 z"
-       id="rect3997-9-1"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccccccc"
-       inkscape:export-filename="C:\Users\jmietling\Documents\rect3997-9-1.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
+       id="rect3997-9-1" />
     <path
        style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:url(#linearGradient4889-2);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
        d="m 3,1039.3622 8.971875,0 0.02812,9 -8.971875,0 z"
-       id="rect3997-9-1-1"
-       inkscape:connector-curvature="0" />
+       id="rect3997-9-1-1" />
     <path
        style="fill:url(#linearGradient5062-9);fill-opacity:1;stroke:none;display:inline"
        d="m 5,1041.3622 0,7 -2,0 0,-9 z"
-       id="rect4853-82-7"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+       id="rect4853-82-7" />
     <path
        style="fill:url(#linearGradient4975-2-1);fill-opacity:1;stroke:none;display:inline"
        d="m 5,1041.3622 7,0 0,-2 -9,0 z"
-       id="rect4853-82-0"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+       id="rect4853-82-0" />
     <path
        style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#8b96ab;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
        d="m 4,1040.3622 0,11 11,0 0,-11 z m 1,1 9,0 0,9 -9,0 z"
-       id="rect3997-9-1-2"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccccccc"
-       inkscape:export-filename="C:\Users\jmietling\Documents\rect3997-9-1.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
+       id="rect3997-9-1-2" />
     <path
        style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:url(#linearGradient4889-2-1);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
        d="m 5,1041.3622 8.971875,0 0.02812,9 -8.971875,0 z"
-       id="rect3997-9-1-1-2"
-       inkscape:connector-curvature="0" />
+       id="rect3997-9-1-1-2" />
     <path
        style="fill:url(#linearGradient4970);fill-opacity:1;stroke:none;display:inline"
        d="m 8,1047.3622 5,0 c 1,0 1,-1 0,-1 l -5,0 c -1,0 -1,1 0,1 z"
-       id="rect4853-82-0-6-8"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+       id="rect4853-82-0-6-8" />
     <path
        style="fill:url(#linearGradient5062-9-5);fill-opacity:1;stroke:none;display:inline"
        d="m 7,1043.3622 0,7 -2,0 0,-9 z"
-       id="rect4853-82-7-1"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+       id="rect4853-82-7-1" />
     <path
        style="fill:url(#linearGradient4975-2-1-1);fill-opacity:1;stroke:none;display:inline"
        d="m 7,1043.3622 7,0 0,-2 -9,0 z"
-       id="rect4853-82-0-6"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+       id="rect4853-82-0-6" />
     <path
        style="fill:url(#linearGradient5050);fill-opacity:1;stroke:none;display:inline"
        d="m 10,1044.3622 0,5 c 0,1 1,1 1,0 l 0,-5 c 0,-1 -1,-1 -1,0 z"
-       id="rect4853-82-0-6-8-41"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+       id="rect4853-82-0-6-8-41" />
     <rect
        style="fill:#01467a;fill-opacity:1;stroke:none"
        id="rect4167"
diff --git a/ui/org.eclipse.pde.spy.context/icons/field_public_obj.svg b/ui/org.eclipse.pde.spy.context/icons/field_public_obj.svg
index 71b9836ad0d..364fe7cf88f 100644
--- a/ui/org.eclipse.pde.spy.context/icons/field_public_obj.svg
+++ b/ui/org.eclipse.pde.spy.context/icons/field_public_obj.svg
@@ -2,371 +2,18 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="field_public_obj.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
-    <linearGradient
-       y2="459.24786"
-       x2="388.63736"
-       y1="478.18777"
-       x1="388.63736"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3929-5"
-       xlink:href="#linearGradient10798-1-9-3-7-6-8-9-0-9-1"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient10798-1-9-3-7-6-8-9-0-9-1">
-      <stop
-         style="stop-color:#a17748;stop-opacity:1"
-         offset="0"
-         id="stop10800-5-2-1-8-20-6-4-9-8-2" />
-      <stop
-         id="stop10806-6-8-5-3-9-24-8-4-3-2"
-         offset="0.5"
-         style="stop-color:#8e5c24;stop-opacity:1" />
-      <stop
-         style="stop-color:#c7af93;stop-opacity:1"
-         offset="1"
-         id="stop10802-1-5-3-0-4-8-4-2-9-2" />
-    </linearGradient>
-    <mask
-       id="mask17098"
-       maskUnits="userSpaceOnUse">
-      <g
-         transform="translate(-0.696415,-25.515546)"
-         style="fill:#ffffff"
-         id="g17100">
-        <g
-           transform="matrix(0.27903303,0,0,0.27903303,-148.50157,940.95641)"
-           style="fill:#ffffff;stroke:#ffffff;display:inline"
-           id="g17102">
-          <g
-             style="fill:#ffffff;stroke:#ffffff"
-             transform="matrix(1.1835826,0,0,1.1835826,-7.5789257,-74.544918)"
-             id="g17104">
-            <g
-               transform="matrix(3.0279299,0,0,3.0279299,456.02712,-2782.985)"
-               style="fill:#ffffff;stroke:#ffffff;display:inline"
-               id="g17106"
-               inkscape:label="Layer 1">
-              <g
-                 id="g17108"
-                 style="fill:#ffffff;stroke:#ffffff;display:inline"
-                 transform="matrix(0.27903303,0,0,0.27903303,-129.51159,939.94639)">
-                <rect
-                   y="363.23068"
-                   x="464.14426"
-                   height="7.1676102"
-                   width="54.014832"
-                   id="rect17110"
-                   style="fill:#ffffff;fill-opacity:1;stroke:#ffffff" />
-                <g
-                   style="fill:#ffffff;stroke:#ffffff"
-                   id="g17112"
-                   transform="matrix(1.1835826,0,0,1.1835826,-75.612218,-74.709882)">
-                  <rect
-                     ry="2.625"
-                     rx="2.625"
-                     y="365.46738"
-                     x="463.93262"
-                     height="16.625"
-                     width="15"
-                     id="rect17114"
-                     style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:3.02792978;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline" />
-                  <path
-                     sodipodi:nodetypes="sssssssss"
-                     inkscape:connector-curvature="0"
-                     id="path17116"
-                     d="m 463.24874,371.54269 31.10344,0 c 1.45425,0 2.625,1.17075 2.625,2.625 l 0,14.39926 c 0,1.45425 -1.21199,2.28111 -2.625,2.625 l -31.10344,7.56983 c -1.413,0.34389 -2.625,-1.17075 -2.625,-2.625 l 0,-21.96909 c 0,-1.45425 1.17075,-2.625 2.625,-2.625 z"
-                     style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:3.02792978;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
-                  <path
-                     sodipodi:nodetypes="sssssssss"
-                     inkscape:connector-curvature="0"
-                     id="path17118"
-                     d="m 463.24874,371.6096 31.10344,0 c 1.45425,0 2.625,1.17075 2.625,2.625 l 0,14.33235 c 0,1.45425 -1.21199,2.28111 -2.625,2.625 l -31.10344,7.56983 c -1.413,0.34389 -2.625,-1.17075 -2.625,-2.625 l 0,-21.90218 c 0,-1.45425 1.17075,-2.625 2.625,-2.625 z"
-                     style="fill:#ffffff;stroke:#ffffff;stroke-width:3.02792978;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline" />
-                  <path
-                     inkscape:connector-curvature="0"
-                     id="path17120"
-                     d="m 462.26171,371.52622 20.09375,0"
-                     style="fill:#ffffff;stroke:#ffffff;stroke-width:3.02792978;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-                  <g
-                     style="fill:#ffffff;stroke:#ffffff"
-                     mask="url(#mask4917-4-0)"
-                     id="g17122">
-                    <rect
-                       style="opacity:0.5;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:2.38039374;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline;filter:url(#filter4929-9)"
-                       id="rect17124"
-                       width="30.899641"
-                       height="22.649353"
-                       x="860.68469"
-                       y="542.8974"
-                       rx="2.625"
-                       ry="3.7184925"
-                       transform="matrix(1,0,-0.70828043,0.70593118,0,0)" />
-                  </g>
-                  <rect
-                     transform="matrix(1,0,-0.70828042,0.70593119,0,0)"
-                     ry="3.7184927"
-                     rx="2.625"
-                     y="543.43286"
-                     x="860.68469"
-                     height="21.542582"
-                     width="30.23728"
-                     id="rect17126"
-                     style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:3.60383272;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline" />
-                </g>
-                <path
-                   sodipodi:nodetypes="ccccccc"
-                   inkscape:connector-curvature="0"
-                   id="path17128"
-                   d="m 492.81474,377.56576 -14.33522,0 0,3.5838 2.02645,0 0,-1.47461 11.8608,0 z"
-                   style="fill:#ffffff;fill-opacity:1;stroke:#ffffff" />
-              </g>
-            </g>
-          </g>
-        </g>
-        <path
-           sodipodi:nodetypes="ssscccssscccscss"
-           inkscape:connector-curvature="0"
-           id="path17130"
-           d="m 5.7026894,1044.9373 c -0.185041,-0.018 -0.402396,-0.059 -0.576929,-0.1108 -0.270837,-0.079 -0.243851,0.015 -0.243851,-0.8593 0,-0.4579 0.0077,-0.7598 0.01951,-0.7646 0.01072,0 0.0317,0 0.04665,0.013 0.04847,0.037 0.294579,0.1623 0.376062,0.1926 0.186482,0.069 0.46629,0.1032 0.663393,0.083 0.436936,-0.047 0.733026,-0.2945 0.881951,-0.7389 0.120095,-0.3583 0.114052,-0.2194 0.12641,-2.9086 l 0.01137,-2.4738 0.829393,0 0.829395,0 0.0062,2.3061 c 0.0064,2.384 -5.49e-4,2.6629 -0.0777,3.0973 -0.156267,0.8809 -0.598495,1.5436 -1.254122,1.8796 -0.440731,0.2258 -1.0806,0.337 -1.637678,0.2843 z"
-           style="fill:#ffffff;fill-opacity:1;display:inline" />
-      </g>
-    </mask>
-    <mask
-       maskUnits="userSpaceOnUse"
-       id="mask4917-4-0">
-      <path
-         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;display:inline"
-         d="m 462.77563,373.22885 29.11636,0 c 1.45425,0 2.625,1.17075 2.625,2.625 l 0,18.76896 c 0,1.45425 -1.17412,2.52598 -2.625,2.625 l -29.11636,1.98708 c -1.45088,0.099 -2.625,-1.17075 -2.625,-2.625 l 0,-20.75604 c 0,-1.45425 1.17075,-2.625 2.625,-2.625 z"
-         id="path4919-6-6"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="sssssssss" />
-    </mask>
-    <filter
-       inkscape:collect="always"
-       id="filter4929-9"
-       x="-0.13757156"
-       width="1.2751431"
-       y="-0.37744918"
-       height="1.7548983"
-       color-interpolation-filters="sRGB">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="3.5620748"
-         id="feGaussianBlur4931-98" />
-    </filter>
-    <mask
-       id="mask17064"
-       maskUnits="userSpaceOnUse">
-      <g
-         transform="matrix(2.4682548,0,0,2.4682548,-151.3224,-1556.3662)"
-         style="fill:#ffffff"
-         id="g17066">
-        <g
-           transform="matrix(0.27903303,0,0,0.27903303,-148.50157,940.95641)"
-           style="fill:#ffffff;stroke:#ffffff;display:inline"
-           id="g17068">
-          <g
-             style="fill:#ffffff;stroke:#ffffff"
-             transform="matrix(1.1835826,0,0,1.1835826,-7.5789257,-74.544918)"
-             id="g17070">
-            <g
-               transform="matrix(3.0279299,0,0,3.0279299,456.02712,-2782.985)"
-               style="fill:#ffffff;stroke:#ffffff;display:inline"
-               id="g17072"
-               inkscape:label="Layer 1">
-              <g
-                 id="g17074"
-                 style="fill:#ffffff;stroke:#ffffff;display:inline"
-                 transform="matrix(0.27903303,0,0,0.27903303,-129.51159,939.94639)">
-                <rect
-                   y="363.23068"
-                   x="464.14426"
-                   height="7.1676102"
-                   width="54.014832"
-                   id="rect17076"
-                   style="fill:#ffffff;fill-opacity:1;stroke:#ffffff" />
-                <g
-                   style="fill:#ffffff;stroke:#ffffff"
-                   id="g17078"
-                   transform="matrix(1.1835826,0,0,1.1835826,-75.612218,-74.709882)">
-                  <rect
-                     ry="2.625"
-                     rx="2.625"
-                     y="365.46738"
-                     x="463.93262"
-                     height="16.625"
-                     width="15"
-                     id="rect17080"
-                     style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:3.02792978;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline" />
-                  <path
-                     sodipodi:nodetypes="sssssssss"
-                     inkscape:connector-curvature="0"
-                     id="path17082"
-                     d="m 463.24874,371.54269 31.10344,0 c 1.45425,0 2.625,1.17075 2.625,2.625 l 0,14.39926 c 0,1.45425 -1.21199,2.28111 -2.625,2.625 l -31.10344,7.56983 c -1.413,0.34389 -2.625,-1.17075 -2.625,-2.625 l 0,-21.96909 c 0,-1.45425 1.17075,-2.625 2.625,-2.625 z"
-                     style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:3.02792978;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
-                  <path
-                     sodipodi:nodetypes="sssssssss"
-                     inkscape:connector-curvature="0"
-                     id="path17084"
-                     d="m 463.24874,371.6096 31.10344,0 c 1.45425,0 2.625,1.17075 2.625,2.625 l 0,14.33235 c 0,1.45425 -1.21199,2.28111 -2.625,2.625 l -31.10344,7.56983 c -1.413,0.34389 -2.625,-1.17075 -2.625,-2.625 l 0,-21.90218 c 0,-1.45425 1.17075,-2.625 2.625,-2.625 z"
-                     style="fill:#ffffff;stroke:#ffffff;stroke-width:3.02792978;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline" />
-                  <path
-                     inkscape:connector-curvature="0"
-                     id="path17086"
-                     d="m 462.26171,371.52622 20.09375,0"
-                     style="fill:#ffffff;stroke:#ffffff;stroke-width:3.02792978;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-                  <g
-                     style="fill:#ffffff;stroke:#ffffff"
-                     mask="url(#mask4917-4-0)"
-                     id="g17088">
-                    <rect
-                       style="opacity:0.5;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:2.38039374;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline;filter:url(#filter4929-9)"
-                       id="rect17090"
-                       width="30.899641"
-                       height="22.649353"
-                       x="860.68469"
-                       y="542.8974"
-                       rx="2.625"
-                       ry="3.7184925"
-                       transform="matrix(1,0,-0.70828043,0.70593118,0,0)" />
-                  </g>
-                  <rect
-                     transform="matrix(1,0,-0.70828042,0.70593119,0,0)"
-                     ry="3.7184927"
-                     rx="2.625"
-                     y="543.43286"
-                     x="860.68469"
-                     height="21.542582"
-                     width="30.23728"
-                     id="rect17092"
-                     style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:3.60383272;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline" />
-                </g>
-                <path
-                   sodipodi:nodetypes="ccccccc"
-                   inkscape:connector-curvature="0"
-                   id="path17094"
-                   d="m 492.81474,377.56576 -14.33522,0 0,3.5838 2.02645,0 0,-1.47461 11.8608,0 z"
-                   style="fill:#ffffff;fill-opacity:1;stroke:#ffffff" />
-              </g>
-            </g>
-          </g>
-        </g>
-        <path
-           sodipodi:nodetypes="ssscccssscccscss"
-           inkscape:connector-curvature="0"
-           id="path17096"
-           d="m 5.7026894,1044.9373 c -0.185041,-0.018 -0.402396,-0.059 -0.576929,-0.1108 -0.270837,-0.079 -0.243851,0.015 -0.243851,-0.8593 0,-0.4579 0.0077,-0.7598 0.01951,-0.7646 0.01072,0 0.0317,0 0.04665,0.013 0.04847,0.037 0.294579,0.1623 0.376062,0.1926 0.186482,0.069 0.46629,0.1032 0.663393,0.083 0.436936,-0.047 0.733026,-0.2945 0.881951,-0.7389 0.120095,-0.3583 0.114052,-0.2194 0.12641,-2.9086 l 0.01137,-2.4738 0.829393,0 0.829395,0 0.0062,2.3061 c 0.0064,2.384 -5.49e-4,2.6629 -0.0777,3.0973 -0.156267,0.8809 -0.598495,1.5436 -1.254122,1.8796 -0.440731,0.2258 -1.0806,0.337 -1.637678,0.2843 z"
-           style="fill:#ffffff;fill-opacity:1;display:inline" />
-      </g>
-    </mask>
-    <mask
-       maskUnits="userSpaceOnUse"
-       id="mask18860">
-      <path
-         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;display:inline"
-         d="m 462.77563,373.22885 29.11636,0 c 1.45425,0 2.625,1.17075 2.625,2.625 l 0,18.76896 c 0,1.45425 -1.17412,2.52598 -2.625,2.625 l -29.11636,1.98708 c -1.45088,0.099 -2.625,-1.17075 -2.625,-2.625 l 0,-20.75604 c 0,-1.45425 1.17075,-2.625 2.625,-2.625 z"
-         id="path18862"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="sssssssss" />
-    </mask>
-    <linearGradient
-       id="linearGradient7540-2-3-8">
-      <stop
-         id="stop7542-8-7-5"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.502" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0.47623286"
-         id="stop7544-8-2-0" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0"
-         offset="0.5"
-         id="stop7546-1-7-9" />
-      <stop
-         id="stop7548-98-9-2"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient7540-6-33-6-3">
-      <stop
-         id="stop7542-4-4-3-3"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.502" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0.47623286"
-         id="stop7544-5-3-8-5" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0"
-         offset="0.5"
-         id="stop7546-2-9-1-2" />
-      <stop
-         id="stop7548-9-2-0-9"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6738"
-       id="linearGradient6744"
-       x1="-31.957434"
-       y1="1042.2544"
-       x2="-31.957434"
-       y2="1039.6025"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.4617999,0,0,1.4617999,38.859115,-483.60399)" />
-    <linearGradient
-       id="linearGradient6738">
-      <stop
-         style="stop-color:#5481b6;stop-opacity:1"
-         offset="0"
-         id="stop6740" />
-      <stop
-         id="stop5729"
-         offset="0.5"
-         style="stop-color:#1c65a2;stop-opacity:1" />
-      <stop
-         style="stop-color:#5286ba;stop-opacity:1"
-         offset="1"
-         id="stop6742" />
-    </linearGradient>
-    <linearGradient
-       y2="1039.6025"
-       x2="-31.957434"
-       y1="1042.2544"
-       x1="-31.957434"
-       gradientTransform="matrix(1.1876056,0,0,1.1876056,46.681185,-191.60474)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4964"
-       xlink:href="#linearGradient6738"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient10798-1-9-3-7-6-8-9-0-9-1-1"
-       id="linearGradient9837"
-       gradientUnits="userSpaceOnUse"
-       x1="388.63736"
-       y1="478.18777"
-       x2="388.63736"
-       y2="462.11539" />
     <linearGradient
        id="linearGradient10798-1-9-3-7-6-8-9-0-9-1-1">
       <stop
@@ -383,7 +30,6 @@
          id="stop10802-1-5-3-0-4-8-4-2-9-2-0" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10798-1-9-3-7-6-8-9-0-9-1-1"
        id="linearGradient3077"
        gradientUnits="userSpaceOnUse"
@@ -392,32 +38,6 @@
        x2="388.63736"
        y2="462.11539" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="11.2"
-     inkscape:cx="11.913935"
-     inkscape:cy="3.0716956"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1107"
-     inkscape:window-height="899"
-     inkscape:window-x="1404"
-     inkscape:window-y="552"
-     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>
@@ -431,28 +51,18 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      transform="translate(0,-1036.3622)">
     <path
-       sodipodi:type="arc"
        style="font-size:13.58917427000000100px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:url(#linearGradient3077);fill-opacity:1;stroke:#058149;stroke-width:4.28791809;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline;font-family:Sans"
        id="path10796-2-6-2"
-       sodipodi:cx="388.125"
-       sodipodi:cy="468.23718"
-       sodipodi:rx="10.625"
-       sodipodi:ry="10.625"
        d="m 398.75,468.23718 a 10.625,10.625 0 1 1 -21.25,0 10.625,10.625 0 1 1 21.25,0 z"
        transform="matrix(0.23321341,0,0,0.23321341,-82.513695,935.16275)" />
     <g
        style="display:inline"
        id="layer1-3"
-       inkscape:label="Layer 1"
        transform="translate(1.6252372,17.080298)" />
     <path
-       sodipodi:nodetypes="czczczczc"
-       inkscape:connector-curvature="0"
        id="rect6501-1-6-1"
        d="m 7.9973152,1042.521 c 0,0 0.1917576,0.6999 0.6766707,1.1849 0.4849113,0.4848 1.1847983,0.6765 1.1847983,0.6765 0,0 -0.6959167,0.1879 -1.1847967,0.6767 -0.4888799,0.4889 -0.6766706,1.1847 -0.6766706,1.1847 0,0 -0.1719097,-0.6798 -0.6766707,-1.1847 -0.504761,-0.5048 -1.1847934,-0.6767 -1.1847934,-0.6767 0,0 0.7117911,-0.2037 1.1847934,-0.6765 0.4730006,-0.4732 0.676669,-1.1849 0.676669,-1.1849 z"
        style="fill:#ffffff;fill-opacity:1;stroke:none;display:inline" />
diff --git a/ui/org.eclipse.pde.spy.context/icons/inher_co.svg b/ui/org.eclipse.pde.spy.context/icons/inher_co.svg
index 2b16dcfb4b1..42a5b14d89f 100644
--- a/ui/org.eclipse.pde.spy.context/icons/inher_co.svg
+++ b/ui/org.eclipse.pde.spy.context/icons/inher_co.svg
@@ -2,20 +2,16 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.48.0 r9654"
-   sodipodi:docname="inher_co.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
@@ -40,8 +36,7 @@
        x1="388.63736"
        gradientUnits="userSpaceOnUse"
        id="linearGradient3929-5"
-       xlink:href="#linearGradient10798-1-9-3-7-6-8-9-0-9-1"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient10798-1-9-3-7-6-8-9-0-9-1" />
     <linearGradient
        id="linearGradient10798-1-9-3-7-6-8-9-0-9-1">
       <stop
@@ -65,34 +60,8 @@
        gradientTransform="matrix(0,-1,1,0,-24.12959,1042.3481)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient7993"
-       xlink:href="#linearGradient8080"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient8080" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="5.6568543"
-     inkscape:cx="26.386098"
-     inkscape:cy="9.1802237"
-     inkscape:document-units="px"
-     inkscape:current-layer="g6438"
-     showgrid="true"
-     inkscape:window-width="1287"
-     inkscape:window-height="862"
-     inkscape:window-x="623"
-     inkscape:window-y="113"
-     inkscape:window-maximized="0"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3960" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -106,8 +75,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
@@ -139,30 +106,19 @@
            x="-5.641345"
            y="1037.8381" />
         <path
-           sodipodi:type="arc"
            style="fill:url(#linearGradient3929-5);fill-opacity:1;stroke:#14733c;stroke-width:5.25411463;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline"
            id="path10796-2-6-2"
-           sodipodi:cx="388.125"
-           sodipodi:cy="468.23718"
-           sodipodi:rx="10.625"
-           sodipodi:ry="10.625"
            d="m 398.75,468.23718 c 0,5.86803 -4.75697,10.625 -10.625,10.625 -5.86803,0 -10.625,-4.75697 -10.625,-10.625 0,-5.86802 4.75697,-10.625 10.625,-10.625 5.86803,0 10.625,4.75698 10.625,10.625 z"
            transform="matrix(0.18865958,0,0,0.18865958,-83.839865,942.49831)" />
         <path
-           sodipodi:nodetypes="cccccccc"
-           inkscape:connector-curvature="0"
            id="path4108-9-0"
            d="m -11.12959,1043.3481 1,0 0,-6 2,0 -2.5,-2.9998 -2.5,2.9998 2,0 z"
            style="font-size:13.58917427px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:url(#linearGradient7993);fill-opacity:1;stroke:none;display:inline;font-family:Sans" />
         <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
            id="path4108-9-0-2"
            d="m -10.12959,1038.3481 0,1 4,0 0,-1 z"
            style="font-size:13.58917427000000100px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#6b778c;fill-opacity:1;stroke:none;display:inline;font-family:Sans" />
         <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
            id="path4108-9-0-2-2"
            d="m -10.12959,1042.3481 0,1 4,0 0,-1 z"
            style="font-size:13.58917427px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#5c7aaa;fill-opacity:1;stroke:none;display:inline;font-family:Sans" />
diff --git a/ui/org.eclipse.pde.spy.context/icons/letter-l-icon.svg b/ui/org.eclipse.pde.spy.context/icons/letter-l-icon.svg
index 54b0817dcab..32e58b641eb 100644
--- a/ui/org.eclipse.pde.spy.context/icons/letter-l-icon.svg
+++ b/ui/org.eclipse.pde.spy.context/icons/letter-l-icon.svg
@@ -2,6231 +2,117 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="letter-l-icon.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient15157">
-      <stop
-         style="stop-color:#eeb9bd;stop-opacity:1"
-         offset="0"
-         id="stop15159" />
-      <stop
-         id="stop15161"
-         offset="1"
-         style="stop-color:#d65b65;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient15151">
+       id="linearGradient4862">
       <stop
-         style="stop-color:#ffe3a7;stop-opacity:1"
+         id="stop4864"
          offset="0"
-         id="stop15153" />
+         style="stop-color:#937323;stop-opacity:1;" />
       <stop
-         id="stop15155"
+         id="stop4866"
          offset="1"
-         style="stop-color:#ffbd2c;stop-opacity:1" />
+         style="stop-color:#79601d;stop-opacity:1;" />
     </linearGradient>
     <linearGradient
-       id="linearGradient10507">
+       id="linearGradient5156">
       <stop
-         style="stop-color:#5f392d;stop-opacity:1"
+         id="stop5158"
          offset="0"
-         id="stop10509" />
-      <stop
-         id="stop10511"
-         offset="0.18181793"
-         style="stop-color:#9e7058;stop-opacity:1" />
-      <stop
-         id="stop10513"
-         offset="0.36363617"
-         style="stop-color:#794f40;stop-opacity:1" />
-      <stop
-         id="stop10515"
-         offset="0.49999985"
-         style="stop-color:#794f40;stop-opacity:1" />
+         style="stop-color:#fdf3cb;stop-opacity:1;" />
       <stop
-         id="stop10517"
-         offset="0.63636351"
-         style="stop-color:#794f40;stop-opacity:1" />
+         style="stop-color:#fdf3cb;stop-opacity:1"
+         offset="0.48612955"
+         id="stop5166" />
       <stop
-         style="stop-color:#9e7058;stop-opacity:1"
-         offset="0.81818175"
-         id="stop10519" />
+         style="stop-color:#a77e1c;stop-opacity:0.502"
+         offset="0.56520796"
+         id="stop5164" />
       <stop
-         style="stop-color:#5f392d;stop-opacity:1"
+         id="stop5160"
          offset="1"
-         id="stop10522" />
+         style="stop-color:#a77e1c;stop-opacity:0.5" />
     </linearGradient>
     <linearGradient
-       id="linearGradient11146-4-4-4-6-2">
+       id="linearGradient4886">
       <stop
-         id="stop11150-4-72-3-9-7"
+         id="stop4888"
          offset="0"
-         style="stop-color:#ffffff;stop-opacity:1" />
+         style="stop-color:#dec26f;stop-opacity:1" />
       <stop
-         style="stop-color:#2692d1;stop-opacity:1"
+         id="stop4890"
          offset="1"
-         id="stop11152-9-0-7-3-8" />
+         style="stop-color:#fce69e;stop-opacity:1" />
     </linearGradient>
+    <filter
+       id="filter5152"
+       color-interpolation-filters="sRGB"
+       x="-0.11338032"
+       y="-0.17825345"
+       width="1.2267606"
+       height="1.3565069">
+      <feGaussianBlur
+         id="feGaussianBlur5154"
+         stdDeviation="0.32374297" />
+    </filter>
     <linearGradient
-       id="linearGradient11146-8-3-2-6-1-7">
+       id="linearGradient4878">
       <stop
-         id="stop11150-7-5-9-3-8-2"
+         id="stop4880"
          offset="0"
-         style="stop-color:#faefba;stop-opacity:1" />
+         style="stop-color:#925218;stop-opacity:1" />
       <stop
-         style="stop-color:#9e6542;stop-opacity:1"
+         id="stop4882"
          offset="1"
-         id="stop11152-8-4-35-5-4-6" />
+         style="stop-color:#c1aa38;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       id="linearGradient11146-7-5-30-1-1-4">
-      <stop
-         id="stop11150-9-6-9-5-6-9"
-         offset="0"
-         style="stop-color:#faefba;stop-opacity:1" />
-      <stop
-         style="stop-color:#9e6542;stop-opacity:1"
-         offset="1"
-         id="stop11152-6-7-6-3-3-3" />
-    </linearGradient>
+       y2="1040.9708"
+       x2="30.0625"
+       y1="1034.4965"
+       x1="30.0625"
+       gradientTransform="translate(-42.734657,2.4992546)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient8465"
+       xlink:href="#linearGradient4862" />
     <linearGradient
-       id="linearGradient11146-8-7-5-7-5-6-8">
-      <stop
-         id="stop11150-7-8-3-8-7-0-6"
-         offset="0"
-         style="stop-color:#faefba;stop-opacity:1" />
-      <stop
-         style="stop-color:#9e6542;stop-opacity:1"
-         offset="1"
-         id="stop11152-8-8-6-3-2-5-1" />
-    </linearGradient>
+       y2="1040.7358"
+       x2="32.325939"
+       y1="1049.9935"
+       x1="32.325939"
+       gradientTransform="translate(-43.389765,1.0553546)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient8469"
+       xlink:href="#linearGradient4886" />
     <linearGradient
-       id="linearGradient10507-2">
-      <stop
-         style="stop-color:#2692d1;stop-opacity:1"
-         offset="0"
-         id="stop10509-4" />
-      <stop
-         id="stop10511-2"
-         offset="0.18181793"
-         style="stop-color:#4aa3d7;stop-opacity:1" />
-      <stop
-         id="stop10513-9"
-         offset="0.36363617"
-         style="stop-color:#49a4d9;stop-opacity:1" />
-      <stop
-         id="stop10515-0"
-         offset="0.49999985"
-         style="stop-color:#2692d1;stop-opacity:1" />
-      <stop
-         id="stop10517-9"
-         offset="0.63636351"
-         style="stop-color:#49a2d7;stop-opacity:1" />
-      <stop
-         style="stop-color:#4aa3d7;stop-opacity:1"
-         offset="0.81818175"
-         id="stop10519-2" />
-      <stop
-         style="stop-color:#2692d1;stop-opacity:1"
-         offset="1"
-         id="stop10522-7" />
-    </linearGradient>
-    <clipPath
-       id="clipPath4256"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path4258"
-         d="m 520.90039,326.68262 15.44141,0 0,159.62304 -15.44141,0 0,-159.62304 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath4260"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path4262"
-         d="m 520.90039,326.68262 15.44141,0 0,15.4414 -15.44141,0 0,-15.4414 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath4264"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path4266"
-         d="m 520.90039,342.70313 15.44141,0 0,15.4414 -15.44141,0 0,-15.4414 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath4268"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path4270"
-         d="m 520.90039,358.72266 15.44141,0 0,15.4414 -15.44141,0 0,-15.4414 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath4272"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path4274"
-         d="m 520.90039,374.74316 15.44141,0 0,15.44141 -15.44141,0 0,-15.44141 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath4276"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path4278"
-         d="m 520.90039,390.76367 15.44141,0 0,15.44141 -15.44141,0 0,-15.44141 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath4280"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path4282"
-         d="m 520.90039,406.7832 15.44141,0 0,15.4419 -15.44141,0 0,-15.4419 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath4284"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path4286"
-         d="m 520.90039,422.80371 15.44141,0 0,15.44141 -15.44141,0 0,-15.44141 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath4288"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path4290"
-         d="m 520.90039,438.82373 15.44141,0 0,15.44141 -15.44141,0 0,-15.44141 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath4292"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path4294"
-         d="m 520.90039,454.84424 15.44141,0 0,15.4414 -15.44141,0 0,-15.4414 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath4296"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path4298"
-         d="m 520.90039,470.86426 15.44141,0 0,15.4414 -15.44141,0 0,-15.4414 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath4408"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path4410"
-         d="m 536.87793,326.68359 15.44141,0 0,159.62207 -15.44141,0 0,-159.62207 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath4412"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path4414"
-         d="m 536.87793,326.68359 15.44141,0 0,15.44141 -15.44141,0 0,-15.44141 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath4416"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path4418"
-         d="m 536.87793,342.70313 15.44141,0 0,15.4414 -15.44141,0 0,-15.4414 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath4420"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path4422"
-         d="m 536.87793,358.72266 15.44141,0 0,15.4414 -15.44141,0 0,-15.4414 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath4424"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path4426"
-         d="m 536.87793,374.74414 15.44141,0 0,15.44141 -15.44141,0 0,-15.44141 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath4428"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path4430"
-         d="m 536.87793,390.76367 15.44141,0 0,15.44092 -15.44141,0 0,-15.44092 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath4432"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path4434"
-         d="m 536.87793,406.78271 15.44141,0 0,15.44239 -15.44141,0 0,-15.44239 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath4436"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path4438"
-         d="m 536.87793,422.80371 15.44141,0 0,15.44141 -15.44141,0 0,-15.44141 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath4440"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path4442"
-         d="m 536.87793,438.82373 15.44141,0 0,15.44141 -15.44141,0 0,-15.44141 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath4444"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path4446"
-         d="m 536.87793,454.84424 15.44141,0 0,15.4414 -15.44141,0 0,-15.4414 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath4448"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path4450"
-         d="m 536.87793,470.86426 15.44141,0 0,15.4414 -15.44141,0 0,-15.4414 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath4560"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path4562"
-         d="m 488.81348,326.68262 15.4414,0 0,159.62304 -15.4414,0 0,-159.62304 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath4564"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path4566"
-         d="m 488.81348,326.68262 15.4414,0 0,15.4414 -15.4414,0 0,-15.4414 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath4568"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path4570"
-         d="m 488.81348,342.70313 15.4414,0 0,15.4414 -15.4414,0 0,-15.4414 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath4572"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path4574"
-         d="m 488.81348,358.72266 15.4414,0 0,15.4414 -15.4414,0 0,-15.4414 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath4576"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path4578"
-         d="m 488.81348,374.74316 15.4414,0 0,15.44141 -15.4414,0 0,-15.44141 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath4580"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path4582"
-         d="m 488.81348,390.76367 15.4414,0 0,15.44141 -15.4414,0 0,-15.44141 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath4584"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path4586"
-         d="m 488.81348,406.7832 15.4414,0 0,15.4419 -15.4414,0 0,-15.4419 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath4588"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path4590"
-         d="m 488.81348,422.80371 15.4414,0 0,15.44141 -15.4414,0 0,-15.44141 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath4592"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path4594"
-         d="m 488.81348,438.82373 15.4414,0 0,15.44141 -15.4414,0 0,-15.44141 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath4596"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path4598"
-         d="m 488.81348,454.84424 15.4414,0 0,15.4414 -15.4414,0 0,-15.4414 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath4600"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path4602"
-         d="m 488.81348,470.86426 15.4414,0 0,15.4414 -15.4414,0 0,-15.4414 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath4712"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path4714"
-         d="m 504.86816,326.68164 15.44141,0 0,159.62402 -15.44141,0 0,-159.62402 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath4716"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path4718"
-         d="m 504.86816,326.68164 15.44141,0 0,15.44141 -15.44141,0 0,-15.44141 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath4720"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path4722"
-         d="m 504.86816,342.70313 15.44141,0 0,15.4414 -15.44141,0 0,-15.4414 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath4724"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path4726"
-         d="m 504.86816,358.72266 15.44141,0 0,15.4414 -15.44141,0 0,-15.4414 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath4728"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path4730"
-         d="m 504.86816,374.74219 15.44141,0 0,15.4414 -15.44141,0 0,-15.4414 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath4732"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path4734"
-         d="m 504.86816,390.76367 15.44141,0 0,15.4419 -15.44141,0 0,-15.4419 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath4736"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path4738"
-         d="m 504.86816,406.78369 15.44141,0 0,15.44141 -15.44141,0 0,-15.44141 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath4740"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path4742"
-         d="m 504.86816,422.80371 15.44141,0 0,15.44141 -15.44141,0 0,-15.44141 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath4744"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path4746"
-         d="m 504.86816,438.82373 15.44141,0 0,15.44141 -15.44141,0 0,-15.44141 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath4748"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path4750"
-         d="m 504.86816,454.84424 15.44141,0 0,15.4414 -15.44141,0 0,-15.4414 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath4752"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path4754"
-         d="m 504.86816,470.86426 15.44141,0 0,15.4414 -15.44141,0 0,-15.4414 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath4864"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path4866"
-         d="m 56.09717,326.68262 15.4414,0 0,159.62304 -15.4414,0 0,-159.62304 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath4868"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path4870"
-         d="m 56.09717,326.68262 15.4414,0 0,15.4414 -15.4414,0 0,-15.4414 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath4872"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path4874"
-         d="m 56.09717,342.70313 15.4414,0 0,15.4414 -15.4414,0 0,-15.4414 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath4876"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path4878"
-         d="m 56.09717,358.72266 15.4414,0 0,15.4414 -15.4414,0 0,-15.4414 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath4880"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path4882"
-         d="m 56.09717,374.74316 15.4414,0 0,15.44141 -15.4414,0 0,-15.44141 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath4884"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path4886"
-         d="m 56.09717,390.76367 15.4414,0 0,15.44141 -15.4414,0 0,-15.44141 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath4888"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path4890"
-         d="m 56.09717,406.7832 15.4414,0 0,15.4419 -15.4414,0 0,-15.4419 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath4892"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path4894"
-         d="m 56.09717,422.80371 15.4414,0 0,15.44141 -15.4414,0 0,-15.44141 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath4896"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path4898"
-         d="m 56.09717,438.82373 15.4414,0 0,15.44141 -15.4414,0 0,-15.44141 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath4900"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path4902"
-         d="m 56.09717,454.84424 15.4414,0 0,15.4414 -15.4414,0 0,-15.4414 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath4904"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path4906"
-         d="m 56.09717,470.86426 15.4414,0 0,15.4414 -15.4414,0 0,-15.4414 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath5016"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path5018"
-         d="m 360.56055,326.68359 15.43945,0 0,159.62207 -15.43945,0 0,-159.62207 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath5020"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path5022"
-         d="m 360.56055,326.68359 15.43945,0 0,15.44141 -15.43945,0 0,-15.44141 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath5024"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path5026"
-         d="m 360.56055,342.70313 15.43945,0 0,15.4414 -15.43945,0 0,-15.4414 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath5028"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path5030"
-         d="m 360.56055,358.72266 15.43945,0 0,15.4414 -15.43945,0 0,-15.4414 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath5032"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path5034"
-         d="m 360.56055,374.74414 15.43945,0 0,15.44141 -15.43945,0 0,-15.44141 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath5036"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path5038"
-         d="m 360.56055,390.76367 15.43945,0 0,15.44092 -15.43945,0 0,-15.44092 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath5040"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path5042"
-         d="m 360.56055,406.78271 15.43945,0 0,15.44239 -15.43945,0 0,-15.44239 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath5044"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path5046"
-         d="m 360.56055,422.80371 15.43945,0 0,15.44141 -15.43945,0 0,-15.44141 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath5048"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path5050"
-         d="m 360.56055,438.82373 15.43945,0 0,15.44141 -15.43945,0 0,-15.44141 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath5052"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path5054"
-         d="m 360.56055,454.84424 15.43945,0 0,15.4414 -15.43945,0 0,-15.4414 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath5056"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path5058"
-         d="m 360.56055,470.86426 15.43945,0 0,15.4414 -15.43945,0 0,-15.4414 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath5168"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path5170"
-         d="m 376.57031,326.68164 15.44141,0 0,159.62402 -15.44141,0 0,-159.62402 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath5172"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path5174"
-         d="m 376.57031,326.68164 15.44141,0 0,15.44141 -15.44141,0 0,-15.44141 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath5176"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path5178"
-         d="m 376.57031,342.70313 15.44141,0 0,15.4414 -15.44141,0 0,-15.4414 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath5180"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path5182"
-         d="m 376.57031,358.72266 15.44141,0 0,15.4414 -15.44141,0 0,-15.4414 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath5184"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path5186"
-         d="m 376.57031,374.74219 15.44141,0 0,15.4414 -15.44141,0 0,-15.4414 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath5188"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path5190"
-         d="m 376.57031,390.76367 15.44141,0 0,15.4419 -15.44141,0 0,-15.4419 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath5192"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path5194"
-         d="m 376.57031,406.78369 15.44141,0 0,15.44141 -15.44141,0 0,-15.44141 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath5196"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path5198"
-         d="m 376.57031,422.80371 15.44141,0 0,15.44141 -15.44141,0 0,-15.44141 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath5200"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path5202"
-         d="m 376.57031,438.82373 15.44141,0 0,15.44141 -15.44141,0 0,-15.44141 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath5204"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path5206"
-         d="m 376.57031,454.84424 15.44141,0 0,15.4414 -15.44141,0 0,-15.4414 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath5208"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path5210"
-         d="m 376.57031,470.86426 15.44141,0 0,15.4414 -15.44141,0 0,-15.4414 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath5320"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path5322"
-         d="m 568.88672,326.68262 15.44141,0 0,159.62304 -15.44141,0 0,-159.62304 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath5324"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path5326"
-         d="m 568.88672,326.68262 15.44141,0 0,15.4414 -15.44141,0 0,-15.4414 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath5328"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path5330"
-         d="m 568.88672,342.70313 15.44141,0 0,15.4414 -15.44141,0 0,-15.4414 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath5332"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path5334"
-         d="m 568.88672,358.72266 15.44141,0 0,15.4414 -15.44141,0 0,-15.4414 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath5336"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path5338"
-         d="m 568.88672,374.74316 15.44141,0 0,15.44141 -15.44141,0 0,-15.44141 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath5340"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path5342"
-         d="m 568.88672,390.76367 15.44141,0 0,15.44141 -15.44141,0 0,-15.44141 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath5344"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path5346"
-         d="m 568.88672,406.7832 15.44141,0 0,15.4419 -15.44141,0 0,-15.4419 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath5348"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path5350"
-         d="m 568.88672,422.80371 15.44141,0 0,15.44141 -15.44141,0 0,-15.44141 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath5352"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path5354"
-         d="m 568.88672,438.82373 15.44141,0 0,15.44141 -15.44141,0 0,-15.44141 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath5356"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path5358"
-         d="m 568.88672,454.84424 15.44141,0 0,15.4414 -15.44141,0 0,-15.4414 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath5360"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path5362"
-         d="m 568.88672,470.86426 15.44141,0 0,15.4414 -15.44141,0 0,-15.4414 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath5472"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path5474"
-         d="m 552.90137,326.68359 15.4414,0 0,159.62207 -15.4414,0 0,-159.62207 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath5476"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path5478"
-         d="m 552.90137,326.68359 15.4414,0 0,15.44141 -15.4414,0 0,-15.44141 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath5480"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path5482"
-         d="m 552.90137,342.70313 15.4414,0 0,15.4414 -15.4414,0 0,-15.4414 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath5484"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path5486"
-         d="m 552.90137,358.72266 15.4414,0 0,15.4414 -15.4414,0 0,-15.4414 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath5488"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path5490"
-         d="m 552.90137,374.74414 15.4414,0 0,15.44141 -15.4414,0 0,-15.44141 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath5492"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path5494"
-         d="m 552.90137,390.76367 15.4414,0 0,15.44092 -15.4414,0 0,-15.44092 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath5496"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path5498"
-         d="m 552.90137,406.78271 15.4414,0 0,15.44239 -15.4414,0 0,-15.44239 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath5500"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path5502"
-         d="m 552.90137,422.80371 15.4414,0 0,15.44141 -15.4414,0 0,-15.44141 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath5504"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path5506"
-         d="m 552.90137,438.82373 15.4414,0 0,15.44141 -15.4414,0 0,-15.44141 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath5508"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path5510"
-         d="m 552.90137,454.84424 15.4414,0 0,15.4414 -15.4414,0 0,-15.4414 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath5512"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path5514"
-         d="m 552.90137,470.86426 15.4414,0 0,15.4414 -15.4414,0 0,-15.4414 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath5624"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path5626"
-         d="m 408.64648,326.68359 15.44336,0 0,159.62207 -15.44336,0 0,-159.62207 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath5628"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path5630"
-         d="m 408.64648,326.68359 15.44336,0 0,15.44141 -15.44336,0 0,-15.44141 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath5632"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path5634"
-         d="m 408.64648,342.70313 15.44336,0 0,15.4414 -15.44336,0 0,-15.4414 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath5636"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path5638"
-         d="m 408.64648,358.72266 15.44336,0 0,15.4414 -15.44336,0 0,-15.4414 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath5640"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path5642"
-         d="m 408.64648,374.74414 15.44336,0 0,15.44141 -15.44336,0 0,-15.44141 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath5644"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path5646"
-         d="m 408.64648,390.76367 15.44336,0 0,15.44092 -15.44336,0 0,-15.44092 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath5648"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path5650"
-         d="m 408.64648,406.78271 15.44336,0 0,15.44239 -15.44336,0 0,-15.44239 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath5652"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path5654"
-         d="m 408.64648,422.80371 15.44336,0 0,15.44141 -15.44336,0 0,-15.44141 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath5656"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path5658"
-         d="m 408.64648,438.82373 15.44336,0 0,15.44141 -15.44336,0 0,-15.44141 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath5660"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path5662"
-         d="m 408.64648,454.84424 15.44336,0 0,15.4414 -15.44336,0 0,-15.4414 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath5664"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path5666"
-         d="m 408.64648,470.86426 15.44336,0 0,15.4414 -15.44336,0 0,-15.4414 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath5776"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path5778"
-         d="m 72.09766,326.68164 15.4414,0 0,159.62402 -15.4414,0 0,-159.62402 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath5780"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path5782"
-         d="m 72.09766,326.68164 15.4414,0 0,15.44141 -15.4414,0 0,-15.44141 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath5784"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path5786"
-         d="m 72.09766,342.70313 15.4414,0 0,15.4414 -15.4414,0 0,-15.4414 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath5788"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path5790"
-         d="m 72.09766,358.72266 15.4414,0 0,15.4414 -15.4414,0 0,-15.4414 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath5792"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path5794"
-         d="m 72.09766,374.74219 15.4414,0 0,15.4414 -15.4414,0 0,-15.4414 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath5796"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path5798"
-         d="m 72.09766,390.76367 15.4414,0 0,15.4419 -15.4414,0 0,-15.4419 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath5800"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path5802"
-         d="m 72.09766,406.78369 15.4414,0 0,15.44092 -15.4414,0 0,-15.44092 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath5804"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path5806"
-         d="m 72.09766,422.80371 15.4414,0 0,15.44141 -15.4414,0 0,-15.44141 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath5808"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path5810"
-         d="m 72.09766,438.82422 15.4414,0 0,15.44092 -15.4414,0 0,-15.44092 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath5812"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path5814"
-         d="m 72.09766,454.84424 15.4414,0 0,15.4414 -15.4414,0 0,-15.4414 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath5816"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path5818"
-         d="m 72.09766,470.86426 15.4414,0 0,15.4414 -15.4414,0 0,-15.4414 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath5928"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path5930"
-         d="m 88.02344,326.68262 15.44238,0 0,159.62304 -15.44238,0 0,-159.62304 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath5932"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path5934"
-         d="m 88.02344,326.68262 15.44238,0 0,15.4414 -15.44238,0 0,-15.4414 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath5936"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path5938"
-         d="m 88.02344,342.70313 15.44238,0 0,15.4414 -15.44238,0 0,-15.4414 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath5940"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path5942"
-         d="m 88.02344,358.72266 15.44238,0 0,15.4414 -15.44238,0 0,-15.4414 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath5944"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path5946"
-         d="m 88.02344,374.74316 15.44238,0 0,15.44141 -15.44238,0 0,-15.44141 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath5948"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path5950"
-         d="m 88.02344,390.76367 15.44238,0 0,15.44141 -15.44238,0 0,-15.44141 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath5952"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path5954"
-         d="m 88.02344,406.7832 15.44238,0 0,15.44239 -15.44238,0 0,-15.44239 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath5956"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path5958"
-         d="m 88.02344,422.80371 15.44238,0 0,15.44141 -15.44238,0 0,-15.44141 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath5960"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path5962"
-         d="m 88.02344,438.82324 15.44238,0 0,15.44141 -15.44238,0 0,-15.44141 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath5964"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path5966"
-         d="m 88.02344,454.84424 15.44238,0 0,15.4414 -15.44238,0 0,-15.4414 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath5968"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path5970"
-         d="m 88.02344,470.86426 15.44238,0 0,15.4414 -15.44238,0 0,-15.4414 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath6080"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path6082"
-         d="m 104.01172,326.68262 15.44189,0 0,159.62304 -15.44189,0 0,-159.62304 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath6084"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path6086"
-         d="m 104.01172,326.68262 15.44189,0 0,15.4414 -15.44189,0 0,-15.4414 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath6088"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path6090"
-         d="m 104.01172,342.70313 15.44189,0 0,15.4414 -15.44189,0 0,-15.4414 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath6092"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path6094"
-         d="m 104.01172,358.72266 15.44189,0 0,15.4414 -15.44189,0 0,-15.4414 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath6096"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path6098"
-         d="m 104.01172,374.74316 15.44189,0 0,15.44141 -15.44189,0 0,-15.44141 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath6100"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path6102"
-         d="m 104.01172,390.76367 15.44189,0 0,15.44141 -15.44189,0 0,-15.44141 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath6104"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path6106"
-         d="m 104.01172,406.7832 15.44189,0 0,15.4419 -15.44189,0 0,-15.4419 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath6108"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path6110"
-         d="m 104.01172,422.80371 15.44189,0 0,15.44141 -15.44189,0 0,-15.44141 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath6112"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path6114"
-         d="m 104.01172,438.82373 15.44189,0 0,15.44141 -15.44189,0 0,-15.44141 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath6116"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path6118"
-         d="m 104.01172,454.84424 15.44189,0 0,15.4414 -15.44189,0 0,-15.4414 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath6120"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path6122"
-         d="m 104.01172,470.86426 15.44189,0 0,15.4414 -15.44189,0 0,-15.4414 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath6232"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path6234"
-         d="m 135.93994,326.68262 15.44141,0 0,159.62304 -15.44141,0 0,-159.62304 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath6236"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path6238"
-         d="m 135.93994,326.68262 15.44141,0 0,15.4414 -15.44141,0 0,-15.4414 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath6240"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path6242"
-         d="m 135.93994,342.70215 15.44141,0 0,15.4414 -15.44141,0 0,-15.4414 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath6244"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path6246"
-         d="m 135.93994,358.72168 15.44141,0 0,15.44141 -15.44141,0 0,-15.44141 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath6248"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path6250"
-         d="m 135.93994,374.74316 15.44141,0 0,15.44141 -15.44141,0 0,-15.44141 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath6252"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path6254"
-         d="m 135.93994,390.7627 15.44141,0 0,15.4414 -15.44141,0 0,-15.4414 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath6256"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path6258"
-         d="m 135.93994,406.78223 15.44141,0 0,15.44287 -15.44141,0 0,-15.44287 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath6260"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path6262"
-         d="m 135.93994,422.80371 15.44141,0 0,15.44141 -15.44141,0 0,-15.44141 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath6264"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path6266"
-         d="m 135.93994,438.82373 15.44141,0 0,15.44141 -15.44141,0 0,-15.44141 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath6268"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path6270"
-         d="m 135.93994,454.84424 15.44141,0 0,15.4414 -15.44141,0 0,-15.4414 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath6272"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path6274"
-         d="m 135.93994,470.86426 15.44141,0 0,15.4414 -15.44141,0 0,-15.4414 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath6384"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path6386"
-         d="m 119.99805,326.68164 15.44091,0 0,159.62402 -15.44091,0 0,-159.62402 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath6388"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path6390"
-         d="m 119.99805,326.68164 15.44091,0 0,15.44141 -15.44091,0 0,-15.44141 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath6392"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path6394"
-         d="m 119.99805,342.70117 15.44091,0 0,15.44141 -15.44091,0 0,-15.44141 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath6396"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path6398"
-         d="m 119.99805,358.7207 15.44091,0 0,15.44141 -15.44091,0 0,-15.44141 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath6400"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path6402"
-         d="m 119.99805,374.74219 15.44091,0 0,15.4414 -15.44091,0 0,-15.4414 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath6404"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path6406"
-         d="m 119.99805,390.76172 15.44091,0 0,15.44189 -15.44091,0 0,-15.44189 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath6408"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path6410"
-         d="m 119.99805,406.78174 15.44091,0 0,15.44336 -15.44091,0 0,-15.44336 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath6412"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path6414"
-         d="m 119.99805,422.80371 15.44091,0 0,15.44141 -15.44091,0 0,-15.44141 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath6416"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path6418"
-         d="m 119.99805,438.82373 15.44091,0 0,15.44141 -15.44091,0 0,-15.44141 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath6420"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path6422"
-         d="m 119.99805,454.84424 15.44091,0 0,15.4414 -15.44091,0 0,-15.4414 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath6424"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path6426"
-         d="m 119.99805,470.86426 15.44091,0 0,15.4414 -15.44091,0 0,-15.4414 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath6536"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path6538"
-         d="m 232.45801,326.68262 15.4414,0 0,159.62304 -15.4414,0 0,-159.62304 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath6540"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path6542"
-         d="m 232.45801,326.68262 15.4414,0 0,15.4414 -15.4414,0 0,-15.4414 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath6544"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path6546"
-         d="m 232.45801,342.70313 15.4414,0 0,15.4414 -15.4414,0 0,-15.4414 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath6548"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path6550"
-         d="m 232.45801,358.72266 15.4414,0 0,15.4414 -15.4414,0 0,-15.4414 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath6552"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path6554"
-         d="m 232.45801,374.74316 15.4414,0 0,15.44141 -15.4414,0 0,-15.44141 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath6556"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path6558"
-         d="m 232.45801,390.76367 15.4414,0 0,15.44141 -15.4414,0 0,-15.44141 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath6560"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path6562"
-         d="m 232.45801,406.7832 15.4414,0 0,15.4419 -15.4414,0 0,-15.4419 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath6564"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path6566"
-         d="m 232.45801,422.80371 15.4414,0 0,15.44141 -15.4414,0 0,-15.44141 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath6568"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path6570"
-         d="m 232.45801,438.82373 15.4414,0 0,15.44141 -15.4414,0 0,-15.44141 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath6572"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path6574"
-         d="m 232.45801,454.84424 15.4414,0 0,15.4414 -15.4414,0 0,-15.4414 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath6576"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path6578"
-         d="m 232.45801,470.86426 15.4414,0 0,15.4414 -15.4414,0 0,-15.4414 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath6688"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path6690"
-         d="m 216.34521,326.68262 15.44141,0 0,159.62304 -15.44141,0 0,-159.62304 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath6692"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path6694"
-         d="m 216.34521,326.68262 15.44141,0 0,15.4414 -15.44141,0 0,-15.4414 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath6696"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path6698"
-         d="m 216.34521,342.70313 15.44141,0 0,15.4414 -15.44141,0 0,-15.4414 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath6700"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path6702"
-         d="m 216.34521,358.72266 15.44141,0 0,15.4414 -15.44141,0 0,-15.4414 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath6704"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path6706"
-         d="m 216.34521,374.74316 15.44141,0 0,15.44141 -15.44141,0 0,-15.44141 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath6708"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path6710"
-         d="m 216.34521,390.76367 15.44141,0 0,15.44141 -15.44141,0 0,-15.44141 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath6712"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path6714"
-         d="m 216.34521,406.7832 15.44141,0 0,15.4419 -15.44141,0 0,-15.4419 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath6716"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path6718"
-         d="m 216.34521,422.80371 15.44141,0 0,15.44141 -15.44141,0 0,-15.44141 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath6720"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path6722"
-         d="m 216.34521,438.82373 15.44141,0 0,15.44141 -15.44141,0 0,-15.44141 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath6724"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path6726"
-         d="m 216.34521,454.84424 15.44141,0 0,15.4414 -15.44141,0 0,-15.4414 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath6728"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path6730"
-         d="m 216.34521,470.86426 15.44141,0 0,15.4414 -15.44141,0 0,-15.4414 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath6840"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path6842"
-         d="m 184.04492,326.68262 15.44141,0 0,159.62304 -15.44141,0 0,-159.62304 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath6844"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path6846"
-         d="m 184.04492,326.68262 15.44141,0 0,15.4414 -15.44141,0 0,-15.4414 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath6848"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path6850"
-         d="m 184.04492,342.70313 15.44141,0 0,15.4414 -15.44141,0 0,-15.4414 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath6852"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path6854"
-         d="m 184.04492,358.72266 15.44141,0 0,15.4414 -15.44141,0 0,-15.4414 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath6856"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path6858"
-         d="m 184.04492,374.74316 15.44141,0 0,15.44141 -15.44141,0 0,-15.44141 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath6860"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path6862"
-         d="m 184.04492,390.76367 15.44141,0 0,15.44141 -15.44141,0 0,-15.44141 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath6864"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path6866"
-         d="m 184.04492,406.7832 15.44141,0 0,15.4419 -15.44141,0 0,-15.4419 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath6868"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path6870"
-         d="m 184.04492,422.80371 15.44141,0 0,15.44141 -15.44141,0 0,-15.44141 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath6872"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path6874"
-         d="m 184.04492,438.82373 15.44141,0 0,15.44141 -15.44141,0 0,-15.44141 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath6876"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path6878"
-         d="m 184.04492,454.84424 15.44141,0 0,15.4414 -15.44141,0 0,-15.4414 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath6880"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path6882"
-         d="m 184.04492,470.86426 15.44141,0 0,15.4414 -15.44141,0 0,-15.4414 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath6992"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path6994"
-         d="m 200.18604,326.68262 15.4414,0 0,159.62304 -15.4414,0 0,-159.62304 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath6996"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path6998"
-         d="m 200.18604,326.68262 15.4414,0 0,15.4414 -15.4414,0 0,-15.4414 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath7000"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path7002"
-         d="m 200.18604,342.70313 15.4414,0 0,15.4414 -15.4414,0 0,-15.4414 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath7004"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path7006"
-         d="m 200.18604,358.72266 15.4414,0 0,15.4414 -15.4414,0 0,-15.4414 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath7008"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path7010"
-         d="m 200.18604,374.74316 15.4414,0 0,15.44141 -15.4414,0 0,-15.44141 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath7012"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path7014"
-         d="m 200.18604,390.76367 15.4414,0 0,15.44141 -15.4414,0 0,-15.44141 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath7016"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path7018"
-         d="m 200.18604,406.7832 15.4414,0 0,15.4419 -15.4414,0 0,-15.4419 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath7020"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path7022"
-         d="m 200.18604,422.80371 15.4414,0 0,15.44141 -15.4414,0 0,-15.44141 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath7024"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path7026"
-         d="m 200.18604,438.82373 15.4414,0 0,15.44141 -15.4414,0 0,-15.44141 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath7028"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path7030"
-         d="m 200.18604,454.84424 15.4414,0 0,15.4414 -15.4414,0 0,-15.4414 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath7032"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path7034"
-         d="m 200.18604,470.86426 15.4414,0 0,15.4414 -15.4414,0 0,-15.4414 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath7144"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path7146"
-         d="m 167.99707,326.68262 15.44141,0 0,159.62304 -15.44141,0 0,-159.62304 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath7148"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path7150"
-         d="m 167.99707,326.68262 15.44141,0 0,15.4414 -15.44141,0 0,-15.4414 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath7152"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path7154"
-         d="m 167.99707,342.70313 15.44141,0 0,15.4414 -15.44141,0 0,-15.4414 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath7156"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path7158"
-         d="m 167.99707,358.72266 15.44141,0 0,15.4414 -15.44141,0 0,-15.4414 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath7160"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path7162"
-         d="m 167.99707,374.74316 15.44141,0 0,15.44141 -15.44141,0 0,-15.44141 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath7164"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path7166"
-         d="m 167.99707,390.76367 15.44141,0 0,15.44141 -15.44141,0 0,-15.44141 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath7168"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path7170"
-         d="m 167.99707,406.7832 15.44141,0 0,15.4419 -15.44141,0 0,-15.4419 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath7172"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path7174"
-         d="m 167.99707,422.80371 15.44141,0 0,15.44141 -15.44141,0 0,-15.44141 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath7176"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path7178"
-         d="m 167.99707,438.82373 15.44141,0 0,15.44141 -15.44141,0 0,-15.44141 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath7180"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path7182"
-         d="m 167.99707,454.84424 15.44141,0 0,15.4414 -15.44141,0 0,-15.4414 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath7184"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path7186"
-         d="m 167.99707,470.86426 15.44141,0 0,15.4414 -15.44141,0 0,-15.4414 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath7296"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path7298"
-         d="m 248.59229,326.68262 15.4414,0 0,159.62304 -15.4414,0 0,-159.62304 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath7300"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path7302"
-         d="m 248.59229,326.68262 15.4414,0 0,15.4414 -15.4414,0 0,-15.4414 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath7304"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path7306"
-         d="m 248.59229,342.70313 15.4414,0 0,15.4414 -15.4414,0 0,-15.4414 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath7308"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path7310"
-         d="m 248.59229,358.72266 15.4414,0 0,15.4414 -15.4414,0 0,-15.4414 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath7312"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path7314"
-         d="m 248.59229,374.74316 15.4414,0 0,15.44141 -15.4414,0 0,-15.44141 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath7316"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path7318"
-         d="m 248.59229,390.76367 15.4414,0 0,15.44141 -15.4414,0 0,-15.44141 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath7320"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path7322"
-         d="m 248.59229,406.7832 15.4414,0 0,15.4419 -15.4414,0 0,-15.4419 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath7324"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path7326"
-         d="m 248.59229,422.80371 15.4414,0 0,15.44141 -15.4414,0 0,-15.44141 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath7328"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path7330"
-         d="m 248.59229,438.82373 15.4414,0 0,15.44141 -15.4414,0 0,-15.44141 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath7332"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path7334"
-         d="m 248.59229,454.84424 15.4414,0 0,15.4414 -15.4414,0 0,-15.4414 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath7336"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path7338"
-         d="m 248.59229,470.86426 15.4414,0 0,15.4414 -15.4414,0 0,-15.4414 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath7448"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path7450"
-         d="m 344.50879,326.68262 15.44141,0 0,159.62304 -15.44141,0 0,-159.62304 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath7452"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path7454"
-         d="m 344.50879,326.68262 15.44141,0 0,15.4414 -15.44141,0 0,-15.4414 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath7456"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path7458"
-         d="m 344.50879,342.70313 15.44141,0 0,15.4414 -15.44141,0 0,-15.4414 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath7460"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path7462"
-         d="m 344.50879,358.72266 15.44141,0 0,15.4414 -15.44141,0 0,-15.4414 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath7464"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path7466"
-         d="m 344.50879,374.74316 15.44141,0 0,15.44141 -15.44141,0 0,-15.44141 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath7468"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path7470"
-         d="m 344.50879,390.76367 15.44141,0 0,15.44141 -15.44141,0 0,-15.44141 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath7472"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path7474"
-         d="m 344.50879,406.7832 15.44141,0 0,15.4419 -15.44141,0 0,-15.4419 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath7476"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path7478"
-         d="m 344.50879,422.80371 15.44141,0 0,15.44141 -15.44141,0 0,-15.44141 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath7480"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path7482"
-         d="m 344.50879,438.82373 15.44141,0 0,15.44141 -15.44141,0 0,-15.44141 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath7484"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path7486"
-         d="m 344.50879,454.84424 15.44141,0 0,15.4414 -15.44141,0 0,-15.4414 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath7488"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path7490"
-         d="m 344.50879,470.86426 15.44141,0 0,15.4414 -15.44141,0 0,-15.4414 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath7600"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path7602"
-         d="m 312.58691,326.68262 15.44141,0 0,159.62304 -15.44141,0 0,-159.62304 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath7604"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path7606"
-         d="m 312.58691,326.68262 15.44141,0 0,15.4414 -15.44141,0 0,-15.4414 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath7608"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path7610"
-         d="m 312.58691,342.70313 15.44141,0 0,15.4414 -15.44141,0 0,-15.4414 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath7612"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path7614"
-         d="m 312.58691,358.72266 15.44141,0 0,15.4414 -15.44141,0 0,-15.4414 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath7616"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path7618"
-         d="m 312.58691,374.74316 15.44141,0 0,15.44141 -15.44141,0 0,-15.44141 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath7620"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path7622"
-         d="m 312.58691,390.76367 15.44141,0 0,15.44141 -15.44141,0 0,-15.44141 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath7624"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path7626"
-         d="m 312.58691,406.7832 15.44141,0 0,15.4419 -15.44141,0 0,-15.4419 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath7628"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path7630"
-         d="m 312.58691,422.80371 15.44141,0 0,15.44141 -15.44141,0 0,-15.44141 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath7632"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path7634"
-         d="m 312.58691,438.82373 15.44141,0 0,15.44141 -15.44141,0 0,-15.44141 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath7636"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path7638"
-         d="m 312.58691,454.84424 15.44141,0 0,15.4414 -15.44141,0 0,-15.4414 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath7640"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path7642"
-         d="m 312.58691,470.86426 15.44141,0 0,15.4414 -15.44141,0 0,-15.4414 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath7752"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path7754"
-         d="m 280.55371,326.68262 15.44141,0 0,159.62304 -15.44141,0 0,-159.62304 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath7756"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path7758"
-         d="m 280.55371,326.68262 15.44141,0 0,15.4414 -15.44141,0 0,-15.4414 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath7760"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path7762"
-         d="m 280.55371,342.70313 15.44141,0 0,15.4414 -15.44141,0 0,-15.4414 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath7764"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path7766"
-         d="m 280.55371,358.72266 15.44141,0 0,15.4414 -15.44141,0 0,-15.4414 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath7768"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path7770"
-         d="m 280.55371,374.74316 15.44141,0 0,15.44141 -15.44141,0 0,-15.44141 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath7772"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path7774"
-         d="m 280.55371,390.76367 15.44141,0 0,15.44141 -15.44141,0 0,-15.44141 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath7776"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path7778"
-         d="m 280.55371,406.7832 15.44141,0 0,15.4419 -15.44141,0 0,-15.4419 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath7780"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path7782"
-         d="m 280.55371,422.80371 15.44141,0 0,15.44141 -15.44141,0 0,-15.44141 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath7784"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path7786"
-         d="m 280.55371,438.82373 15.44141,0 0,15.44141 -15.44141,0 0,-15.44141 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath7788"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path7790"
-         d="m 280.55371,454.84424 15.44141,0 0,15.4414 -15.44141,0 0,-15.4414 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath7792"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path7794"
-         d="m 280.55371,470.86426 15.44141,0 0,15.4414 -15.44141,0 0,-15.4414 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath7904"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path7906"
-         d="m 296.45996,326.68262 15.44141,0 0,159.62304 -15.44141,0 0,-159.62304 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath7908"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path7910"
-         d="m 296.45996,326.68262 15.44141,0 0,15.4414 -15.44141,0 0,-15.4414 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath7912"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path7914"
-         d="m 296.45996,342.70313 15.44141,0 0,15.4414 -15.44141,0 0,-15.4414 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath7916"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path7918"
-         d="m 296.45996,358.72266 15.44141,0 0,15.4414 -15.44141,0 0,-15.4414 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath7920"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path7922"
-         d="m 296.45996,374.74316 15.44141,0 0,15.44141 -15.44141,0 0,-15.44141 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath7924"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path7926"
-         d="m 296.45996,390.76367 15.44141,0 0,15.44141 -15.44141,0 0,-15.44141 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath7928"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path7930"
-         d="m 296.45996,406.7832 15.44141,0 0,15.4419 -15.44141,0 0,-15.4419 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath7932"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path7934"
-         d="m 296.45996,422.80371 15.44141,0 0,15.44141 -15.44141,0 0,-15.44141 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath7936"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path7938"
-         d="m 296.45996,438.82373 15.44141,0 0,15.44141 -15.44141,0 0,-15.44141 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath7940"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path7942"
-         d="m 296.45996,454.84424 15.44141,0 0,15.4414 -15.44141,0 0,-15.4414 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath7944"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path7946"
-         d="m 296.45996,470.86426 15.44141,0 0,15.4414 -15.44141,0 0,-15.4414 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath8056"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path8058"
-         d="m 264.5459,326.68262 15.4414,0 0,159.62304 -15.4414,0 0,-159.62304 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath8060"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path8062"
-         d="m 264.5459,326.68262 15.4414,0 0,15.4414 -15.4414,0 0,-15.4414 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath8064"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path8066"
-         d="m 264.5459,342.70313 15.4414,0 0,15.4414 -15.4414,0 0,-15.4414 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath8068"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path8070"
-         d="m 264.5459,358.72266 15.4414,0 0,15.4414 -15.4414,0 0,-15.4414 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath8072"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path8074"
-         d="m 264.5459,374.74316 15.4414,0 0,15.44141 -15.4414,0 0,-15.44141 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath8076"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path8078"
-         d="m 264.5459,390.76367 15.4414,0 0,15.44141 -15.4414,0 0,-15.44141 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath8080"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path8082"
-         d="m 264.5459,406.7832 15.4414,0 0,15.4419 -15.4414,0 0,-15.4419 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath8084"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path8086"
-         d="m 264.5459,422.80371 15.4414,0 0,15.44141 -15.4414,0 0,-15.44141 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath8088"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path8090"
-         d="m 264.5459,438.82373 15.4414,0 0,15.44141 -15.4414,0 0,-15.44141 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath8092"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path8094"
-         d="m 264.5459,454.84424 15.4414,0 0,15.4414 -15.4414,0 0,-15.4414 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath8096"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path8098"
-         d="m 264.5459,470.86426 15.4414,0 0,15.4414 -15.4414,0 0,-15.4414 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath8208"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path8210"
-         d="m 328.63379,326.68262 15.44141,0 0,159.62304 -15.44141,0 0,-159.62304 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath8212"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path8214"
-         d="m 328.63379,326.68262 15.44141,0 0,15.4414 -15.44141,0 0,-15.4414 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath8216"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path8218"
-         d="m 328.63379,342.70313 15.44141,0 0,15.4414 -15.44141,0 0,-15.4414 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath8220"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path8222"
-         d="m 328.63379,358.72266 15.44141,0 0,15.4414 -15.44141,0 0,-15.4414 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath8224"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path8226"
-         d="m 328.63379,374.74316 15.44141,0 0,15.44141 -15.44141,0 0,-15.44141 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath8228"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path8230"
-         d="m 328.63379,390.76367 15.44141,0 0,15.44141 -15.44141,0 0,-15.44141 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath8232"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path8234"
-         d="m 328.63379,406.7832 15.44141,0 0,15.4419 -15.44141,0 0,-15.4419 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath8236"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path8238"
-         d="m 328.63379,422.80371 15.44141,0 0,15.44141 -15.44141,0 0,-15.44141 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath8240"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path8242"
-         d="m 328.63379,438.82373 15.44141,0 0,15.44141 -15.44141,0 0,-15.44141 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath8244"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path8246"
-         d="m 328.63379,454.84424 15.44141,0 0,15.4414 -15.44141,0 0,-15.4414 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath8248"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path8250"
-         d="m 328.63379,470.86426 15.44141,0 0,15.4414 -15.44141,0 0,-15.4414 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath8360"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path8362"
-         d="m 392.56836,326.68164 15.44141,0 0,159.62402 -15.44141,0 0,-159.62402 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath8364"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path8366"
-         d="m 392.56836,326.68164 15.44141,0 0,15.44141 -15.44141,0 0,-15.44141 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath8368"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path8370"
-         d="m 392.56836,342.70313 15.44141,0 0,15.4414 -15.44141,0 0,-15.4414 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath8372"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path8374"
-         d="m 392.56836,358.72266 15.44141,0 0,15.4414 -15.44141,0 0,-15.4414 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath8376"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path8378"
-         d="m 392.56836,374.74219 15.44141,0 0,15.4414 -15.44141,0 0,-15.4414 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath8380"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path8382"
-         d="m 392.56836,390.76367 15.44141,0 0,15.4419 -15.44141,0 0,-15.4419 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath8384"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path8386"
-         d="m 392.56836,406.78369 15.44141,0 0,15.44141 -15.44141,0 0,-15.44141 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath8388"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path8390"
-         d="m 392.56836,422.80371 15.44141,0 0,15.44141 -15.44141,0 0,-15.44141 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath8392"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path8394"
-         d="m 392.56836,438.82373 15.44141,0 0,15.44141 -15.44141,0 0,-15.44141 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath8396"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path8398"
-         d="m 392.56836,454.84424 15.44141,0 0,15.4414 -15.44141,0 0,-15.4414 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath8400"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path8402"
-         d="m 392.56836,470.86426 15.44141,0 0,15.4414 -15.44141,0 0,-15.4414 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath8512"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path8514"
-         d="m 151.93799,326.68262 15.4414,0 0,159.62304 -15.4414,0 0,-159.62304 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath8516"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path8518"
-         d="m 151.93799,326.68262 15.4414,0 0,15.4414 -15.4414,0 0,-15.4414 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath8520"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path8522"
-         d="m 151.93799,342.70313 15.4414,0 0,15.4414 -15.4414,0 0,-15.4414 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath8524"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path8526"
-         d="m 151.93799,358.72266 15.4414,0 0,15.4414 -15.4414,0 0,-15.4414 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath8528"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path8530"
-         d="m 151.93799,374.74316 15.4414,0 0,15.44141 -15.4414,0 0,-15.44141 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath8532"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path8534"
-         d="m 151.93799,390.76367 15.4414,0 0,15.44141 -15.4414,0 0,-15.44141 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath8536"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path8538"
-         d="m 151.93799,406.7832 15.4414,0 0,15.4419 -15.4414,0 0,-15.4419 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath8540"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path8542"
-         d="m 151.93799,422.80371 15.4414,0 0,15.44141 -15.4414,0 0,-15.44141 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath8544"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path8546"
-         d="m 151.93799,438.82373 15.4414,0 0,15.44141 -15.4414,0 0,-15.44141 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath8548"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path8550"
-         d="m 151.93799,454.84424 15.4414,0 0,15.4414 -15.4414,0 0,-15.4414 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath8552"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path8554"
-         d="m 151.93799,470.86426 15.4414,0 0,15.4414 -15.4414,0 0,-15.4414 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath8664"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path8666"
-         d="m 424.74902,326.68359 15.44336,0 0,159.62207 -15.44336,0 0,-159.62207 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath8668"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path8670"
-         d="m 424.74902,326.68359 15.44336,0 0,15.44141 -15.44336,0 0,-15.44141 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath8672"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path8674"
-         d="m 424.74902,342.70313 15.44336,0 0,15.4414 -15.44336,0 0,-15.4414 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath8676"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path8678"
-         d="m 424.74902,358.72266 15.44336,0 0,15.4414 -15.44336,0 0,-15.4414 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath8680"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path8682"
-         d="m 424.74902,374.74414 15.44336,0 0,15.44141 -15.44336,0 0,-15.44141 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath8684"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path8686"
-         d="m 424.74902,390.76367 15.44336,0 0,15.44141 -15.44336,0 0,-15.44141 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath8688"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path8690"
-         d="m 424.74902,406.7832 15.44336,0 0,15.4419 -15.44336,0 0,-15.4419 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath8692"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path8694"
-         d="m 424.74902,422.80371 15.44336,0 0,15.44141 -15.44336,0 0,-15.44141 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath8696"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path8698"
-         d="m 424.74902,438.82373 15.44336,0 0,15.44141 -15.44336,0 0,-15.44141 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath8700"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path8702"
-         d="m 424.74902,454.84424 15.44336,0 0,15.4414 -15.44336,0 0,-15.4414 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath8704"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path8706"
-         d="m 424.74902,470.86426 15.44336,0 0,15.4414 -15.44336,0 0,-15.4414 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath8816"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path8818"
-         d="m 440.83203,326.68359 15.44336,0 0,159.62207 -15.44336,0 0,-159.62207 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath8820"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path8822"
-         d="m 440.83203,326.68359 15.44336,0 0,15.44141 -15.44336,0 0,-15.44141 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath8824"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path8826"
-         d="m 440.83203,342.70313 15.44336,0 0,15.4414 -15.44336,0 0,-15.4414 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath8828"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path8830"
-         d="m 440.83203,358.72266 15.44336,0 0,15.4414 -15.44336,0 0,-15.4414 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath8832"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path8834"
-         d="m 440.83203,374.74414 15.44336,0 0,15.44141 -15.44336,0 0,-15.44141 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath8836"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path8838"
-         d="m 440.83203,390.76367 15.44336,0 0,15.44141 -15.44336,0 0,-15.44141 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath8840"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path8842"
-         d="m 440.83203,406.7832 15.44336,0 0,15.4419 -15.44336,0 0,-15.4419 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath8844"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path8846"
-         d="m 440.83203,422.80371 15.44336,0 0,15.44141 -15.44336,0 0,-15.44141 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath8848"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path8850"
-         d="m 440.83203,438.82373 15.44336,0 0,15.44141 -15.44336,0 0,-15.44141 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath8852"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path8854"
-         d="m 440.83203,454.84424 15.44336,0 0,15.4414 -15.44336,0 0,-15.4414 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath8856"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path8858"
-         d="m 440.83203,470.86426 15.44336,0 0,15.4414 -15.44336,0 0,-15.4414 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath8968"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path8970"
-         d="m 456.79199,326.68359 15.44336,0 0,159.62207 -15.44336,0 0,-159.62207 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath8972"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path8974"
-         d="m 456.79199,326.68359 15.44336,0 0,15.44141 -15.44336,0 0,-15.44141 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath8976"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path8978"
-         d="m 456.79199,342.70313 15.44336,0 0,15.4414 -15.44336,0 0,-15.4414 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath8980"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path8982"
-         d="m 456.79199,358.72266 15.44336,0 0,15.4414 -15.44336,0 0,-15.4414 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath8984"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path8986"
-         d="m 456.79199,374.74414 15.44336,0 0,15.44141 -15.44336,0 0,-15.44141 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath8988"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path8990"
-         d="m 456.79199,390.76367 15.44336,0 0,15.44141 -15.44336,0 0,-15.44141 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath8992"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path8994"
-         d="m 456.79199,406.7832 15.44336,0 0,15.4419 -15.44336,0 0,-15.4419 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath8996"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path8998"
-         d="m 456.79199,422.80371 15.44336,0 0,15.44141 -15.44336,0 0,-15.44141 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath9000"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path9002"
-         d="m 456.79199,438.82373 15.44336,0 0,15.44141 -15.44336,0 0,-15.44141 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath9004"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path9006"
-         d="m 456.79199,454.84424 15.44336,0 0,15.4414 -15.44336,0 0,-15.4414 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath9008"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path9010"
-         d="m 456.79199,470.86426 15.44336,0 0,15.4414 -15.44336,0 0,-15.4414 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath9120"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path9122"
-         d="m 472.84082,326.68457 15.44336,0 0,159.62109 -15.44336,0 0,-159.62109 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath9124"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path9126"
-         d="m 472.84082,326.68457 15.44336,0 0,15.44141 -15.44336,0 0,-15.44141 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath9128"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path9130"
-         d="m 472.84082,342.7041 15.44336,0 0,15.44141 -15.44336,0 0,-15.44141 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath9132"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path9134"
-         d="m 472.84082,358.72363 15.44336,0 0,15.44141 -15.44336,0 0,-15.44141 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath9136"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path9138"
-         d="m 472.84082,374.74512 15.44336,0 0,15.4414 -15.44336,0 0,-15.4414 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath9140"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path9142"
-         d="m 472.84082,390.76465 15.44336,0 0,15.4414 -15.44336,0 0,-15.4414 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath9144"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path9146"
-         d="m 472.84082,406.78418 15.44336,0 0,15.44092 -15.44336,0 0,-15.44092 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath9148"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path9150"
-         d="m 472.84082,422.80371 15.44336,0 0,15.44141 -15.44336,0 0,-15.44141 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath9152"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path9154"
-         d="m 472.84082,438.82373 15.44336,0 0,15.44141 -15.44336,0 0,-15.44141 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath9156"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path9158"
-         d="m 472.84082,454.84424 15.44336,0 0,15.4414 -15.44336,0 0,-15.4414 z" />
-    </clipPath>
-    <clipPath
-       id="clipPath9160"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         id="path9162"
-         d="m 472.84082,470.86426 15.44336,0 0,15.4414 -15.44336,0 0,-15.4414 z" />
-    </clipPath>
-    <linearGradient
-       id="linearGradient18855">
-      <stop
-         style="stop-color:#a4b1c7;stop-opacity:1;"
-         offset="0"
-         id="stop18857" />
-      <stop
-         id="stop18859"
-         offset="0.50000364"
-         style="stop-color:#e1e9f8;stop-opacity:0" />
-      <stop
-         style="stop-color:#e7eefa;stop-opacity:0"
-         offset="1"
-         id="stop18861" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient18808">
-      <stop
-         id="stop18810"
-         offset="0"
-         style="stop-color:#a4b1c7;stop-opacity:1;" />
-      <stop
-         style="stop-color:#e1e9f8;stop-opacity:1"
-         offset="0.24999017"
-         id="stop18816" />
-      <stop
-         id="stop18812"
-         offset="1"
-         style="stop-color:#e7eefa;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient18543">
-      <stop
-         id="stop18545"
-         offset="0"
-         style="stop-color:#a79c68;stop-opacity:1;" />
-      <stop
-         style="stop-color:#687692;stop-opacity:1"
-         offset="0.31919643"
-         id="stop18555" />
-      <stop
-         style="stop-color:#8c99a6;stop-opacity:1"
-         offset="0.42585152"
-         id="stop18553" />
-      <stop
-         style="stop-color:#7b8da7;stop-opacity:1"
-         offset="0.671875"
-         id="stop18551" />
-      <stop
-         id="stop18547"
-         offset="1"
-         style="stop-color:#5e78a8;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4862">
-      <stop
-         id="stop4864"
-         offset="0"
-         style="stop-color:#937323;stop-opacity:1;" />
-      <stop
-         id="stop4866"
-         offset="1"
-         style="stop-color:#79601d;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5156">
-      <stop
-         id="stop5158"
-         offset="0"
-         style="stop-color:#fdf3cb;stop-opacity:1;" />
-      <stop
-         style="stop-color:#fdf3cb;stop-opacity:1"
-         offset="0.48612955"
-         id="stop5166" />
-      <stop
-         style="stop-color:#a77e1c;stop-opacity:0.502"
-         offset="0.56520796"
-         id="stop5164" />
-      <stop
-         id="stop5160"
-         offset="1"
-         style="stop-color:#a77e1c;stop-opacity:0.5" />
-    </linearGradient>
-    <mask
-       id="mask8608"
-       maskUnits="userSpaceOnUse">
-      <rect
-         ry="0.67081022"
-         rx="0.67081022"
-         y="1037.3622"
-         x="1"
-         height="14"
-         width="14"
-         id="rect8610"
-         style="fill:#ffffff;fill-opacity:1;stroke:none" />
-    </mask>
-    <linearGradient
-       id="linearGradient4886"
-       inkscape:collect="always">
-      <stop
-         id="stop4888"
-         offset="0"
-         style="stop-color:#dec26f;stop-opacity:1" />
-      <stop
-         id="stop4890"
-         offset="1"
-         style="stop-color:#fce69e;stop-opacity:1" />
-    </linearGradient>
-    <filter
-       id="filter5152"
-       inkscape:collect="always"
-       color-interpolation-filters="sRGB">
-      <feGaussianBlur
-         id="feGaussianBlur5154"
-         stdDeviation="0.32374297"
-         inkscape:collect="always" />
-    </filter>
-    <linearGradient
-       id="linearGradient4878"
-       inkscape:collect="always">
-      <stop
-         id="stop4880"
-         offset="0"
-         style="stop-color:#925218;stop-opacity:1" />
-      <stop
-         id="stop4882"
-         offset="1"
-         style="stop-color:#c1aa38;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       y2="1040.9708"
-       x2="30.0625"
-       y1="1034.4965"
-       x1="30.0625"
-       gradientTransform="translate(-42.734657,2.4992546)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient8465"
-       xlink:href="#linearGradient4862"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="1040.7358"
-       x2="32.325939"
-       y1="1049.9935"
-       x1="32.325939"
-       gradientTransform="translate(-43.389765,1.0553546)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient8469"
-       xlink:href="#linearGradient4886"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="1049.7878"
-       x2="32.558262"
-       y1="1041.8381"
-       x1="27.20822"
-       gradientTransform="translate(-43.389765,1.0553546)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient8471"
-       xlink:href="#linearGradient5156"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="1040.7803"
-       x2="29.263437"
-       y1="1048.656"
-       x1="29.263437"
-       gradientTransform="translate(-43.389765,1.0553546)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient8473"
-       xlink:href="#linearGradient4878"
-       inkscape:collect="always" />
-    <mask
-       id="mask8608-4"
-       maskUnits="userSpaceOnUse">
-      <rect
-         ry="0.67081022"
-         rx="0.67081022"
-         y="1037.3622"
-         x="1"
-         height="14"
-         width="14"
-         id="rect8610-4"
-         style="fill:#ffffff;fill-opacity:1;stroke:none" />
-    </mask>
-    <linearGradient
-       id="linearGradient3783">
-      <stop
-         style="stop-color:#dce2f4;stop-opacity:1"
-         offset="0"
-         id="stop3785" />
-      <stop
-         id="stop3787"
-         offset="0.31933746"
-         style="stop-color:#c4cee4;stop-opacity:1" />
-      <stop
-         style="stop-color:#c4cef4;stop-opacity:1"
-         offset="1"
-         id="stop3789" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4903-7-7">
-      <stop
-         id="stop4905-2-3"
-         offset="0"
-         style="stop-color:#ffe69f;stop-opacity:1" />
-      <stop
-         style="stop-color:#ffcb2f;stop-opacity:1"
-         offset="0.41477016"
-         id="stop4911-4-9" />
-      <stop
-         id="stop4907-3-6"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:1" />
-    </linearGradient>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath4256-9">
-      <path
-         d="m 520.90039,326.68262 15.44141,0 0,159.62304 -15.44141,0 0,-159.62304 z"
-         id="path4258-0"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath4260-6">
-      <path
-         d="m 520.90039,326.68262 15.44141,0 0,15.4414 -15.44141,0 0,-15.4414 z"
-         id="path4262-2"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath4264-7">
-      <path
-         d="m 520.90039,342.70313 15.44141,0 0,15.4414 -15.44141,0 0,-15.4414 z"
-         id="path4266-6"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath4268-8">
-      <path
-         d="m 520.90039,358.72266 15.44141,0 0,15.4414 -15.44141,0 0,-15.4414 z"
-         id="path4270-2"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath4272-5">
-      <path
-         d="m 520.90039,374.74316 15.44141,0 0,15.44141 -15.44141,0 0,-15.44141 z"
-         id="path4274-5"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath4276-8">
-      <path
-         d="m 520.90039,390.76367 15.44141,0 0,15.44141 -15.44141,0 0,-15.44141 z"
-         id="path4278-3"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath4280-3">
-      <path
-         d="m 520.90039,406.7832 15.44141,0 0,15.4419 -15.44141,0 0,-15.4419 z"
-         id="path4282-0"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath4284-0">
-      <path
-         d="m 520.90039,422.80371 15.44141,0 0,15.44141 -15.44141,0 0,-15.44141 z"
-         id="path4286-3"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath4288-3">
-      <path
-         d="m 520.90039,438.82373 15.44141,0 0,15.44141 -15.44141,0 0,-15.44141 z"
-         id="path4290-0"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath4292-7">
-      <path
-         d="m 520.90039,454.84424 15.44141,0 0,15.4414 -15.44141,0 0,-15.4414 z"
-         id="path4294-6"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath4296-2">
-      <path
-         d="m 520.90039,470.86426 15.44141,0 0,15.4414 -15.44141,0 0,-15.4414 z"
-         id="path4298-0"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath4408-8">
-      <path
-         d="m 536.87793,326.68359 15.44141,0 0,159.62207 -15.44141,0 0,-159.62207 z"
-         id="path4410-7"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath4412-2">
-      <path
-         d="m 536.87793,326.68359 15.44141,0 0,15.44141 -15.44141,0 0,-15.44141 z"
-         id="path4414-2"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath4416-3">
-      <path
-         d="m 536.87793,342.70313 15.44141,0 0,15.4414 -15.44141,0 0,-15.4414 z"
-         id="path4418-2"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath4420-5">
-      <path
-         d="m 536.87793,358.72266 15.44141,0 0,15.4414 -15.44141,0 0,-15.4414 z"
-         id="path4422-9"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath4424-1">
-      <path
-         d="m 536.87793,374.74414 15.44141,0 0,15.44141 -15.44141,0 0,-15.44141 z"
-         id="path4426-4"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath4428-6">
-      <path
-         d="m 536.87793,390.76367 15.44141,0 0,15.44092 -15.44141,0 0,-15.44092 z"
-         id="path4430-4"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath4432-2">
-      <path
-         d="m 536.87793,406.78271 15.44141,0 0,15.44239 -15.44141,0 0,-15.44239 z"
-         id="path4434-3"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath4436-4">
-      <path
-         d="m 536.87793,422.80371 15.44141,0 0,15.44141 -15.44141,0 0,-15.44141 z"
-         id="path4438-7"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath4440-3">
-      <path
-         d="m 536.87793,438.82373 15.44141,0 0,15.44141 -15.44141,0 0,-15.44141 z"
-         id="path4442-4"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath4444-9">
-      <path
-         d="m 536.87793,454.84424 15.44141,0 0,15.4414 -15.44141,0 0,-15.4414 z"
-         id="path4446-2"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath4448-7">
-      <path
-         d="m 536.87793,470.86426 15.44141,0 0,15.4414 -15.44141,0 0,-15.4414 z"
-         id="path4450-5"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath4560-0">
-      <path
-         d="m 488.81348,326.68262 15.4414,0 0,159.62304 -15.4414,0 0,-159.62304 z"
-         id="path4562-7"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath4564-8">
-      <path
-         d="m 488.81348,326.68262 15.4414,0 0,15.4414 -15.4414,0 0,-15.4414 z"
-         id="path4566-8"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath4568-6">
-      <path
-         d="m 488.81348,342.70313 15.4414,0 0,15.4414 -15.4414,0 0,-15.4414 z"
-         id="path4570-9"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath4572-4">
-      <path
-         d="m 488.81348,358.72266 15.4414,0 0,15.4414 -15.4414,0 0,-15.4414 z"
-         id="path4574-7"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath4576-5">
-      <path
-         d="m 488.81348,374.74316 15.4414,0 0,15.44141 -15.4414,0 0,-15.44141 z"
-         id="path4578-0"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath4580-0">
-      <path
-         d="m 488.81348,390.76367 15.4414,0 0,15.44141 -15.4414,0 0,-15.44141 z"
-         id="path4582-1"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath4584-4">
-      <path
-         d="m 488.81348,406.7832 15.4414,0 0,15.4419 -15.4414,0 0,-15.4419 z"
-         id="path4586-0"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath4588-4">
-      <path
-         d="m 488.81348,422.80371 15.4414,0 0,15.44141 -15.4414,0 0,-15.44141 z"
-         id="path4590-5"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath4592-7">
-      <path
-         d="m 488.81348,438.82373 15.4414,0 0,15.44141 -15.4414,0 0,-15.44141 z"
-         id="path4594-5"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath4596-5">
-      <path
-         d="m 488.81348,454.84424 15.4414,0 0,15.4414 -15.4414,0 0,-15.4414 z"
-         id="path4598-8"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath4600-3">
-      <path
-         d="m 488.81348,470.86426 15.4414,0 0,15.4414 -15.4414,0 0,-15.4414 z"
-         id="path4602-8"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath4712-3">
-      <path
-         d="m 504.86816,326.68164 15.44141,0 0,159.62402 -15.44141,0 0,-159.62402 z"
-         id="path4714-6"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath4716-4">
-      <path
-         d="m 504.86816,326.68164 15.44141,0 0,15.44141 -15.44141,0 0,-15.44141 z"
-         id="path4718-6"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath4720-5">
-      <path
-         d="m 504.86816,342.70313 15.44141,0 0,15.4414 -15.44141,0 0,-15.4414 z"
-         id="path4722-0"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath4724-4">
-      <path
-         d="m 504.86816,358.72266 15.44141,0 0,15.4414 -15.44141,0 0,-15.4414 z"
-         id="path4726-4"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath4728-9">
-      <path
-         d="m 504.86816,374.74219 15.44141,0 0,15.4414 -15.44141,0 0,-15.4414 z"
-         id="path4730-6"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath4732-7">
-      <path
-         d="m 504.86816,390.76367 15.44141,0 0,15.4419 -15.44141,0 0,-15.4419 z"
-         id="path4734-2"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath4736-0">
-      <path
-         d="m 504.86816,406.78369 15.44141,0 0,15.44141 -15.44141,0 0,-15.44141 z"
-         id="path4738-4"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath4740-9">
-      <path
-         d="m 504.86816,422.80371 15.44141,0 0,15.44141 -15.44141,0 0,-15.44141 z"
-         id="path4742-6"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath4744-3">
-      <path
-         d="m 504.86816,438.82373 15.44141,0 0,15.44141 -15.44141,0 0,-15.44141 z"
-         id="path4746-6"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath4748-0">
-      <path
-         d="m 504.86816,454.84424 15.44141,0 0,15.4414 -15.44141,0 0,-15.4414 z"
-         id="path4750-4"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath4752-1">
-      <path
-         d="m 504.86816,470.86426 15.44141,0 0,15.4414 -15.44141,0 0,-15.4414 z"
-         id="path4754-1"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath4864-0">
-      <path
-         d="m 56.09717,326.68262 15.4414,0 0,159.62304 -15.4414,0 0,-159.62304 z"
-         id="path4866-0"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath4868-9">
-      <path
-         d="m 56.09717,326.68262 15.4414,0 0,15.4414 -15.4414,0 0,-15.4414 z"
-         id="path4870-1"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath4872-9">
-      <path
-         d="m 56.09717,342.70313 15.4414,0 0,15.4414 -15.4414,0 0,-15.4414 z"
-         id="path4874-8"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath4876-1">
-      <path
-         d="m 56.09717,358.72266 15.4414,0 0,15.4414 -15.4414,0 0,-15.4414 z"
-         id="path4878-1"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath4880-7">
-      <path
-         d="m 56.09717,374.74316 15.4414,0 0,15.44141 -15.4414,0 0,-15.44141 z"
-         id="path4882-3"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath4884-6">
-      <path
-         d="m 56.09717,390.76367 15.4414,0 0,15.44141 -15.4414,0 0,-15.44141 z"
-         id="path4886-6"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath4888-7">
-      <path
-         d="m 56.09717,406.7832 15.4414,0 0,15.4419 -15.4414,0 0,-15.4419 z"
-         id="path4890-4"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath4892-7">
-      <path
-         d="m 56.09717,422.80371 15.4414,0 0,15.44141 -15.4414,0 0,-15.44141 z"
-         id="path4894-5"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath4896-6">
-      <path
-         d="m 56.09717,438.82373 15.4414,0 0,15.44141 -15.4414,0 0,-15.44141 z"
-         id="path4898-4"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath4900-7">
-      <path
-         d="m 56.09717,454.84424 15.4414,0 0,15.4414 -15.4414,0 0,-15.4414 z"
-         id="path4902-8"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath4904-4">
-      <path
-         d="m 56.09717,470.86426 15.4414,0 0,15.4414 -15.4414,0 0,-15.4414 z"
-         id="path4906-6"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath5016-3">
-      <path
-         d="m 360.56055,326.68359 15.43945,0 0,159.62207 -15.43945,0 0,-159.62207 z"
-         id="path5018-7"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath5020-3">
-      <path
-         d="m 360.56055,326.68359 15.43945,0 0,15.44141 -15.43945,0 0,-15.44141 z"
-         id="path5022-7"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath5024-6">
-      <path
-         d="m 360.56055,342.70313 15.43945,0 0,15.4414 -15.43945,0 0,-15.4414 z"
-         id="path5026-0"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath5028-9">
-      <path
-         d="m 360.56055,358.72266 15.43945,0 0,15.4414 -15.43945,0 0,-15.4414 z"
-         id="path5030-2"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath5032-7">
-      <path
-         d="m 360.56055,374.74414 15.43945,0 0,15.44141 -15.43945,0 0,-15.44141 z"
-         id="path5034-0"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath5036-6">
-      <path
-         d="m 360.56055,390.76367 15.43945,0 0,15.44092 -15.43945,0 0,-15.44092 z"
-         id="path5038-8"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath5040-6">
-      <path
-         d="m 360.56055,406.78271 15.43945,0 0,15.44239 -15.43945,0 0,-15.44239 z"
-         id="path5042-1"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath5044-3">
-      <path
-         d="m 360.56055,422.80371 15.43945,0 0,15.44141 -15.43945,0 0,-15.44141 z"
-         id="path5046-6"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath5048-3">
-      <path
-         d="m 360.56055,438.82373 15.43945,0 0,15.44141 -15.43945,0 0,-15.44141 z"
-         id="path5050-4"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath5052-2">
-      <path
-         d="m 360.56055,454.84424 15.43945,0 0,15.4414 -15.43945,0 0,-15.4414 z"
-         id="path5054-7"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath5056-8">
-      <path
-         d="m 360.56055,470.86426 15.43945,0 0,15.4414 -15.43945,0 0,-15.4414 z"
-         id="path5058-7"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath5168-3">
-      <path
-         d="m 376.57031,326.68164 15.44141,0 0,159.62402 -15.44141,0 0,-159.62402 z"
-         id="path5170-1"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath5172-0">
-      <path
-         d="m 376.57031,326.68164 15.44141,0 0,15.44141 -15.44141,0 0,-15.44141 z"
-         id="path5174-3"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath5176-8">
-      <path
-         d="m 376.57031,342.70313 15.44141,0 0,15.4414 -15.44141,0 0,-15.4414 z"
-         id="path5178-7"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath5180-4">
-      <path
-         d="m 376.57031,358.72266 15.44141,0 0,15.4414 -15.44141,0 0,-15.4414 z"
-         id="path5182-6"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath5184-7">
-      <path
-         d="m 376.57031,374.74219 15.44141,0 0,15.4414 -15.44141,0 0,-15.4414 z"
-         id="path5186-4"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath5188-5">
-      <path
-         d="m 376.57031,390.76367 15.44141,0 0,15.4419 -15.44141,0 0,-15.4419 z"
-         id="path5190-4"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath5192-5">
-      <path
-         d="m 376.57031,406.78369 15.44141,0 0,15.44141 -15.44141,0 0,-15.44141 z"
-         id="path5194-3"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath5196-6">
-      <path
-         d="m 376.57031,422.80371 15.44141,0 0,15.44141 -15.44141,0 0,-15.44141 z"
-         id="path5198-8"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath5200-2">
-      <path
-         d="m 376.57031,438.82373 15.44141,0 0,15.44141 -15.44141,0 0,-15.44141 z"
-         id="path5202-2"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath5204-8">
-      <path
-         d="m 376.57031,454.84424 15.44141,0 0,15.4414 -15.44141,0 0,-15.4414 z"
-         id="path5206-9"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath5208-7">
-      <path
-         d="m 376.57031,470.86426 15.44141,0 0,15.4414 -15.44141,0 0,-15.4414 z"
-         id="path5210-5"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath5320-2">
-      <path
-         d="m 568.88672,326.68262 15.44141,0 0,159.62304 -15.44141,0 0,-159.62304 z"
-         id="path5322-7"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath5324-9">
-      <path
-         d="m 568.88672,326.68262 15.44141,0 0,15.4414 -15.44141,0 0,-15.4414 z"
-         id="path5326-4"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath5328-2">
-      <path
-         d="m 568.88672,342.70313 15.44141,0 0,15.4414 -15.44141,0 0,-15.4414 z"
-         id="path5330-5"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath5332-3">
-      <path
-         d="m 568.88672,358.72266 15.44141,0 0,15.4414 -15.44141,0 0,-15.4414 z"
-         id="path5334-3"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath5336-4">
-      <path
-         d="m 568.88672,374.74316 15.44141,0 0,15.44141 -15.44141,0 0,-15.44141 z"
-         id="path5338-1"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath5340-1">
-      <path
-         d="m 568.88672,390.76367 15.44141,0 0,15.44141 -15.44141,0 0,-15.44141 z"
-         id="path5342-8"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath5344-1">
-      <path
-         d="m 568.88672,406.7832 15.44141,0 0,15.4419 -15.44141,0 0,-15.4419 z"
-         id="path5346-2"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath5348-0">
-      <path
-         d="m 568.88672,422.80371 15.44141,0 0,15.44141 -15.44141,0 0,-15.44141 z"
-         id="path5350-3"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath5352-9">
-      <path
-         d="m 568.88672,438.82373 15.44141,0 0,15.44141 -15.44141,0 0,-15.44141 z"
-         id="path5354-9"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath5356-5">
-      <path
-         d="m 568.88672,454.84424 15.44141,0 0,15.4414 -15.44141,0 0,-15.4414 z"
-         id="path5358-6"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath5360-4">
-      <path
-         d="m 568.88672,470.86426 15.44141,0 0,15.4414 -15.44141,0 0,-15.4414 z"
-         id="path5362-7"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath5472-1">
-      <path
-         d="m 552.90137,326.68359 15.4414,0 0,159.62207 -15.4414,0 0,-159.62207 z"
-         id="path5474-6"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath5476-0">
-      <path
-         d="m 552.90137,326.68359 15.4414,0 0,15.44141 -15.4414,0 0,-15.44141 z"
-         id="path5478-1"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath5480-2">
-      <path
-         d="m 552.90137,342.70313 15.4414,0 0,15.4414 -15.4414,0 0,-15.4414 z"
-         id="path5482-1"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath5484-6">
-      <path
-         d="m 552.90137,358.72266 15.4414,0 0,15.4414 -15.4414,0 0,-15.4414 z"
-         id="path5486-3"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath5488-3">
-      <path
-         d="m 552.90137,374.74414 15.4414,0 0,15.44141 -15.4414,0 0,-15.44141 z"
-         id="path5490-2"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath5492-4">
-      <path
-         d="m 552.90137,390.76367 15.4414,0 0,15.44092 -15.4414,0 0,-15.44092 z"
-         id="path5494-4"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath5496-1">
-      <path
-         d="m 552.90137,406.78271 15.4414,0 0,15.44239 -15.4414,0 0,-15.44239 z"
-         id="path5498-4"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath5500-2">
-      <path
-         d="m 552.90137,422.80371 15.4414,0 0,15.44141 -15.4414,0 0,-15.44141 z"
-         id="path5502-4"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath5504-8">
-      <path
-         d="m 552.90137,438.82373 15.4414,0 0,15.44141 -15.4414,0 0,-15.44141 z"
-         id="path5506-8"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath5508-7">
-      <path
-         d="m 552.90137,454.84424 15.4414,0 0,15.4414 -15.4414,0 0,-15.4414 z"
-         id="path5510-7"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath5512-4">
-      <path
-         d="m 552.90137,470.86426 15.4414,0 0,15.4414 -15.4414,0 0,-15.4414 z"
-         id="path5514-2"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath5624-0">
-      <path
-         d="m 408.64648,326.68359 15.44336,0 0,159.62207 -15.44336,0 0,-159.62207 z"
-         id="path5626-5"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath5628-7">
-      <path
-         d="m 408.64648,326.68359 15.44336,0 0,15.44141 -15.44336,0 0,-15.44141 z"
-         id="path5630-4"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath5632-3">
-      <path
-         d="m 408.64648,342.70313 15.44336,0 0,15.4414 -15.44336,0 0,-15.4414 z"
-         id="path5634-0"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath5636-2">
-      <path
-         d="m 408.64648,358.72266 15.44336,0 0,15.4414 -15.44336,0 0,-15.4414 z"
-         id="path5638-5"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath5640-8">
-      <path
-         d="m 408.64648,374.74414 15.44336,0 0,15.44141 -15.44336,0 0,-15.44141 z"
-         id="path5642-2"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath5644-2">
-      <path
-         d="m 408.64648,390.76367 15.44336,0 0,15.44092 -15.44336,0 0,-15.44092 z"
-         id="path5646-0"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath5648-6">
-      <path
-         d="m 408.64648,406.78271 15.44336,0 0,15.44239 -15.44336,0 0,-15.44239 z"
-         id="path5650-4"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath5652-4">
-      <path
-         d="m 408.64648,422.80371 15.44336,0 0,15.44141 -15.44336,0 0,-15.44141 z"
-         id="path5654-6"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath5656-2">
-      <path
-         d="m 408.64648,438.82373 15.44336,0 0,15.44141 -15.44336,0 0,-15.44141 z"
-         id="path5658-4"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath5660-8">
-      <path
-         d="m 408.64648,454.84424 15.44336,0 0,15.4414 -15.44336,0 0,-15.4414 z"
-         id="path5662-9"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath5664-8">
-      <path
-         d="m 408.64648,470.86426 15.44336,0 0,15.4414 -15.44336,0 0,-15.4414 z"
-         id="path5666-5"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath5776-9">
-      <path
-         d="m 72.09766,326.68164 15.4414,0 0,159.62402 -15.4414,0 0,-159.62402 z"
-         id="path5778-7"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath5780-1">
-      <path
-         d="m 72.09766,326.68164 15.4414,0 0,15.44141 -15.4414,0 0,-15.44141 z"
-         id="path5782-9"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath5784-9">
-      <path
-         d="m 72.09766,342.70313 15.4414,0 0,15.4414 -15.4414,0 0,-15.4414 z"
-         id="path5786-9"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath5788-3">
-      <path
-         d="m 72.09766,358.72266 15.4414,0 0,15.4414 -15.4414,0 0,-15.4414 z"
-         id="path5790-3"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath5792-9">
-      <path
-         d="m 72.09766,374.74219 15.4414,0 0,15.4414 -15.4414,0 0,-15.4414 z"
-         id="path5794-5"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath5796-6">
-      <path
-         d="m 72.09766,390.76367 15.4414,0 0,15.4419 -15.4414,0 0,-15.4419 z"
-         id="path5798-8"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath5800-9">
-      <path
-         d="m 72.09766,406.78369 15.4414,0 0,15.44092 -15.4414,0 0,-15.44092 z"
-         id="path5802-1"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath5804-8">
-      <path
-         d="m 72.09766,422.80371 15.4414,0 0,15.44141 -15.4414,0 0,-15.44141 z"
-         id="path5806-8"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath5808-3">
-      <path
-         d="m 72.09766,438.82422 15.4414,0 0,15.44092 -15.4414,0 0,-15.44092 z"
-         id="path5810-9"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath5812-2">
-      <path
-         d="m 72.09766,454.84424 15.4414,0 0,15.4414 -15.4414,0 0,-15.4414 z"
-         id="path5814-0"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath5816-1">
-      <path
-         d="m 72.09766,470.86426 15.4414,0 0,15.4414 -15.4414,0 0,-15.4414 z"
-         id="path5818-6"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath5928-7">
-      <path
-         d="m 88.02344,326.68262 15.44238,0 0,159.62304 -15.44238,0 0,-159.62304 z"
-         id="path5930-6"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath5932-2">
-      <path
-         d="m 88.02344,326.68262 15.44238,0 0,15.4414 -15.44238,0 0,-15.4414 z"
-         id="path5934-8"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath5936-9">
-      <path
-         d="m 88.02344,342.70313 15.44238,0 0,15.4414 -15.44238,0 0,-15.4414 z"
-         id="path5938-7"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath5940-7">
-      <path
-         d="m 88.02344,358.72266 15.44238,0 0,15.4414 -15.44238,0 0,-15.4414 z"
-         id="path5942-0"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath5944-2">
-      <path
-         d="m 88.02344,374.74316 15.44238,0 0,15.44141 -15.44238,0 0,-15.44141 z"
-         id="path5946-3"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath5948-7">
-      <path
-         d="m 88.02344,390.76367 15.44238,0 0,15.44141 -15.44238,0 0,-15.44141 z"
-         id="path5950-5"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath5952-1">
-      <path
-         d="m 88.02344,406.7832 15.44238,0 0,15.44239 -15.44238,0 0,-15.44239 z"
-         id="path5954-6"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath5956-6">
-      <path
-         d="m 88.02344,422.80371 15.44238,0 0,15.44141 -15.44238,0 0,-15.44141 z"
-         id="path5958-4"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath5960-4">
-      <path
-         d="m 88.02344,438.82324 15.44238,0 0,15.44141 -15.44238,0 0,-15.44141 z"
-         id="path5962-5"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath5964-4">
-      <path
-         d="m 88.02344,454.84424 15.44238,0 0,15.4414 -15.44238,0 0,-15.4414 z"
-         id="path5966-7"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath5968-0">
-      <path
-         d="m 88.02344,470.86426 15.44238,0 0,15.4414 -15.44238,0 0,-15.4414 z"
-         id="path5970-0"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath6080-1">
-      <path
-         d="m 104.01172,326.68262 15.44189,0 0,159.62304 -15.44189,0 0,-159.62304 z"
-         id="path6082-8"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath6084-5">
-      <path
-         d="m 104.01172,326.68262 15.44189,0 0,15.4414 -15.44189,0 0,-15.4414 z"
-         id="path6086-9"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath6088-7">
-      <path
-         d="m 104.01172,342.70313 15.44189,0 0,15.4414 -15.44189,0 0,-15.4414 z"
-         id="path6090-2"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath6092-6">
-      <path
-         d="m 104.01172,358.72266 15.44189,0 0,15.4414 -15.44189,0 0,-15.4414 z"
-         id="path6094-4"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath6096-9">
-      <path
-         d="m 104.01172,374.74316 15.44189,0 0,15.44141 -15.44189,0 0,-15.44141 z"
-         id="path6098-7"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath6100-2">
-      <path
-         d="m 104.01172,390.76367 15.44189,0 0,15.44141 -15.44189,0 0,-15.44141 z"
-         id="path6102-4"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath6104-1">
-      <path
-         d="m 104.01172,406.7832 15.44189,0 0,15.4419 -15.44189,0 0,-15.4419 z"
-         id="path6106-5"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath6108-6">
-      <path
-         d="m 104.01172,422.80371 15.44189,0 0,15.44141 -15.44189,0 0,-15.44141 z"
-         id="path6110-0"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath6112-2">
-      <path
-         d="m 104.01172,438.82373 15.44189,0 0,15.44141 -15.44189,0 0,-15.44141 z"
-         id="path6114-2"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath6116-8">
-      <path
-         d="m 104.01172,454.84424 15.44189,0 0,15.4414 -15.44189,0 0,-15.4414 z"
-         id="path6118-9"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath6120-9">
-      <path
-         d="m 104.01172,470.86426 15.44189,0 0,15.4414 -15.44189,0 0,-15.4414 z"
-         id="path6122-1"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath6232-8">
-      <path
-         d="m 135.93994,326.68262 15.44141,0 0,159.62304 -15.44141,0 0,-159.62304 z"
-         id="path6234-0"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath6236-8">
-      <path
-         d="m 135.93994,326.68262 15.44141,0 0,15.4414 -15.44141,0 0,-15.4414 z"
-         id="path6238-2"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath6240-1">
-      <path
-         d="m 135.93994,342.70215 15.44141,0 0,15.4414 -15.44141,0 0,-15.4414 z"
-         id="path6242-1"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath6244-2">
-      <path
-         d="m 135.93994,358.72168 15.44141,0 0,15.44141 -15.44141,0 0,-15.44141 z"
-         id="path6246-6"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath6248-6">
-      <path
-         d="m 135.93994,374.74316 15.44141,0 0,15.44141 -15.44141,0 0,-15.44141 z"
-         id="path6250-3"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath6252-4">
-      <path
-         d="m 135.93994,390.7627 15.44141,0 0,15.4414 -15.44141,0 0,-15.4414 z"
-         id="path6254-1"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath6256-4">
-      <path
-         d="m 135.93994,406.78223 15.44141,0 0,15.44287 -15.44141,0 0,-15.44287 z"
-         id="path6258-0"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath6260-3">
-      <path
-         d="m 135.93994,422.80371 15.44141,0 0,15.44141 -15.44141,0 0,-15.44141 z"
-         id="path6262-9"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath6264-2">
-      <path
-         d="m 135.93994,438.82373 15.44141,0 0,15.44141 -15.44141,0 0,-15.44141 z"
-         id="path6266-4"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath6268-5">
-      <path
-         d="m 135.93994,454.84424 15.44141,0 0,15.4414 -15.44141,0 0,-15.4414 z"
-         id="path6270-9"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath6272-0">
-      <path
-         d="m 135.93994,470.86426 15.44141,0 0,15.4414 -15.44141,0 0,-15.4414 z"
-         id="path6274-2"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath6384-4">
-      <path
-         d="m 119.99805,326.68164 15.44091,0 0,159.62402 -15.44091,0 0,-159.62402 z"
-         id="path6386-2"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath6388-3">
-      <path
-         d="m 119.99805,326.68164 15.44091,0 0,15.44141 -15.44091,0 0,-15.44141 z"
-         id="path6390-2"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath6392-4">
-      <path
-         d="m 119.99805,342.70117 15.44091,0 0,15.44141 -15.44091,0 0,-15.44141 z"
-         id="path6394-0"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath6396-9">
-      <path
-         d="m 119.99805,358.7207 15.44091,0 0,15.44141 -15.44091,0 0,-15.44141 z"
-         id="path6398-1"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath6400-2">
-      <path
-         d="m 119.99805,374.74219 15.44091,0 0,15.4414 -15.44091,0 0,-15.4414 z"
-         id="path6402-4"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath6404-6">
-      <path
-         d="m 119.99805,390.76172 15.44091,0 0,15.44189 -15.44091,0 0,-15.44189 z"
-         id="path6406-2"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath6408-3">
-      <path
-         d="m 119.99805,406.78174 15.44091,0 0,15.44336 -15.44091,0 0,-15.44336 z"
-         id="path6410-0"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath6412-0">
-      <path
-         d="m 119.99805,422.80371 15.44091,0 0,15.44141 -15.44091,0 0,-15.44141 z"
-         id="path6414-3"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath6416-3">
-      <path
-         d="m 119.99805,438.82373 15.44091,0 0,15.44141 -15.44091,0 0,-15.44141 z"
-         id="path6418-2"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath6420-2">
-      <path
-         d="m 119.99805,454.84424 15.44091,0 0,15.4414 -15.44091,0 0,-15.4414 z"
-         id="path6422-6"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath6424-1">
-      <path
-         d="m 119.99805,470.86426 15.44091,0 0,15.4414 -15.44091,0 0,-15.4414 z"
-         id="path6426-9"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath6536-6">
-      <path
-         d="m 232.45801,326.68262 15.4414,0 0,159.62304 -15.4414,0 0,-159.62304 z"
-         id="path6538-7"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath6540-6">
-      <path
-         d="m 232.45801,326.68262 15.4414,0 0,15.4414 -15.4414,0 0,-15.4414 z"
-         id="path6542-0"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath6544-8">
-      <path
-         d="m 232.45801,342.70313 15.4414,0 0,15.4414 -15.4414,0 0,-15.4414 z"
-         id="path6546-1"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath6548-9">
-      <path
-         d="m 232.45801,358.72266 15.4414,0 0,15.4414 -15.4414,0 0,-15.4414 z"
-         id="path6550-1"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath6552-5">
-      <path
-         d="m 232.45801,374.74316 15.4414,0 0,15.44141 -15.4414,0 0,-15.44141 z"
-         id="path6554-3"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath6556-8">
-      <path
-         d="m 232.45801,390.76367 15.4414,0 0,15.44141 -15.4414,0 0,-15.44141 z"
-         id="path6558-0"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath6560-8">
-      <path
-         d="m 232.45801,406.7832 15.4414,0 0,15.4419 -15.4414,0 0,-15.4419 z"
-         id="path6562-2"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath6564-3">
-      <path
-         d="m 232.45801,422.80371 15.4414,0 0,15.44141 -15.4414,0 0,-15.44141 z"
-         id="path6566-3"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath6568-3">
-      <path
-         d="m 232.45801,438.82373 15.4414,0 0,15.44141 -15.4414,0 0,-15.44141 z"
-         id="path6570-0"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath6572-0">
-      <path
-         d="m 232.45801,454.84424 15.4414,0 0,15.4414 -15.4414,0 0,-15.4414 z"
-         id="path6574-1"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath6576-5">
-      <path
-         d="m 232.45801,470.86426 15.4414,0 0,15.4414 -15.4414,0 0,-15.4414 z"
-         id="path6578-2"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath6688-3">
-      <path
-         d="m 216.34521,326.68262 15.44141,0 0,159.62304 -15.44141,0 0,-159.62304 z"
-         id="path6690-4"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath6692-7">
-      <path
-         d="m 216.34521,326.68262 15.44141,0 0,15.4414 -15.44141,0 0,-15.4414 z"
-         id="path6694-0"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath6696-3">
-      <path
-         d="m 216.34521,342.70313 15.44141,0 0,15.4414 -15.44141,0 0,-15.4414 z"
-         id="path6698-0"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath6700-9">
-      <path
-         d="m 216.34521,358.72266 15.44141,0 0,15.4414 -15.44141,0 0,-15.4414 z"
-         id="path6702-7"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath6704-9">
-      <path
-         d="m 216.34521,374.74316 15.44141,0 0,15.44141 -15.44141,0 0,-15.44141 z"
-         id="path6706-2"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath6708-6">
-      <path
-         d="m 216.34521,390.76367 15.44141,0 0,15.44141 -15.44141,0 0,-15.44141 z"
-         id="path6710-6"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath6712-3">
-      <path
-         d="m 216.34521,406.7832 15.44141,0 0,15.4419 -15.44141,0 0,-15.4419 z"
-         id="path6714-2"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath6716-1">
-      <path
-         d="m 216.34521,422.80371 15.44141,0 0,15.44141 -15.44141,0 0,-15.44141 z"
-         id="path6718-5"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath6720-3">
-      <path
-         d="m 216.34521,438.82373 15.44141,0 0,15.44141 -15.44141,0 0,-15.44141 z"
-         id="path6722-0"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath6724-3">
-      <path
-         d="m 216.34521,454.84424 15.44141,0 0,15.4414 -15.44141,0 0,-15.4414 z"
-         id="path6726-8"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath6728-6">
-      <path
-         d="m 216.34521,470.86426 15.44141,0 0,15.4414 -15.44141,0 0,-15.4414 z"
-         id="path6730-8"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath6840-2">
-      <path
-         d="m 184.04492,326.68262 15.44141,0 0,159.62304 -15.44141,0 0,-159.62304 z"
-         id="path6842-7"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath6844-3">
-      <path
-         d="m 184.04492,326.68262 15.44141,0 0,15.4414 -15.44141,0 0,-15.4414 z"
-         id="path6846-6"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath6848-4">
-      <path
-         d="m 184.04492,342.70313 15.44141,0 0,15.4414 -15.44141,0 0,-15.4414 z"
-         id="path6850-7"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath6852-7">
-      <path
-         d="m 184.04492,358.72266 15.44141,0 0,15.4414 -15.44141,0 0,-15.4414 z"
-         id="path6854-0"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath6856-8">
-      <path
-         d="m 184.04492,374.74316 15.44141,0 0,15.44141 -15.44141,0 0,-15.44141 z"
-         id="path6858-0"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath6860-8">
-      <path
-         d="m 184.04492,390.76367 15.44141,0 0,15.44141 -15.44141,0 0,-15.44141 z"
-         id="path6862-1"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath6864-5">
-      <path
-         d="m 184.04492,406.7832 15.44141,0 0,15.4419 -15.44141,0 0,-15.4419 z"
-         id="path6866-2"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath6868-3">
-      <path
-         d="m 184.04492,422.80371 15.44141,0 0,15.44141 -15.44141,0 0,-15.44141 z"
-         id="path6870-7"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath6872-1">
-      <path
-         d="m 184.04492,438.82373 15.44141,0 0,15.44141 -15.44141,0 0,-15.44141 z"
-         id="path6874-2"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath6876-0">
-      <path
-         d="m 184.04492,454.84424 15.44141,0 0,15.4414 -15.44141,0 0,-15.4414 z"
-         id="path6878-6"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath6880-4">
-      <path
-         d="m 184.04492,470.86426 15.44141,0 0,15.4414 -15.44141,0 0,-15.4414 z"
-         id="path6882-2"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath6992-1">
-      <path
-         d="m 200.18604,326.68262 15.4414,0 0,159.62304 -15.4414,0 0,-159.62304 z"
-         id="path6994-8"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath6996-3">
-      <path
-         d="m 200.18604,326.68262 15.4414,0 0,15.4414 -15.4414,0 0,-15.4414 z"
-         id="path6998-7"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath7000-1">
-      <path
-         d="m 200.18604,342.70313 15.4414,0 0,15.4414 -15.4414,0 0,-15.4414 z"
-         id="path7002-5"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath7004-5">
-      <path
-         d="m 200.18604,358.72266 15.4414,0 0,15.4414 -15.4414,0 0,-15.4414 z"
-         id="path7006-6"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath7008-1">
-      <path
-         d="m 200.18604,374.74316 15.4414,0 0,15.44141 -15.4414,0 0,-15.44141 z"
-         id="path7010-1"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath7012-6">
-      <path
-         d="m 200.18604,390.76367 15.4414,0 0,15.44141 -15.4414,0 0,-15.44141 z"
-         id="path7014-0"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath7016-6">
-      <path
-         d="m 200.18604,406.7832 15.4414,0 0,15.4419 -15.4414,0 0,-15.4419 z"
-         id="path7018-7"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath7020-6">
-      <path
-         d="m 200.18604,422.80371 15.4414,0 0,15.44141 -15.4414,0 0,-15.44141 z"
-         id="path7022-1"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath7024-3">
-      <path
-         d="m 200.18604,438.82373 15.4414,0 0,15.44141 -15.4414,0 0,-15.44141 z"
-         id="path7026-8"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath7028-2">
-      <path
-         d="m 200.18604,454.84424 15.4414,0 0,15.4414 -15.4414,0 0,-15.4414 z"
-         id="path7030-1"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath7032-7">
-      <path
-         d="m 200.18604,470.86426 15.4414,0 0,15.4414 -15.4414,0 0,-15.4414 z"
-         id="path7034-2"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath7144-4">
-      <path
-         d="m 167.99707,326.68262 15.44141,0 0,159.62304 -15.44141,0 0,-159.62304 z"
-         id="path7146-0"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath7148-1">
-      <path
-         d="m 167.99707,326.68262 15.44141,0 0,15.4414 -15.44141,0 0,-15.4414 z"
-         id="path7150-5"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath7152-6">
-      <path
-         d="m 167.99707,342.70313 15.44141,0 0,15.4414 -15.44141,0 0,-15.4414 z"
-         id="path7154-8"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath7156-3">
-      <path
-         d="m 167.99707,358.72266 15.44141,0 0,15.4414 -15.44141,0 0,-15.4414 z"
-         id="path7158-1"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath7160-7">
-      <path
-         d="m 167.99707,374.74316 15.44141,0 0,15.44141 -15.44141,0 0,-15.44141 z"
-         id="path7162-0"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath7164-6">
-      <path
-         d="m 167.99707,390.76367 15.44141,0 0,15.44141 -15.44141,0 0,-15.44141 z"
-         id="path7166-8"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath7168-4">
-      <path
-         d="m 167.99707,406.7832 15.44141,0 0,15.4419 -15.44141,0 0,-15.4419 z"
-         id="path7170-7"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath7172-4">
-      <path
-         d="m 167.99707,422.80371 15.44141,0 0,15.44141 -15.44141,0 0,-15.44141 z"
-         id="path7174-5"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath7176-4">
-      <path
-         d="m 167.99707,438.82373 15.44141,0 0,15.44141 -15.44141,0 0,-15.44141 z"
-         id="path7178-1"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath7180-5">
-      <path
-         d="m 167.99707,454.84424 15.44141,0 0,15.4414 -15.44141,0 0,-15.4414 z"
-         id="path7182-1"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath7184-1">
-      <path
-         d="m 167.99707,470.86426 15.44141,0 0,15.4414 -15.44141,0 0,-15.4414 z"
-         id="path7186-7"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath7296-2">
-      <path
-         d="m 248.59229,326.68262 15.4414,0 0,159.62304 -15.4414,0 0,-159.62304 z"
-         id="path7298-4"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath7300-8">
-      <path
-         d="m 248.59229,326.68262 15.4414,0 0,15.4414 -15.4414,0 0,-15.4414 z"
-         id="path7302-0"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath7304-8">
-      <path
-         d="m 248.59229,342.70313 15.4414,0 0,15.4414 -15.4414,0 0,-15.4414 z"
-         id="path7306-4"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath7308-6">
-      <path
-         d="m 248.59229,358.72266 15.4414,0 0,15.4414 -15.4414,0 0,-15.4414 z"
-         id="path7310-1"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath7312-3">
-      <path
-         d="m 248.59229,374.74316 15.4414,0 0,15.44141 -15.4414,0 0,-15.44141 z"
-         id="path7314-5"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath7316-5">
-      <path
-         d="m 248.59229,390.76367 15.4414,0 0,15.44141 -15.4414,0 0,-15.44141 z"
-         id="path7318-7"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath7320-9">
-      <path
-         d="m 248.59229,406.7832 15.4414,0 0,15.4419 -15.4414,0 0,-15.4419 z"
-         id="path7322-3"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath7324-2">
-      <path
-         d="m 248.59229,422.80371 15.4414,0 0,15.44141 -15.4414,0 0,-15.44141 z"
-         id="path7326-1"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath7328-1">
-      <path
-         d="m 248.59229,438.82373 15.4414,0 0,15.44141 -15.4414,0 0,-15.44141 z"
-         id="path7330-3"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath7332-6">
-      <path
-         d="m 248.59229,454.84424 15.4414,0 0,15.4414 -15.4414,0 0,-15.4414 z"
-         id="path7334-7"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath7336-7">
-      <path
-         d="m 248.59229,470.86426 15.4414,0 0,15.4414 -15.4414,0 0,-15.4414 z"
-         id="path7338-5"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath7448-9">
-      <path
-         d="m 344.50879,326.68262 15.44141,0 0,159.62304 -15.44141,0 0,-159.62304 z"
-         id="path7450-8"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath7452-1">
-      <path
-         d="m 344.50879,326.68262 15.44141,0 0,15.4414 -15.44141,0 0,-15.4414 z"
-         id="path7454-5"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath7456-3">
-      <path
-         d="m 344.50879,342.70313 15.44141,0 0,15.4414 -15.44141,0 0,-15.4414 z"
-         id="path7458-5"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath7460-8">
-      <path
-         d="m 344.50879,358.72266 15.44141,0 0,15.4414 -15.44141,0 0,-15.4414 z"
-         id="path7462-2"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath7464-6">
-      <path
-         d="m 344.50879,374.74316 15.44141,0 0,15.44141 -15.44141,0 0,-15.44141 z"
-         id="path7466-8"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath7468-5">
-      <path
-         d="m 344.50879,390.76367 15.44141,0 0,15.44141 -15.44141,0 0,-15.44141 z"
-         id="path7470-3"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath7472-9">
-      <path
-         d="m 344.50879,406.7832 15.44141,0 0,15.4419 -15.44141,0 0,-15.4419 z"
-         id="path7474-6"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath7476-2">
-      <path
-         d="m 344.50879,422.80371 15.44141,0 0,15.44141 -15.44141,0 0,-15.44141 z"
-         id="path7478-4"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath7480-7">
-      <path
-         d="m 344.50879,438.82373 15.44141,0 0,15.44141 -15.44141,0 0,-15.44141 z"
-         id="path7482-9"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath7484-9">
-      <path
-         d="m 344.50879,454.84424 15.44141,0 0,15.4414 -15.44141,0 0,-15.4414 z"
-         id="path7486-8"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath7488-4">
-      <path
-         d="m 344.50879,470.86426 15.44141,0 0,15.4414 -15.44141,0 0,-15.4414 z"
-         id="path7490-6"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath7600-1">
-      <path
-         d="m 312.58691,326.68262 15.44141,0 0,159.62304 -15.44141,0 0,-159.62304 z"
-         id="path7602-3"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath7604-4">
-      <path
-         d="m 312.58691,326.68262 15.44141,0 0,15.4414 -15.44141,0 0,-15.4414 z"
-         id="path7606-4"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath7608-2">
-      <path
-         d="m 312.58691,342.70313 15.44141,0 0,15.4414 -15.44141,0 0,-15.4414 z"
-         id="path7610-2"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath7612-3">
-      <path
-         d="m 312.58691,358.72266 15.44141,0 0,15.4414 -15.44141,0 0,-15.4414 z"
-         id="path7614-5"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath7616-3">
-      <path
-         d="m 312.58691,374.74316 15.44141,0 0,15.44141 -15.44141,0 0,-15.44141 z"
-         id="path7618-5"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath7620-2">
-      <path
-         d="m 312.58691,390.76367 15.44141,0 0,15.44141 -15.44141,0 0,-15.44141 z"
-         id="path7622-1"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath7624-2">
-      <path
-         d="m 312.58691,406.7832 15.44141,0 0,15.4419 -15.44141,0 0,-15.4419 z"
-         id="path7626-7"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath7628-3">
-      <path
-         d="m 312.58691,422.80371 15.44141,0 0,15.44141 -15.44141,0 0,-15.44141 z"
-         id="path7630-1"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath7632-2">
-      <path
-         d="m 312.58691,438.82373 15.44141,0 0,15.44141 -15.44141,0 0,-15.44141 z"
-         id="path7634-0"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath7636-4">
-      <path
-         d="m 312.58691,454.84424 15.44141,0 0,15.4414 -15.44141,0 0,-15.4414 z"
-         id="path7638-5"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath7640-4">
-      <path
-         d="m 312.58691,470.86426 15.44141,0 0,15.4414 -15.44141,0 0,-15.4414 z"
-         id="path7642-7"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath7752-0">
-      <path
-         d="m 280.55371,326.68262 15.44141,0 0,159.62304 -15.44141,0 0,-159.62304 z"
-         id="path7754-7"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath7756-8">
-      <path
-         d="m 280.55371,326.68262 15.44141,0 0,15.4414 -15.44141,0 0,-15.4414 z"
-         id="path7758-2"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath7760-3">
-      <path
-         d="m 280.55371,342.70313 15.44141,0 0,15.4414 -15.44141,0 0,-15.4414 z"
-         id="path7762-7"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath7764-2">
-      <path
-         d="m 280.55371,358.72266 15.44141,0 0,15.4414 -15.44141,0 0,-15.4414 z"
-         id="path7766-3"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath7768-9">
-      <path
-         d="m 280.55371,374.74316 15.44141,0 0,15.44141 -15.44141,0 0,-15.44141 z"
-         id="path7770-5"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath7772-6">
-      <path
-         d="m 280.55371,390.76367 15.44141,0 0,15.44141 -15.44141,0 0,-15.44141 z"
-         id="path7774-1"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath7776-3">
-      <path
-         d="m 280.55371,406.7832 15.44141,0 0,15.4419 -15.44141,0 0,-15.4419 z"
-         id="path7778-2"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath7780-8">
-      <path
-         d="m 280.55371,422.80371 15.44141,0 0,15.44141 -15.44141,0 0,-15.44141 z"
-         id="path7782-8"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath7784-8">
-      <path
-         d="m 280.55371,438.82373 15.44141,0 0,15.44141 -15.44141,0 0,-15.44141 z"
-         id="path7786-3"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath7788-4">
-      <path
-         d="m 280.55371,454.84424 15.44141,0 0,15.4414 -15.44141,0 0,-15.4414 z"
-         id="path7790-9"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath7792-0">
-      <path
-         d="m 280.55371,470.86426 15.44141,0 0,15.4414 -15.44141,0 0,-15.4414 z"
-         id="path7794-4"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath7904-4">
-      <path
-         d="m 296.45996,326.68262 15.44141,0 0,159.62304 -15.44141,0 0,-159.62304 z"
-         id="path7906-9"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath7908-3">
-      <path
-         d="m 296.45996,326.68262 15.44141,0 0,15.4414 -15.44141,0 0,-15.4414 z"
-         id="path7910-6"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath7912-4">
-      <path
-         d="m 296.45996,342.70313 15.44141,0 0,15.4414 -15.44141,0 0,-15.4414 z"
-         id="path7914-7"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath7916-7">
-      <path
-         d="m 296.45996,358.72266 15.44141,0 0,15.4414 -15.44141,0 0,-15.4414 z"
-         id="path7918-0"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath7920-3">
-      <path
-         d="m 296.45996,374.74316 15.44141,0 0,15.44141 -15.44141,0 0,-15.44141 z"
-         id="path7922-8"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath7924-0">
-      <path
-         d="m 296.45996,390.76367 15.44141,0 0,15.44141 -15.44141,0 0,-15.44141 z"
-         id="path7926-3"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath7928-7">
-      <path
-         d="m 296.45996,406.7832 15.44141,0 0,15.4419 -15.44141,0 0,-15.4419 z"
-         id="path7930-2"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath7932-7">
-      <path
-         d="m 296.45996,422.80371 15.44141,0 0,15.44141 -15.44141,0 0,-15.44141 z"
-         id="path7934-1"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath7936-7">
-      <path
-         d="m 296.45996,438.82373 15.44141,0 0,15.44141 -15.44141,0 0,-15.44141 z"
-         id="path7938-4"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath7940-3">
-      <path
-         d="m 296.45996,454.84424 15.44141,0 0,15.4414 -15.44141,0 0,-15.4414 z"
-         id="path7942-4"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath7944-4">
-      <path
-         d="m 296.45996,470.86426 15.44141,0 0,15.4414 -15.44141,0 0,-15.4414 z"
-         id="path7946-3"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath8056-7">
-      <path
-         d="m 264.5459,326.68262 15.4414,0 0,159.62304 -15.4414,0 0,-159.62304 z"
-         id="path8058-9"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath8060-2">
-      <path
-         d="m 264.5459,326.68262 15.4414,0 0,15.4414 -15.4414,0 0,-15.4414 z"
-         id="path8062-9"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath8064-8">
-      <path
-         d="m 264.5459,342.70313 15.4414,0 0,15.4414 -15.4414,0 0,-15.4414 z"
-         id="path8066-8"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath8068-4">
-      <path
-         d="m 264.5459,358.72266 15.4414,0 0,15.4414 -15.4414,0 0,-15.4414 z"
-         id="path8070-1"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath8072-3">
-      <path
-         d="m 264.5459,374.74316 15.4414,0 0,15.44141 -15.4414,0 0,-15.44141 z"
-         id="path8074-3"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath8076-1">
-      <path
-         d="m 264.5459,390.76367 15.4414,0 0,15.44141 -15.4414,0 0,-15.44141 z"
-         id="path8078-4"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath8080-4">
-      <path
-         d="m 264.5459,406.7832 15.4414,0 0,15.4419 -15.4414,0 0,-15.4419 z"
-         id="path8082-9"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath8084-6">
-      <path
-         d="m 264.5459,422.80371 15.4414,0 0,15.44141 -15.4414,0 0,-15.44141 z"
-         id="path8086-6"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath8088-9">
-      <path
-         d="m 264.5459,438.82373 15.4414,0 0,15.44141 -15.4414,0 0,-15.44141 z"
-         id="path8090-8"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath8092-2">
-      <path
-         d="m 264.5459,454.84424 15.4414,0 0,15.4414 -15.4414,0 0,-15.4414 z"
-         id="path8094-8"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath8096-6">
-      <path
-         d="m 264.5459,470.86426 15.4414,0 0,15.4414 -15.4414,0 0,-15.4414 z"
-         id="path8098-5"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath8208-1">
-      <path
-         d="m 328.63379,326.68262 15.44141,0 0,159.62304 -15.44141,0 0,-159.62304 z"
-         id="path8210-1"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath8212-6">
-      <path
-         d="m 328.63379,326.68262 15.44141,0 0,15.4414 -15.44141,0 0,-15.4414 z"
-         id="path8214-2"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath8216-1">
-      <path
-         d="m 328.63379,342.70313 15.44141,0 0,15.4414 -15.44141,0 0,-15.4414 z"
-         id="path8218-8"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath8220-1">
-      <path
-         d="m 328.63379,358.72266 15.44141,0 0,15.4414 -15.44141,0 0,-15.4414 z"
-         id="path8222-1"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath8224-1">
-      <path
-         d="m 328.63379,374.74316 15.44141,0 0,15.44141 -15.44141,0 0,-15.44141 z"
-         id="path8226-2"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath8228-5">
-      <path
-         d="m 328.63379,390.76367 15.44141,0 0,15.44141 -15.44141,0 0,-15.44141 z"
-         id="path8230-9"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath8232-3">
-      <path
-         d="m 328.63379,406.7832 15.44141,0 0,15.4419 -15.44141,0 0,-15.4419 z"
-         id="path8234-7"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath8236-9">
-      <path
-         d="m 328.63379,422.80371 15.44141,0 0,15.44141 -15.44141,0 0,-15.44141 z"
-         id="path8238-4"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath8240-3">
-      <path
-         d="m 328.63379,438.82373 15.44141,0 0,15.44141 -15.44141,0 0,-15.44141 z"
-         id="path8242-2"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath8244-3">
-      <path
-         d="m 328.63379,454.84424 15.44141,0 0,15.4414 -15.44141,0 0,-15.4414 z"
-         id="path8246-5"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath8248-9">
-      <path
-         d="m 328.63379,470.86426 15.44141,0 0,15.4414 -15.44141,0 0,-15.4414 z"
-         id="path8250-3"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath8360-9">
-      <path
-         d="m 392.56836,326.68164 15.44141,0 0,159.62402 -15.44141,0 0,-159.62402 z"
-         id="path8362-5"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath8364-6">
-      <path
-         d="m 392.56836,326.68164 15.44141,0 0,15.44141 -15.44141,0 0,-15.44141 z"
-         id="path8366-1"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath8368-4">
-      <path
-         d="m 392.56836,342.70313 15.44141,0 0,15.4414 -15.44141,0 0,-15.4414 z"
-         id="path8370-0"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath8372-4">
-      <path
-         d="m 392.56836,358.72266 15.44141,0 0,15.4414 -15.44141,0 0,-15.4414 z"
-         id="path8374-1"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath8376-2">
-      <path
-         d="m 392.56836,374.74219 15.44141,0 0,15.4414 -15.44141,0 0,-15.4414 z"
-         id="path8378-4"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath8380-8">
-      <path
-         d="m 392.56836,390.76367 15.44141,0 0,15.4419 -15.44141,0 0,-15.4419 z"
-         id="path8382-3"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath8384-7">
-      <path
-         d="m 392.56836,406.78369 15.44141,0 0,15.44141 -15.44141,0 0,-15.44141 z"
-         id="path8386-8"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath8388-9">
-      <path
-         d="m 392.56836,422.80371 15.44141,0 0,15.44141 -15.44141,0 0,-15.44141 z"
-         id="path8390-6"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath8392-5">
-      <path
-         d="m 392.56836,438.82373 15.44141,0 0,15.44141 -15.44141,0 0,-15.44141 z"
-         id="path8394-4"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath8396-7">
-      <path
-         d="m 392.56836,454.84424 15.44141,0 0,15.4414 -15.44141,0 0,-15.4414 z"
-         id="path8398-5"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath8400-4">
-      <path
-         d="m 392.56836,470.86426 15.44141,0 0,15.4414 -15.44141,0 0,-15.4414 z"
-         id="path8402-3"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath8512-5">
-      <path
-         d="m 151.93799,326.68262 15.4414,0 0,159.62304 -15.4414,0 0,-159.62304 z"
-         id="path8514-4"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath8516-6">
-      <path
-         d="m 151.93799,326.68262 15.4414,0 0,15.4414 -15.4414,0 0,-15.4414 z"
-         id="path8518-7"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath8520-1">
-      <path
-         d="m 151.93799,342.70313 15.4414,0 0,15.4414 -15.4414,0 0,-15.4414 z"
-         id="path8522-7"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath8524-3">
-      <path
-         d="m 151.93799,358.72266 15.4414,0 0,15.4414 -15.4414,0 0,-15.4414 z"
-         id="path8526-8"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath8528-3">
-      <path
-         d="m 151.93799,374.74316 15.4414,0 0,15.44141 -15.4414,0 0,-15.44141 z"
-         id="path8530-0"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath8532-0">
-      <path
-         d="m 151.93799,390.76367 15.4414,0 0,15.44141 -15.4414,0 0,-15.44141 z"
-         id="path8534-4"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath8536-8">
-      <path
-         d="m 151.93799,406.7832 15.4414,0 0,15.4419 -15.4414,0 0,-15.4419 z"
-         id="path8538-8"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath8540-4">
-      <path
-         d="m 151.93799,422.80371 15.4414,0 0,15.44141 -15.4414,0 0,-15.44141 z"
-         id="path8542-8"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath8544-0">
-      <path
-         d="m 151.93799,438.82373 15.4414,0 0,15.44141 -15.4414,0 0,-15.44141 z"
-         id="path8546-3"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath8548-5">
-      <path
-         d="m 151.93799,454.84424 15.4414,0 0,15.4414 -15.4414,0 0,-15.4414 z"
-         id="path8550-0"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath8552-6">
-      <path
-         d="m 151.93799,470.86426 15.4414,0 0,15.4414 -15.4414,0 0,-15.4414 z"
-         id="path8554-3"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath8664-2">
-      <path
-         d="m 424.74902,326.68359 15.44336,0 0,159.62207 -15.44336,0 0,-159.62207 z"
-         id="path8666-5"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath8668-1">
-      <path
-         d="m 424.74902,326.68359 15.44336,0 0,15.44141 -15.44336,0 0,-15.44141 z"
-         id="path8670-7"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath8672-4">
-      <path
-         d="m 424.74902,342.70313 15.44336,0 0,15.4414 -15.44336,0 0,-15.4414 z"
-         id="path8674-1"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath8676-6">
-      <path
-         d="m 424.74902,358.72266 15.44336,0 0,15.4414 -15.44336,0 0,-15.4414 z"
-         id="path8678-6"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath8680-6">
-      <path
-         d="m 424.74902,374.74414 15.44336,0 0,15.44141 -15.44336,0 0,-15.44141 z"
-         id="path8682-7"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath8684-3">
-      <path
-         d="m 424.74902,390.76367 15.44336,0 0,15.44141 -15.44336,0 0,-15.44141 z"
-         id="path8686-3"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath8688-0">
-      <path
-         d="m 424.74902,406.7832 15.44336,0 0,15.4419 -15.44336,0 0,-15.4419 z"
-         id="path8690-5"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath8692-1">
-      <path
-         d="m 424.74902,422.80371 15.44336,0 0,15.44141 -15.44336,0 0,-15.44141 z"
-         id="path8694-1"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath8696-0">
-      <path
-         d="m 424.74902,438.82373 15.44336,0 0,15.44141 -15.44336,0 0,-15.44141 z"
-         id="path8698-7"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath8700-7">
-      <path
-         d="m 424.74902,454.84424 15.44336,0 0,15.4414 -15.44336,0 0,-15.4414 z"
-         id="path8702-3"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath8704-2">
-      <path
-         d="m 424.74902,470.86426 15.44336,0 0,15.4414 -15.44336,0 0,-15.4414 z"
-         id="path8706-2"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath8816-7">
-      <path
-         d="m 440.83203,326.68359 15.44336,0 0,159.62207 -15.44336,0 0,-159.62207 z"
-         id="path8818-0"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath8820-9">
-      <path
-         d="m 440.83203,326.68359 15.44336,0 0,15.44141 -15.44336,0 0,-15.44141 z"
-         id="path8822-7"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath8824-9">
-      <path
-         d="m 440.83203,342.70313 15.44336,0 0,15.4414 -15.44336,0 0,-15.4414 z"
-         id="path8826-8"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath8828-9">
-      <path
-         d="m 440.83203,358.72266 15.44336,0 0,15.4414 -15.44336,0 0,-15.4414 z"
-         id="path8830-9"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath8832-0">
-      <path
-         d="m 440.83203,374.74414 15.44336,0 0,15.44141 -15.44336,0 0,-15.44141 z"
-         id="path8834-5"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath8836-9">
-      <path
-         d="m 440.83203,390.76367 15.44336,0 0,15.44141 -15.44336,0 0,-15.44141 z"
-         id="path8838-4"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath8840-8">
-      <path
-         d="m 440.83203,406.7832 15.44336,0 0,15.4419 -15.44336,0 0,-15.4419 z"
-         id="path8842-6"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath8844-8">
-      <path
-         d="m 440.83203,422.80371 15.44336,0 0,15.44141 -15.44336,0 0,-15.44141 z"
-         id="path8846-1"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath8848-4">
-      <path
-         d="m 440.83203,438.82373 15.44336,0 0,15.44141 -15.44336,0 0,-15.44141 z"
-         id="path8850-7"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath8852-0">
-      <path
-         d="m 440.83203,454.84424 15.44336,0 0,15.4414 -15.44336,0 0,-15.4414 z"
-         id="path8854-9"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath8856-7">
-      <path
-         d="m 440.83203,470.86426 15.44336,0 0,15.4414 -15.44336,0 0,-15.4414 z"
-         id="path8858-1"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath8968-1">
-      <path
-         d="m 456.79199,326.68359 15.44336,0 0,159.62207 -15.44336,0 0,-159.62207 z"
-         id="path8970-1"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath8972-2">
-      <path
-         d="m 456.79199,326.68359 15.44336,0 0,15.44141 -15.44336,0 0,-15.44141 z"
-         id="path8974-1"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath8976-1">
-      <path
-         d="m 456.79199,342.70313 15.44336,0 0,15.4414 -15.44336,0 0,-15.4414 z"
-         id="path8978-6"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath8980-2">
-      <path
-         d="m 456.79199,358.72266 15.44336,0 0,15.4414 -15.44336,0 0,-15.4414 z"
-         id="path8982-6"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath8984-6">
-      <path
-         d="m 456.79199,374.74414 15.44336,0 0,15.44141 -15.44336,0 0,-15.44141 z"
-         id="path8986-5"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath8988-4">
-      <path
-         d="m 456.79199,390.76367 15.44336,0 0,15.44141 -15.44336,0 0,-15.44141 z"
-         id="path8990-1"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath8992-4">
-      <path
-         d="m 456.79199,406.7832 15.44336,0 0,15.4419 -15.44336,0 0,-15.4419 z"
-         id="path8994-7"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath8996-1">
-      <path
-         d="m 456.79199,422.80371 15.44336,0 0,15.44141 -15.44336,0 0,-15.44141 z"
-         id="path8998-0"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath9000-7">
-      <path
-         d="m 456.79199,438.82373 15.44336,0 0,15.44141 -15.44336,0 0,-15.44141 z"
-         id="path9002-9"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath9004-5">
-      <path
-         d="m 456.79199,454.84424 15.44336,0 0,15.4414 -15.44336,0 0,-15.4414 z"
-         id="path9006-2"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath9008-3">
-      <path
-         d="m 456.79199,470.86426 15.44336,0 0,15.4414 -15.44336,0 0,-15.4414 z"
-         id="path9010-2"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath9120-4">
-      <path
-         d="m 472.84082,326.68457 15.44336,0 0,159.62109 -15.44336,0 0,-159.62109 z"
-         id="path9122-4"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath9124-9">
-      <path
-         d="m 472.84082,326.68457 15.44336,0 0,15.44141 -15.44336,0 0,-15.44141 z"
-         id="path9126-9"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath9128-7">
-      <path
-         d="m 472.84082,342.7041 15.44336,0 0,15.44141 -15.44336,0 0,-15.44141 z"
-         id="path9130-8"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath9132-2">
-      <path
-         d="m 472.84082,358.72363 15.44336,0 0,15.44141 -15.44336,0 0,-15.44141 z"
-         id="path9134-6"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath9136-8">
-      <path
-         d="m 472.84082,374.74512 15.44336,0 0,15.4414 -15.44336,0 0,-15.4414 z"
-         id="path9138-6"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath9140-3">
-      <path
-         d="m 472.84082,390.76465 15.44336,0 0,15.4414 -15.44336,0 0,-15.4414 z"
-         id="path9142-9"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath9144-7">
-      <path
-         d="m 472.84082,406.78418 15.44336,0 0,15.44092 -15.44336,0 0,-15.44092 z"
-         id="path9146-6"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath9148-0">
-      <path
-         d="m 472.84082,422.80371 15.44336,0 0,15.44141 -15.44336,0 0,-15.44141 z"
-         id="path9150-2"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath9152-4">
-      <path
-         d="m 472.84082,438.82373 15.44336,0 0,15.44141 -15.44336,0 0,-15.44141 z"
-         id="path9154-2"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath9156-1">
-      <path
-         d="m 472.84082,454.84424 15.44336,0 0,15.4414 -15.44336,0 0,-15.4414 z"
-         id="path9158-8"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath9160-6">
-      <path
-         d="m 472.84082,470.86426 15.44336,0 0,15.4414 -15.44336,0 0,-15.4414 z"
-         id="path9162-1"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <linearGradient
-       id="linearGradient4794-9">
-      <stop
-         id="stop4796-8"
-         offset="0"
-         style="stop-color:#3a9ed6;stop-opacity:1" />
-      <stop
-         style="stop-color:#2692d1;stop-opacity:1"
-         offset="0.38869566"
-         id="stop4802-2" />
-      <stop
-         id="stop4798-4"
-         offset="1"
-         style="stop-color:#3a9ed6;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4695-9">
-      <stop
-         id="stop4697-8"
-         offset="0"
-         style="stop-color:#1385cc;stop-opacity:1" />
-      <stop
-         style="stop-color:#6eb6e0;stop-opacity:1"
-         offset="0.17353664"
-         id="stop4719-3" />
-      <stop
-         style="stop-color:#e3eefa;stop-opacity:1"
-         offset="0.34707329"
-         id="stop4713-8" />
-      <stop
-         style="stop-color:#c1ddf0;stop-opacity:1"
-         offset="0.5"
-         id="stop4711-6" />
-      <stop
-         id="stop4715-9"
-         offset="0.63836575"
-         style="stop-color:#53aadb;stop-opacity:1" />
-      <stop
-         style="stop-color:#2692d1;stop-opacity:1"
-         offset="0.81918287"
-         id="stop4717-8" />
-      <stop
-         id="stop4699-6"
-         offset="1"
-         style="stop-color:#1385cc;stop-opacity:1" />
-    </linearGradient>
+       y2="1049.7878"
+       x2="32.558262"
+       y1="1041.8381"
+       x1="27.20822"
+       gradientTransform="translate(-43.389765,1.0553546)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient8471"
+       xlink:href="#linearGradient5156" />
     <linearGradient
-       id="linearGradient3827">
-      <stop
-         id="stop3829"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0.60149658"
-         id="stop3835" />
-      <stop
-         id="stop3831"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
+       y2="1040.7803"
+       x2="29.263437"
+       y1="1048.656"
+       x1="29.263437"
+       gradientTransform="translate(-43.389765,1.0553546)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient8473"
+       xlink:href="#linearGradient4878" />
     <linearGradient
        id="linearGradient10798-1-9-3-7-6-8-9-0-9-1">
       <stop
@@ -6250,46 +136,8 @@
        gradientUnits="userSpaceOnUse"
        id="linearGradient4293"
        xlink:href="#linearGradient10798-1-9-3-7-6-8-9-0-9-1"
-       inkscape:collect="always"
        gradientTransform="matrix(0.83730975,0,0,0.83704396,-316.98085,652.42707)" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="22.675681"
-     inkscape:cx="13.120152"
-     inkscape:cy="8.4842089"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1440"
-     inkscape:window-height="856"
-     inkscape:window-x="0"
-     inkscape:window-y="1"
-     inkscape:window-maximized="1"
-     inkscape:snap-global="true"
-     inkscape:snap-grids="true"
-     inkscape:snap-to-guides="true"
-     inkscape:snap-nodes="false"
-     inkscape:snap-page="true"
-     showguides="false"
-     inkscape:guide-bbox="true"
-     inkscape:snap-object-midpoints="false"
-     inkscape:snap-bbox="true"
-     inkscape:object-paths="false"
-     inkscape:snap-intersection-paths="false"
-     inkscape:object-nodes="true"
-     inkscape:snap-midpoints="false"
-     inkscape:bbox-paths="false"
-     inkscape:bbox-nodes="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3947" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -6298,13 +146,11 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Model Object"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline;opacity:1"
      transform="translate(0,-1036.3622)">
@@ -6312,23 +158,7 @@
        y="1036.3622"
        x="18"
        id="image5764"
-       xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAADO0lEQVR42m2TX0hTcRTHv/dubcjU
-RDcls2msSa2HFVsbEZk1kYJu2dJsr6kM/z1U9FA9lNJLBEagUlREWIH6IrMFbhNRBEMRTMXltLRr
-NvyTzrS5dN51rqFodeA83N/9nc/3nPM7h8FfptFoZMnJyed0Ol2WWq3eyzAMeJ4f83q9Hr/f7/D5
-fCtb7zNbPywWC0dWrZfL1UxPDzA+vn7OpqoRMR5BXzjMO53OMpfL1fwP4GJu7rVCq/WBUFPDKilQ
-FRcHCakLS0vAzp2Y9vsR0GjAlJUJzx2OG/X19VWbgMzMTO56QUET7txl90QrMB0TAyEUQmRxEfsJ
-wCgUEORyLAoCvi0vAxUVQlVdXY7b7W5m0tLSZHa7feSA06lO9PkQGxuLT1evwnD+PL729iKppAQS
-lQqrBAuGw/gZDGKeMhm4cIF/+uyZljGbzbm38vMbZZWV2J2QACmpTd68iaMch7GODkQXFgKU0TKp
-C5EI1ggwRVkIt2/jXlNTHmOz2R7bduywx7x9CyXVLV6ae/gQR7Ky8Lm1FVFFRQhLpViTSBChf5G1
-NQRWVrB8+jResewTpry8vOXk4GC2qr8fcTIZBFL68eIFDmdkYMzjQWJBAcLUzF/kIfIwy2KJSpnX
-6eAxGFxMcXFxi8XrzU4aGICKVCSkMP3mDfTHjmGcAGlXrkCgRq+S/6Rg0edJ5DsBXHq9i7FarY/z
-pVJ7stuNVALI6Ofo69c4dPw4FmZm0Nfejggpg1x5/z52TU1hku7MWiyoA54wBoMhtyg7u1FfWwst
-AaRU54eXL2E4dWrbhIr1fzlzBklDQ/hEgBF6nerW1jwmJSVFdpbjRi719qoPDQ9DTim2lZZCYzb/
-iVyl5MW3p2dkHz1CIg3UsFaLVyYT73z3Trs+SCaTics5caLpckMDm7iwAJYg/zOxwQGakwabTWjs
-6Mjp6upq3hxlmsZrmXr9A66zk9WOjkJCEHGRNtIXgyf27YMjI0No6eu70dbWVrVtF0QzGo1cenp6
-tTEqSn2Q55EQCKxD5mkXPqam4n0oxNM2lnV3d/+7TBsm9kSpVJ6Lj4/PUigUe8WzYDA4Njc355md
-nXVMTExsW+ffsOdeUfdtBg0AAAAASUVORK5CYII=
-"
+       xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAADO0lEQVR42m2TX0hTcRTHv/dubcjU RDcls2msSa2HFVsbEZk1kYJu2dJsr6kM/z1U9FA9lNJLBEagUlREWIH6IrMFbhNRBEMRTMXltLRr NvyTzrS5dN51rqFodeA83N/9nc/3nPM7h8FfptFoZMnJyed0Ol2WWq3eyzAMeJ4f83q9Hr/f7/D5 fCtb7zNbPywWC0dWrZfL1UxPDzA+vn7OpqoRMR5BXzjMO53OMpfL1fwP4GJu7rVCq/WBUFPDKilQ FRcHCakLS0vAzp2Y9vsR0GjAlJUJzx2OG/X19VWbgMzMTO56QUET7txl90QrMB0TAyEUQmRxEfsJ wCgUEORyLAoCvi0vAxUVQlVdXY7b7W5m0tLSZHa7feSA06lO9PkQGxuLT1evwnD+PL729iKppAQS lQqrBAuGw/gZDGKeMhm4cIF/+uyZljGbzbm38vMbZZWV2J2QACmpTd68iaMch7GODkQXFgKU0TKp C5EI1ggwRVkIt2/jXlNTHmOz2R7bduywx7x9CyXVLV6ae/gQR7Ky8Lm1FVFFRQhLpViTSBChf5G1 NQRWVrB8+jResewTpry8vOXk4GC2qr8fcTIZBFL68eIFDmdkYMzjQWJBAcLUzF/kIfIwy2KJSpnX 6eAxGFxMcXFxi8XrzU4aGICKVCSkMP3mDfTHjmGcAGlXrkCgRq+S/6Rg0edJ5DsBXHq9i7FarY/z pVJ7stuNVALI6Ofo69c4dPw4FmZm0Nfejggpg1x5/z52TU1hku7MWiyoA54wBoMhtyg7u1FfWwst AaRU54eXL2E4dWrbhIr1fzlzBklDQ/hEgBF6nerW1jwmJSVFdpbjRi719qoPDQ9DTim2lZZCYzb/ iVyl5MW3p2dkHz1CIg3UsFaLVyYT73z3Trs+SCaTics5caLpckMDm7iwAJYg/zOxwQGakwabTWjs 6Mjp6upq3hxlmsZrmXr9A66zk9WOjkJCEHGRNtIXgyf27YMjI0No6eu70dbWVrVtF0QzGo1cenp6 tTEqSn2Q55EQCKxD5mkXPqam4n0oxNM2lnV3d/+7TBsm9kSpVJ6Lj4/PUigUe8WzYDA4Njc355md nXVMTExsW+ffsOdeUfdtBg0AAAAASUVORK5CYII= "
        style="image-rendering:optimizeSpeed"
        preserveAspectRatio="none"
        height="16"
@@ -6367,30 +197,23 @@ nXVMTExsW+ffsOdeUfdtBg0AAAAASUVORK5CYII=
       <path
          style="fill:none;fill-rule:evenodd;stroke:#f4f4f4;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
          d="m 8.4816799,1038.4744 0,7 5.0000001,0"
-         id="path5769"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccc" />
+         id="path5769" />
     </g>
   </g>
   <g
-     inkscape:groupmode="layer"
      id="layer3"
-     inkscape:label="Decorators"
      style="display:none;opacity:1">
     <g
        transform="matrix(0.87968602,0,0,0.71944079,5.9144653,-747.05937)"
        style="display:inline"
-       id="layer1-9"
-       inkscape:label="Layer 1">
+       id="layer1-9">
       <g
          transform="matrix(0.60714811,0,0,0.60714811,16.028618,409.50264)"
          id="g8451">
         <path
            style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:none;stroke:url(#linearGradient8465);stroke-width:2.47056675;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker:none;enable-background:accumulate"
            d="m -10.059546,1045.0618 0,-2.9375 c 0,-2.7586 -1.253608,-5 -4.012192,-5 -2.758584,0 -4.162918,2.2414 -4.162918,5 l 0,2.9375"
-           id="rect4838-1"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="csssc" />
+           id="rect4838-1" />
         <rect
            style="display:inline;fill:url(#linearGradient8469);fill-opacity:1;stroke:none"
            id="rect4838"
@@ -6458,8 +281,7 @@ nXVMTExsW+ffsOdeUfdtBg0AAAAASUVORK5CYII=
     <g
        transform="matrix(0.86783246,0,0,0.86783246,5.6599727,-893.87978)"
        style="display:inline"
-       id="layer1-7"
-       inkscape:label="Layer 1">
+       id="layer1-7">
       <g
          id="g11331-3-1-1"
          style="display:inline"
diff --git a/ui/org.eclipse.pde.spy.context/icons/methpub_obj.svg b/ui/org.eclipse.pde.spy.context/icons/methpub_obj.svg
index e69941d40ce..82fa821def0 100644
--- a/ui/org.eclipse.pde.spy.context/icons/methpub_obj.svg
+++ b/ui/org.eclipse.pde.spy.context/icons/methpub_obj.svg
@@ -2,20 +2,16 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.48.0 r9654"
-   sodipodi:docname="methpub_obj.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
@@ -34,7 +30,6 @@
          id="stop10802-1-5-3-0-4-8-4-2-9-2" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10798-1-9-3-7-6-8-9-0-9-1"
        id="linearGradient9837"
        gradientUnits="userSpaceOnUse"
@@ -43,31 +38,6 @@
        x2="388.63736"
        y2="462.11539" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="16"
-     inkscape:cx="8.1831043"
-     inkscape:cy="7.2601498"
-     inkscape:document-units="px"
-     inkscape:current-layer="g6438"
-     showgrid="true"
-     inkscape:window-width="1287"
-     inkscape:window-height="862"
-     inkscape:window-x="623"
-     inkscape:window-y="113"
-     inkscape:window-maximized="0"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3960" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -81,8 +51,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
@@ -107,13 +75,8 @@
          style="font-size:13.58917427px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;display:inline;font-family:Sans"
          id="g6438">
         <path
-           sodipodi:type="arc"
            style="fill:url(#linearGradient9837);fill-opacity:1;stroke:#058149;stroke-width:3.17967892;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline"
            id="path10796-2-6-2"
-           sodipodi:cx="388.125"
-           sodipodi:cy="468.23718"
-           sodipodi:rx="10.625"
-           sodipodi:ry="10.625"
            d="m 398.75,468.23718 c 0,5.86803 -4.75697,10.625 -10.625,10.625 -5.86803,0 -10.625,-4.75697 -10.625,-10.625 0,-5.86802 4.75697,-10.625 10.625,-10.625 5.86803,0 10.625,4.75698 10.625,10.625 z"
            transform="matrix(0.32984735,0,0,0.32984735,-136.12701,882.92787)" />
       </g>
diff --git a/ui/org.eclipse.pde.spy.context/icons/refresh.svg b/ui/org.eclipse.pde.spy.context/icons/refresh.svg
index e9a2093b028..b90934a9b7f 100644
--- a/ui/org.eclipse.pde.spy.context/icons/refresh.svg
+++ b/ui/org.eclipse.pde.spy.context/icons/refresh.svg
@@ -2,24 +2,19 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.48.0 r9654"
-   sodipodi:docname="refresh.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient7584-5"
        id="linearGradient7608-3"
        gradientUnits="userSpaceOnUse"
@@ -40,7 +35,6 @@
          id="stop7588-5" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient7592-1"
        id="linearGradient7610-5"
        gradientUnits="userSpaceOnUse"
@@ -61,7 +55,6 @@
          id="stop7596-9" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient7584-9-3"
        id="linearGradient7608-9-7"
        gradientUnits="userSpaceOnUse"
@@ -81,7 +74,6 @@
          id="stop7588-9-9" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient7592-0-5"
        id="linearGradient7610-7-6"
        gradientUnits="userSpaceOnUse"
@@ -101,30 +93,6 @@
          id="stop7596-5-6" />
     </linearGradient>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="22.627416"
-     inkscape:cx="12.871772"
-     inkscape:cy="11.737298"
-     inkscape:document-units="px"
-     inkscape:current-layer="g7604"
-     showgrid="true"
-     inkscape:window-width="1171"
-     inkscape:window-height="959"
-     inkscape:window-x="150"
-     inkscape:window-y="150"
-     inkscape:window-maximized="0"
-     showguides="true"
-     inkscape:guide-bbox="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid4074" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -138,8 +106,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
@@ -148,14 +114,10 @@
        id="g7604"
        transform="translate(-12.551145,-2.6983344e-7)">
       <path
-         sodipodi:nodetypes="ccssscscsssszcc"
-         inkscape:connector-curvature="0"
          id="path7582"
          d="m 23.231602,1038.8387 0,-1.591 c 0,0 -0.353553,-0.8397 -1.370019,-0.044 -1.016466,0.7955 -2.209709,2.0772 -2.386486,2.4307 -0.176776,0.3536 -0.928077,0.9723 0.08839,1.9446 1.016466,0.9722 2.121321,1.9887 2.121321,1.9887 0,0 1.546796,1.4584 1.546796,0.088 0,-1.37 0,-1.812 0,-1.812 1.366404,-0.063 1.694788,0.3552 2.039845,0.6884 0.345482,0.3336 0.8125,1.9687 1.21875,2.0937 0.40625,0.125 0.625,-2.1875 0.625,-2.625 0,-0.4375 -0.174793,-1.2439 -0.71875,-1.9687 -0.293544,-0.3911 -1.006571,-0.9555 -1.53125,-1.0998 -0.524679,-0.1444 -1.633595,-0.094 -1.633595,-0.094 z"
          style="fill:url(#linearGradient7608-3);fill-opacity:1;stroke:url(#linearGradient7610-5);stroke-width:0.80000001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
       <path
-         sodipodi:nodetypes="ccssscc"
-         inkscape:connector-curvature="0"
          id="path7602"
          d="m 22.715806,1038.5073 0,-0.5966 c 0,0 0.110485,-0.3756 -0.220971,-0.2431 -0.331456,0.1326 -0.972272,0.6629 -1.038563,0.7734 -0.06629,0.1105 -0.751301,0.5967 -0.596622,0.8176 0.15468,0.221 1.458408,0.066 1.458408,0.066 z"
          style="opacity:0.85714285;fill:#ffffff;fill-opacity:1;stroke:none" />
@@ -165,14 +127,10 @@
        id="g7604-6"
        transform="matrix(-1,0,0,-1,29.009738,2088.8723)">
       <path
-         sodipodi:nodetypes="ccssscsscsssszcc"
-         inkscape:connector-curvature="0"
          id="path7582-7"
          d="m 23.585155,1039.3249 0,-1.591 c 0,0 -0.353553,-0.8397 -1.370019,-0.044 -1.016466,0.7955 -2.209709,2.0772 -2.386486,2.4307 -0.176776,0.3536 -0.928077,0.9723 0.08839,1.9446 1.016466,0.9722 2.121321,1.9887 2.121321,1.9887 0,0 0.404271,0.3812 0.799458,0.5707 0.37782,0.1811 0.747338,0.1871 0.747338,-0.4827 0,-1.37 0,-1.812 0,-1.812 1.366404,-0.063 1.727345,0.3446 2.039845,0.6884 0.3125,0.3437 0.8125,1.9687 1.21875,2.0937 0.40625,0.125 0.625,-2.1875 0.625,-2.625 0,-0.4375 -0.09375,-1.3125 -0.71875,-1.9687 -0.625,-0.6563 -1.006571,-0.9555 -1.53125,-1.0998 -0.524679,-0.1444 -1.633595,-0.094 -1.633595,-0.094 z"
          style="fill:url(#linearGradient7608-9-7);fill-opacity:1;stroke:url(#linearGradient7610-7-6);stroke-width:0.80000001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
       <path
-         sodipodi:nodetypes="ccssscc"
-         inkscape:connector-curvature="0"
          id="path7602-2"
          d="m 23.069359,1042.9731 0,0.5966 c 0,0 0.110485,0.3757 -0.220971,0.2431 -0.331456,-0.1326 -0.972272,-0.6629 -1.038563,-0.7734 -0.06629,-0.1105 -0.751301,-0.5966 -0.596622,-0.8176 0.15468,-0.221 1.458408,-0.066 1.458408,-0.066 z"
          style="opacity:0.85714285;fill:#ffffff;fill-opacity:1;stroke:none" />
diff --git a/ui/org.eclipse.pde.spy.context/icons/valueincontext.svg b/ui/org.eclipse.pde.spy.context/icons/valueincontext.svg
index 7972f783096..24bfb6bc8cc 100644
--- a/ui/org.eclipse.pde.spy.context/icons/valueincontext.svg
+++ b/ui/org.eclipse.pde.spy.context/icons/valueincontext.svg
@@ -2,20 +2,16 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="valueincontext.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
@@ -34,7 +30,6 @@
          id="stop10802-1-5-3-0-4-8-4-2-9-2" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10798-1-9-3-7-6-8-9-0-9-1"
        id="linearGradient9837"
        gradientUnits="userSpaceOnUse"
@@ -43,33 +38,6 @@
        x2="388.63736"
        y2="462.11539" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="19.09375"
-     inkscape:cx="12.231759"
-     inkscape:cy="7.2601498"
-     inkscape:document-units="px"
-     inkscape:current-layer="g6438"
-     showgrid="true"
-     inkscape:window-width="1440"
-     inkscape:window-height="856"
-     inkscape:window-x="0"
-     inkscape:window-y="1"
-     inkscape:window-maximized="1"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="true"
-     inkscape:snap-bbox="true"
-     inkscape:bbox-nodes="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3960" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -78,13 +46,11 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
@@ -109,25 +75,15 @@
          style="font-size:13.58917427px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;display:inline;font-family:Sans"
          id="g6438">
         <path
-           sodipodi:type="arc"
            style="fill:url(#linearGradient9837);fill-opacity:1;stroke:#464fff;stroke-width:3.17967892;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline"
            id="path10796-2-6-2"
-           sodipodi:cx="388.125"
-           sodipodi:cy="468.23718"
-           sodipodi:rx="10.625"
-           sodipodi:ry="10.625"
            d="m 398.75,468.23718 a 10.625,10.625 0 0 1 -10.625,10.625 10.625,10.625 0 0 1 -10.625,-10.625 10.625,10.625 0 0 1 10.625,-10.625 10.625,10.625 0 0 1 10.625,10.625 z"
            transform="matrix(0.32984735,0,0,0.32984735,-136.12701,882.92787)" />
         <image
            y="1028.3481"
            x="0.87041003"
            id="image4230"
-           xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAMJJREFU
-OI3tkL0OQUEQhT8isTck9yokfqJ0Owkab6D1Eko6j6CkovQSSl5Bp9C7N0qXws92q5gGu8IDOMnJ
-7JyZOZkd+CP1qbCYGbOPIEmg1YT+MOXsdYqjgTGFAGpVyeMDnM4wmdsm6XdhOjYmnwOl4HYXKgWe
-J7WvBquNRK3hmAi1fq09I/MuFH24XF0fg0pga9YG7VBiPidre568ARp128B5xG7PmE4IKiv56Qzb
-GNbLH44I0hj4sIuE5ZJ7+A/BAyjYNrwfTTLxAAAAAElFTkSuQmCC
-"
+           xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAMJJREFU OI3tkL0OQUEQhT8isTck9yokfqJ0Owkab6D1Eko6j6CkovQSSl5Bp9C7N0qXws92q5gGu8IDOMnJ 7JyZOZkd+CP1qbCYGbOPIEmg1YT+MOXsdYqjgTGFAGpVyeMDnM4wmdsm6XdhOjYmnwOl4HYXKgWe J7WvBquNRK3hmAi1fq09I/MuFH24XF0fg0pga9YG7VBiPidre568ARp128B5xG7PmE4IKiv56Qzb GNbLH44I0hj4sIuE5ZJ7+A/BAyjYNrwfTTLxAAAAAElFTkSuQmCC "
            style="image-rendering:optimizeSpeed"
            preserveAspectRatio="none"
            height="16"
diff --git a/ui/org.eclipse.pde.spy.core/icons/spyicon.svg b/ui/org.eclipse.pde.spy.core/icons/spyicon.svg
index fb84b34acc6..53d159dea9a 100644
--- a/ui/org.eclipse.pde.spy.core/icons/spyicon.svg
+++ b/ui/org.eclipse.pde.spy.core/icons/spyicon.svg
@@ -6,586 +6,16 @@
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="1.3.2 (091e20e, 2023-11-25, custom)"
-   sodipodi:docname="spyicon.svg"
    xml:space="preserve"
-   inkscape:export-filename="search.png"
-   inkscape:export-xdpi="96"
-   inkscape:export-ydpi="96"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:cc="http://creativecommons.org/ns#"
    xmlns:dc="http://purl.org/dc/elements/1.1/"><defs
-     id="defs4"><inkscape:path-effect
-       effect="fillet_chamfer"
-       id="path-effect1"
-       is_visible="true"
-       lpeversion="1"
-       nodesatellites_param="F,0,1,1,0,0.22043108,0,1 @ F,0,1,1,0,0.22043108,0,1 @ F,0,1,1,0,0.22043108,0,1 @ F,0,1,1,0,0.22043108,0,1 @ F,0,1,1,0,0.22043108,0,1 @ F,0,1,1,0,0.22043108,0,1 @ F,0,1,1,0,0.22043108,0,1 @ F,0,1,1,0,0.22043108,0,1 @ F,0,1,1,0,0.22043108,0,1 @ F,0,1,1,0,0.22043108,0,1 @ F,0,1,1,0,0.22043108,0,1 @ F,0,1,1,0,0.22043108,0,1 @ F,0,1,1,0,0.22043108,0,1 @ F,0,1,1,0,0.22043108,0,1 @ F,0,1,1,0,0.22043108,0,1 @ F,0,1,1,0,0.22043108,0,1 @ F,0,1,1,0,0.22043108,0,1 @ F,0,0,1,0,0.22043108,0,1"
-       radius="0"
-       unit="px"
-       method="auto"
-       mode="F"
-       chamfer_steps="1"
-       flexible="false"
-       use_knot_distance="true"
-       apply_no_radius="true"
-       apply_with_radius="true"
-       only_selected="false"
-       hide_knots="false" /><linearGradient
-       id="linearGradient3866"><stop
-         id="stop3868"
-         offset="0"
-         style="stop-color:#717188;stop-opacity:1" /><stop
-         id="stop3870"
-         offset="1"
-         style="stop-color:#6b6b6b;stop-opacity:1;" /></linearGradient><linearGradient
-       id="linearGradient3860"><stop
-         id="stop3862"
-         offset="0"
-         style="stop-color:#424242;stop-opacity:1" /><stop
-         id="stop3864"
-         offset="1"
-         style="stop-color:#6b6b6b;stop-opacity:1;" /></linearGradient><linearGradient
-       id="linearGradient3852"><stop
-         id="stop3854"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" /><stop
-         style="stop-color:#dddddd;stop-opacity:1;"
-         offset="0.66561043"
-         id="stop3856" /><stop
-         id="stop3858"
-         offset="1"
-         style="stop-color:#464646;stop-opacity:1;" /></linearGradient><linearGradient
-       id="linearGradient3844"><stop
-         id="stop3846"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" /><stop
-         style="stop-color:#dddddd;stop-opacity:1;"
-         offset="0.61245775"
-         id="stop3848" /><stop
-         id="stop3850"
-         offset="1"
-         style="stop-color:#464646;stop-opacity:1;" /></linearGradient><linearGradient
-       id="linearGradient5328-5"><stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop5330-9" /><stop
-         id="stop3842"
-         offset="0.5"
-         style="stop-color:#dddddd;stop-opacity:1;" /><stop
-         style="stop-color:#464646;stop-opacity:1;"
-         offset="1"
-         id="stop5332-8" /></linearGradient><linearGradient
-       id="linearGradient5209-0"><stop
-         style="stop-color:#4c4c4c;stop-opacity:1"
-         offset="0"
-         id="stop5211-9" /><stop
-         style="stop-color:#6b6b6b;stop-opacity:1;"
-         offset="1"
-         id="stop5213-4" /></linearGradient><linearGradient
-       y2="6.9843998"
-       x2="10.007812"
-       y1="5"
-       x1="10"
-       gradientTransform="translate(-15.015625,1046.6356)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient6323-7"
-       xlink:href="#linearGradient5068-6-9"
-       inkscape:collect="always" /><linearGradient
-       id="linearGradient5068-6-9"
-       inkscape:collect="always"><stop
-         id="stop5070-8-0"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" /><stop
-         id="stop5072-3-6"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" /></linearGradient><linearGradient
-       gradientTransform="translate(-15.015625,10.2734)"
-       gradientUnits="userSpaceOnUse"
-       y2="1045.3466"
-       x2="12"
-       y1="1043.3622"
-       x1="12"
-       id="linearGradient5084-3-3"
-       xlink:href="#linearGradient5068-6-9"
-       inkscape:collect="always" /><linearGradient
-       gradientTransform="translate(-15.015625,10.2734)"
-       gradientUnits="userSpaceOnUse"
-       y2="1043.3466"
-       x2="15.007812"
-       y1="1043.3622"
-       x1="13"
-       id="linearGradient5086-8-0"
-       xlink:href="#linearGradient5068-6-9"
-       inkscape:collect="always" /><linearGradient
-       gradientTransform="translate(-15.015625,10.2734)"
-       gradientUnits="userSpaceOnUse"
-       y2="1042.3622"
-       x2="10.007812"
-       y1="1042.3622"
-       x1="12"
-       id="linearGradient5082-1-0"
-       xlink:href="#linearGradient5068-6-9"
-       inkscape:collect="always" /><linearGradient
-       gradientTransform="translate(-15.015625,10.2734)"
-       gradientUnits="userSpaceOnUse"
-       y2="1041.3466"
-       x2="8.0078125"
-       y1="1041.3622"
-       x1="10"
-       id="linearGradient5078-8-2"
-       xlink:href="#linearGradient5068-6-9"
-       inkscape:collect="always" /><linearGradient
-       gradientTransform="translate(-15.015625,10.2734)"
-       gradientUnits="userSpaceOnUse"
-       y2="1038.3466"
-       x2="10.007812"
-       y1="1040.3622"
-       x1="10"
-       id="linearGradient5076-5-2"
-       xlink:href="#linearGradient5068-6-9"
-       inkscape:collect="always" /><linearGradient
-       gradientTransform="translate(-15.015625,10.2734)"
-       gradientUnits="userSpaceOnUse"
-       y2="1038.3466"
-       x2="10.007812"
-       y1="1038.3622"
-       x1="12"
-       id="linearGradient5074-2-1"
-       xlink:href="#linearGradient5068-6-9"
-       inkscape:collect="always" /><linearGradient
-       gradientTransform="translate(-15.015625,10.2734)"
-       gradientUnits="userSpaceOnUse"
-       y2="1043.3466"
-       x2="14"
-       y1="1041.3622"
-       x1="14"
-       id="linearGradient5088-1-4"
-       xlink:href="#linearGradient5068-6-9"
-       inkscape:collect="always" /><radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4528-9-5-7-9"
-       id="radialGradient3091-1-9-6"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.8508179,-8.813921e-6,8.4531434e-6,1.7750589,644.24981,572.63612)"
-       cx="-757.20496"
-       cy="-738.83777"
-       fx="-757.20496"
-       fy="-738.83777"
-       r="3.4803574" /><linearGradient
-       id="linearGradient4528-9-5-7-9"><stop
-         style="stop-color:#e0c576;stop-opacity:1;"
-         offset="0"
-         id="stop4530-0-5-0-5" /><stop
-         style="stop-color:#9e7916;stop-opacity:1"
-         offset="1"
-         id="stop4532-7-9-3-3" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6281-8-0-1-6-6-4-2"
-       id="linearGradient3093-5-2-7"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.3199889,0,0,2.3199889,10.199693,1043.1852)"
-       x1="0.9375"
-       y1="4.8437853"
-       x2="0.9375"
-       y2="7.549418" /><linearGradient
-       id="linearGradient6281-8-0-1-6-6-4-2"><stop
-         id="stop6283-0-2-2-1-2-0-1"
-         offset="0"
-         style="stop-color:#f7f9fb;stop-opacity:1" /><stop
-         id="stop6285-5-0-9-7-6-9-9"
-         offset="1"
-         style="stop-color:#ffd680;stop-opacity:1" /></linearGradient><radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3844-6"
-       id="radialGradient5366-0-9"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.3089145,0.02433326,-0.0270668,0.33136796,5.4628028,1.7171329)"
-       cx="7.7379637"
-       cy="2.4332652"
-       fx="7.7379637"
-       fy="2.4332652"
-       r="2.3503494" /><linearGradient
-       id="linearGradient3844-6"><stop
-         id="stop3846-3"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" /><stop
-         style="stop-color:#dddddd;stop-opacity:1;"
-         offset="0.61245775"
-         id="stop3848-7" /><stop
-         id="stop3850-1"
-         offset="1"
-         style="stop-color:#464646;stop-opacity:1;" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3860-2"
-       id="linearGradient5368-1-5"
-       gradientUnits="userSpaceOnUse"
-       x1="7.8304267"
-       y1="5.5753322"
-       x2="7.8018494"
-       y2="1.9306878" /><linearGradient
-       id="linearGradient3860-2"><stop
-         id="stop3862-3"
-         offset="0"
-         style="stop-color:#424242;stop-opacity:1" /><stop
-         id="stop3864-4"
-         offset="1"
-         style="stop-color:#6b6b6b;stop-opacity:1;" /></linearGradient><radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3844-0"
-       id="radialGradient5366-0-5"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.3089145,0.02433326,-0.0270668,0.33136796,5.4628028,1.7171329)"
-       cx="7.7379637"
-       cy="2.4332652"
-       fx="7.7379637"
-       fy="2.4332652"
-       r="2.3503494" /><linearGradient
-       id="linearGradient3844-0"><stop
-         id="stop3846-36"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" /><stop
-         style="stop-color:#dddddd;stop-opacity:1;"
-         offset="0.61245775"
-         id="stop3848-6" /><stop
-         id="stop3850-5"
-         offset="1"
-         style="stop-color:#464646;stop-opacity:1;" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3860-0"
-       id="linearGradient5368-1-0"
-       gradientUnits="userSpaceOnUse"
-       x1="7.8304267"
-       y1="5.5753322"
-       x2="7.8018494"
-       y2="1.9306878" /><linearGradient
-       id="linearGradient3860-0"><stop
-         id="stop3862-6"
-         offset="0"
-         style="stop-color:#424242;stop-opacity:1" /><stop
-         id="stop3864-0"
-         offset="1"
-         style="stop-color:#6b6b6b;stop-opacity:1;" /></linearGradient><radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3844-8"
-       id="radialGradient5366-0-7"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.3089145,0.02433326,-0.0270668,0.33136796,5.4628028,1.7171329)"
-       cx="7.7379637"
-       cy="2.4332652"
-       fx="7.7379637"
-       fy="2.4332652"
-       r="2.3503494" /><linearGradient
-       id="linearGradient3844-8"><stop
-         id="stop3846-1"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" /><stop
-         style="stop-color:#dddddd;stop-opacity:1;"
-         offset="0.61245775"
-         id="stop3848-4" /><stop
-         id="stop3850-19"
-         offset="1"
-         style="stop-color:#464646;stop-opacity:1;" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3860-4"
-       id="linearGradient5368-1-8"
-       gradientUnits="userSpaceOnUse"
-       x1="7.8304267"
-       y1="5.5753322"
-       x2="7.8018494"
-       y2="1.9306878" /><linearGradient
-       id="linearGradient3860-4"><stop
-         id="stop3862-30"
-         offset="0"
-         style="stop-color:#424242;stop-opacity:1" /><stop
-         id="stop3864-9"
-         offset="1"
-         style="stop-color:#6b6b6b;stop-opacity:1;" /></linearGradient><radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3844-3"
-       id="radialGradient5366-0-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.3089145,0.02433326,-0.0270668,0.33136796,5.4628028,1.7171329)"
-       cx="7.7379637"
-       cy="2.4332652"
-       fx="7.7379637"
-       fy="2.4332652"
-       r="2.3503494" /><linearGradient
-       id="linearGradient3844-3"><stop
-         id="stop3846-7"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" /><stop
-         style="stop-color:#dddddd;stop-opacity:1;"
-         offset="0.61245775"
-         id="stop3848-3" /><stop
-         id="stop3850-3"
-         offset="1"
-         style="stop-color:#464646;stop-opacity:1;" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3860-9"
-       id="linearGradient5368-1-7"
-       gradientUnits="userSpaceOnUse"
-       x1="7.8304267"
-       y1="5.5753322"
-       x2="7.8018494"
-       y2="1.9306878" /><linearGradient
-       id="linearGradient3860-9"><stop
-         id="stop3862-5"
-         offset="0"
-         style="stop-color:#424242;stop-opacity:1" /><stop
-         id="stop3864-2"
-         offset="1"
-         style="stop-color:#6b6b6b;stop-opacity:1;" /></linearGradient><radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3852-6"
-       id="radialGradient5374-4-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.35882709,-0.01458857,0.01251176,0.40537334,4.9838699,2.1071585)"
-       cx="7.7274323"
-       cy="2.8622203"
-       fx="7.7274323"
-       fy="2.8622203"
-       r="2.3503494" /><linearGradient
-       id="linearGradient3852-6"><stop
-         id="stop3854-9"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" /><stop
-         style="stop-color:#dddddd;stop-opacity:1;"
-         offset="0.66561043"
-         id="stop3856-8" /><stop
-         id="stop3858-2"
-         offset="1"
-         style="stop-color:#464646;stop-opacity:1;" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3866-8"
-       id="linearGradient5376-4-1"
-       gradientUnits="userSpaceOnUse"
-       x1="7.8451643"
-       y1="5.6525216"
-       x2="7.8451643"
-       y2="1.0179684" /><linearGradient
-       id="linearGradient3866-8"><stop
-         id="stop3868-1"
-         offset="0"
-         style="stop-color:#717188;stop-opacity:1" /><stop
-         id="stop3870-1"
-         offset="1"
-         style="stop-color:#6b6b6b;stop-opacity:1;" /></linearGradient><linearGradient
-       y2="1.0179684"
-       x2="7.8451643"
-       y1="5.6525216"
-       x1="7.8451643"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4515"
-       xlink:href="#linearGradient3866-8"
-       inkscape:collect="always" /><radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3852-4"
-       id="radialGradient5374-4-7"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.35882709,-0.01458857,0.01251176,0.40537334,4.9838699,2.1071585)"
-       cx="7.9300532"
-       cy="1.7860492"
-       fx="7.9300532"
-       fy="1.7860492"
-       r="2.3503494" /><linearGradient
-       id="linearGradient3852-4"><stop
-         id="stop3854-0"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" /><stop
-         style="stop-color:#dddddd;stop-opacity:1;"
-         offset="0.66561043"
-         id="stop3856-5" /><stop
-         id="stop3858-8"
-         offset="1"
-         style="stop-color:#464646;stop-opacity:1;" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3866-7"
-       id="linearGradient5376-4-6"
-       gradientUnits="userSpaceOnUse"
-       x1="7.8451643"
-       y1="5.6525216"
-       x2="7.8451643"
-       y2="1.0179684" /><linearGradient
-       id="linearGradient3866-7"><stop
-         id="stop3868-0"
-         offset="0"
-         style="stop-color:#717188;stop-opacity:1" /><stop
-         id="stop3870-7"
-         offset="1"
-         style="stop-color:#6b6b6b;stop-opacity:1;" /></linearGradient><radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3852-5"
-       id="radialGradient5374-4-3"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.35882709,-0.01458857,0.01251176,0.40537334,4.9838699,2.1071585)"
-       cx="7.9300532"
-       cy="1.7860492"
-       fx="7.9300532"
-       fy="1.7860492"
-       r="2.3503494" /><linearGradient
-       id="linearGradient3852-5"><stop
-         id="stop3854-1"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" /><stop
-         style="stop-color:#dddddd;stop-opacity:1;"
-         offset="0.66561043"
-         id="stop3856-6" /><stop
-         id="stop3858-4"
-         offset="1"
-         style="stop-color:#464646;stop-opacity:1;" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3866-3"
-       id="linearGradient5376-4-0"
-       gradientUnits="userSpaceOnUse"
-       x1="7.8451643"
-       y1="5.6525216"
-       x2="7.8451643"
-       y2="1.0179684" /><linearGradient
-       id="linearGradient3866-3"><stop
-         id="stop3868-6"
-         offset="0"
-         style="stop-color:#717188;stop-opacity:1" /><stop
-         id="stop3870-4"
-         offset="1"
-         style="stop-color:#6b6b6b;stop-opacity:1;" /></linearGradient><radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5328-5-9"
-       id="radialGradient5370-9-4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.37553419,-2.0140452e-8,1.7614747e-8,0.40297829,4.9079328,2.1932289)"
-       cx="7.9383807"
-       cy="3.451864"
-       fx="7.9383807"
-       fy="3.451864"
-       r="2.3503494" /><linearGradient
-       id="linearGradient5328-5-9"><stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop5330-9-7" /><stop
-         id="stop3842-2"
-         offset="0.5"
-         style="stop-color:#dddddd;stop-opacity:1;" /><stop
-         style="stop-color:#464646;stop-opacity:1;"
-         offset="1"
-         id="stop5332-8-3" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5209-0-2"
-       id="linearGradient5372-5-0"
-       gradientUnits="userSpaceOnUse"
-       x1="7.8304267"
-       y1="5.9680095"
-       x2="7.8890662"
-       y2="3.584255" /><linearGradient
-       id="linearGradient5209-0-2"><stop
-         style="stop-color:#4c4c4c;stop-opacity:1"
-         offset="0"
-         id="stop5211-9-4" /><stop
-         style="stop-color:#6b6b6b;stop-opacity:1;"
-         offset="1"
-         id="stop5213-4-2" /></linearGradient><radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5328-5-4"
-       id="radialGradient5370-9-6"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.37553419,-2.0140452e-8,1.7614747e-8,0.40297829,4.9079328,2.1932289)"
-       cx="7.9383807"
-       cy="3.451864"
-       fx="7.9383807"
-       fy="3.451864"
-       r="2.3503494" /><linearGradient
-       id="linearGradient5328-5-4"><stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop5330-9-9" /><stop
-         id="stop3842-7"
-         offset="0.5"
-         style="stop-color:#dddddd;stop-opacity:1;" /><stop
-         style="stop-color:#464646;stop-opacity:1;"
-         offset="1"
-         id="stop5332-8-0" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5209-0-7"
-       id="linearGradient5372-5-6"
-       gradientUnits="userSpaceOnUse"
-       x1="7.8304267"
-       y1="5.9680095"
-       x2="7.8890662"
-       y2="3.584255" /><linearGradient
-       id="linearGradient5209-0-7"><stop
-         style="stop-color:#4c4c4c;stop-opacity:1"
-         offset="0"
-         id="stop5211-9-9" /><stop
-         style="stop-color:#6b6b6b;stop-opacity:1;"
-         offset="1"
-         id="stop5213-4-4" /></linearGradient><linearGradient
-       id="linearGradient10798-1-9-3-7-1-15-1-7-6-1"><stop
-         style="stop-color:#4f9e55;stop-opacity:1"
-         offset="0"
-         id="stop10800-5-2-1-8-2-8-1-7-3-7" /><stop
-         id="stop10806-6-8-5-3-2-95-0-5-4-8"
-         offset="0.5"
-         style="stop-color:#3c8d49;stop-opacity:1;" /><stop
-         style="stop-color:#a4e173;stop-opacity:1;"
-         offset="1"
-         id="stop10802-1-5-3-0-2-0-9-8-4-3" /></linearGradient><inkscape:path-effect
-       effect="fillet_chamfer"
-       id="path-effect1-1"
-       is_visible="true"
-       lpeversion="1"
-       nodesatellites_param="F,0,1,1,0,0.22043108,0,1 @ F,0,1,1,0,0.22043108,0,1 @ F,0,1,1,0,0.22043108,0,1 @ F,0,1,1,0,0.22043108,0,1 @ F,0,1,1,0,0.22043108,0,1 @ F,0,1,1,0,0.22043108,0,1 @ F,0,1,1,0,0.22043108,0,1 @ F,0,1,1,0,0.22043108,0,1 @ F,0,1,1,0,0.22043108,0,1 @ F,0,1,1,0,0.22043108,0,1 @ F,0,1,1,0,0.22043108,0,1 @ F,0,1,1,0,0.22043108,0,1 @ F,0,1,1,0,0.22043108,0,1 @ F,0,1,1,0,0.22043108,0,1 @ F,0,1,1,0,0.22043108,0,1 @ F,0,1,1,0,0.22043108,0,1 @ F,0,1,1,0,0.22043108,0,1 @ F,0,0,1,0,0.22043108,0,1"
-       radius="0"
-       unit="px"
-       method="auto"
-       mode="F"
-       chamfer_steps="1"
-       flexible="false"
-       use_knot_distance="true"
-       apply_no_radius="true"
-       apply_with_radius="true"
-       only_selected="false"
-       hide_knots="false" /></defs><sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="32"
-     inkscape:cx="6.828125"
-     inkscape:cy="7.265625"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1920"
-     inkscape:window-height="991"
-     inkscape:window-x="-9"
-     inkscape:window-y="-9"
-     inkscape:window-maximized="1"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="false"
-     inkscape:showpageshadow="0"
-     inkscape:pagecheckerboard="0"
-     inkscape:deskcolor="#505050"><inkscape:grid
-       type="xygrid"
-       id="grid3006"
-       originx="0"
-       originy="0"
-       spacingy="1"
-       spacingx="1"
-       units="px"
-       visible="true" /></sodipodi:namedview><metadata
+     id="defs4" /><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" /></cc:Work></rdf:RDF></metadata><g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)"><path
diff --git a/ui/org.eclipse.pde.spy.css/icons/css_scratchpad.svg b/ui/org.eclipse.pde.spy.css/icons/css_scratchpad.svg
index 988a2f54684..3b9236f69d4 100644
--- a/ui/org.eclipse.pde.spy.css/icons/css_scratchpad.svg
+++ b/ui/org.eclipse.pde.spy.css/icons/css_scratchpad.svg
@@ -2,25 +2,20 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="open_log.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient5147"
-       inkscape:collect="always">
+       id="linearGradient5147">
       <stop
          id="stop5149"
          offset="0"
@@ -31,8 +26,7 @@
          style="stop-color:#637aa7;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       id="linearGradient5141"
-       inkscape:collect="always">
+       id="linearGradient5141">
       <stop
          id="stop5143"
          offset="0"
@@ -43,8 +37,7 @@
          style="stop-color:#637aa7;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       id="linearGradient5135"
-       inkscape:collect="always">
+       id="linearGradient5135">
       <stop
          id="stop5137"
          offset="0"
@@ -55,7 +48,6 @@
          style="stop-color:#637aa7;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4994">
       <stop
          style="stop-color:#f9fafc;stop-opacity:1;"
@@ -67,7 +59,6 @@
          id="stop4998" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4902">
       <stop
          style="stop-color:#b4903d;stop-opacity:1"
@@ -79,7 +70,6 @@
          id="stop4906" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4894">
       <stop
          style="stop-color:#e0c88f;stop-opacity:1"
@@ -91,8 +81,7 @@
          id="stop4898" />
     </linearGradient>
     <linearGradient
-       id="linearGradient4877"
-       inkscape:collect="always">
+       id="linearGradient4877">
       <stop
          id="stop4879"
          offset="0"
@@ -103,7 +92,6 @@
          style="stop-color:#5e76a3;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4861">
       <stop
          style="stop-color:#91a5c7;stop-opacity:1;"
@@ -115,7 +103,6 @@
          id="stop4865" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4877"
        id="linearGradient4867"
        x1="7.0070496"
@@ -125,7 +112,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-1.9449709,-2.9907914)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4861"
        id="linearGradient4869"
        x1="7.0070496"
@@ -135,7 +121,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1.0013691,0,0,0.98980409,-2.0191666,7.6358418)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient5147"
        id="linearGradient4871"
        x1="7.0070496"
@@ -145,7 +130,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1.0035898,0,0,0.96856508,-2.0502566,29.955202)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient5135"
        id="linearGradient4873"
        x1="7.0070496"
@@ -155,7 +139,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(0.99812022,0,0,0.98971353,0.00612244,7.8250365)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient5141"
        id="linearGradient4875"
        x1="7.0070496"
@@ -165,7 +148,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1.0013691,0,0,1.0006833,-2.03023,-3.7729963)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4894"
        id="linearGradient4900"
        x1="7.9987183"
@@ -175,7 +157,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(2.023379,-0.9900341)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4902"
        id="linearGradient4908"
        x1="10.544736"
@@ -185,7 +166,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(0.99287847,0,0,1.0029935,-1.9581335,-4.1515444)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4994"
        id="linearGradient5000"
        x1="9.8946028"
@@ -195,113 +175,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-2.0112622,-1.0460341)" />
     <linearGradient
-       id="linearGradient4844-4-1">
-      <stop
-         id="stop4846-8-4"
-         offset="0"
-         style="stop-color:#3f3f3f;stop-opacity:1;" />
-      <stop
-         id="stop4848-8-9"
-         offset="1"
-         style="stop-color:#303030;stop-opacity:1;" />
-    </linearGradient>
-    <mask
-       maskUnits="userSpaceOnUse"
-       id="mask6204">
-      <path
-         style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-         d="m 1,1036.3935 0,0.5 0,12.9687 0,0.5 0.5,0 10.0625,0 0.5,0 0,-0.5 0,-9.9687 0,-0.2188 -0.15625,-0.125 -3.0625,-3 -0.125,-0.1562 -0.21875,0 -7,0 -0.5,0 z"
-         id="path6206"
-         inkscape:connector-curvature="0" />
-    </mask>
-    <linearGradient
-       y2="1038.5814"
-       x2="4.7528968"
-       y1="1051.0466"
-       x1="4.7528968"
-       gradientTransform="translate(1.9961442e-6,-9.9830355e-5)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient6120-1"
-       xlink:href="#linearGradient4852-7-8-1"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient4852-7-8-1"
-       inkscape:collect="always">
-      <stop
-         id="stop4854-4-1-9"
-         offset="0"
-         style="stop-color:#707070;stop-opacity:1" />
-      <stop
-         id="stop4856-0-2-1"
-         offset="1"
-         style="stop-color:#a0a0a0;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       y2="1037.7"
-       x2="8.6566515"
-       y1="1050.7386"
-       x1="8.6566515"
-       gradientTransform="translate(1.9961442e-6,-9.9830355e-5)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient6122-0"
-       xlink:href="#linearGradient4844-4-1-4"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient4844-4-1-4">
-      <stop
-         id="stop4846-8-4-2"
-         offset="0"
-         style="stop-color:#3f3f3f;stop-opacity:1;" />
-      <stop
-         id="stop4848-8-9-2"
-         offset="1"
-         style="stop-color:#303030;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       y2="1038.5814"
-       x2="4.7528968"
-       y1="1051.0466"
-       x1="4.7528968"
-       gradientTransform="translate(1.9961442e-6,-9.9830355e-5)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient6120-4"
-       xlink:href="#linearGradient4852-7-8-6"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient4852-7-8-6"
-       inkscape:collect="always">
-      <stop
-         id="stop4854-4-1-5"
-         offset="0"
-         style="stop-color:#707070;stop-opacity:1" />
-      <stop
-         id="stop4856-0-2-9"
-         offset="1"
-         style="stop-color:#a0a0a0;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       y2="1037.7"
-       x2="8.6566515"
-       y1="1050.7386"
-       x1="8.6566515"
-       gradientTransform="translate(1.9961442e-6,-9.9830355e-5)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient6122-8"
-       xlink:href="#linearGradient4844-4-1-7"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient4844-4-1-7">
-      <stop
-         id="stop4846-8-4-5"
-         offset="0"
-         style="stop-color:#3f3f3f;stop-opacity:1;" />
-      <stop
-         id="stop4848-8-9-3"
-         offset="1"
-         style="stop-color:#303030;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4877"
        id="linearGradient4867-5"
        x1="7.0070496"
@@ -311,7 +184,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(0.99419538,0,0,1.000733,-4.9031953,-3.754382)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4877"
        id="linearGradient4867-5-1"
        x1="7.0070496"
@@ -321,7 +193,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(0.99419538,0,0,1.000733,-4.9031953,-1.7543822)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4877"
        id="linearGradient4867-5-2"
        x1="7.0070496"
@@ -331,7 +202,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(0.99419538,0,0,1.000733,-4.9031953,0.24561776)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4877"
        id="linearGradient4867-5-6"
        x1="7.0070496"
@@ -341,7 +211,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(0.99419538,0,0,1.000733,-4.9031953,2.2456178)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4877"
        id="linearGradient4867-5-0"
        x1="7.0070496"
@@ -351,33 +220,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(0.99419538,0,0,1.000733,-4.9031953,4.2456178)" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="68.758621"
-     inkscape:cx="17.5"
-     inkscape:cy="8.0000174"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="2560"
-     inkscape:window-height="1391"
-     inkscape:window-x="0"
-     inkscape:window-y="1"
-     inkscape:window-maximized="1"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="true"
-     inkscape:snap-bbox="true"
-     inkscape:bbox-nodes="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3999" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -386,33 +228,26 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
     <path
        style="display:inline;fill:url(#linearGradient5000);fill-opacity:1;stroke:none"
        d="m 3.4860203,1037.8577 7.0096687,0 3.062057,3.0066 0,9.9546 -10.0717257,0 z"
-       id="rect4001-3"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccc" />
+       id="rect4001-3" />
     <path
        style="fill:url(#linearGradient4900);fill-opacity:1;stroke:none"
        d="m 10,1037.451 0,3.9112 3.977476,0 z"
-       id="path4884"
-       inkscape:connector-curvature="0" />
+       id="path4884" />
     <path
        style="fill:none;stroke:url(#linearGradient4908);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1"
        d="m 3.5,1037.8622 6.959749,0 3.040251,3.0156 0,9.9844 -10,0 z"
-       id="rect4001"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccc" />
+       id="rect4001" />
     <rect
        style="display:inline;fill:url(#linearGradient4867);fill-opacity:1;stroke:none"
        id="rect4001-1"
@@ -487,15 +322,7 @@
        y="1036.3622"
        x="16"
        id="image4248"
-       xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAVhJREFU
-OI2lk88rRFEUxz/3pdnMcv4BBqVoklBMo6wUZUGpsZiVDSnK3zE1/gIrSxuNnVKUJEVRIn+I9949
-51g886s318ap273ndvqc7/2erjMz/hMj/cnV6cqftI2jW5e7NLPuardqFid+6Hq73Ld2q2b99WZG
-1A/z5lAzzDJw7wyFYomx8kxO5cATvESowXn7mThJiWNPknqOGzUKxRIAo+VpLpqrtn1y43KAVCNE
-oL4+iwEOwEAUSpXDbt3rx9pwBak6FLi+/8R7JUk937EfUHOwWyMVFwBIhIixujiJy5rnQtRIpWfd
-ACARh6hx+/QVVLC3UyUJKUgkwitU5yaG9M4UiWZ1AQ8iVOHhJaygsVXFawggEaLGQmV8qIKOB0EF
-XhxqcPf4nutc31z6NdXhg1PQzMTl+anuFDq7WscHCwNEI86a9azMwLneMLMcMPeLzcL99zv/AN06
-ELrjUgfZAAAAAElFTkSuQmCC
-"
+       xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAVhJREFU OI2lk88rRFEUxz/3pdnMcv4BBqVoklBMo6wUZUGpsZiVDSnK3zE1/gIrSxuNnVKUJEVRIn+I9949 51g886s318ap273ndvqc7/2erjMz/hMj/cnV6cqftI2jW5e7NLPuardqFid+6Hq73Ld2q2b99WZG 1A/z5lAzzDJw7wyFYomx8kxO5cATvESowXn7mThJiWNPknqOGzUKxRIAo+VpLpqrtn1y43KAVCNE oL4+iwEOwEAUSpXDbt3rx9pwBak6FLi+/8R7JUk937EfUHOwWyMVFwBIhIixujiJy5rnQtRIpWfd ACARh6hx+/QVVLC3UyUJKUgkwitU5yaG9M4UiWZ1AQ8iVOHhJaygsVXFawggEaLGQmV8qIKOB0EF XhxqcPf4nutc31z6NdXhg1PQzMTl+anuFDq7WscHCwNEI86a9azMwLneMLMcMPeLzcL99zv/AN06 ELrjUgfZAAAAAElFTkSuQmCC "
        style="image-rendering:optimizeSpeed"
        preserveAspectRatio="none"
        height="16"
diff --git a/ui/org.eclipse.pde.spy.css/icons/cssspy.svg b/ui/org.eclipse.pde.spy.css/icons/cssspy.svg
index d9e9a52e61a..4eaea09b6ba 100644
--- a/ui/org.eclipse.pde.spy.css/icons/cssspy.svg
+++ b/ui/org.eclipse.pde.spy.css/icons/cssspy.svg
@@ -2,24 +2,19 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="cssspy.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4652">
       <stop
          style="stop-color:#98b4e2;stop-opacity:1"
@@ -35,7 +30,6 @@
          id="stop4656" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4638">
       <stop
          style="stop-color:#fefefe;stop-opacity:1"
@@ -59,277 +53,6 @@
          id="stop4642" />
     </linearGradient>
     <linearGradient
-       id="linearGradient4575">
-      <stop
-         id="stop4577"
-         offset="0"
-         style="stop-color:#fff900;stop-opacity:1" />
-      <stop
-         id="stop4579"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4569">
-      <stop
-         id="stop4571"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:0" />
-      <stop
-         id="stop4573"
-         offset="1"
-         style="stop-color:#ec9b00;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3803">
-      <stop
-         style="stop-color:#8ea1bf;stop-opacity:1;"
-         offset="0"
-         id="stop3805" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop3807" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3795">
-      <stop
-         style="stop-color:#5b779a;stop-opacity:1;"
-         offset="0"
-         id="stop3797" />
-      <stop
-         style="stop-color:#37649c;stop-opacity:1;"
-         offset="1"
-         id="stop3799" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3803-1"
-       id="linearGradient3809-1"
-       x1="6.5151834"
-       y1="-1.094625"
-       x2="6.026401"
-       y2="-1.5485992"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient3803-1">
-      <stop
-         style="stop-color:#8ea1bf;stop-opacity:1;"
-         offset="0"
-         id="stop3805-6" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop3807-5" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3795-0"
-       id="linearGradient3801-7"
-       x1="6.026401"
-       y1="-1.5485992"
-       x2="7.0246148"
-       y2="0.55446869"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient3795-0">
-      <stop
-         style="stop-color:#5b779a;stop-opacity:1;"
-         offset="0"
-         id="stop3797-3" />
-      <stop
-         style="stop-color:#37649c;stop-opacity:1;"
-         offset="1"
-         id="stop3799-8" />
-    </linearGradient>
-    <linearGradient
-       y2="-1.5485992"
-       x2="6.026401"
-       y1="-1.094625"
-       x1="6.5151834"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3859-7"
-       xlink:href="#linearGradient3803-1-0"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient3803-1-0">
-      <stop
-         style="stop-color:#8ea1bf;stop-opacity:1;"
-         offset="0"
-         id="stop3805-6-8" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop3807-5-7" />
-    </linearGradient>
-    <linearGradient
-       y2="0.55446869"
-       x2="7.0246148"
-       y1="-1.5485992"
-       x1="6.026401"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3861-6"
-       xlink:href="#linearGradient3795-0-3"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient3795-0-3">
-      <stop
-         style="stop-color:#5b779a;stop-opacity:1;"
-         offset="0"
-         id="stop3797-3-9" />
-      <stop
-         style="stop-color:#37649c;stop-opacity:1;"
-         offset="1"
-         id="stop3799-8-0" />
-    </linearGradient>
-    <linearGradient
-       y2="-1.5485992"
-       x2="6.026401"
-       y1="-1.094625"
-       x1="6.5151834"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3909-1"
-       xlink:href="#linearGradient3803-1-0-6"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient3803-1-0-6">
-      <stop
-         style="stop-color:#8ea1bf;stop-opacity:1;"
-         offset="0"
-         id="stop3805-6-8-5" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop3807-5-7-1" />
-    </linearGradient>
-    <linearGradient
-       y2="0.55446869"
-       x2="7.0246148"
-       y1="-1.5485992"
-       x1="6.026401"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3911-7"
-       xlink:href="#linearGradient3795-0-3-0"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient3795-0-3-0">
-      <stop
-         style="stop-color:#5b779a;stop-opacity:1;"
-         offset="0"
-         id="stop3797-3-9-2" />
-      <stop
-         style="stop-color:#37649c;stop-opacity:1;"
-         offset="1"
-         id="stop3799-8-0-6" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3803-1-1">
-      <stop
-         style="stop-color:#8ea1bf;stop-opacity:1;"
-         offset="0"
-         id="stop3805-6-5" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop3807-5-1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3795-0-8">
-      <stop
-         style="stop-color:#5b779a;stop-opacity:1;"
-         offset="0"
-         id="stop3797-3-92" />
-      <stop
-         style="stop-color:#37649c;stop-opacity:1;"
-         offset="1"
-         id="stop3799-8-5" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3803-1-0-63">
-      <stop
-         style="stop-color:#8ea1bf;stop-opacity:1;"
-         offset="0"
-         id="stop3805-6-8-8" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop3807-5-7-5" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3795-0-3-8">
-      <stop
-         style="stop-color:#5b779a;stop-opacity:1;"
-         offset="0"
-         id="stop3797-3-9-4" />
-      <stop
-         style="stop-color:#37649c;stop-opacity:1;"
-         offset="1"
-         id="stop3799-8-0-0" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3803-5"
-       id="linearGradient3809-2"
-       x1="6.5151834"
-       y1="-1.094625"
-       x2="6.026401"
-       y2="-1.5485992"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient3803-5">
-      <stop
-         style="stop-color:#8ea1bf;stop-opacity:1;"
-         offset="0"
-         id="stop3805-3" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop3807-58" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3795-2"
-       id="linearGradient3801-1"
-       x1="6.026401"
-       y1="-1.5485992"
-       x2="7.0246148"
-       y2="0.55446869"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient3795-2">
-      <stop
-         style="stop-color:#5b779a;stop-opacity:1;"
-         offset="0"
-         id="stop3797-9" />
-      <stop
-         style="stop-color:#37649c;stop-opacity:1;"
-         offset="1"
-         id="stop3799-9" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3803-1-0-6-2">
-      <stop
-         style="stop-color:#8ea1bf;stop-opacity:1;"
-         offset="0"
-         id="stop3805-6-8-5-7" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop3807-5-7-1-5" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3795-0-3-0-9">
-      <stop
-         style="stop-color:#5b779a;stop-opacity:1;"
-         offset="0"
-         id="stop3797-3-9-2-2" />
-      <stop
-         style="stop-color:#37649c;stop-opacity:1;"
-         offset="1"
-         id="stop3799-8-0-6-9" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4638"
        id="linearGradient4644"
        x1="1038.3622"
@@ -338,7 +61,6 @@
        y2="-14"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4652"
        id="linearGradient4658"
        x1="1036.3622"
@@ -347,42 +69,6 @@
        y2="-8.5"
        gradientUnits="userSpaceOnUse" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="44.073372"
-     inkscape:cx="16.004277"
-     inkscape:cy="7.960503"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="2560"
-     inkscape:window-height="1391"
-     inkscape:window-x="0"
-     inkscape:window-y="1"
-     inkscape:window-maximized="1"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:object-nodes="true"
-     inkscape:snap-bbox="true"
-     inkscape:bbox-nodes="true"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3811"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="-548,82"
-       id="guide3836" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -391,13 +77,11 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      transform="translate(0,-1036.3622)">
     <circle
@@ -411,21 +95,7 @@
        y="1036.3622"
        x="16"
        id="image4398"
-       xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAArhJREFU
-OI2dk8FrHHUUxz+/yc7M7uxm09mQNNUaDVXMqQppbSmKF28KKkWQ/gFeKl68epJePKQgCIr1pFC8
-FIXipWigRUpbpDZhq0TddWRpcHezu0k2O5mZnZ2vh4WQSr34vT147/ve9/H9Gkn8G8FGT63eLj8H
-4/rJSkil7DHrl3jqMd8c7DUHCVq9XdUaHRw7x+FKEb/s4eVtwmhIbyek2R2QDFOOPTHNrF8yANbB
-4fWgzfwRn6X4dQpXfYrrZ5DgiwfP8t43R/nRfpH5Iz7rQZtWb3e8WRKSuLkaqPH3tuJkpM1LSDHa
-vITiZKQ3Py0q1Ud6+6uy4iRVo7mtm6uBJI0vCDZ6su0J/CmPdJQxfWKJzpcwfWKJdJTx8iszvPXZ
-h5w+XcGxJ/DLHrY9QbDRk5HEnfsNHT3sUyw4CDAY9uIhQXsAwFTB5lDJxXMnwACCztYum1uD8QXd
-nRCAwq3nKXz8OIVbzxG0B2SZyDLR3xvSDxPON08yd9HlfPMkedehuxOOCcJoCBh0u4376ia63SZn
-WViW4VDRYXoyj5fPceXyGssfvMOVy2uAIYyG5AC8vM1ekmJOzRB/B+bUDJWSg52zcB0L184x5dmc
-PXec9y98ztlzx4mSFC9vs/+DYsHFcfP7Gu2cxaTnUC7a2JahsTkgikdgBIIkThjsRWMJs36JfhiT
-jjKGacbTD+r89doZKr/+wh+NbS7eF/MvBVzdmiRNxXCU0Q8jZv3Swz6o1lu6V+9oZW5B6Q/fa2Vu
-Qau1jlis6utIYrGqe7WOqvXWvg/2CZrdvq7frWut1lJ87YZW5hYUX7uhn35ra7maicWqlquZ1mot
-Xb9bV7Pbl6RHZ0HGkHcdZCwyGYwRVpYRJQlGeigL5lFp/OTbP/XCMzm6OyFhNMTL21TKHnd+T3n3
-jYX/TuP/wT9HTo9AAVWvFAAAAABJRU5ErkJggg==
-"
+       xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAArhJREFU OI2dk8FrHHUUxz+/yc7M7uxm09mQNNUaDVXMqQppbSmKF28KKkWQ/gFeKl68epJePKQgCIr1pFC8 FIXipWigRUpbpDZhq0TddWRpcHezu0k2O5mZnZ2vh4WQSr34vT147/ve9/H9Gkn8G8FGT63eLj8H 4/rJSkil7DHrl3jqMd8c7DUHCVq9XdUaHRw7x+FKEb/s4eVtwmhIbyek2R2QDFOOPTHNrF8yANbB 4fWgzfwRn6X4dQpXfYrrZ5DgiwfP8t43R/nRfpH5Iz7rQZtWb3e8WRKSuLkaqPH3tuJkpM1LSDHa vITiZKQ3Py0q1Ud6+6uy4iRVo7mtm6uBJI0vCDZ6su0J/CmPdJQxfWKJzpcwfWKJdJTx8iszvPXZ h5w+XcGxJ/DLHrY9QbDRk5HEnfsNHT3sUyw4CDAY9uIhQXsAwFTB5lDJxXMnwACCztYum1uD8QXd nRCAwq3nKXz8OIVbzxG0B2SZyDLR3xvSDxPON08yd9HlfPMkedehuxOOCcJoCBh0u4376ia63SZn WViW4VDRYXoyj5fPceXyGssfvMOVy2uAIYyG5AC8vM1ekmJOzRB/B+bUDJWSg52zcB0L184x5dmc PXec9y98ztlzx4mSFC9vs/+DYsHFcfP7Gu2cxaTnUC7a2JahsTkgikdgBIIkThjsRWMJs36JfhiT jjKGacbTD+r89doZKr/+wh+NbS7eF/MvBVzdmiRNxXCU0Q8jZv3Swz6o1lu6V+9oZW5B6Q/fa2Vu Qau1jlis6utIYrGqe7WOqvXWvg/2CZrdvq7frWut1lJ87YZW5hYUX7uhn35ra7maicWqlquZ1mot Xb9bV7Pbl6RHZ0HGkHcdZCwyGYwRVpYRJQlGeigL5lFp/OTbP/XCMzm6OyFhNMTL21TKHnd+T3n3 jYX/TuP/wT9HTo9AAVWvFAAAAABJRU5ErkJggg== "
        style="image-rendering:optimizeSpeed"
        preserveAspectRatio="none"
        height="16"
diff --git a/ui/org.eclipse.pde.spy.event/META-INF/MANIFEST.MF b/ui/org.eclipse.pde.spy.event/META-INF/MANIFEST.MF
index 792df054fde..bd1ea43a15c 100644
--- a/ui/org.eclipse.pde.spy.event/META-INF/MANIFEST.MF
+++ b/ui/org.eclipse.pde.spy.event/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %name
 Bundle-SymbolicName: org.eclipse.pde.spy.event;singleton:=true
-Bundle-Version: 1.2.300.qualifier
+Bundle-Version: 1.2.400.qualifier
 Bundle-Vendor: Eclipse Foundation
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
diff --git a/ui/org.eclipse.pde.spy.event/icons/eventspy.svg b/ui/org.eclipse.pde.spy.event/icons/eventspy.svg
index 6880c0708ae..60ca9ef9860 100644
--- a/ui/org.eclipse.pde.spy.event/icons/eventspy.svg
+++ b/ui/org.eclipse.pde.spy.event/icons/eventspy.svg
@@ -2,24 +2,19 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.48.0 r9654"
-   sodipodi:docname="configs.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient17410">
       <stop
          style="stop-color:#e0ebf6;stop-opacity:1;"
@@ -31,7 +26,6 @@
          id="stop17414" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient17159">
       <stop
          style="stop-color:#ffeece;stop-opacity:1"
@@ -43,7 +37,6 @@
          id="stop17163" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient17410"
        id="linearGradient17441"
        gradientUnits="userSpaceOnUse"
@@ -52,7 +45,6 @@
        x2="-3.9386158"
        y2="6.8402538" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient17159"
        id="linearGradient17443"
        gradientUnits="userSpaceOnUse"
@@ -62,31 +54,6 @@
        x2="-10.422931"
        y2="7.9916593" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="22.627418"
-     inkscape:cx="1.2239013"
-     inkscape:cy="5.7033411"
-     inkscape:document-units="px"
-     inkscape:current-layer="g17418"
-     showgrid="true"
-     inkscape:window-width="1497"
-     inkscape:window-height="814"
-     inkscape:window-x="226"
-     inkscape:window-y="512"
-     inkscape:window-maximized="0"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid5126" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -100,15 +67,12 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
     <g
        style="display:inline;fill:none"
        id="layer1-4"
-       inkscape:label="Layer 1"
        transform="matrix(0.8261236,0,0,0.8261236,1.7832208,183.40446)">
       <g
          transform="matrix(1.2065384,0,0,1.2065384,-22.98457,-221.37405)"
@@ -118,134 +82,85 @@
            id="g17418"
            transform="matrix(0.96836657,0,0,0.96836657,20.738144,33.659982)">
           <path
-             sodipodi:type="arc"
              style="color:#000000;fill:url(#linearGradient17441);fill-opacity:1;stroke:#3f7fbf;stroke-width:0.5091278;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
              id="path6139-1-5"
-             sodipodi:cx="-6.7838054"
-             sodipodi:cy="9.7465248"
-             sodipodi:rx="4.3089318"
-             sodipodi:ry="4.3089318"
              d="m -2.4748735,9.7465248 c 0,2.3797572 -1.9291745,4.3089322 -4.3089319,4.3089322 -2.3797573,0 -4.3089316,-1.929175 -4.3089316,-4.3089322 0,-2.3797573 1.9291743,-4.3089318 4.3089316,-4.3089318 2.3797574,0 4.3089319,1.9291745 4.3089319,4.3089318 z"
              transform="matrix(1.0450409,-1.0450409,1.0450409,1.0450409,2.1256839,1029.9689)" />
           <path
-             sodipodi:nodetypes="cccc"
-             inkscape:connector-curvature="0"
              id="path6139-1-4-14"
              d="m 11.53513,1045.8134 c 0.07294,0.9455 0.07325,1.9032 9.05e-4,2.8489 l -2.3011454,-1.4186 z"
              style="color:#000000;fill:#d2d5cb;fill-opacity:1;stroke:none;stroke-width:0.33941853;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
           <path
-             sodipodi:nodetypes="cccc"
-             inkscape:connector-curvature="0"
              id="path6139-1-4-5-2"
              d="m -1.0914354,1048.6741 c -0.07294,-0.9455 -0.07325,-1.9032 -9.07e-4,-2.849 l 2.301146,1.4186 z"
              style="color:#000000;fill:#d2d5cb;fill-opacity:1;stroke:none;stroke-width:0.33941853;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
           <path
-             sodipodi:nodetypes="cccc"
-             inkscape:connector-curvature="0"
              id="path6139-1-4-14-3"
              d="m 6.6521976,1053.557 c -0.9455,0.073 -1.9032,0.073 -2.8489,9e-4 l 1.4186,-2.3011 z"
              style="color:#000000;fill:#d2d5cb;fill-opacity:1;stroke:none;stroke-width:0.33941853;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
           <path
-             sodipodi:nodetypes="cccc"
-             inkscape:connector-curvature="0"
              id="path6139-1-4-5-2-2"
              d="m 3.7914976,1040.9305 c 0.9455,-0.073 1.9032,-0.073 2.849,-9e-4 l -1.4186,2.3011 z"
              style="color:#000000;fill:#d2d5cb;fill-opacity:1;stroke:none;stroke-width:0.33941853;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
           <path
-             sodipodi:nodetypes="cccc"
-             inkscape:connector-curvature="0"
              id="path6139-1-4-14-2"
              d="m 10.697423,1050.6965 c -0.616993,0.7202 -1.2939698,1.3976 -2.013837,2.0151 l -0.6240538,-2.6302 z"
              style="color:#000000;fill:#bfdfbf;fill-opacity:1;stroke:none;stroke-width:0.33941853;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
           <path
-             sodipodi:nodetypes="cccc"
-             inkscape:connector-curvature="0"
              id="path6139-1-4-5-2-1"
              d="m -0.2537278,1043.791 c 0.61699309,-0.7202 1.2939701,-1.3976 2.0139059,-2.0152 l 0.6240542,2.6303 z"
              style="color:#000000;fill:#bfdfbf;fill-opacity:1;stroke:none;stroke-width:0.33941853;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
           <path
-             sodipodi:nodetypes="cccc"
-             inkscape:connector-curvature="0"
              id="path6139-1-4-14-3-6"
              d="m 1.7691159,1052.7193 c -0.7201883,-0.6169 -1.39738442,-1.2941 -2.0151129,-2.0138 l 2.6302251,-0.6241 z"
              style="color:#000000;fill:#bfdfbf;fill-opacity:1;stroke:none;stroke-width:0.33941853;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
           <path
-             sodipodi:nodetypes="cccc"
-             inkscape:connector-curvature="0"
              id="path6139-1-4-5-2-2-8"
              d="m 8.6745793,1041.7682 c 0.7201883,0.6169 1.3973847,1.2941 2.0151837,2.0139 l -2.6302252,0.624 z"
              style="color:#000000;fill:#bfdfbf;fill-opacity:1;stroke:none;stroke-width:0.33941853;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
           <path
-             sodipodi:type="arc"
              style="color:#000000;fill:#1d4984;fill-opacity:1;stroke:none;stroke-width:0.33941853;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
              id="path6139-1-76"
-             sodipodi:cx="-6.7838054"
-             sodipodi:cy="9.7465248"
-             sodipodi:rx="4.3089318"
-             sodipodi:ry="4.3089318"
              d="m -2.4748735,9.7465248 c 0,2.3797572 -1.9291745,4.3089322 -4.3089319,4.3089322 -2.3797573,0 -4.3089316,-1.929175 -4.3089316,-4.3089322 0,-2.3797573 1.9291743,-4.3089318 4.3089316,-4.3089318 2.3797574,0 4.3089319,1.9291745 4.3089319,4.3089318 z"
              transform="matrix(0.31739531,-0.31739531,0.31739531,0.31739531,4.2814936,1041.9971)" />
           <path
-             sodipodi:nodetypes="cccc"
-             inkscape:connector-curvature="0"
              id="path6139-1-4"
              d="m 11.535129,1046.4091 c 0.07294,0.5517 0.07325,1.1106 9.06e-4,1.6624 l -2.3011454,-0.8278 z"
              style="color:#000000;fill:#4d607b;fill-opacity:1;stroke:none;stroke-width:0.33941853;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
           <path
-             sodipodi:nodetypes="cccc"
-             inkscape:connector-curvature="0"
              id="path6139-1-4-5"
              d="m -1.0914359,1048.0784 c -0.072942,-0.5517 -0.073247,-1.1106 -9.07e-4,-1.6625 l 2.3011463,0.8278 z"
              style="color:#000000;fill:#4d607b;fill-opacity:1;stroke:none;stroke-width:0.33941853;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
           <path
-             sodipodi:nodetypes="cccc"
-             inkscape:connector-curvature="0"
              id="path6139-1-4-51"
              d="m 6.0564977,1053.557 c -0.5517,0.073 -1.1106,0.073 -1.6624,9e-4 l 0.8278,-2.3011 z"
              style="color:#000000;fill:#4d607b;fill-opacity:1;stroke:none;stroke-width:0.33941853;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
           <path
-             sodipodi:nodetypes="cccc"
-             inkscape:connector-curvature="0"
              id="path6139-1-4-5-7"
              d="m 4.3871977,1040.9305 c 0.5517,-0.073 1.1106,-0.073 1.6624,-9e-4 l -0.8277,2.3011 z"
              style="color:#000000;fill:#4d607b;fill-opacity:1;stroke:none;stroke-width:0.33941853;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
           <path
-             sodipodi:nodetypes="cccc"
-             inkscape:connector-curvature="0"
              id="path6139-1-4-1"
              d="m 10.276129,1051.1178 c -0.3385343,0.4417 -0.7335171,0.8371 -1.1748536,1.1761 l -1.0418139,-2.2125 z"
              style="color:#000000;fill:#4d607b;fill-opacity:1;stroke:none;stroke-width:0.33941853;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
           <path
-             sodipodi:nodetypes="cccc"
-             inkscape:connector-curvature="0"
              id="path6139-1-4-5-1"
              d="m 0.16742503,1043.3698 c 0.33853445,-0.4416 0.73351722,-0.8371 1.17492367,-1.1762 l 1.0418137,2.2125 z"
              style="color:#000000;fill:#4d607b;fill-opacity:1;stroke:none;stroke-width:0.33941853;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
           <path
-             sodipodi:nodetypes="cccc"
-             inkscape:connector-curvature="0"
              id="path6139-1-4-51-5"
              d="m 1.3478924,1052.2981 c -0.44172887,-0.3385 -0.83693085,-0.7337 -1.17612997,-1.1749 l 2.21246567,-1.0418 z"
              style="color:#000000;fill:#4d607b;fill-opacity:1;stroke:none;stroke-width:0.33941853;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
           <path
-             sodipodi:nodetypes="cccc"
-             inkscape:connector-curvature="0"
              id="path6139-1-4-5-7-2"
              d="m 9.0958029,1042.1894 c 0.4417296,0.3385 0.8369322,0.7337 1.1761311,1.1749 l -2.2123961,1.0418 z"
              style="color:#000000;fill:#4d607b;fill-opacity:1;stroke:none;stroke-width:0.33941853;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
           <path
-             sodipodi:type="arc"
              style="color:#000000;fill:none;stroke:#3f7fbf;stroke-width:0.7180745;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
              id="path6139-1"
-             sodipodi:cx="-6.7838054"
-             sodipodi:cy="9.7465248"
-             sodipodi:rx="4.3089318"
-             sodipodi:ry="4.3089318"
              d="m -2.4748735,9.7465248 c 0,2.3797572 -1.9291745,4.3089322 -4.3089319,4.3089322 -2.3797573,0 -4.3089316,-1.929175 -4.3089316,-4.3089322 0,-2.3797573 1.9291743,-4.3089318 4.3089316,-4.3089318 2.3797574,0 4.3089319,1.9291745 4.3089319,4.3089318 z"
              transform="matrix(1.0202099,-1.0202099,1.0202099,1.0202099,2.1992508,1030.3794)" />
           <path
-             sodipodi:nodetypes="cccccssc"
-             inkscape:connector-curvature="0"
              id="path6139-1-7"
              d="m 6.0190516,1046.4513 -4.6356786,-3.9985 -1.80221867,-0.8517 0.85667548,1.7973 4.00338379,4.6307 c 0.2002055,0.2002 0.4771321,0.3237 0.7840021,0.3237 0.61367,0 1.1076548,-0.494 1.1076828,-1.1077 -5.64e-5,-0.3068 -0.1127546,-0.5927 -0.3138469,-0.7938 z"
              style="color:#000000;fill:url(#linearGradient17443);fill-opacity:1;stroke:#4d607b;stroke-width:0.80260861;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
diff --git a/ui/org.eclipse.pde.spy.model/icons/full/obj16/application_lightning.svg b/ui/org.eclipse.pde.spy.model/icons/full/obj16/application_lightning.svg
index c7867f025af..02e36a3d181 100644
--- a/ui/org.eclipse.pde.spy.model/icons/full/obj16/application_lightning.svg
+++ b/ui/org.eclipse.pde.spy.model/icons/full/obj16/application_lightning.svg
@@ -6,587 +6,20 @@
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="1.3.2 (091e20e, 2023-11-25, custom)"
-   sodipodi:docname="application_ligthning.svg"
    xml:space="preserve"
-   inkscape:export-filename="application_lightning@2x.png"
-   inkscape:export-xdpi="192"
-   inkscape:export-ydpi="192"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:cc="http://creativecommons.org/ns#"
    xmlns:dc="http://purl.org/dc/elements/1.1/"><defs
-     id="defs4"><linearGradient
-       id="linearGradient3866"><stop
-         id="stop3868"
-         offset="0"
-         style="stop-color:#717188;stop-opacity:1" /><stop
-         id="stop3870"
-         offset="1"
-         style="stop-color:#6b6b6b;stop-opacity:1;" /></linearGradient><linearGradient
-       id="linearGradient3860"><stop
-         id="stop3862"
-         offset="0"
-         style="stop-color:#424242;stop-opacity:1" /><stop
-         id="stop3864"
-         offset="1"
-         style="stop-color:#6b6b6b;stop-opacity:1;" /></linearGradient><linearGradient
-       id="linearGradient3852"><stop
-         id="stop3854"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" /><stop
-         style="stop-color:#dddddd;stop-opacity:1;"
-         offset="0.66561043"
-         id="stop3856" /><stop
-         id="stop3858"
-         offset="1"
-         style="stop-color:#464646;stop-opacity:1;" /></linearGradient><linearGradient
-       id="linearGradient3844"><stop
-         id="stop3846"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" /><stop
-         style="stop-color:#dddddd;stop-opacity:1;"
-         offset="0.61245775"
-         id="stop3848" /><stop
-         id="stop3850"
-         offset="1"
-         style="stop-color:#464646;stop-opacity:1;" /></linearGradient><linearGradient
-       id="linearGradient5328-5"><stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop5330-9" /><stop
-         id="stop3842"
-         offset="0.5"
-         style="stop-color:#dddddd;stop-opacity:1;" /><stop
-         style="stop-color:#464646;stop-opacity:1;"
-         offset="1"
-         id="stop5332-8" /></linearGradient><linearGradient
-       id="linearGradient5209-0"><stop
-         style="stop-color:#4c4c4c;stop-opacity:1"
-         offset="0"
-         id="stop5211-9" /><stop
-         style="stop-color:#6b6b6b;stop-opacity:1;"
-         offset="1"
-         id="stop5213-4" /></linearGradient><linearGradient
-       y2="6.9843998"
-       x2="10.007812"
-       y1="5"
-       x1="10"
-       gradientTransform="translate(-15.015625,1046.6356)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient6323-7"
-       xlink:href="#linearGradient5068-6-9"
-       inkscape:collect="always" /><linearGradient
-       id="linearGradient5068-6-9"
-       inkscape:collect="always"><stop
-         id="stop5070-8-0"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" /><stop
-         id="stop5072-3-6"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" /></linearGradient><linearGradient
-       gradientTransform="translate(-15.015625,10.2734)"
-       gradientUnits="userSpaceOnUse"
-       y2="1045.3466"
-       x2="12"
-       y1="1043.3622"
-       x1="12"
-       id="linearGradient5084-3-3"
-       xlink:href="#linearGradient5068-6-9"
-       inkscape:collect="always" /><linearGradient
-       gradientTransform="translate(-15.015625,10.2734)"
-       gradientUnits="userSpaceOnUse"
-       y2="1043.3466"
-       x2="15.007812"
-       y1="1043.3622"
-       x1="13"
-       id="linearGradient5086-8-0"
-       xlink:href="#linearGradient5068-6-9"
-       inkscape:collect="always" /><linearGradient
-       gradientTransform="translate(-15.015625,10.2734)"
-       gradientUnits="userSpaceOnUse"
-       y2="1042.3622"
-       x2="10.007812"
-       y1="1042.3622"
-       x1="12"
-       id="linearGradient5082-1-0"
-       xlink:href="#linearGradient5068-6-9"
-       inkscape:collect="always" /><linearGradient
-       gradientTransform="translate(-15.015625,10.2734)"
-       gradientUnits="userSpaceOnUse"
-       y2="1041.3466"
-       x2="8.0078125"
-       y1="1041.3622"
-       x1="10"
-       id="linearGradient5078-8-2"
-       xlink:href="#linearGradient5068-6-9"
-       inkscape:collect="always" /><linearGradient
-       gradientTransform="translate(-15.015625,10.2734)"
-       gradientUnits="userSpaceOnUse"
-       y2="1038.3466"
-       x2="10.007812"
-       y1="1040.3622"
-       x1="10"
-       id="linearGradient5076-5-2"
-       xlink:href="#linearGradient5068-6-9"
-       inkscape:collect="always" /><linearGradient
-       gradientTransform="translate(-15.015625,10.2734)"
-       gradientUnits="userSpaceOnUse"
-       y2="1038.3466"
-       x2="10.007812"
-       y1="1038.3622"
-       x1="12"
-       id="linearGradient5074-2-1"
-       xlink:href="#linearGradient5068-6-9"
-       inkscape:collect="always" /><linearGradient
-       gradientTransform="translate(-15.015625,10.2734)"
-       gradientUnits="userSpaceOnUse"
-       y2="1043.3466"
-       x2="14"
-       y1="1041.3622"
-       x1="14"
-       id="linearGradient5088-1-4"
-       xlink:href="#linearGradient5068-6-9"
-       inkscape:collect="always" /><radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4528-9-5-7-9"
-       id="radialGradient3091-1-9-6"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.8508179,-8.813921e-6,8.4531434e-6,1.7750589,644.24981,572.63612)"
-       cx="-757.20496"
-       cy="-738.83777"
-       fx="-757.20496"
-       fy="-738.83777"
-       r="3.4803574" /><linearGradient
-       id="linearGradient4528-9-5-7-9"><stop
-         style="stop-color:#e0c576;stop-opacity:1;"
-         offset="0"
-         id="stop4530-0-5-0-5" /><stop
-         style="stop-color:#9e7916;stop-opacity:1"
-         offset="1"
-         id="stop4532-7-9-3-3" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6281-8-0-1-6-6-4-2"
-       id="linearGradient3093-5-2-7"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.3199889,0,0,2.3199889,10.199693,1043.1852)"
-       x1="0.9375"
-       y1="4.8437853"
-       x2="0.9375"
-       y2="7.549418" /><linearGradient
-       id="linearGradient6281-8-0-1-6-6-4-2"><stop
-         id="stop6283-0-2-2-1-2-0-1"
-         offset="0"
-         style="stop-color:#f7f9fb;stop-opacity:1" /><stop
-         id="stop6285-5-0-9-7-6-9-9"
-         offset="1"
-         style="stop-color:#ffd680;stop-opacity:1" /></linearGradient><radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3844-6"
-       id="radialGradient5366-0-9"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.3089145,0.02433326,-0.0270668,0.33136796,5.4628028,1.7171329)"
-       cx="7.7379637"
-       cy="2.4332652"
-       fx="7.7379637"
-       fy="2.4332652"
-       r="2.3503494" /><linearGradient
-       id="linearGradient3844-6"><stop
-         id="stop3846-3"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" /><stop
-         style="stop-color:#dddddd;stop-opacity:1;"
-         offset="0.61245775"
-         id="stop3848-7" /><stop
-         id="stop3850-1"
-         offset="1"
-         style="stop-color:#464646;stop-opacity:1;" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3860-2"
-       id="linearGradient5368-1-5"
-       gradientUnits="userSpaceOnUse"
-       x1="7.8304267"
-       y1="5.5753322"
-       x2="7.8018494"
-       y2="1.9306878" /><linearGradient
-       id="linearGradient3860-2"><stop
-         id="stop3862-3"
-         offset="0"
-         style="stop-color:#424242;stop-opacity:1" /><stop
-         id="stop3864-4"
-         offset="1"
-         style="stop-color:#6b6b6b;stop-opacity:1;" /></linearGradient><radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3844-0"
-       id="radialGradient5366-0-5"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.3089145,0.02433326,-0.0270668,0.33136796,5.4628028,1.7171329)"
-       cx="7.7379637"
-       cy="2.4332652"
-       fx="7.7379637"
-       fy="2.4332652"
-       r="2.3503494" /><linearGradient
-       id="linearGradient3844-0"><stop
-         id="stop3846-36"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" /><stop
-         style="stop-color:#dddddd;stop-opacity:1;"
-         offset="0.61245775"
-         id="stop3848-6" /><stop
-         id="stop3850-5"
-         offset="1"
-         style="stop-color:#464646;stop-opacity:1;" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3860-0"
-       id="linearGradient5368-1-0"
-       gradientUnits="userSpaceOnUse"
-       x1="7.8304267"
-       y1="5.5753322"
-       x2="7.8018494"
-       y2="1.9306878" /><linearGradient
-       id="linearGradient3860-0"><stop
-         id="stop3862-6"
-         offset="0"
-         style="stop-color:#424242;stop-opacity:1" /><stop
-         id="stop3864-0"
-         offset="1"
-         style="stop-color:#6b6b6b;stop-opacity:1;" /></linearGradient><radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3844-8"
-       id="radialGradient5366-0-7"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.3089145,0.02433326,-0.0270668,0.33136796,5.4628028,1.7171329)"
-       cx="7.7379637"
-       cy="2.4332652"
-       fx="7.7379637"
-       fy="2.4332652"
-       r="2.3503494" /><linearGradient
-       id="linearGradient3844-8"><stop
-         id="stop3846-1"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" /><stop
-         style="stop-color:#dddddd;stop-opacity:1;"
-         offset="0.61245775"
-         id="stop3848-4" /><stop
-         id="stop3850-19"
-         offset="1"
-         style="stop-color:#464646;stop-opacity:1;" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3860-4"
-       id="linearGradient5368-1-8"
-       gradientUnits="userSpaceOnUse"
-       x1="7.8304267"
-       y1="5.5753322"
-       x2="7.8018494"
-       y2="1.9306878" /><linearGradient
-       id="linearGradient3860-4"><stop
-         id="stop3862-30"
-         offset="0"
-         style="stop-color:#424242;stop-opacity:1" /><stop
-         id="stop3864-9"
-         offset="1"
-         style="stop-color:#6b6b6b;stop-opacity:1;" /></linearGradient><radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3844-3"
-       id="radialGradient5366-0-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.3089145,0.02433326,-0.0270668,0.33136796,5.4628028,1.7171329)"
-       cx="7.7379637"
-       cy="2.4332652"
-       fx="7.7379637"
-       fy="2.4332652"
-       r="2.3503494" /><linearGradient
-       id="linearGradient3844-3"><stop
-         id="stop3846-7"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" /><stop
-         style="stop-color:#dddddd;stop-opacity:1;"
-         offset="0.61245775"
-         id="stop3848-3" /><stop
-         id="stop3850-3"
-         offset="1"
-         style="stop-color:#464646;stop-opacity:1;" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3860-9"
-       id="linearGradient5368-1-7"
-       gradientUnits="userSpaceOnUse"
-       x1="7.8304267"
-       y1="5.5753322"
-       x2="7.8018494"
-       y2="1.9306878" /><linearGradient
-       id="linearGradient3860-9"><stop
-         id="stop3862-5"
-         offset="0"
-         style="stop-color:#424242;stop-opacity:1" /><stop
-         id="stop3864-2"
-         offset="1"
-         style="stop-color:#6b6b6b;stop-opacity:1;" /></linearGradient><radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3852-6"
-       id="radialGradient5374-4-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.35882709,-0.01458857,0.01251176,0.40537334,4.9838699,2.1071585)"
-       cx="7.7274323"
-       cy="2.8622203"
-       fx="7.7274323"
-       fy="2.8622203"
-       r="2.3503494" /><linearGradient
-       id="linearGradient3852-6"><stop
-         id="stop3854-9"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" /><stop
-         style="stop-color:#dddddd;stop-opacity:1;"
-         offset="0.66561043"
-         id="stop3856-8" /><stop
-         id="stop3858-2"
-         offset="1"
-         style="stop-color:#464646;stop-opacity:1;" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3866-8"
-       id="linearGradient5376-4-1"
-       gradientUnits="userSpaceOnUse"
-       x1="7.8451643"
-       y1="5.6525216"
-       x2="7.8451643"
-       y2="1.0179684" /><linearGradient
-       id="linearGradient3866-8"><stop
-         id="stop3868-1"
-         offset="0"
-         style="stop-color:#717188;stop-opacity:1" /><stop
-         id="stop3870-1"
-         offset="1"
-         style="stop-color:#6b6b6b;stop-opacity:1;" /></linearGradient><linearGradient
-       y2="1.0179684"
-       x2="7.8451643"
-       y1="5.6525216"
-       x1="7.8451643"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4515"
-       xlink:href="#linearGradient3866-8"
-       inkscape:collect="always" /><radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3852-4"
-       id="radialGradient5374-4-7"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.35882709,-0.01458857,0.01251176,0.40537334,4.9838699,2.1071585)"
-       cx="7.9300532"
-       cy="1.7860492"
-       fx="7.9300532"
-       fy="1.7860492"
-       r="2.3503494" /><linearGradient
-       id="linearGradient3852-4"><stop
-         id="stop3854-0"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" /><stop
-         style="stop-color:#dddddd;stop-opacity:1;"
-         offset="0.66561043"
-         id="stop3856-5" /><stop
-         id="stop3858-8"
-         offset="1"
-         style="stop-color:#464646;stop-opacity:1;" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3866-7"
-       id="linearGradient5376-4-6"
-       gradientUnits="userSpaceOnUse"
-       x1="7.8451643"
-       y1="5.6525216"
-       x2="7.8451643"
-       y2="1.0179684" /><linearGradient
-       id="linearGradient3866-7"><stop
-         id="stop3868-0"
-         offset="0"
-         style="stop-color:#717188;stop-opacity:1" /><stop
-         id="stop3870-7"
-         offset="1"
-         style="stop-color:#6b6b6b;stop-opacity:1;" /></linearGradient><radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3852-5"
-       id="radialGradient5374-4-3"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.35882709,-0.01458857,0.01251176,0.40537334,4.9838699,2.1071585)"
-       cx="7.9300532"
-       cy="1.7860492"
-       fx="7.9300532"
-       fy="1.7860492"
-       r="2.3503494" /><linearGradient
-       id="linearGradient3852-5"><stop
-         id="stop3854-1"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" /><stop
-         style="stop-color:#dddddd;stop-opacity:1;"
-         offset="0.66561043"
-         id="stop3856-6" /><stop
-         id="stop3858-4"
-         offset="1"
-         style="stop-color:#464646;stop-opacity:1;" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3866-3"
-       id="linearGradient5376-4-0"
-       gradientUnits="userSpaceOnUse"
-       x1="7.8451643"
-       y1="5.6525216"
-       x2="7.8451643"
-       y2="1.0179684" /><linearGradient
-       id="linearGradient3866-3"><stop
-         id="stop3868-6"
-         offset="0"
-         style="stop-color:#717188;stop-opacity:1" /><stop
-         id="stop3870-4"
-         offset="1"
-         style="stop-color:#6b6b6b;stop-opacity:1;" /></linearGradient><radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5328-5-9"
-       id="radialGradient5370-9-4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.37553419,-2.0140452e-8,1.7614747e-8,0.40297829,4.9079328,2.1932289)"
-       cx="7.9383807"
-       cy="3.451864"
-       fx="7.9383807"
-       fy="3.451864"
-       r="2.3503494" /><linearGradient
-       id="linearGradient5328-5-9"><stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop5330-9-7" /><stop
-         id="stop3842-2"
-         offset="0.5"
-         style="stop-color:#dddddd;stop-opacity:1;" /><stop
-         style="stop-color:#464646;stop-opacity:1;"
-         offset="1"
-         id="stop5332-8-3" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5209-0-2"
-       id="linearGradient5372-5-0"
-       gradientUnits="userSpaceOnUse"
-       x1="7.8304267"
-       y1="5.9680095"
-       x2="7.8890662"
-       y2="3.584255" /><linearGradient
-       id="linearGradient5209-0-2"><stop
-         style="stop-color:#4c4c4c;stop-opacity:1"
-         offset="0"
-         id="stop5211-9-4" /><stop
-         style="stop-color:#6b6b6b;stop-opacity:1;"
-         offset="1"
-         id="stop5213-4-2" /></linearGradient><radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5328-5-4"
-       id="radialGradient5370-9-6"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.37553419,-2.0140452e-8,1.7614747e-8,0.40297829,4.9079328,2.1932289)"
-       cx="7.9383807"
-       cy="3.451864"
-       fx="7.9383807"
-       fy="3.451864"
-       r="2.3503494" /><linearGradient
-       id="linearGradient5328-5-4"><stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop5330-9-9" /><stop
-         id="stop3842-7"
-         offset="0.5"
-         style="stop-color:#dddddd;stop-opacity:1;" /><stop
-         style="stop-color:#464646;stop-opacity:1;"
-         offset="1"
-         id="stop5332-8-0" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5209-0-7"
-       id="linearGradient5372-5-6"
-       gradientUnits="userSpaceOnUse"
-       x1="7.8304267"
-       y1="5.9680095"
-       x2="7.8890662"
-       y2="3.584255" /><linearGradient
-       id="linearGradient5209-0-7"><stop
-         style="stop-color:#4c4c4c;stop-opacity:1"
-         offset="0"
-         id="stop5211-9-9" /><stop
-         style="stop-color:#6b6b6b;stop-opacity:1;"
-         offset="1"
-         id="stop5213-4-4" /></linearGradient><linearGradient
-       id="linearGradient10798-1-9-3-7-1-15-1-7-6-1"><stop
-         style="stop-color:#4f9e55;stop-opacity:1"
-         offset="0"
-         id="stop10800-5-2-1-8-2-8-1-7-3-7" /><stop
-         id="stop10806-6-8-5-3-2-95-0-5-4-8"
-         offset="0.5"
-         style="stop-color:#3c8d49;stop-opacity:1;" /><stop
-         style="stop-color:#a4e173;stop-opacity:1;"
-         offset="1"
-         id="stop10802-1-5-3-0-2-0-9-8-4-3" /></linearGradient><linearGradient
-       id="linearGradient4929"><stop
-         style="stop-color:#d5f3ff;stop-opacity:1;"
-         offset="0"
-         id="stop4931" /><stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop4934" /></linearGradient><linearGradient
-       id="linearGradient4900"><stop
-         style="stop-color:#8fb7e6;stop-opacity:1;"
-         offset="0"
-         id="stop4902" /><stop
-         style="stop-color:#89b2e3;stop-opacity:1;"
-         offset="1"
-         id="stop4904" /></linearGradient><linearGradient
-       id="linearGradient4839"><stop
-         style="stop-color:#8db6e5;stop-opacity:1;"
-         offset="0"
-         id="stop4841" /><stop
-         style="stop-color:#8eb6e5;stop-opacity:1;"
-         offset="1"
-         id="stop4843" /></linearGradient><linearGradient
-       id="linearGradient4881"><stop
-         style="stop-color:#68b3e1;stop-opacity:1;"
-         offset="0"
-         id="stop4883" /><stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop4885" /></linearGradient></defs><sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="32"
-     inkscape:cx="5.796875"
-     inkscape:cy="5.984375"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1920"
-     inkscape:window-height="991"
-     inkscape:window-x="-9"
-     inkscape:window-y="-9"
-     inkscape:window-maximized="1"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="false"
-     inkscape:showpageshadow="0"
-     inkscape:pagecheckerboard="0"
-     inkscape:deskcolor="#505050"><inkscape:grid
-       type="xygrid"
-       id="grid3006"
-       originx="0"
-       originy="0"
-       spacingy="1"
-       spacingx="1"
-       units="px"
-       visible="true" /></sodipodi:namedview><metadata
+     id="defs4" /><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" /></cc:Work></rdf:RDF></metadata><g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)"><g
        id="g2"
-       inkscape:label="window"
        style="display:inline"
        transform="translate(-0.90624654,-1.84375)"><rect
          y="1039.8638"
@@ -604,5 +37,4 @@
          ry="0.49170199" /></g><path
        style="display:inline;fill:#f4e09b;fill-opacity:0.964706;stroke:#ecbc26;stroke-width:1.5;stroke-linecap:square;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
        d="m 5.4496156,1042.9092 h 5.1951974 l -2.6014406,2.5439 2.9045306,0.019 -5.713473,4.0429 0.7224091,-1.9991 H 3.2959623 Z"
-       id="path1"
-       sodipodi:nodetypes="cccccccc" /></g></svg>
+       id="path1" /></g></svg>
diff --git a/ui/org.eclipse.pde.spy.preferences/META-INF/MANIFEST.MF b/ui/org.eclipse.pde.spy.preferences/META-INF/MANIFEST.MF
index a815e055c98..f7534009820 100644
--- a/ui/org.eclipse.pde.spy.preferences/META-INF/MANIFEST.MF
+++ b/ui/org.eclipse.pde.spy.preferences/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %name
 Bundle-SymbolicName: org.eclipse.pde.spy.preferences;singleton:=true
-Bundle-Version: 0.14.0.qualifier
+Bundle-Version: 0.14.100.qualifier
 Automatic-Module-Name: org.eclipse.pde.spy.preferences
 Bundle-RequiredExecutionEnvironment: JavaSE-21
 Bundle-Vendor: %provider-name
diff --git a/ui/org.eclipse.pde.spy.preferences/icons/collapseall.svg b/ui/org.eclipse.pde.spy.preferences/icons/collapseall.svg
index 16b4be366bd..40e951e862f 100644
--- a/ui/org.eclipse.pde.spy.preferences/icons/collapseall.svg
+++ b/ui/org.eclipse.pde.spy.preferences/icons/collapseall.svg
@@ -2,20 +2,16 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.48.5 r10040"
-   sodipodi:docname="collapseall.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
@@ -30,7 +26,6 @@
          id="stop5084-3-8" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient5080-79"
        id="linearGradient5113-12"
        gradientUnits="userSpaceOnUse"
@@ -57,34 +52,8 @@
        x1="16.774115"
        gradientUnits="userSpaceOnUse"
        id="linearGradient5178"
-       xlink:href="#linearGradient5080-7-5"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient5080-7-5" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="22.627418"
-     inkscape:cx="9.3169434"
-     inkscape:cy="3.8885032"
-     inkscape:document-units="px"
-     inkscape:current-layer="g5108"
-     showgrid="true"
-     inkscape:window-width="1147"
-     inkscape:window-height="752"
-     inkscape:window-x="1197"
-     inkscape:window-y="810"
-     inkscape:window-maximized="0"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2997" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -98,8 +67,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
diff --git a/ui/org.eclipse.pde.spy.preferences/icons/expandall.svg b/ui/org.eclipse.pde.spy.preferences/icons/expandall.svg
index 0ea4a112e24..9def5249cd3 100644
--- a/ui/org.eclipse.pde.spy.preferences/icons/expandall.svg
+++ b/ui/org.eclipse.pde.spy.preferences/icons/expandall.svg
@@ -2,23 +2,16 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.48.0 r9654"
-   sodipodi:docname="expandall.svg"
-   inkscape:export-filename="C:\Users\jmietling\Documents\rect3997-9-1.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
@@ -44,11 +37,9 @@
        gradientUnits="userSpaceOnUse"
        id="linearGradient4975-2-1"
        xlink:href="#linearGradient4994-4-7"
-       inkscape:collect="always"
        gradientTransform="translate(18,-3)" />
     <linearGradient
-       id="linearGradient4994-4-7"
-       inkscape:collect="always">
+       id="linearGradient4994-4-7">
       <stop
          id="stop4996-5-4"
          offset="0"
@@ -66,10 +57,8 @@
        gradientTransform="translate(18,-3)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient5062-9"
-       xlink:href="#linearGradient4910-4-4"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4910-4-4" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4910-4-4">
       <stop
          style="stop-color:#ffffff;stop-opacity:0"
@@ -81,7 +70,6 @@
          id="stop4914-8-8" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4883-4"
        id="linearGradient4889-2"
        x1="28"
@@ -91,7 +79,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(0.9,0,0,0.9,-17.7,103.93622)" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4883-4">
       <stop
          style="stop-color:#ebf9ff;stop-opacity:1"
@@ -103,7 +90,6 @@
          id="stop4887-5" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4883-4-7"
        id="linearGradient4889-2-1"
        x1="28"
@@ -113,7 +99,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(0.9,0,0,0.9,-15.7,105.93622)" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4883-4-7">
       <stop
          style="stop-color:#ebf9ff;stop-opacity:1"
@@ -132,10 +117,8 @@
        gradientTransform="translate(20,-1)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient5062-9-5"
-       xlink:href="#linearGradient4910-4-4-2"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4910-4-4-2" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4910-4-4-2">
       <stop
          style="stop-color:#ffffff;stop-opacity:0"
@@ -154,11 +137,9 @@
        gradientUnits="userSpaceOnUse"
        id="linearGradient4975-2-1-1"
        xlink:href="#linearGradient4994-4-7-4"
-       inkscape:collect="always"
        gradientTransform="translate(20,-1)" />
     <linearGradient
-       id="linearGradient4994-4-7-4"
-       inkscape:collect="always">
+       id="linearGradient4994-4-7-4">
       <stop
          id="stop4996-5-4-2"
          offset="0"
@@ -176,8 +157,7 @@
        gradientTransform="translate(22,4)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient4970"
-       xlink:href="#linearGradient4989"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4989" />
     <linearGradient
        id="linearGradient4989-1">
       <stop
@@ -201,38 +181,8 @@
        gradientTransform="matrix(0,1,-1,0,1053.3622,1058.3622)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient5050"
-       xlink:href="#linearGradient4989-1"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4989-1" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="3.9999998"
-     inkscape:cx="1.5251501"
-     inkscape:cy="27.213599"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1241"
-     inkscape:window-height="814"
-     inkscape:window-x="1191"
-     inkscape:window-y="173"
-     inkscape:window-maximized="0"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3999"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -246,75 +196,49 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
     <path
        style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#8b96ab;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
        d="m 2,1038.3622 0,11 11,0 0,-11 z m 1,1 9,0 0,9 -9,0 z"
-       id="rect3997-9-1"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccccccc"
-       inkscape:export-filename="C:\Users\jmietling\Documents\rect3997-9-1.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
+       id="rect3997-9-1" />
     <path
        style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:url(#linearGradient4889-2);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
        d="m 3,1039.3622 8.971875,0 0.02812,9 -8.971875,0 z"
-       id="rect3997-9-1-1"
-       inkscape:connector-curvature="0" />
+       id="rect3997-9-1-1" />
     <path
        style="fill:url(#linearGradient5062-9);fill-opacity:1;stroke:none;display:inline"
        d="m 5,1041.3622 0,7 -2,0 0,-9 z"
-       id="rect4853-82-7"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+       id="rect4853-82-7" />
     <path
        style="fill:url(#linearGradient4975-2-1);fill-opacity:1;stroke:none;display:inline"
        d="m 5,1041.3622 7,0 0,-2 -9,0 z"
-       id="rect4853-82-0"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+       id="rect4853-82-0" />
     <path
        style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#8b96ab;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
        d="m 4,1040.3622 0,11 11,0 0,-11 z m 1,1 9,0 0,9 -9,0 z"
-       id="rect3997-9-1-2"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccccccc"
-       inkscape:export-filename="C:\Users\jmietling\Documents\rect3997-9-1.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
+       id="rect3997-9-1-2" />
     <path
        style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:url(#linearGradient4889-2-1);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
        d="m 5,1041.3622 8.971875,0 0.02812,9 -8.971875,0 z"
-       id="rect3997-9-1-1-2"
-       inkscape:connector-curvature="0" />
+       id="rect3997-9-1-1-2" />
     <path
        style="fill:url(#linearGradient4970);fill-opacity:1;stroke:none;display:inline"
        d="m 8,1047.3622 5,0 c 1,0 1,-1 0,-1 l -5,0 c -1,0 -1,1 0,1 z"
-       id="rect4853-82-0-6-8"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+       id="rect4853-82-0-6-8" />
     <path
        style="fill:url(#linearGradient5062-9-5);fill-opacity:1;stroke:none;display:inline"
        d="m 7,1043.3622 0,7 -2,0 0,-9 z"
-       id="rect4853-82-7-1"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+       id="rect4853-82-7-1" />
     <path
        style="fill:url(#linearGradient4975-2-1-1);fill-opacity:1;stroke:none;display:inline"
        d="m 7,1043.3622 7,0 0,-2 -9,0 z"
-       id="rect4853-82-0-6"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+       id="rect4853-82-0-6" />
     <path
        style="fill:url(#linearGradient5050);fill-opacity:1;stroke:none;display:inline"
        d="m 10,1044.3622 0,5 c 0,1 1,1 1,0 l 0,-5 c 0,-1 -1,-1 -1,0 z"
-       id="rect4853-82-0-6-8-41"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+       id="rect4853-82-0-6-8-41" />
     <rect
        style="fill:#01467a;fill-opacity:1;stroke:none"
        id="rect4167"
diff --git a/ui/org.eclipse.pde.spy.preferences/icons/flatLayout.svg b/ui/org.eclipse.pde.spy.preferences/icons/flatLayout.svg
index b8255353f0b..fce121df55f 100644
--- a/ui/org.eclipse.pde.spy.preferences/icons/flatLayout.svg
+++ b/ui/org.eclipse.pde.spy.preferences/icons/flatLayout.svg
@@ -2,4919 +2,63 @@
 <!-- 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="16"
-   height="16"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.2 r9819"
-   sodipodi:docname="flatLayout.svg"
-   inkscape:export-filename="C:\Users\jmietling\Documents\rect3997-9-1.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient4980"
-       inkscape:collect="always">
-      <stop
-         id="stop4982"
-         offset="0"
-         style="stop-color:#7694be;stop-opacity:1" />
-      <stop
-         id="stop4984"
-         offset="1"
-         style="stop-color:#607ead;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4974"
-       inkscape:collect="always">
-      <stop
-         id="stop4976"
-         offset="0"
-         style="stop-color:#7694be;stop-opacity:1" />
-      <stop
-         id="stop4978"
-         offset="1"
-         style="stop-color:#607ead;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient4962">
-      <stop
-         style="stop-color:#7694be;stop-opacity:1"
-         offset="0"
-         id="stop4964" />
-      <stop
-         style="stop-color:#607ead;stop-opacity:1"
-         offset="1"
-         id="stop4966" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5274">
-      <stop
-         style="stop-color:#ffeecd;stop-opacity:1;"
-         offset="0"
-         id="stop5276" />
-      <stop
-         style="stop-color:#ecb448;stop-opacity:1;"
-         offset="1"
-         id="stop5278" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5232">
-      <stop
-         style="stop-color:#785830;stop-opacity:1;"
-         offset="0"
-         id="stop5234" />
-      <stop
-         style="stop-color:#958160;stop-opacity:1"
-         offset="1"
-         id="stop5236" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient4871">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop4873" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop4875" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5056">
-      <stop
-         style="stop-color:#97adce;stop-opacity:1"
-         offset="0"
-         id="stop5058" />
-      <stop
-         id="stop5066"
-         offset="0.2858389"
-         style="stop-color:#e0e8f0;stop-opacity:1" />
-      <stop
-         id="stop5064"
-         offset="0.60006815"
-         style="stop-color:#98aece;stop-opacity:1" />
-      <stop
-         style="stop-color:#7e9bca;stop-opacity:1"
-         offset="1"
-         id="stop5060" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4898">
-      <stop
-         style="stop-color:#ffd991;stop-opacity:1;"
-         offset="0"
-         id="stop4900" />
-      <stop
-         style="stop-color:#ffcd6f;stop-opacity:0;"
-         offset="1"
-         id="stop4902" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient4846">
-      <stop
-         style="stop-color:#937e48;stop-opacity:1"
-         offset="0"
-         id="stop4848" />
-      <stop
-         style="stop-color:#7c724f;stop-opacity:1"
-         offset="1"
-         id="stop4850" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4784">
-      <stop
-         style="stop-color:#b68e69;stop-opacity:1"
-         offset="0"
-         id="stop4786" />
-      <stop
-         id="stop4792"
-         offset="0.94238818"
-         style="stop-color:#d5ae7d;stop-opacity:1" />
-      <stop
-         style="stop-color:#c69863;stop-opacity:1"
-         offset="1"
-         id="stop4788" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4805">
-      <stop
-         style="stop-color:#4b82b6;stop-opacity:1"
-         offset="0"
-         id="stop4807" />
-      <stop
-         id="stop4815"
-         offset="0.79358917"
-         style="stop-color:#9ab7d5;stop-opacity:1" />
-      <stop
-         style="stop-color:#a2bcd8;stop-opacity:1"
-         offset="1"
-         id="stop4809" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5591">
-      <stop
-         style="stop-color:#e0e566;stop-opacity:1;"
-         offset="0"
-         id="stop5593" />
-      <stop
-         style="stop-color:#b0b456;stop-opacity:1;"
-         offset="1"
-         id="stop5595" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5583">
-      <stop
-         style="stop-color:#426e4a;stop-opacity:1;"
-         offset="0"
-         id="stop5585" />
-      <stop
-         style="stop-color:#669f71;stop-opacity:1;"
-         offset="1"
-         id="stop5587" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5328">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop5330" />
-      <stop
-         style="stop-color:#464646;stop-opacity:1;"
-         offset="1"
-         id="stop5332" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5209">
-      <stop
-         style="stop-color:#5c5c5c;stop-opacity:1;"
-         offset="0"
-         id="stop5211" />
-      <stop
-         style="stop-color:#aeaeae;stop-opacity:1;"
-         offset="1"
-         id="stop5213" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4961">
-      <stop
-         style="stop-color:#df9a39;stop-opacity:1;"
-         offset="0"
-         id="stop4963" />
-      <stop
-         style="stop-color:#b55829;stop-opacity:1;"
-         offset="1"
-         id="stop4965" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4938">
-      <stop
-         style="stop-color:#8bc7d7;stop-opacity:1;"
-         offset="0"
-         id="stop4940" />
-      <stop
-         style="stop-color:#17477c;stop-opacity:1;"
-         offset="1"
-         id="stop4942" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4928">
-      <stop
-         style="stop-color:#4dac81;stop-opacity:1;"
-         offset="0"
-         id="stop4930" />
-      <stop
-         style="stop-color:#058048;stop-opacity:1;"
-         offset="1"
-         id="stop4932" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4918">
-      <stop
-         style="stop-color:#d48a4b;stop-opacity:1;"
-         offset="0"
-         id="stop4920" />
-      <stop
-         style="stop-color:#b1623a;stop-opacity:1;"
-         offset="1"
-         id="stop4922" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4907">
-      <stop
-         style="stop-color:#b86c44;stop-opacity:1;"
-         offset="0"
-         id="stop4909" />
-      <stop
-         style="stop-color:#8f4017;stop-opacity:1;"
-         offset="1"
-         id="stop4911" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4789">
-      <stop
-         style="stop-color:#4e8fbd;stop-opacity:1;"
-         offset="0"
-         id="stop4791" />
-      <stop
-         style="stop-color:#30495a;stop-opacity:1;"
-         offset="1"
-         id="stop4793" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4781">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop4783" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop4785" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4773">
-      <stop
-         style="stop-color:#8e4694;stop-opacity:1;"
-         offset="0"
-         id="stop4775" />
-      <stop
-         style="stop-color:#bc7bc1;stop-opacity:1;"
-         offset="1"
-         id="stop4777" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4763">
-      <stop
-         style="stop-color:#77a29d;stop-opacity:1;"
-         offset="0"
-         id="stop4765" />
-      <stop
-         style="stop-color:#1b867b;stop-opacity:1;"
-         offset="1"
-         id="stop4767" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient13856">
-      <stop
-         style="stop-color:#807e66;stop-opacity:1;"
-         offset="0"
-         id="stop13858" />
-      <stop
-         style="stop-color:#ccab63;stop-opacity:1"
-         offset="1"
-         id="stop13860" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient13850">
-      <stop
-         id="stop13852"
-         offset="0"
-         style="stop-color:#807e66;stop-opacity:1;" />
-      <stop
-         id="stop13854"
-         offset="1"
-         style="stop-color:#ccab63;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient13834">
-      <stop
-         style="stop-color:#807e66;stop-opacity:1;"
-         offset="0"
-         id="stop13836" />
-      <stop
-         style="stop-color:#807e66;stop-opacity:0;"
-         offset="1"
-         id="stop13838" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient13799">
-      <stop
-         style="stop-color:#b9772f;stop-opacity:1"
-         offset="0"
-         id="stop13801" />
-      <stop
-         id="stop13809"
-         offset="0.15381166"
-         style="stop-color:#f2dc91;stop-opacity:1" />
-      <stop
-         id="stop13807"
-         offset="0.5"
-         style="stop-color:#fbdc8b;stop-opacity:1" />
-      <stop
-         style="stop-color:#e6bd7a;stop-opacity:1"
-         offset="0.75"
-         id="stop13811" />
-      <stop
-         style="stop-color:#ba772f;stop-opacity:1"
-         offset="1"
-         id="stop13803" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient12088">
-      <stop
-         style="stop-color:#84a7d5;stop-opacity:1;"
-         offset="0"
-         id="stop12090" />
-      <stop
-         id="stop12096"
-         offset="0.5"
-         style="stop-color:#a9cded;stop-opacity:1" />
-      <stop
-         style="stop-color:#95b8e0;stop-opacity:1"
-         offset="1"
-         id="stop12092" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient11999">
-      <stop
-         style="stop-color:#f8b098;stop-opacity:1"
-         offset="0"
-         id="stop12001" />
-      <stop
-         id="stop12007"
-         offset="0.5"
-         style="stop-color:#f8decd;stop-opacity:1" />
-      <stop
-         style="stop-color:#f8b098;stop-opacity:1"
-         offset="1"
-         id="stop12003" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient11969">
-      <stop
-         style="stop-color:#6f93c7;stop-opacity:1;"
-         offset="0"
-         id="stop11971" />
-      <stop
-         id="stop11979"
-         offset="0.29546595"
-         style="stop-color:#6f93c7;stop-opacity:0;" />
-      <stop
-         id="stop11977"
-         offset="0.57727957"
-         style="stop-color:#6f93c7;stop-opacity:0;" />
-      <stop
-         style="stop-color:#6f93c7;stop-opacity:1"
-         offset="1"
-         id="stop11973" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient11687">
-      <stop
-         style="stop-color:#bdb692;stop-opacity:1;"
-         offset="0"
-         id="stop11689" />
-      <stop
-         id="stop11695"
-         offset="0.5"
-         style="stop-color:#869097;stop-opacity:1" />
-      <stop
-         style="stop-color:#c3cace;stop-opacity:1"
-         offset="1"
-         id="stop11691" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient11146">
-      <stop
-         style="stop-color:#faefba;stop-opacity:1"
-         offset="0"
-         id="stop11150" />
-      <stop
-         id="stop11152"
-         offset="1"
-         style="stop-color:#9e6542;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient11128">
-      <stop
-         style="stop-color:#e4d09d;stop-opacity:1"
-         offset="0"
-         id="stop11130" />
-      <stop
-         id="stop11136"
-         offset="0.27413794"
-         style="stop-color:#f6ecb2;stop-opacity:1" />
-      <stop
-         style="stop-color:#b58a68;stop-opacity:1"
-         offset="1"
-         id="stop11132" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10856">
-      <stop
-         id="stop10858"
-         offset="0"
-         style="stop-color:#7d75ac;stop-opacity:1" />
-      <stop
-         style="stop-color:#574a96;stop-opacity:1"
-         offset="0.5"
-         id="stop10860" />
-      <stop
-         id="stop10862"
-         offset="1"
-         style="stop-color:#9f99c8;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10798">
-      <stop
-         style="stop-color:#4f9e55;stop-opacity:1"
-         offset="0"
-         id="stop10800" />
-      <stop
-         id="stop10806"
-         offset="0.5"
-         style="stop-color:#418a4d;stop-opacity:1" />
-      <stop
-         style="stop-color:#a4c589;stop-opacity:1"
-         offset="1"
-         id="stop10802" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10748">
-      <stop
-         id="stop10750"
-         offset="0"
-         style="stop-color:#ecac18;stop-opacity:1" />
-      <stop
-         style="stop-color:#f1ce66;stop-opacity:1"
-         offset="0.25"
-         id="stop10752" />
-      <stop
-         style="stop-color:#f6e5a6;stop-opacity:1"
-         offset="0.5"
-         id="stop10754" />
-      <stop
-         id="stop10756"
-         offset="0.75"
-         style="stop-color:#f1cf6c;stop-opacity:1" />
-      <stop
-         id="stop10758"
-         offset="1"
-         style="stop-color:#e5b630;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10448">
-      <stop
-         style="stop-color:#ecac18;stop-opacity:1"
-         offset="0"
-         id="stop10450" />
-      <stop
-         id="stop10458"
-         offset="0.25"
-         style="stop-color:#ffe38d;stop-opacity:1" />
-      <stop
-         id="stop10456"
-         offset="0.5"
-         style="stop-color:#fdf5d2;stop-opacity:1" />
-      <stop
-         style="stop-color:#ffeba7;stop-opacity:1"
-         offset="0.75"
-         id="stop10460" />
-      <stop
-         style="stop-color:#e5b630;stop-opacity:1"
-         offset="1"
-         id="stop10452" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10440">
-      <stop
-         style="stop-color:#ae7603;stop-opacity:1;"
-         offset="0"
-         id="stop10442" />
-      <stop
-         id="stop10521"
-         offset="0.5"
-         style="stop-color:#e8d8a3;stop-opacity:1" />
-      <stop
-         style="stop-color:#bb9221;stop-opacity:1"
-         offset="1"
-         id="stop10444" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10432">
-      <stop
-         id="stop10434"
-         offset="0"
-         style="stop-color:#1f4d9a;stop-opacity:1" />
-      <stop
-         style="stop-color:#4e6da1;stop-opacity:1"
-         offset="0.5"
-         id="stop10436" />
-      <stop
-         id="stop10438"
-         offset="1"
-         style="stop-color:#567ebc;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10414">
-      <stop
-         style="stop-color:#5078b9;stop-opacity:1;"
-         offset="0"
-         id="stop10416" />
-      <stop
-         id="stop10422"
-         offset="0.5"
-         style="stop-color:#6d8cbd;stop-opacity:1" />
-      <stop
-         style="stop-color:#5f88c9;stop-opacity:1"
-         offset="1"
-         id="stop10418" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10396">
-      <stop
-         style="stop-color:#1b3e79;stop-opacity:1;"
-         offset="0"
-         id="stop10398" />
-      <stop
-         id="stop10404"
-         offset="0.5"
-         style="stop-color:#728fbf;stop-opacity:1" />
-      <stop
-         style="stop-color:#1f4d9a;stop-opacity:1"
-         offset="1"
-         id="stop10400" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10157">
-      <stop
-         style="stop-color:#6588c1;stop-opacity:1"
-         offset="0"
-         id="stop10159" />
-      <stop
-         id="stop10165"
-         offset="0.5"
-         style="stop-color:#becce3;stop-opacity:1" />
-      <stop
-         style="stop-color:#809dcb;stop-opacity:1"
-         offset="1"
-         id="stop10161" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient9914"
-       inkscape:collect="always">
-      <stop
-         id="stop9916"
-         offset="0"
-         style="stop-color:#4a6fa4;stop-opacity:1" />
-      <stop
-         id="stop9918"
-         offset="1"
-         style="stop-color:#4e86ca;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient9908"
-       inkscape:collect="always">
-      <stop
-         id="stop9910"
-         offset="0"
-         style="stop-color:#525f72;stop-opacity:1" />
-      <stop
-         id="stop9912"
-         offset="1"
-         style="stop-color:#9e884e;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient9605">
-      <stop
-         style="stop-color:#2a5bbf;stop-opacity:1;"
-         offset="0"
-         id="stop9607" />
-      <stop
-         style="stop-color:#2a5bbf;stop-opacity:0;"
-         offset="1"
-         id="stop9609" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient9510">
-      <stop
-         style="stop-color:#c07c32;stop-opacity:1;"
-         offset="0"
-         id="stop9512" />
-      <stop
-         id="stop9514"
-         offset="0.35636142"
-         style="stop-color:#e2ca69;stop-opacity:1" />
-      <stop
-         style="stop-color:#c07c32;stop-opacity:1;"
-         offset="1"
-         id="stop9516" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient9332">
-      <stop
-         style="stop-color:#f5b517;stop-opacity:1"
-         offset="0"
-         id="stop9334" />
-      <stop
-         id="stop9340"
-         offset="0.33703175"
-         style="stop-color:#fcf79e;stop-opacity:1" />
-      <stop
-         style="stop-color:#f5ae19;stop-opacity:1"
-         offset="1"
-         id="stop9336" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient9324">
-      <stop
-         id="stop9326"
-         offset="0"
-         style="stop-color:#c07c32;stop-opacity:1;" />
-      <stop
-         style="stop-color:#e2ca69;stop-opacity:1"
-         offset="0.30000001"
-         id="stop9328" />
-      <stop
-         id="stop9330"
-         offset="1"
-         style="stop-color:#c07c32;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient9312">
-      <stop
-         style="stop-color:#cf6c00;stop-opacity:1"
-         offset="0"
-         id="stop9314" />
-      <stop
-         id="stop9322"
-         offset="0.36339331"
-         style="stop-color:#f5db48;stop-opacity:0.24200913" />
-      <stop
-         style="stop-color:#c36000;stop-opacity:1"
-         offset="1"
-         id="stop9316" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient9299">
-      <stop
-         style="stop-color:#929baa;stop-opacity:1"
-         offset="0"
-         id="stop9301" />
-      <stop
-         style="stop-color:#cac3a5;stop-opacity:1"
-         offset="1"
-         id="stop9303" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient9291">
-      <stop
-         style="stop-color:#e9f8ff;stop-opacity:1;"
-         offset="0"
-         id="stop9293" />
-      <stop
-         style="stop-color:#f5f6f9;stop-opacity:1"
-         offset="1"
-         id="stop9295" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient8661"
-       inkscape:collect="always">
-      <stop
-         id="stop8663"
-         offset="0"
-         style="stop-color:#c6e7f9;stop-opacity:1" />
-      <stop
-         id="stop8665"
-         offset="1"
-         style="stop-color:#f9fcff;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient8653">
-      <stop
-         style="stop-color:#676656;stop-opacity:1;"
-         offset="0"
-         id="stop8655" />
-      <stop
-         style="stop-color:#9e884e;stop-opacity:1"
-         offset="1"
-         id="stop8657" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient8337">
-      <stop
-         style="stop-color:#4e86ca;stop-opacity:1;"
-         offset="0"
-         id="stop8339" />
-      <stop
-         style="stop-color:#4e86ca;stop-opacity:0;"
-         offset="1"
-         id="stop8341" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient8137">
-      <stop
-         style="stop-color:#326097;stop-opacity:1"
-         offset="0"
-         id="stop8139" />
-      <stop
-         style="stop-color:#2e73c5;stop-opacity:1"
-         offset="1"
-         id="stop8141" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient7559-9-3-0-9">
-      <stop
-         id="stop7561-3-3-4-48"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:0.502" />
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0.5"
-         id="stop7563-1-3-0-1" />
-      <stop
-         id="stop7565-8-8-3-2"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0.49599999;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient7102-3-8-5">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="0"
-         id="stop7104-0-1-6" />
-      <stop
-         id="stop7114-9-0-1"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.49803922;" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop7106-25-7-1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4320">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="0"
-         id="stop4322" />
-      <stop
-         id="stop4324"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.49803922;" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop4326" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4329">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="0"
-         id="stop4331" />
-      <stop
-         id="stop4333"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.49803922;" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop4335" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient7559-9-3-0-9-8">
-      <stop
-         id="stop7561-3-3-4-48-7"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:0.502" />
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0.5"
-         id="stop7563-1-3-0-1-7" />
-      <stop
-         id="stop7565-8-8-3-2-0"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0.49599999;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient7102-3-8-5-2">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="0"
-         id="stop7104-0-1-6-7" />
-      <stop
-         id="stop7114-9-0-1-4"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.49803922;" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop7106-25-7-1-2" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3256">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="0"
-         id="stop3258" />
-      <stop
-         id="stop3260"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.49803922;" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop3262" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3265">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="0"
-         id="stop3267" />
-      <stop
-         id="stop3269"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.49803922;" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop3271" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient7559-9-3-0-9-2">
-      <stop
-         id="stop7561-3-3-4-48-5"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:0.502" />
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0.5"
-         id="stop7563-1-3-0-1-76" />
-      <stop
-         id="stop7565-8-8-3-2-7"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0.49599999;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient7102-3-8-5-22">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="0"
-         id="stop7104-0-1-6-8" />
-      <stop
-         id="stop7114-9-0-1-1"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.49803922;" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop7106-25-7-1-4" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3506">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="0"
-         id="stop3508" />
-      <stop
-         id="stop3510"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.49803922;" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop3512" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3515">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="0"
-         id="stop3517" />
-      <stop
-         id="stop3519"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.49803922;" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop3521" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient7559-9-3-0-9-8-1">
-      <stop
-         id="stop7561-3-3-4-48-7-4"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:0.502" />
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0.5"
-         id="stop7563-1-3-0-1-7-3" />
-      <stop
-         id="stop7565-8-8-3-2-0-3"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0.49599999;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient7102-3-8-5-2-2">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="0"
-         id="stop7104-0-1-6-7-9" />
-      <stop
-         id="stop7114-9-0-1-4-6"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.49803922;" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop7106-25-7-1-2-9" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4133">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="0"
-         id="stop4135" />
-      <stop
-         id="stop4137"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.49803922;" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop4139" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4142">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="0"
-         id="stop4144" />
-      <stop
-         id="stop4146"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.49803922;" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop4148" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient7559-9-3-0-9-8-1-4">
-      <stop
-         id="stop7561-3-3-4-48-7-4-3"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:0.502" />
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0.5"
-         id="stop7563-1-3-0-1-7-3-4" />
-      <stop
-         id="stop7565-8-8-3-2-0-3-0"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0.49599999;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient7102-3-8-5-2-2-1">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="0"
-         id="stop7104-0-1-6-7-9-1" />
-      <stop
-         id="stop7114-9-0-1-4-6-2"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.49803922;" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop7106-25-7-1-2-9-0" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4354">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="0"
-         id="stop4356" />
-      <stop
-         id="stop4358"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.49803922;" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop4360" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4363">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="0"
-         id="stop4365" />
-      <stop
-         id="stop4367"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.49803922;" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop4369" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient7559-9-3-0-9-8-1-5">
-      <stop
-         id="stop7561-3-3-4-48-7-4-5"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:0.502" />
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0.5"
-         id="stop7563-1-3-0-1-7-3-0" />
-      <stop
-         id="stop7565-8-8-3-2-0-3-2"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0.49599999;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient7102-3-8-5-2-2-3">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="0"
-         id="stop7104-0-1-6-7-9-4" />
-      <stop
-         id="stop7114-9-0-1-4-6-3"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.49803922;" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop7106-25-7-1-2-9-3" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4354-1">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="0"
-         id="stop4356-1" />
-      <stop
-         id="stop4358-6"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.49803922;" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop4360-2" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4363-3">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="0"
-         id="stop4365-6" />
-      <stop
-         id="stop4367-1"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.49803922;" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop4369-3" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient7559-9-3-0-9-8-1-4-5">
-      <stop
-         id="stop7561-3-3-4-48-7-4-3-8"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:0.502" />
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0.5"
-         id="stop7563-1-3-0-1-7-3-4-7" />
-      <stop
-         id="stop7565-8-8-3-2-0-3-0-7"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0.49599999;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient7102-3-8-5-2-2-1-9">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="0"
-         id="stop7104-0-1-6-7-9-1-0" />
-      <stop
-         id="stop7114-9-0-1-4-6-2-1"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.49803922;" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop7106-25-7-1-2-9-0-5" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5690">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="0"
-         id="stop5692" />
-      <stop
-         id="stop5694"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.49803922;" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop5696" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5699">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="0"
-         id="stop5701" />
-      <stop
-         id="stop5703"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.49803922;" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop5705" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient7559-9-3-0-9-8-1-4-9">
-      <stop
-         id="stop7561-3-3-4-48-7-4-3-2"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:0.502" />
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0.5"
-         id="stop7563-1-3-0-1-7-3-4-0" />
-      <stop
-         id="stop7565-8-8-3-2-0-3-0-5"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0.49599999;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient7102-3-8-5-2-2-1-2">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="0"
-         id="stop7104-0-1-6-7-9-1-2" />
-      <stop
-         id="stop7114-9-0-1-4-6-2-16"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.49803922;" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop7106-25-7-1-2-9-0-6" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5690-4">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="0"
-         id="stop5692-0" />
-      <stop
-         id="stop5694-4"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.49803922;" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop5696-5" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5699-0">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="0"
-         id="stop5701-6" />
-      <stop
-         id="stop5703-0"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.49803922;" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop5705-3" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient7559-9-3-0-9-8-1-4-6">
-      <stop
-         id="stop7561-3-3-4-48-7-4-3-3"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:0.502" />
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0.5"
-         id="stop7563-1-3-0-1-7-3-4-2" />
-      <stop
-         id="stop7565-8-8-3-2-0-3-0-3"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0.49599999;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient7102-3-8-5-2-2-1-7">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="0"
-         id="stop7104-0-1-6-7-9-1-8" />
-      <stop
-         id="stop7114-9-0-1-4-6-2-4"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.49803922;" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop7106-25-7-1-2-9-0-0" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient6125">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="0"
-         id="stop6127" />
-      <stop
-         id="stop6129"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.49803922;" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop6131" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient6134">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="0"
-         id="stop6136" />
-      <stop
-         id="stop6138"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.49803922;" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop6140" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient7559-9-3-0-9-8-1-4-62">
-      <stop
-         id="stop7561-3-3-4-48-7-4-3-5"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:0.502" />
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0.5"
-         id="stop7563-1-3-0-1-7-3-4-1" />
-      <stop
-         id="stop7565-8-8-3-2-0-3-0-1"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0.49599999;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient7102-3-8-5-2-2-1-0">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="0"
-         id="stop7104-0-1-6-7-9-1-4" />
-      <stop
-         id="stop7114-9-0-1-4-6-2-3"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.49803922;" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop7106-25-7-1-2-9-0-8" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient6125-7">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="0"
-         id="stop6127-4" />
-      <stop
-         id="stop6129-0"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.49803922;" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop6131-6" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient6134-4">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="0"
-         id="stop6136-6" />
-      <stop
-         id="stop6138-0"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.49803922;" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop6140-7" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient7559-9-3-0-9-8-1-4-92">
-      <stop
-         id="stop7561-3-3-4-48-7-4-3-4"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:0.502" />
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0.5"
-         id="stop7563-1-3-0-1-7-3-4-6" />
-      <stop
-         id="stop7565-8-8-3-2-0-3-0-55"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0.49599999;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient7102-3-8-5-2-2-1-72">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="0"
-         id="stop7104-0-1-6-7-9-1-5" />
-      <stop
-         id="stop7114-9-0-1-4-6-2-6"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.49803922;" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop7106-25-7-1-2-9-0-2" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient6293">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="0"
-         id="stop6295" />
-      <stop
-         id="stop6297"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.49803922;" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop6299" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient6302">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="0"
-         id="stop6304" />
-      <stop
-         id="stop6306"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.49803922;" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop6308" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient7559-9-3-0-9-8-1-4-62-9">
-      <stop
-         id="stop7561-3-3-4-48-7-4-3-5-8"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:0.502" />
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0.5"
-         id="stop7563-1-3-0-1-7-3-4-1-4" />
-      <stop
-         id="stop7565-8-8-3-2-0-3-0-1-8"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0.49599999;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient7102-3-8-5-2-2-1-0-5">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="0"
-         id="stop7104-0-1-6-7-9-1-4-9" />
-      <stop
-         id="stop7114-9-0-1-4-6-2-3-0"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.49803922;" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop7106-25-7-1-2-9-0-8-4" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient6321">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="0"
-         id="stop6323" />
-      <stop
-         id="stop6325"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.49803922;" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop6327" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient6330">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="0"
-         id="stop6332" />
-      <stop
-         id="stop6334"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.49803922;" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop6336" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient7559-9-3-0-9-8-1-4-6-6">
-      <stop
-         id="stop7561-3-3-4-48-7-4-3-3-3"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:0.502" />
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0.5"
-         id="stop7563-1-3-0-1-7-3-4-2-2" />
-      <stop
-         id="stop7565-8-8-3-2-0-3-0-3-8"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0.49599999;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient7102-3-8-5-2-2-1-7-9">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="0"
-         id="stop7104-0-1-6-7-9-1-8-5" />
-      <stop
-         id="stop7114-9-0-1-4-6-2-4-5"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.49803922;" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop7106-25-7-1-2-9-0-0-1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient6349">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="0"
-         id="stop6351" />
-      <stop
-         id="stop6353"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.49803922;" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop6355" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient6358">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="0"
-         id="stop6360" />
-      <stop
-         id="stop6362"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.49803922;" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop6364" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient7559-9-3-0-9-8-1-4-62-9-6">
-      <stop
-         id="stop7561-3-3-4-48-7-4-3-5-8-0"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:0.502" />
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0.5"
-         id="stop7563-1-3-0-1-7-3-4-1-4-7" />
-      <stop
-         id="stop7565-8-8-3-2-0-3-0-1-8-6"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0.49599999;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient7102-3-8-5-2-2-1-0-5-3">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="0"
-         id="stop7104-0-1-6-7-9-1-4-9-4" />
-      <stop
-         id="stop7114-9-0-1-4-6-2-3-0-7"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.49803922;" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop7106-25-7-1-2-9-0-8-4-1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient6940">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="0"
-         id="stop6942" />
-      <stop
-         id="stop6944"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.49803922;" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop6946" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient6949">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="0"
-         id="stop6951" />
-      <stop
-         id="stop6953"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.49803922;" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop6955" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient7559-9-3-0-9-8-1-4-62-9-6-1">
-      <stop
-         id="stop7561-3-3-4-48-7-4-3-5-8-0-8"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:0.502" />
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0.5"
-         id="stop7563-1-3-0-1-7-3-4-1-4-7-3" />
-      <stop
-         id="stop7565-8-8-3-2-0-3-0-1-8-6-8"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0.49599999;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient7102-3-8-5-2-2-1-0-5-3-0">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="0"
-         id="stop7104-0-1-6-7-9-1-4-9-4-8" />
-      <stop
-         id="stop7114-9-0-1-4-6-2-3-0-7-1"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.49803922;" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop7106-25-7-1-2-9-0-8-4-1-9" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient7106">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="0"
-         id="stop7108" />
-      <stop
-         id="stop7110"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.49803922;" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop7112" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient7115">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="0"
-         id="stop7117" />
-      <stop
-         id="stop7119"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.49803922;" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop7121" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient7686-9"
-       id="linearGradient7692-4"
-       x1="1303.0625"
-       y1="610.34235"
-       x2="1303.0625"
-       y2="723.85583"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient7686-9">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop7688-7" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop7690-5" />
-    </linearGradient>
-    <linearGradient
-       gradientTransform="translate(0,-140)"
-       y2="723.85583"
-       x2="1303.0625"
-       y1="610.34235"
-       x1="1303.0625"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient7755-5"
-       xlink:href="#linearGradient7686-9-7"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient7686-9-7">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop7688-7-1" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop7690-5-0" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8153-2"
-       id="linearGradient8159-0"
-       x1="616.34216"
-       y1="272.22238"
-       x2="658.34216"
-       y2="272.22238"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient8153-2">
-      <stop
-         style="stop-color:#75b1e3;stop-opacity:1;"
-         offset="0"
-         id="stop8155-7" />
-      <stop
-         style="stop-color:#c1def7;stop-opacity:1"
-         offset="1"
-         id="stop8157-7" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8137-9"
-       id="linearGradient8143-2"
-       x1="617.06256"
-       y1="283.2832"
-       x2="657.71722"
-       y2="283.2832"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient8137-9">
-      <stop
-         style="stop-color:#326097;stop-opacity:1"
-         offset="0"
-         id="stop8139-4" />
-      <stop
-         style="stop-color:#2e73c5;stop-opacity:1"
-         offset="1"
-         id="stop8141-1" />
-    </linearGradient>
-    <linearGradient
-       gradientTransform="translate(0,2.6171875e-6)"
-       y2="272.22238"
-       x2="658.34216"
-       y1="272.22238"
-       x1="616.34216"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient8180-3"
-       xlink:href="#linearGradient8153-2-8"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient8153-2-8">
-      <stop
-         style="stop-color:#75b1e3;stop-opacity:1;"
-         offset="0"
-         id="stop8155-7-7" />
-      <stop
-         style="stop-color:#c1def7;stop-opacity:1"
-         offset="1"
-         id="stop8157-7-3" />
-    </linearGradient>
-    <linearGradient
-       gradientTransform="translate(0,2.6171875e-6)"
-       y2="283.2832"
-       x2="657.71722"
-       y1="283.2832"
-       x1="617.06256"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient8182"
-       xlink:href="#linearGradient8137-9-5"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient8137-9-5">
-      <stop
-         style="stop-color:#326097;stop-opacity:1"
-         offset="0"
-         id="stop8139-4-2" />
-      <stop
-         style="stop-color:#2e73c5;stop-opacity:1"
-         offset="1"
-         id="stop8141-1-9" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8153-2-6"
-       id="linearGradient8291-2"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,3e-6)"
-       x1="616.34216"
-       y1="272.22238"
-       x2="658.34216"
-       y2="272.22238" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient8153-2-6">
-      <stop
-         style="stop-color:#75b1e3;stop-opacity:1;"
-         offset="0"
-         id="stop8155-7-6" />
-      <stop
-         style="stop-color:#c1def7;stop-opacity:1"
-         offset="1"
-         id="stop8157-7-6" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient8337-1">
-      <stop
-         style="stop-color:#4e86ca;stop-opacity:1;"
-         offset="0"
-         id="stop8339-4" />
-      <stop
-         style="stop-color:#4e86ca;stop-opacity:0;"
-         offset="1"
-         id="stop8341-2" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient8153-2-4">
-      <stop
-         style="stop-color:#75b1e3;stop-opacity:1;"
-         offset="0"
-         id="stop8155-7-78" />
-      <stop
-         style="stop-color:#c1def7;stop-opacity:1"
-         offset="1"
-         id="stop8157-7-0" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient8137-93">
-      <stop
-         style="stop-color:#326097;stop-opacity:1"
-         offset="0"
-         id="stop8139-9" />
-      <stop
-         style="stop-color:#2e73c5;stop-opacity:1"
-         offset="1"
-         id="stop8141-8" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8498"
-       id="linearGradient8504"
-       x1="636.99469"
-       y1="277.45544"
-       x2="636.99469"
-       y2="308.57455"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient8498">
-      <stop
-         style="stop-color:#d9f4ff;stop-opacity:1"
-         offset="0"
-         id="stop8500" />
-      <stop
-         style="stop-color:#f9fcff;stop-opacity:1"
-         offset="1"
-         id="stop8502" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8653"
-       id="linearGradient8659"
-       x1="641.07611"
-       y1="308.68875"
-       x2="641.07611"
-       y2="276.3064"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8661"
-       id="linearGradient8681"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,2.6171875e-6)"
-       x1="636.99469"
-       y1="277.45544"
-       x2="636.99469"
-       y2="308.57455" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8137"
-       id="linearGradient8683"
-       gradientUnits="userSpaceOnUse"
-       x1="617.06256"
-       y1="283.2832"
-       x2="657.71722"
-       y2="283.2832" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8153-2"
-       id="linearGradient8685"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,3e-6)"
-       x1="616.34216"
-       y1="272.22238"
-       x2="658.34216"
-       y2="272.22238" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8337"
-       id="linearGradient8687"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,0.34375)"
-       x1="636.09375"
-       y1="275.53125"
-       x2="636.09375"
-       y2="269.33588" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8653"
-       id="linearGradient8689"
-       gradientUnits="userSpaceOnUse"
-       x1="641.07611"
-       y1="308.68875"
-       x2="641.07611"
-       y2="276.3064" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8653"
-       id="linearGradient8691"
-       gradientUnits="userSpaceOnUse"
-       x1="641.07611"
-       y1="308.68875"
-       x2="641.07611"
-       y2="276.3064" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8653"
-       id="linearGradient8693"
-       gradientUnits="userSpaceOnUse"
-       x1="641.07611"
-       y1="308.68875"
-       x2="641.07611"
-       y2="276.3064" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8653"
-       id="linearGradient8695"
-       gradientUnits="userSpaceOnUse"
-       x1="641.07611"
-       y1="308.68875"
-       x2="641.07611"
-       y2="276.3064" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8653"
-       id="linearGradient8697"
-       gradientUnits="userSpaceOnUse"
-       x1="641.07611"
-       y1="308.68875"
-       x2="641.07611"
-       y2="276.3064" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8137-93"
-       id="linearGradient8699"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,2.6171875e-6)"
-       x1="617.06256"
-       y1="283.2832"
-       x2="657.71722"
-       y2="283.2832" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8153-2-4"
-       id="linearGradient8701"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,2.6171875e-6)"
-       x1="616.34216"
-       y1="272.22238"
-       x2="658.34216"
-       y2="272.22238" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8337-1"
-       id="linearGradient8703"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,0.34375262)"
-       x1="636.09375"
-       y1="275.53125"
-       x2="636.09375"
-       y2="269.33588" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient9291"
-       id="linearGradient9297"
-       x1="548.41693"
-       y1="488.59351"
-       x2="548.41693"
-       y2="463.98975"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient9299"
-       id="linearGradient9305"
-       x1="567.47571"
-       y1="489.69833"
-       x2="567.47571"
-       y2="463.04114"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient9332-9"
-       id="linearGradient9338-8"
-       x1="528.36798"
-       y1="460.34375"
-       x2="555.01776"
-       y2="460.34375"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient9332-9">
-      <stop
-         style="stop-color:#f5b517;stop-opacity:1"
-         offset="0"
-         id="stop9334-5" />
-      <stop
-         id="stop9340-2"
-         offset="0.33703175"
-         style="stop-color:#fcf79e;stop-opacity:1" />
-      <stop
-         style="stop-color:#f5ae19;stop-opacity:1"
-         offset="1"
-         id="stop9336-4" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient9324-7"
-       id="linearGradient9318"
-       x1="526.85181"
-       y1="472.63525"
-       x2="556.25635"
-       y2="472.63525"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient9324-7">
-      <stop
-         id="stop9326-0"
-         offset="0"
-         style="stop-color:#c07c32;stop-opacity:1;" />
-      <stop
-         style="stop-color:#e2ca69;stop-opacity:1"
-         offset="0.30000001"
-         id="stop9328-1" />
-      <stop
-         id="stop9330-5"
-         offset="1"
-         style="stop-color:#c07c32;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient9291-8"
-       id="linearGradient9297-1"
-       x1="548.41693"
-       y1="488.59351"
-       x2="548.41693"
-       y2="463.98975"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient9291-8">
-      <stop
-         style="stop-color:#e9f8ff;stop-opacity:1;"
-         offset="0"
-         id="stop9293-7" />
-      <stop
-         style="stop-color:#f5f6f9;stop-opacity:1"
-         offset="1"
-         id="stop9295-3" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient9299-1"
-       id="linearGradient9305-8"
-       x1="567.47571"
-       y1="489.69833"
-       x2="567.47571"
-       y2="463.04114"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient9299-1">
-      <stop
-         style="stop-color:#929baa;stop-opacity:1"
-         offset="0"
-         id="stop9301-6" />
-      <stop
-         style="stop-color:#cac3a5;stop-opacity:1"
-         offset="1"
-         id="stop9303-8" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient9332-6">
-      <stop
-         style="stop-color:#f5b517;stop-opacity:1"
-         offset="0"
-         id="stop9334-52" />
-      <stop
-         id="stop9340-23"
-         offset="0.33703175"
-         style="stop-color:#fcf79e;stop-opacity:1" />
-      <stop
-         style="stop-color:#f5ae19;stop-opacity:1"
-         offset="1"
-         id="stop9336-3" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient9312-9">
-      <stop
-         style="stop-color:#cf6c00;stop-opacity:1"
-         offset="0"
-         id="stop9314-5" />
-      <stop
-         id="stop9322-0"
-         offset="0.36339331"
-         style="stop-color:#f5db48;stop-opacity:0.24200913" />
-      <stop
-         style="stop-color:#c36000;stop-opacity:1"
-         offset="1"
-         id="stop9316-6" />
-    </linearGradient>
-    <linearGradient
-       gradientTransform="translate(2.5942995e-8,2.6171875e-6)"
-       y2="472.63525"
-       x2="556.25635"
-       y1="472.63525"
-       x1="526.85181"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient9415-5"
-       xlink:href="#linearGradient9510-3"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient9510-3">
-      <stop
-         style="stop-color:#c07c32;stop-opacity:1;"
-         offset="0"
-         id="stop9512-4" />
-      <stop
-         id="stop9514-9"
-         offset="0.35636142"
-         style="stop-color:#e2ca69;stop-opacity:1" />
-      <stop
-         style="stop-color:#c07c32;stop-opacity:1;"
-         offset="1"
-         id="stop9516-6" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient8661-5"
-       inkscape:collect="always">
-      <stop
-         id="stop8663-3"
-         offset="0"
-         style="stop-color:#c6e7f9;stop-opacity:1" />
-      <stop
-         id="stop8665-5"
-         offset="1"
-         style="stop-color:#f9fcff;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient8137-6">
-      <stop
-         style="stop-color:#326097;stop-opacity:1"
-         offset="0"
-         id="stop8139-1" />
-      <stop
-         style="stop-color:#2e73c5;stop-opacity:1"
-         offset="1"
-         id="stop8141-6" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient8153-2-0">
-      <stop
-         style="stop-color:#75b1e3;stop-opacity:1;"
-         offset="0"
-         id="stop8155-7-9" />
-      <stop
-         style="stop-color:#c1def7;stop-opacity:1"
-         offset="1"
-         id="stop8157-7-5" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient8337-2">
-      <stop
-         style="stop-color:#4e86ca;stop-opacity:1;"
-         offset="0"
-         id="stop8339-7" />
-      <stop
-         style="stop-color:#4e86ca;stop-opacity:0;"
-         offset="1"
-         id="stop8341-8" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8653-2"
-       id="linearGradient8697-5"
-       gradientUnits="userSpaceOnUse"
-       x1="641.07611"
-       y1="308.68875"
-       x2="641.07611"
-       y2="276.3064" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient8653-2">
-      <stop
-         style="stop-color:#676656;stop-opacity:1;"
-         offset="0"
-         id="stop8655-9" />
-      <stop
-         style="stop-color:#9e884e;stop-opacity:1"
-         offset="1"
-         id="stop8657-2" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient8153-2-4-4">
-      <stop
-         style="stop-color:#75b1e3;stop-opacity:1;"
-         offset="0"
-         id="stop8155-7-78-0" />
-      <stop
-         style="stop-color:#c1def7;stop-opacity:1"
-         offset="1"
-         id="stop8157-7-0-7" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8337-1-3"
-       id="linearGradient8703-1"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,0.34375262)"
-       x1="636.09375"
-       y1="275.53125"
-       x2="636.09375"
-       y2="269.33588" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient8337-1-3">
-      <stop
-         style="stop-color:#4e86ca;stop-opacity:1;"
-         offset="0"
-         id="stop8339-4-2" />
-      <stop
-         style="stop-color:#4e86ca;stop-opacity:0;"
-         offset="1"
-         id="stop8341-2-6" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient9605"
-       id="linearGradient9962"
-       gradientUnits="userSpaceOnUse"
-       x1="213.82529"
-       y1="441.62799"
-       x2="227.09628"
-       y2="454.31174" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient9332-6"
-       id="linearGradient9964"
-       gradientUnits="userSpaceOnUse"
-       x1="528.36798"
-       y1="460.34375"
-       x2="555.01776"
-       y2="460.34375" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient9312-9"
-       id="linearGradient9966"
-       gradientUnits="userSpaceOnUse"
-       x1="526.4375"
-       y1="448.46484"
-       x2="556.9375"
-       y2="448.46484" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient9510-3"
-       id="linearGradient9968"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(2.5942995e-8,2.6171875e-6)"
-       x1="526.85181"
-       y1="472.63525"
-       x2="556.25635"
-       y2="472.63525" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8661-5"
-       id="linearGradient9970"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-33.506824,2.6171875e-6)"
-       x1="636.99469"
-       y1="277.45544"
-       x2="636.99469"
-       y2="308.57455" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8137-6"
-       id="linearGradient9972"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-33.506824,0)"
-       x1="617.06256"
-       y1="283.2832"
-       x2="657.71722"
-       y2="283.2832" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8153-2-0"
-       id="linearGradient9974"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-33.506824,3e-6)"
-       x1="616.34216"
-       y1="272.22238"
-       x2="658.34216"
-       y2="272.22238" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8337-2"
-       id="linearGradient9976"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-33.506824,0.34375)"
-       x1="636.09375"
-       y1="275.53125"
-       x2="636.09375"
-       y2="269.33588" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient9908"
-       id="linearGradient9978"
-       gradientUnits="userSpaceOnUse"
-       x1="641.07611"
-       y1="306.07397"
-       x2="641.07611"
-       y2="281.43512" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8653-2"
-       id="linearGradient9980"
-       gradientUnits="userSpaceOnUse"
-       x1="641.07611"
-       y1="308.68875"
-       x2="641.07611"
-       y2="276.3064" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8153-2-4-4"
-       id="linearGradient9982"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-33.506824,2.6171875e-6)"
-       x1="616.34216"
-       y1="272.22238"
-       x2="658.34216"
-       y2="272.22238" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient9914"
-       id="linearGradient9984"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-33.506824,0.34375262)"
-       x1="636.09375"
-       y1="279.41037"
-       x2="636.09375"
-       y2="269.33588" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient9332"
-       id="linearGradient9997"
-       gradientUnits="userSpaceOnUse"
-       x1="528.36798"
-       y1="460.34375"
-       x2="555.01776"
-       y2="460.34375" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient9312"
-       id="linearGradient9999"
-       gradientUnits="userSpaceOnUse"
-       x1="526.4375"
-       y1="448.46484"
-       x2="556.9375"
-       y2="448.46484" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient9510"
-       id="linearGradient10001"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(2.5942995e-8,2.6171875e-6)"
-       x1="526.85181"
-       y1="472.63525"
-       x2="556.25635"
-       y2="472.63525" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient9291-8"
-       id="linearGradient10003"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,-7.3828125e-6)"
-       x1="548.41693"
-       y1="488.59351"
-       x2="548.41693"
-       y2="463.98975" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient9299-1"
-       id="linearGradient10005"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,-7.3828125e-6)"
-       x1="567.47571"
-       y1="489.69833"
-       x2="567.47571"
-       y2="463.04114" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient10157-5"
-       id="linearGradient10163-8"
-       x1="305"
-       y1="504.36218"
-       x2="305"
-       y2="542.73901"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient10157-5">
-      <stop
-         style="stop-color:#6588c1;stop-opacity:1"
-         offset="0"
-         id="stop10159-7" />
-      <stop
-         id="stop10165-2"
-         offset="0.5"
-         style="stop-color:#becce3;stop-opacity:1" />
-      <stop
-         style="stop-color:#809dcb;stop-opacity:1"
-         offset="1"
-         id="stop10161-3" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient10149-3"
-       id="linearGradient10155-1"
-       x1="322.875"
-       y1="536.61243"
-       x2="322.875"
-       y2="504.44818"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient10149-3">
-      <stop
-         style="stop-color:#1d4d9d;stop-opacity:1"
-         offset="0"
-         id="stop10151-0" />
-      <stop
-         style="stop-color:#638ac8;stop-opacity:1"
-         offset="1"
-         id="stop10153-7" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient10149-6"
-       id="linearGradient10155-5"
-       x1="322.875"
-       y1="536.61243"
-       x2="322.875"
-       y2="504.44818"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient10149-6">
-      <stop
-         style="stop-color:#1d4d9d;stop-opacity:1"
-         offset="0"
-         id="stop10151-5" />
-      <stop
-         style="stop-color:#638ac8;stop-opacity:1"
-         offset="1"
-         id="stop10153-8" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient10157-2"
-       id="linearGradient10163-2"
-       x1="305"
-       y1="504.36218"
-       x2="305"
-       y2="542.73901"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient10157-2">
-      <stop
-         style="stop-color:#6588c1;stop-opacity:1"
-         offset="0"
-         id="stop10159-8" />
-      <stop
-         id="stop10165-3"
-         offset="0.5"
-         style="stop-color:#becce3;stop-opacity:1" />
-      <stop
-         style="stop-color:#809dcb;stop-opacity:1"
-         offset="1"
-         id="stop10161-5" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient10149-39"
-       id="linearGradient10155-7"
-       x1="322.875"
-       y1="536.61243"
-       x2="322.875"
-       y2="504.44818"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient10149-39">
-      <stop
-         style="stop-color:#1d4d9d;stop-opacity:1"
-         offset="0"
-         id="stop10151-3" />
-      <stop
-         style="stop-color:#638ac8;stop-opacity:1"
-         offset="1"
-         id="stop10153-72" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10149-6-5">
-      <stop
-         style="stop-color:#1f4d9a;stop-opacity:1"
-         offset="0"
-         id="stop10151-5-7" />
-      <stop
-         id="stop10394"
-         offset="0.5"
-         style="stop-color:#b9c7df;stop-opacity:1" />
-      <stop
-         style="stop-color:#567ebc;stop-opacity:1"
-         offset="1"
-         id="stop10153-8-1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient10448-4"
-       id="linearGradient10454-7"
-       x1="324.1601"
-       y1="535.52948"
-       x2="324.1601"
-       y2="511.66458"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient10448-4">
-      <stop
-         style="stop-color:#ecac18;stop-opacity:1"
-         offset="0"
-         id="stop10450-4" />
-      <stop
-         id="stop10458-7"
-         offset="0.25"
-         style="stop-color:#ffe38d;stop-opacity:1" />
-      <stop
-         id="stop10456-9"
-         offset="0.5"
-         style="stop-color:#fdf5d2;stop-opacity:1" />
-      <stop
-         style="stop-color:#ffeba7;stop-opacity:1"
-         offset="0.75"
-         id="stop10460-1" />
-      <stop
-         style="stop-color:#e5b630;stop-opacity:1"
-         offset="1"
-         id="stop10452-2" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient10440-2"
-       id="linearGradient10446-9"
-       x1="334.375"
-       y1="535.36218"
-       x2="334.375"
-       y2="512.36218"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient10440-2">
-      <stop
-         style="stop-color:#ae7603;stop-opacity:1;"
-         offset="0"
-         id="stop10442-4" />
-      <stop
-         style="stop-color:#bb9221;stop-opacity:1"
-         offset="1"
-         id="stop10444-4" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient10448-9"
-       id="linearGradient10454-9"
-       x1="324.1601"
-       y1="535.52948"
-       x2="324.1601"
-       y2="511.66458"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient10448-9">
-      <stop
-         style="stop-color:#ecac18;stop-opacity:1"
-         offset="0"
-         id="stop10450-3" />
-      <stop
-         id="stop10458-8"
-         offset="0.25"
-         style="stop-color:#ffe38d;stop-opacity:1" />
-      <stop
-         id="stop10456-4"
-         offset="0.5"
-         style="stop-color:#fdf5d2;stop-opacity:1" />
-      <stop
-         style="stop-color:#ffeba7;stop-opacity:1"
-         offset="0.75"
-         id="stop10460-2" />
-      <stop
-         style="stop-color:#e5b630;stop-opacity:1"
-         offset="1"
-         id="stop10452-22" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient10440-1"
-       id="linearGradient10446-7"
-       x1="334.375"
-       y1="535.36218"
-       x2="334.375"
-       y2="512.36218"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient10440-1">
-      <stop
-         style="stop-color:#ae7603;stop-opacity:1;"
-         offset="0"
-         id="stop10442-43" />
-      <stop
-         id="stop10521-1"
-         offset="0.5"
-         style="stop-color:#e8d8a3;stop-opacity:1" />
-      <stop
-         style="stop-color:#bb9221;stop-opacity:1"
-         offset="1"
-         id="stop10444-3" />
-    </linearGradient>
-    <linearGradient
-       gradientTransform="translate(7.4375,2.6171875e-6)"
-       y2="511.66458"
-       x2="324.1601"
-       y1="535.52948"
-       x1="324.1601"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient10546-3"
-       xlink:href="#linearGradient10448-9-7"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient10448-9-7">
-      <stop
-         style="stop-color:#ecac18;stop-opacity:1"
-         offset="0"
-         id="stop10450-3-5" />
-      <stop
-         id="stop10458-8-0"
-         offset="0.25"
-         style="stop-color:#ffe38d;stop-opacity:1" />
-      <stop
-         id="stop10456-4-1"
-         offset="0.5"
-         style="stop-color:#fdf5d2;stop-opacity:1" />
-      <stop
-         style="stop-color:#ffeba7;stop-opacity:1"
-         offset="0.75"
-         id="stop10460-2-9" />
-      <stop
-         style="stop-color:#e5b630;stop-opacity:1"
-         offset="1"
-         id="stop10452-22-7" />
-    </linearGradient>
-    <linearGradient
-       gradientTransform="translate(7.4375,2.6171875e-6)"
-       y2="512.36218"
-       x2="334.375"
-       y1="535.36218"
-       x1="334.375"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient10548-3"
-       xlink:href="#linearGradient10440-1-0"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient10440-1-0">
-      <stop
-         style="stop-color:#ae7603;stop-opacity:1;"
-         offset="0"
-         id="stop10442-43-2" />
-      <stop
-         id="stop10521-1-2"
-         offset="0.5"
-         style="stop-color:#e8d8a3;stop-opacity:1" />
-      <stop
-         style="stop-color:#bb9221;stop-opacity:1"
-         offset="1"
-         id="stop10444-3-4" />
-    </linearGradient>
-    <linearGradient
-       gradientTransform="translate(7.4375,2.6171875e-6)"
-       y2="511.66458"
-       x2="324.1601"
-       y1="535.52948"
-       x1="324.1601"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient10546-8"
-       xlink:href="#linearGradient10448-9-6"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient10448-9-6">
-      <stop
-         style="stop-color:#ecac18;stop-opacity:1"
-         offset="0"
-         id="stop10450-3-8" />
-      <stop
-         id="stop10458-8-7"
-         offset="0.25"
-         style="stop-color:#ffe38d;stop-opacity:1" />
-      <stop
-         id="stop10456-4-7"
-         offset="0.5"
-         style="stop-color:#fdf5d2;stop-opacity:1" />
-      <stop
-         style="stop-color:#ffeba7;stop-opacity:1"
-         offset="0.75"
-         id="stop10460-2-1" />
-      <stop
-         style="stop-color:#e5b630;stop-opacity:1"
-         offset="1"
-         id="stop10452-22-8" />
-    </linearGradient>
-    <linearGradient
-       gradientTransform="translate(7.4375,2.6171875e-6)"
-       y2="512.36218"
-       x2="334.375"
-       y1="535.36218"
-       x1="334.375"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient10548-1"
-       xlink:href="#linearGradient10440-1-3"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient10440-1-3">
-      <stop
-         style="stop-color:#ae7603;stop-opacity:1;"
-         offset="0"
-         id="stop10442-43-0" />
-      <stop
-         id="stop10521-1-4"
-         offset="0.5"
-         style="stop-color:#e8d8a3;stop-opacity:1" />
-      <stop
-         style="stop-color:#bb9221;stop-opacity:1"
-         offset="1"
-         id="stop10444-3-2" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10448-9-7-0">
-      <stop
-         style="stop-color:#cf9307;stop-opacity:1"
-         offset="0"
-         id="stop10450-3-5-6" />
-      <stop
-         id="stop10456-4-1-5"
-         offset="0.5"
-         style="stop-color:#f7d87b;stop-opacity:1" />
-      <stop
-         style="stop-color:#ebb313;stop-opacity:1"
-         offset="1"
-         id="stop10452-22-7-8" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10440-1-0-0">
-      <stop
-         style="stop-color:#ae7603;stop-opacity:1;"
-         offset="0"
-         id="stop10442-43-2-0" />
-      <stop
-         id="stop10521-1-2-5"
-         offset="0.5"
-         style="stop-color:#e8d8a3;stop-opacity:1" />
-      <stop
-         style="stop-color:#bb9221;stop-opacity:1"
-         offset="1"
-         id="stop10444-3-4-0" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient10448-9-7-0"
-       id="linearGradient10770"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(7.875,2.6171875e-6)"
-       x1="324.1601"
-       y1="529.30121"
-       x2="323.98331"
-       y2="518.28192" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient10440-1-0-0"
-       id="linearGradient10772"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(7.875,2.6171875e-6)"
-       x1="334.375"
-       y1="529.06494"
-       x2="334.375"
-       y2="518.67365" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient10748"
-       id="linearGradient10774"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(7.4375,2.6171875e-6)"
-       x1="324.1601"
-       y1="532.15552"
-       x2="324.1601"
-       y2="515.53949" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient10440-1-3"
-       id="linearGradient10776"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(7.4375,2.6171875e-6)"
-       x1="334.375"
-       y1="532.30212"
-       x2="334.375"
-       y2="515.73615" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient10448"
-       id="linearGradient10778"
-       gradientUnits="userSpaceOnUse"
-       x1="324.1601"
-       y1="535.52948"
-       x2="324.1601"
-       y2="511.66458" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient10440"
-       id="linearGradient10780"
-       gradientUnits="userSpaceOnUse"
-       x1="334.375"
-       y1="535.36218"
-       x2="334.375"
-       y2="512.36218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient10414"
-       id="linearGradient10782"
-       gradientUnits="userSpaceOnUse"
-       x1="298.34253"
-       y1="528.1048"
-       x2="298.34253"
-       y2="519.08923" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient10432"
-       id="linearGradient10784"
-       gradientUnits="userSpaceOnUse"
-       x1="289.8125"
-       y1="528.73804"
-       x2="289.8125"
-       y2="519.36218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient10157"
-       id="linearGradient10786"
-       gradientUnits="userSpaceOnUse"
-       x1="306.05069"
-       y1="532.08228"
-       x2="306.05069"
-       y2="514.75818" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient10396"
-       id="linearGradient10788"
-       gradientUnits="userSpaceOnUse"
-       x1="302.3125"
-       y1="532.98718"
-       x2="302.3125"
-       y2="514.67456" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient10157-2"
-       id="linearGradient10790"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,2.6171875e-6)"
-       x1="305"
-       y1="504.36218"
-       x2="305"
-       y2="542.73901" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient10149-39"
-       id="linearGradient10792"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,2.6171875e-6)"
-       x1="322.875"
-       y1="536.61243"
-       x2="322.875"
-       y2="504.44818" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient10149-6-5"
-       id="linearGradient10794"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0.88388349,2.6171875e-6)"
-       x1="322.875"
-       y1="536.61243"
-       x2="322.875"
-       y2="511.38498" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient10798-8"
-       id="linearGradient10804-7"
-       x1="388.63736"
-       y1="478.18777"
-       x2="388.63736"
-       y2="457.95499"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient10798-8">
-      <stop
-         style="stop-color:#4f9e55;stop-opacity:1"
-         offset="0"
-         id="stop10800-2" />
-      <stop
-         id="stop10806-9"
-         offset="0.5"
-         style="stop-color:#418a4d;stop-opacity:1" />
-      <stop
-         style="stop-color:#a4c589;stop-opacity:1"
-         offset="1"
-         id="stop10802-3" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient10798-1"
-       id="linearGradient10804-8"
-       x1="388.63736"
-       y1="478.18777"
-       x2="388.63736"
-       y2="457.95499"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient10798-1">
-      <stop
-         style="stop-color:#4f9e55;stop-opacity:1"
-         offset="0"
-         id="stop10800-5" />
-      <stop
-         id="stop10806-6"
-         offset="0.5"
-         style="stop-color:#418a4d;stop-opacity:1" />
-      <stop
-         style="stop-color:#a4c589;stop-opacity:1"
-         offset="1"
-         id="stop10802-1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10798-1-9">
-      <stop
-         style="stop-color:#4f9e55;stop-opacity:1"
-         offset="0"
-         id="stop10800-5-2" />
-      <stop
-         id="stop10806-6-8"
-         offset="0.5"
-         style="stop-color:#418a4d;stop-opacity:1" />
-      <stop
-         style="stop-color:#a4c589;stop-opacity:1"
-         offset="1"
-         id="stop10802-1-5" />
-    </linearGradient>
-    <linearGradient
-       y2="457.95499"
-       x2="388.63736"
-       y1="478.18777"
-       x1="388.63736"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient10835-2"
-       xlink:href="#linearGradient10856-6"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient10856-6">
-      <stop
-         id="stop10858-0"
-         offset="0"
-         style="stop-color:#7d75ac;stop-opacity:1" />
-      <stop
-         style="stop-color:#574a96;stop-opacity:1"
-         offset="0.5"
-         id="stop10860-7" />
-      <stop
-         id="stop10862-3"
-         offset="1"
-         style="stop-color:#9f99c8;stop-opacity:1" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11146-8"
-       id="radialGradient11144-4"
-       cx="387.59717"
-       cy="442.57816"
-       fx="387.59717"
-       fy="442.57816"
-       r="6.1875"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.5657869,-2.9706834e-6,2.6069523e-6,1.3740716,-219.20821,-165.52072)" />
-    <linearGradient
-       id="linearGradient11146-8">
-      <stop
-         style="stop-color:#faefba;stop-opacity:1"
-         offset="0"
-         id="stop11150-7" />
-      <stop
-         id="stop11152-8"
-         offset="1"
-         style="stop-color:#9e6542;stop-opacity:1" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11146-7"
-       id="radialGradient11144-2"
-       cx="387.59717"
-       cy="442.57816"
-       fx="387.59717"
-       fy="442.57816"
-       r="6.1875"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.5657869,-2.9706834e-6,2.6069523e-6,1.3740716,-219.20821,-165.52072)" />
-    <linearGradient
-       id="linearGradient11146-7">
-      <stop
-         style="stop-color:#faefba;stop-opacity:1"
-         offset="0"
-         id="stop11150-9" />
-      <stop
-         id="stop11152-6"
-         offset="1"
-         style="stop-color:#9e6542;stop-opacity:1" />
-    </linearGradient>
-    <radialGradient
-       r="6.1875"
-       fy="442.57816"
-       fx="387.59717"
-       cy="442.57816"
-       cx="387.59717"
-       gradientTransform="matrix(1.5657869,-2.9706834e-6,2.6069523e-6,1.3740716,-208.33321,-165.52072)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient11169-6"
-       xlink:href="#linearGradient11146-8-7"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient11146-8-7">
-      <stop
-         style="stop-color:#faefba;stop-opacity:1"
-         offset="0"
-         id="stop11150-7-8" />
-      <stop
-         id="stop11152-8-8"
-         offset="1"
-         style="stop-color:#9e6542;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       y2="457.95499"
-       x2="388.63736"
-       y1="478.18777"
-       x1="388.63736"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient11063-6"
-       xlink:href="#linearGradient10856-6-3"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient10856-6-3">
-      <stop
-         id="stop10858-0-7"
-         offset="0"
-         style="stop-color:#7d75ac;stop-opacity:1" />
-      <stop
-         style="stop-color:#574a96;stop-opacity:1"
-         offset="0.5"
-         id="stop10860-7-9" />
-      <stop
-         id="stop10862-3-3"
-         offset="1"
-         style="stop-color:#9f99c8;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10798-1-9-3">
-      <stop
-         style="stop-color:#4f9e55;stop-opacity:1"
-         offset="0"
-         id="stop10800-5-2-1" />
-      <stop
-         id="stop10806-6-8-5"
-         offset="0.5"
-         style="stop-color:#418a4d;stop-opacity:1" />
-      <stop
-         style="stop-color:#a4c589;stop-opacity:1"
-         offset="1"
-         id="stop10802-1-5-3" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11146-4"
-       id="radialGradient11268-5"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.5657869,-2.9706834e-6,2.6069523e-6,1.3740716,-219.20821,-165.52072)"
-       cx="387.59717"
-       cy="442.57816"
-       fx="387.59717"
-       fy="442.57816"
-       r="6.1875" />
-    <linearGradient
-       id="linearGradient11146-4">
-      <stop
-         style="stop-color:#faefba;stop-opacity:1"
-         offset="0"
-         id="stop11150-4" />
-      <stop
-         id="stop11152-9"
-         offset="1"
-         style="stop-color:#9e6542;stop-opacity:1" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11146-8-3"
-       id="radialGradient11270-4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.5657869,-2.9706834e-6,2.6069523e-6,1.3740716,-208.33321,-165.52072)"
-       cx="387.59717"
-       cy="442.57816"
-       fx="387.59717"
-       fy="442.57816"
-       r="6.1875" />
-    <linearGradient
-       id="linearGradient11146-8-3">
-      <stop
-         style="stop-color:#faefba;stop-opacity:1"
-         offset="0"
-         id="stop11150-7-5" />
-      <stop
-         id="stop11152-8-4"
-         offset="1"
-         style="stop-color:#9e6542;stop-opacity:1" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11146-7-5"
-       id="radialGradient11272-3"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.5657869,-2.9706834e-6,2.6069523e-6,1.3740716,-219.20821,-154.64572)"
-       cx="387.59717"
-       cy="442.57816"
-       fx="387.59717"
-       fy="442.57816"
-       r="6.1875" />
-    <linearGradient
-       id="linearGradient11146-7-5">
-      <stop
-         style="stop-color:#faefba;stop-opacity:1"
-         offset="0"
-         id="stop11150-9-6" />
-      <stop
-         id="stop11152-6-7"
-         offset="1"
-         style="stop-color:#9e6542;stop-opacity:1" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11146-8-7-5"
-       id="radialGradient11274-3"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.5657869,-2.9706834e-6,2.6069523e-6,1.3740716,-208.33321,-154.64572)"
-       cx="387.59717"
-       cy="442.57816"
-       fx="387.59717"
-       fy="442.57816"
-       r="6.1875" />
-    <linearGradient
-       id="linearGradient11146-8-7-5">
-      <stop
-         style="stop-color:#faefba;stop-opacity:1"
-         offset="0"
-         id="stop11150-7-8-3" />
-      <stop
-         id="stop11152-8-8-6"
-         offset="1"
-         style="stop-color:#9e6542;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       y2="457.95499"
-       x2="388.63736"
-       y1="478.18777"
-       x1="388.63736"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient11298-3"
-       xlink:href="#linearGradient10856-6-3-0"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient10856-6-3-0">
-      <stop
-         id="stop10858-0-7-6"
-         offset="0"
-         style="stop-color:#7d75ac;stop-opacity:1" />
-      <stop
-         style="stop-color:#574a96;stop-opacity:1"
-         offset="0.5"
-         id="stop10860-7-9-1" />
-      <stop
-         id="stop10862-3-3-8"
-         offset="1"
-         style="stop-color:#9f99c8;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       y2="457.95499"
-       x2="388.63736"
-       y1="478.18777"
-       x1="388.63736"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient10880-5-3-4"
-       xlink:href="#linearGradient10798-1-9-3-7"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient10798-1-9-3-7">
-      <stop
-         style="stop-color:#4f9e55;stop-opacity:1"
-         offset="0"
-         id="stop10800-5-2-1-8" />
-      <stop
-         id="stop10806-6-8-5-3"
-         offset="0.5"
-         style="stop-color:#418a4d;stop-opacity:1" />
-      <stop
-         style="stop-color:#a4c589;stop-opacity:1"
-         offset="1"
-         id="stop10802-1-5-3-0" />
-    </linearGradient>
-    <linearGradient
-       y2="457.95499"
-       x2="388.63736"
-       y1="478.18777"
-       x1="388.63736"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient11390"
-       xlink:href="#linearGradient10798-1-9-3-7"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient11146-4-5">
-      <stop
-         style="stop-color:#faefba;stop-opacity:1"
-         offset="0"
-         id="stop11150-4-7" />
-      <stop
-         id="stop11152-9-2"
-         offset="1"
-         style="stop-color:#9e6542;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient11146-8-3-4">
-      <stop
-         style="stop-color:#faefba;stop-opacity:1"
-         offset="0"
-         id="stop11150-7-5-5" />
-      <stop
-         id="stop11152-8-4-9"
-         offset="1"
-         style="stop-color:#9e6542;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient11146-7-5-3">
-      <stop
-         style="stop-color:#faefba;stop-opacity:1"
-         offset="0"
-         id="stop11150-9-6-4" />
-      <stop
-         id="stop11152-6-7-2"
-         offset="1"
-         style="stop-color:#9e6542;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient11146-8-7-5-6">
-      <stop
-         style="stop-color:#faefba;stop-opacity:1"
-         offset="0"
-         id="stop11150-7-8-3-1" />
-      <stop
-         id="stop11152-8-8-6-6"
-         offset="1"
-         style="stop-color:#9e6542;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10856-6-3-0-1">
-      <stop
-         id="stop10858-0-7-6-1"
-         offset="0"
-         style="stop-color:#7d75ac;stop-opacity:1" />
-      <stop
-         style="stop-color:#574a96;stop-opacity:1"
-         offset="0.5"
-         id="stop10860-7-9-1-7" />
-      <stop
-         id="stop10862-3-3-8-4"
-         offset="1"
-         style="stop-color:#9f99c8;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       y2="457.95499"
-       x2="388.63736"
-       y1="478.18777"
-       x1="388.63736"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient11390-0"
-       xlink:href="#linearGradient10798-1-9-3-7-1"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient10798-1-9-3-7-1">
-      <stop
-         style="stop-color:#4f9e55;stop-opacity:1"
-         offset="0"
-         id="stop10800-5-2-1-8-2" />
-      <stop
-         id="stop10806-6-8-5-3-2"
-         offset="0.5"
-         style="stop-color:#418a4d;stop-opacity:1" />
-      <stop
-         style="stop-color:#a4c589;stop-opacity:1"
-         offset="1"
-         id="stop10802-1-5-3-0-2" />
-    </linearGradient>
-    <linearGradient
-       y2="457.95499"
-       x2="388.63736"
-       y1="478.18777"
-       x1="388.63736"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient11520-3"
-       xlink:href="#linearGradient10798-1-9-3-7-1-2"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient10798-1-9-3-7-1-2">
-      <stop
-         style="stop-color:#4f9e55;stop-opacity:1"
-         offset="0"
-         id="stop10800-5-2-1-8-2-6" />
-      <stop
-         id="stop10806-6-8-5-3-2-9"
-         offset="0.5"
-         style="stop-color:#418a4d;stop-opacity:1" />
-      <stop
-         style="stop-color:#a4c589;stop-opacity:1"
-         offset="1"
-         id="stop10802-1-5-3-0-2-6" />
-    </linearGradient>
-    <linearGradient
-       y2="457.95499"
-       x2="388.63736"
-       y1="478.18777"
-       x1="388.63736"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient11520-8"
-       xlink:href="#linearGradient10798-1-9-3-7-1-1"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient10798-1-9-3-7-1-1">
-      <stop
-         style="stop-color:#4f9e55;stop-opacity:1"
-         offset="0"
-         id="stop10800-5-2-1-8-2-5" />
-      <stop
-         id="stop10806-6-8-5-3-2-3"
-         offset="0.5"
-         style="stop-color:#418a4d;stop-opacity:1" />
-      <stop
-         style="stop-color:#a4c589;stop-opacity:1"
-         offset="1"
-         id="stop10802-1-5-3-0-2-2" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11679-2"
-       id="radialGradient11685-7"
-       cx="385.7438"
-       cy="465.42303"
-       fx="385.7438"
-       fy="465.42303"
-       r="11.849554"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient11679-2">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.72146118"
-         offset="0"
-         id="stop11681-9" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop11683-1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11687-1"
-       id="linearGradient11693-0"
-       x1="390.76602"
-       y1="458.54279"
-       x2="390.76602"
-       y2="478.80402"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient11687-1">
-      <stop
-         style="stop-color:#bdb692;stop-opacity:1;"
-         offset="0"
-         id="stop11689-9" />
-      <stop
-         id="stop11695-3"
-         offset="0.5"
-         style="stop-color:#869097;stop-opacity:1" />
-      <stop
-         style="stop-color:#c3cace;stop-opacity:1"
-         offset="1"
-         id="stop11691-9" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11888-8"
-       id="linearGradient11894-2"
-       x1="342.37973"
-       y1="457.29816"
-       x2="358.60471"
-       y2="444.57022"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient11888-8">
-      <stop
-         style="stop-color:#a7c8ec;stop-opacity:1"
-         offset="0"
-         id="stop11890-4" />
-      <stop
-         style="stop-color:#b4def6;stop-opacity:1"
-         offset="1"
-         id="stop11892-1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11888-4"
-       id="linearGradient11894-5"
-       x1="342.37973"
-       y1="457.29816"
-       x2="358.60471"
-       y2="444.57022"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient11888-4">
-      <stop
-         style="stop-color:#a7c8ec;stop-opacity:1"
-         offset="0"
-         id="stop11890-8" />
-      <stop
-         style="stop-color:#b4def6;stop-opacity:1"
-         offset="1"
-         id="stop11892-8" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient11969-2">
-      <stop
-         style="stop-color:#6f93c7;stop-opacity:1;"
-         offset="0"
-         id="stop11971-3" />
-      <stop
-         id="stop11979-8"
-         offset="0.29546595"
-         style="stop-color:#6f93c7;stop-opacity:0;" />
-      <stop
-         id="stop11977-7"
-         offset="0.57727957"
-         style="stop-color:#6f93c7;stop-opacity:0;" />
-      <stop
-         style="stop-color:#6f93c7;stop-opacity:1"
-         offset="1"
-         id="stop11973-6" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient12088-2">
-      <stop
-         style="stop-color:#84a7d5;stop-opacity:1;"
-         offset="0"
-         id="stop12090-1" />
-      <stop
-         id="stop12096-1"
-         offset="0.5"
-         style="stop-color:#a9cded;stop-opacity:1" />
-      <stop
-         style="stop-color:#95b8e0;stop-opacity:1"
-         offset="1"
-         id="stop12092-2" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient11999-7">
-      <stop
-         style="stop-color:#f8b098;stop-opacity:1"
-         offset="0"
-         id="stop12001-9" />
-      <stop
-         id="stop12007-1"
-         offset="0.5"
-         style="stop-color:#f8decd;stop-opacity:1" />
-      <stop
-         style="stop-color:#f8b098;stop-opacity:1"
-         offset="1"
-         id="stop12003-2" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11679-7"
-       id="radialGradient11685-5"
-       cx="385.7438"
-       cy="465.42303"
-       fx="385.7438"
-       fy="465.42303"
-       r="11.849554"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient11679-7">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.72146118"
-         offset="0"
-         id="stop11681-94" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop11683-0" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11687-9"
-       id="linearGradient11693-2"
-       x1="390.76602"
-       y1="458.54279"
-       x2="390.76602"
-       y2="478.80402"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient11687-9">
-      <stop
-         style="stop-color:#bdb692;stop-opacity:1;"
-         offset="0"
-         id="stop11689-1" />
-      <stop
-         id="stop11695-2"
-         offset="0.5"
-         style="stop-color:#869097;stop-opacity:1" />
-      <stop
-         style="stop-color:#c3cace;stop-opacity:1"
-         offset="1"
-         id="stop11691-1" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11679-8"
-       id="radialGradient11685-3"
-       cx="385.7438"
-       cy="465.42303"
-       fx="385.7438"
-       fy="465.42303"
-       r="11.849554"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient11679-8">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.72146118"
-         offset="0"
-         id="stop11681-3" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop11683-6" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11687-8"
-       id="linearGradient11693-26"
-       x1="390.76602"
-       y1="458.54279"
-       x2="390.76602"
-       y2="478.80402"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient11687-8">
-      <stop
-         style="stop-color:#bdb692;stop-opacity:1;"
-         offset="0"
-         id="stop11689-6" />
-      <stop
-         id="stop11695-6"
-         offset="0.5"
-         style="stop-color:#869097;stop-opacity:1" />
-      <stop
-         style="stop-color:#c3cace;stop-opacity:1"
-         offset="1"
-         id="stop11691-5" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient11969-2-2">
-      <stop
-         style="stop-color:#6f93c7;stop-opacity:1;"
-         offset="0"
-         id="stop11971-3-7" />
-      <stop
-         id="stop11979-8-6"
-         offset="0.29546595"
-         style="stop-color:#6f93c7;stop-opacity:0;" />
-      <stop
-         id="stop11977-7-6"
-         offset="0.57727957"
-         style="stop-color:#6f93c7;stop-opacity:0;" />
-      <stop
-         style="stop-color:#6f93c7;stop-opacity:1"
-         offset="1"
-         id="stop11973-6-6" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient12088-2-1">
-      <stop
-         style="stop-color:#84a7d5;stop-opacity:1;"
-         offset="0"
-         id="stop12090-1-8" />
-      <stop
-         id="stop12096-1-8"
-         offset="0.5"
-         style="stop-color:#a9cded;stop-opacity:1" />
-      <stop
-         style="stop-color:#95b8e0;stop-opacity:1"
-         offset="1"
-         id="stop12092-2-4" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient11999-7-2">
-      <stop
-         style="stop-color:#f8b098;stop-opacity:1"
-         offset="0"
-         id="stop12001-9-2" />
-      <stop
-         id="stop12007-1-3"
-         offset="0.5"
-         style="stop-color:#f8decd;stop-opacity:1" />
-      <stop
-         style="stop-color:#f8b098;stop-opacity:1"
-         offset="1"
-         id="stop12003-2-8" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10798-1-9-3-7-1-15">
-      <stop
-         style="stop-color:#4f9e55;stop-opacity:1"
-         offset="0"
-         id="stop10800-5-2-1-8-2-8" />
-      <stop
-         id="stop10806-6-8-5-3-2-95"
-         offset="0.5"
-         style="stop-color:#418a4d;stop-opacity:1" />
-      <stop
-         style="stop-color:#a4c589;stop-opacity:1"
-         offset="1"
-         id="stop10802-1-5-3-0-2-0" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient11969-9">
-      <stop
-         style="stop-color:#6f93c7;stop-opacity:1;"
-         offset="0"
-         id="stop11971-7" />
-      <stop
-         id="stop11979-0"
-         offset="0.29546595"
-         style="stop-color:#6f93c7;stop-opacity:0;" />
-      <stop
-         id="stop11977-6"
-         offset="0.57727957"
-         style="stop-color:#6f93c7;stop-opacity:0;" />
-      <stop
-         style="stop-color:#6f93c7;stop-opacity:1"
-         offset="1"
-         id="stop11973-8" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient12088-7">
-      <stop
-         style="stop-color:#84a7d5;stop-opacity:1;"
-         offset="0"
-         id="stop12090-7" />
-      <stop
-         id="stop12096-6"
-         offset="0.5"
-         style="stop-color:#a9cded;stop-opacity:1" />
-      <stop
-         style="stop-color:#95b8e0;stop-opacity:1"
-         offset="1"
-         id="stop12092-1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient11999-9">
-      <stop
-         style="stop-color:#f8b098;stop-opacity:1"
-         offset="0"
-         id="stop12001-1" />
-      <stop
-         id="stop12007-4"
-         offset="0.5"
-         style="stop-color:#f8decd;stop-opacity:1" />
-      <stop
-         style="stop-color:#f8b098;stop-opacity:1"
-         offset="1"
-         id="stop12003-3" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10798-1-9-3-7-1-1-2">
-      <stop
-         style="stop-color:#4f9e55;stop-opacity:1"
-         offset="0"
-         id="stop10800-5-2-1-8-2-5-2" />
-      <stop
-         id="stop10806-6-8-5-3-2-3-3"
-         offset="0.5"
-         style="stop-color:#418a4d;stop-opacity:1" />
-      <stop
-         style="stop-color:#a4c589;stop-opacity:1"
-         offset="1"
-         id="stop10802-1-5-3-0-2-2-2" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11679-3"
-       id="radialGradient11685-2"
-       cx="385.7438"
-       cy="465.42303"
-       fx="385.7438"
-       fy="465.42303"
-       r="11.849554"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient11679-3">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.72146118"
-         offset="0"
-         id="stop11681-91" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop11683-02" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11687-2"
-       id="linearGradient11693-3"
-       x1="390.76602"
-       y1="458.54279"
-       x2="390.76602"
-       y2="478.80402"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient11687-2">
-      <stop
-         style="stop-color:#bdb692;stop-opacity:1;"
-         offset="0"
-         id="stop11689-3" />
-      <stop
-         id="stop11695-9"
-         offset="0.5"
-         style="stop-color:#869097;stop-opacity:1" />
-      <stop
-         style="stop-color:#c3cace;stop-opacity:1"
-         offset="1"
-         id="stop11691-10" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient12717-9"
-       id="radialGradient12723-3"
-       cx="433.36786"
-       cy="424.34106"
-       fx="433.36786"
-       fy="424.34106"
-       r="12.027534"
-       gradientTransform="matrix(1.1614831,2.1855961e-7,-2.811228e-7,1.4939602,-69.981471,-211.63828)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient12717-9">
-      <stop
-         style="stop-color:#e4f1d8;stop-opacity:1"
-         offset="0"
-         id="stop12719-7" />
-      <stop
-         style="stop-color:#8ebc7b;stop-opacity:1"
-         offset="1"
-         id="stop12721-6" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient12717-5">
-      <stop
-         style="stop-color:#e4f1d8;stop-opacity:1"
-         offset="0"
-         id="stop12719-6" />
-      <stop
-         style="stop-color:#8ebc7b;stop-opacity:1"
-         offset="1"
-         id="stop12721-9" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient12717-5"
-       id="radialGradient12739-4"
-       cx="433.5452"
-       cy="420.74988"
-       fx="433.5452"
-       fy="420.74988"
-       r="12.952347"
-       gradientTransform="matrix(1,0,0,1.2797889,0,-120.61151)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient12862-1">
-      <stop
-         style="stop-color:#2d493b;stop-opacity:1;"
-         offset="0"
-         id="stop12864-3" />
-      <stop
-         style="stop-color:#296c79;stop-opacity:1"
-         offset="1"
-         id="stop12866-4" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient12862-1"
-       id="linearGradient12904-2"
-       x1="420.88995"
-       y1="455.88452"
-       x2="440.35345"
-       y2="417.26108"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient11146-4-0">
-      <stop
-         style="stop-color:#faefba;stop-opacity:1"
-         offset="0"
-         id="stop11150-4-1" />
-      <stop
-         id="stop11152-9-9"
-         offset="1"
-         style="stop-color:#9e6542;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient11146-8-3-5">
-      <stop
-         style="stop-color:#faefba;stop-opacity:1"
-         offset="0"
-         id="stop11150-7-5-2" />
-      <stop
-         id="stop11152-8-4-3"
-         offset="1"
-         style="stop-color:#9e6542;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient11146-7-5-5">
-      <stop
-         style="stop-color:#faefba;stop-opacity:1"
-         offset="0"
-         id="stop11150-9-6-8" />
-      <stop
-         id="stop11152-6-7-5"
-         offset="1"
-         style="stop-color:#9e6542;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient11146-8-7-5-9">
-      <stop
-         style="stop-color:#faefba;stop-opacity:1"
-         offset="0"
-         id="stop11150-7-8-3-19" />
-      <stop
-         id="stop11152-8-8-6-2"
-         offset="1"
-         style="stop-color:#9e6542;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10856-6-3-0-5">
-      <stop
-         id="stop10858-0-7-6-9"
-         offset="0"
-         style="stop-color:#7d75ac;stop-opacity:1" />
-      <stop
-         style="stop-color:#574a96;stop-opacity:1"
-         offset="0.5"
-         id="stop10860-7-9-1-9" />
-      <stop
-         id="stop10862-3-3-8-6"
-         offset="1"
-         style="stop-color:#9f99c8;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       y2="457.95499"
-       x2="388.63736"
-       y1="478.18777"
-       x1="388.63736"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient11390-9"
-       xlink:href="#linearGradient10798-1-9-3-7-6"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient10798-1-9-3-7-6">
-      <stop
-         style="stop-color:#4f9e55;stop-opacity:1"
-         offset="0"
-         id="stop10800-5-2-1-8-20" />
-      <stop
-         id="stop10806-6-8-5-3-9"
-         offset="0.5"
-         style="stop-color:#418a4d;stop-opacity:1" />
-      <stop
-         style="stop-color:#a4c589;stop-opacity:1"
-         offset="1"
-         id="stop10802-1-5-3-0-4" />
-    </linearGradient>
-    <linearGradient
-       y2="457.95499"
-       x2="388.63736"
-       y1="478.18777"
-       x1="388.63736"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient13197-7"
-       xlink:href="#linearGradient10798-1-9-3-7-6-6"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient10798-1-9-3-7-6-6">
-      <stop
-         style="stop-color:#4f9e55;stop-opacity:1"
-         offset="0"
-         id="stop10800-5-2-1-8-20-4" />
-      <stop
-         id="stop10806-6-8-5-3-9-2"
-         offset="0.5"
-         style="stop-color:#418a4d;stop-opacity:1" />
-      <stop
-         style="stop-color:#a4c589;stop-opacity:1"
-         offset="1"
-         id="stop10802-1-5-3-0-4-6" />
-    </linearGradient>
-    <linearGradient
-       y2="457.95499"
-       x2="388.63736"
-       y1="478.18777"
-       x1="388.63736"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient13296-4"
-       xlink:href="#linearGradient10798-1-9-3-7-6-6-7"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient10798-1-9-3-7-6-6-7">
-      <stop
-         style="stop-color:#4f9e55;stop-opacity:1"
-         offset="0"
-         id="stop10800-5-2-1-8-20-4-5" />
-      <stop
-         id="stop10806-6-8-5-3-9-2-0"
-         offset="0.5"
-         style="stop-color:#418a4d;stop-opacity:1" />
-      <stop
-         style="stop-color:#a4c589;stop-opacity:1"
-         offset="1"
-         id="stop10802-1-5-3-0-4-6-4" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10798-1-9-3-7-6-6-7-1">
-      <stop
-         style="stop-color:#4f9e55;stop-opacity:1"
-         offset="0"
-         id="stop10800-5-2-1-8-20-4-5-3" />
-      <stop
-         id="stop10806-6-8-5-3-9-2-0-2"
-         offset="0.5"
-         style="stop-color:#418a4d;stop-opacity:1" />
-      <stop
-         style="stop-color:#a4c589;stop-opacity:1"
-         offset="1"
-         id="stop10802-1-5-3-0-4-6-4-2" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10798-1-9-3-7-6-6-6">
-      <stop
-         style="stop-color:#4f9e55;stop-opacity:1"
-         offset="0"
-         id="stop10800-5-2-1-8-20-4-0" />
-      <stop
-         id="stop10806-6-8-5-3-9-2-2"
-         offset="0.5"
-         style="stop-color:#418a4d;stop-opacity:1" />
-      <stop
-         style="stop-color:#a4c589;stop-opacity:1"
-         offset="1"
-         id="stop10802-1-5-3-0-4-6-8" />
-    </linearGradient>
-    <linearGradient
-       y2="457.95499"
-       x2="388.63736"
-       y1="478.18777"
-       x1="388.63736"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient13197-3"
-       xlink:href="#linearGradient10798-1-9-3-7-6-8"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient10798-1-9-3-7-6-8">
-      <stop
-         style="stop-color:#4f9e55;stop-opacity:1"
-         offset="0"
-         id="stop10800-5-2-1-8-20-6" />
-      <stop
-         id="stop10806-6-8-5-3-9-24"
-         offset="0.5"
-         style="stop-color:#418a4d;stop-opacity:1" />
-      <stop
-         style="stop-color:#a4c589;stop-opacity:1"
-         offset="1"
-         id="stop10802-1-5-3-0-4-8" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10798-1-9-3-7-6-8-9">
-      <stop
-         style="stop-color:#4f9e55;stop-opacity:1"
-         offset="0"
-         id="stop10800-5-2-1-8-20-6-4" />
-      <stop
-         id="stop10806-6-8-5-3-9-24-8"
-         offset="0.5"
-         style="stop-color:#418a4d;stop-opacity:1" />
-      <stop
-         style="stop-color:#a4c589;stop-opacity:1"
-         offset="1"
-         id="stop10802-1-5-3-0-4-8-4" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10798-1-9-3-7-6-6-6-2">
-      <stop
-         style="stop-color:#4f9e55;stop-opacity:1"
-         offset="0"
-         id="stop10800-5-2-1-8-20-4-0-2" />
-      <stop
-         id="stop10806-6-8-5-3-9-2-2-7"
-         offset="0.5"
-         style="stop-color:#418a4d;stop-opacity:1" />
-      <stop
-         style="stop-color:#a4c589;stop-opacity:1"
-         offset="1"
-         id="stop10802-1-5-3-0-4-6-8-5" />
-    </linearGradient>
-    <linearGradient
-       y2="457.95499"
-       x2="388.63736"
-       y1="478.18777"
-       x1="388.63736"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient13333-0-1"
-       xlink:href="#linearGradient10798-1-9-3-7-6-6-7-1-5"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient10798-1-9-3-7-6-6-7-1-5">
-      <stop
-         style="stop-color:#4f9e55;stop-opacity:1"
-         offset="0"
-         id="stop10800-5-2-1-8-20-4-5-3-1" />
-      <stop
-         id="stop10806-6-8-5-3-9-2-0-2-1"
-         offset="0.5"
-         style="stop-color:#418a4d;stop-opacity:1" />
-      <stop
-         style="stop-color:#a4c589;stop-opacity:1"
-         offset="1"
-         id="stop10802-1-5-3-0-4-6-4-2-3" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient13850-2">
-      <stop
-         id="stop13852-4"
-         offset="0"
-         style="stop-color:#807e66;stop-opacity:1;" />
-      <stop
-         id="stop13854-7"
-         offset="1"
-         style="stop-color:#ccab63;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient13856-0">
-      <stop
-         style="stop-color:#807e66;stop-opacity:1;"
-         offset="0"
-         id="stop13858-8" />
-      <stop
-         style="stop-color:#ccab63;stop-opacity:1"
-         offset="1"
-         id="stop13860-4" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient13799-7">
-      <stop
-         style="stop-color:#b9772f;stop-opacity:1"
-         offset="0"
-         id="stop13801-4" />
-      <stop
-         id="stop13809-4"
-         offset="0.15381166"
-         style="stop-color:#f2dc91;stop-opacity:1" />
-      <stop
-         id="stop13807-7"
-         offset="0.5"
-         style="stop-color:#fbdc8b;stop-opacity:1" />
-      <stop
-         style="stop-color:#e6bd7a;stop-opacity:1"
-         offset="0.75"
-         id="stop13811-8" />
-      <stop
-         style="stop-color:#ba772f;stop-opacity:1"
-         offset="1"
-         id="stop13803-6" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient12862-1-8">
-      <stop
-         style="stop-color:#2d493b;stop-opacity:1;"
-         offset="0"
-         id="stop12864-3-6" />
-      <stop
-         style="stop-color:#296c79;stop-opacity:1"
-         offset="1"
-         id="stop12866-4-9" />
-    </linearGradient>
-    <linearGradient
-       y2="417.26108"
-       x2="440.35345"
-       y1="455.88452"
-       x1="420.88995"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient13011-8"
-       xlink:href="#linearGradient12862-1-8"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient11969-9-0">
-      <stop
-         style="stop-color:#6f93c7;stop-opacity:1;"
-         offset="0"
-         id="stop11971-7-1" />
-      <stop
-         id="stop11979-0-0"
-         offset="0.29546595"
-         style="stop-color:#6f93c7;stop-opacity:0;" />
-      <stop
-         id="stop11977-6-1"
-         offset="0.57727957"
-         style="stop-color:#6f93c7;stop-opacity:0;" />
-      <stop
-         style="stop-color:#6f93c7;stop-opacity:1"
-         offset="1"
-         id="stop11973-8-0" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient12088-7-6">
-      <stop
-         style="stop-color:#84a7d5;stop-opacity:1;"
-         offset="0"
-         id="stop12090-7-9" />
-      <stop
-         id="stop12096-6-2"
-         offset="0.5"
-         style="stop-color:#a9cded;stop-opacity:1" />
-      <stop
-         style="stop-color:#95b8e0;stop-opacity:1"
-         offset="1"
-         id="stop12092-1-3" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient11999-9-8">
-      <stop
-         style="stop-color:#f8b098;stop-opacity:1"
-         offset="0"
-         id="stop12001-1-9" />
-      <stop
-         id="stop12007-4-6"
-         offset="0.5"
-         style="stop-color:#f8decd;stop-opacity:1" />
-      <stop
-         style="stop-color:#f8b098;stop-opacity:1"
-         offset="1"
-         id="stop12003-3-6" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10798-1-9-3-7-1-15-1">
-      <stop
-         style="stop-color:#4f9e55;stop-opacity:1"
-         offset="0"
-         id="stop10800-5-2-1-8-2-8-1" />
-      <stop
-         id="stop10806-6-8-5-3-2-95-0"
-         offset="0.5"
-         style="stop-color:#418a4d;stop-opacity:1" />
-      <stop
-         style="stop-color:#a4c589;stop-opacity:1"
-         offset="1"
-         id="stop10802-1-5-3-0-2-0-9" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10798-1-9-3-7-1-1-2-1">
-      <stop
-         style="stop-color:#4f9e55;stop-opacity:1"
-         offset="0"
-         id="stop10800-5-2-1-8-2-5-2-6" />
-      <stop
-         id="stop10806-6-8-5-3-2-3-3-7"
-         offset="0.5"
-         style="stop-color:#418a4d;stop-opacity:1" />
-      <stop
-         style="stop-color:#a4c589;stop-opacity:1"
-         offset="1"
-         id="stop10802-1-5-3-0-2-2-2-2" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient11687-2-2">
-      <stop
-         style="stop-color:#bdb692;stop-opacity:1;"
-         offset="0"
-         id="stop11689-3-7" />
-      <stop
-         id="stop11695-9-8"
-         offset="0.5"
-         style="stop-color:#869097;stop-opacity:1" />
-      <stop
-         style="stop-color:#c3cace;stop-opacity:1"
-         offset="1"
-         id="stop11691-10-4" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient11146-4-4">
-      <stop
-         style="stop-color:#faefba;stop-opacity:1"
-         offset="0"
-         id="stop11150-4-72" />
-      <stop
-         id="stop11152-9-0"
-         offset="1"
-         style="stop-color:#9e6542;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient11146-8-3-2">
-      <stop
-         style="stop-color:#faefba;stop-opacity:1"
-         offset="0"
-         id="stop11150-7-5-9" />
-      <stop
-         id="stop11152-8-4-35"
-         offset="1"
-         style="stop-color:#9e6542;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient11146-7-5-30">
-      <stop
-         style="stop-color:#faefba;stop-opacity:1"
-         offset="0"
-         id="stop11150-9-6-9" />
-      <stop
-         id="stop11152-6-7-6"
-         offset="1"
-         style="stop-color:#9e6542;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient11146-8-7-5-7">
-      <stop
-         style="stop-color:#faefba;stop-opacity:1"
-         offset="0"
-         id="stop11150-7-8-3-8" />
-      <stop
-         id="stop11152-8-8-6-3"
-         offset="1"
-         style="stop-color:#9e6542;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10856-6-3-0-0">
-      <stop
-         id="stop10858-0-7-6-0"
-         offset="0"
-         style="stop-color:#7d75ac;stop-opacity:1" />
-      <stop
-         style="stop-color:#574a96;stop-opacity:1"
-         offset="0.5"
-         id="stop10860-7-9-1-0" />
-      <stop
-         id="stop10862-3-3-8-2"
-         offset="1"
-         style="stop-color:#9f99c8;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       y2="457.95499"
-       x2="388.63736"
-       y1="478.18777"
-       x1="388.63736"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient11390-1"
-       xlink:href="#linearGradient10798-1-9-3-7-7"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient10798-1-9-3-7-7">
-      <stop
-         style="stop-color:#4f9e55;stop-opacity:1"
-         offset="0"
-         id="stop10800-5-2-1-8-4" />
-      <stop
-         id="stop10806-6-8-5-3-1"
-         offset="0.5"
-         style="stop-color:#418a4d;stop-opacity:1" />
-      <stop
-         style="stop-color:#a4c589;stop-opacity:1"
-         offset="1"
-         id="stop10802-1-5-3-0-0" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4918-5">
-      <stop
-         style="stop-color:#d48a4b;stop-opacity:1;"
-         offset="0"
-         id="stop4920-9" />
-      <stop
-         style="stop-color:#b1623a;stop-opacity:1;"
-         offset="1"
-         id="stop4922-9" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4907-9">
-      <stop
-         style="stop-color:#b86c44;stop-opacity:1;"
-         offset="0"
-         id="stop4909-5" />
-      <stop
-         style="stop-color:#8f4017;stop-opacity:1;"
-         offset="1"
-         id="stop4911-0" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4928-4">
-      <stop
-         style="stop-color:#4dac81;stop-opacity:1;"
-         offset="0"
-         id="stop4930-9" />
-      <stop
-         style="stop-color:#058048;stop-opacity:1;"
-         offset="1"
-         id="stop4932-8" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4938-8">
-      <stop
-         style="stop-color:#8bc7d7;stop-opacity:1;"
-         offset="0"
-         id="stop4940-4" />
-      <stop
-         style="stop-color:#17477c;stop-opacity:1;"
-         offset="1"
-         id="stop4942-8" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4961-6"
-       id="linearGradient4983-5"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-4.625,0)"
-       x1="15.073242"
-       y1="1040.0764"
-       x2="18.744612"
-       y2="1049.2014" />
-    <linearGradient
-       id="linearGradient4961-6">
-      <stop
-         style="stop-color:#df9a39;stop-opacity:1;"
-         offset="0"
-         id="stop4963-0" />
-      <stop
-         style="stop-color:#b55829;stop-opacity:1;"
-         offset="1"
-         id="stop4965-3" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5328-5">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop5330-9" />
-      <stop
-         style="stop-color:#464646;stop-opacity:1;"
-         offset="1"
-         id="stop5332-8" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5209-0">
-      <stop
-         style="stop-color:#5c5c5c;stop-opacity:1;"
-         offset="0"
-         id="stop5211-9" />
-      <stop
-         style="stop-color:#aeaeae;stop-opacity:1;"
-         offset="1"
-         id="stop5213-4" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5397">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop5399" />
-      <stop
-         style="stop-color:#464646;stop-opacity:1;"
-         offset="1"
-         id="stop5401" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5404">
-      <stop
-         style="stop-color:#5c5c5c;stop-opacity:1;"
-         offset="0"
-         id="stop5406" />
-      <stop
-         style="stop-color:#aeaeae;stop-opacity:1;"
-         offset="1"
-         id="stop5408" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5411">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop5413" />
-      <stop
-         style="stop-color:#464646;stop-opacity:1;"
-         offset="1"
-         id="stop5415" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5418">
-      <stop
-         style="stop-color:#5c5c5c;stop-opacity:1;"
-         offset="0"
-         id="stop5420" />
-      <stop
-         style="stop-color:#aeaeae;stop-opacity:1;"
-         offset="1"
-         id="stop5422" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5583"
-       id="linearGradient5589"
-       x1="2.03125"
-       y1="9.1435204"
-       x2="2.03125"
-       y2="4.671875"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5591"
-       id="linearGradient5597"
-       x1="2.03125"
-       y1="7.8880248"
-       x2="2.03125"
-       y2="9.1435204"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5591-4"
-       id="linearGradient5597-1"
-       x1="2.03125"
-       y1="7.8880248"
-       x2="2.03125"
-       y2="9.1435204"
-       gradientUnits="userSpaceOnUse" />
+   width="16"
+   height="16"
+   id="svg2"
+   version="1.1"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
+  <defs
+     id="defs4">
     <linearGradient
-       id="linearGradient5591-4">
+       id="linearGradient4980">
       <stop
-         style="stop-color:#e0e566;stop-opacity:1;"
+         id="stop4982"
          offset="0"
-         id="stop5593-0" />
+         style="stop-color:#7694be;stop-opacity:1" />
       <stop
-         style="stop-color:#b0b456;stop-opacity:1;"
+         id="stop4984"
          offset="1"
-         id="stop5595-5" />
+         style="stop-color:#607ead;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5583-2"
-       id="linearGradient5589-8"
-       x1="2.03125"
-       y1="9.1435204"
-       x2="2.03125"
-       y2="4.671875"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient5583-2">
+       id="linearGradient4974">
       <stop
-         style="stop-color:#426e4a;stop-opacity:1;"
+         id="stop4976"
          offset="0"
-         id="stop5585-3" />
+         style="stop-color:#7694be;stop-opacity:1" />
       <stop
-         style="stop-color:#669f71;stop-opacity:1;"
+         id="stop4978"
          offset="1"
-         id="stop5587-3" />
+         style="stop-color:#607ead;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4919-1"
-       id="linearGradient4925-7"
-       x1="-10"
-       y1="1045.3622"
-       x2="-10"
-       y2="1043.3622"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient4919-1">
+       id="linearGradient4962">
       <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
+         style="stop-color:#7694be;stop-opacity:1"
          offset="0"
-         id="stop4921-2" />
+         id="stop4964" />
       <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
+         style="stop-color:#607ead;stop-opacity:1"
          offset="1"
-         id="stop4923-6" />
+         id="stop4966" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4919-9"
-       id="linearGradient4925-4"
-       x1="-10"
-       y1="1045.3622"
-       x2="-10"
-       y2="1043.3622"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient4919-9">
+       id="linearGradient4871">
       <stop
          style="stop-color:#ffffff;stop-opacity:1;"
          offset="0"
-         id="stop4921-4" />
+         id="stop4873" />
       <stop
          style="stop-color:#ffffff;stop-opacity:0;"
          offset="1"
-         id="stop4923-60" />
-    </linearGradient>
-    <linearGradient
-       gradientTransform="translate(-2,2.000062)"
-       y2="1050.0707"
-       x2="8.0137892"
-       y1="1036.6622"
-       x1="8.0137892"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4791"
-       xlink:href="#linearGradient4810"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient4810"
-       inkscape:collect="always">
-      <stop
-         id="stop4812"
-         offset="0"
-         style="stop-color:#bfb688;stop-opacity:1;" />
-      <stop
-         id="stop4814"
-         offset="1"
-         style="stop-color:#8694ae;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5057-7"
-       id="linearGradient5065-1"
-       x1="6"
-       y1="1050.8623"
-       x2="11"
-       y2="1050.8623"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(2,-2.000037)" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient5057-7">
-      <stop
-         style="stop-color:#677da9;stop-opacity:1;"
-         offset="0"
-         id="stop5059-1" />
-      <stop
-         style="stop-color:#b4bbd1;stop-opacity:1"
-         offset="1"
-         id="stop5061-1" />
-    </linearGradient>
-    <linearGradient
-       y2="1047.3622"
-       x2="-15"
-       y1="1047.3622"
-       x1="-13"
-       gradientTransform="translate(25,-4.000037)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient5062-1"
-       xlink:href="#linearGradient4910-4-7"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient4910-4-7">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0"
-         offset="0"
-         id="stop4912-8-4" />
-      <stop
-         style="stop-color:#d1eeff;stop-opacity:1"
-         offset="1"
-         id="stop4914-8-0" />
-    </linearGradient>
-    <linearGradient
-       y2="1050.0707"
-       x2="8.0137892"
-       y1="1036.6622"
-       x1="8.0137892"
-       gradientTransform="translate(0,2.000063)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4121-5"
-       xlink:href="#linearGradient4810-5"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient4810-5"
-       inkscape:collect="always">
-      <stop
-         id="stop4812-1"
-         offset="0"
-         style="stop-color:#bfb688;stop-opacity:1;" />
-      <stop
-         id="stop4814-7"
-         offset="1"
-         style="stop-color:#8694ae;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       y2="1047.3622"
-       x2="-15"
-       y1="1047.3622"
-       x1="-13"
-       gradientTransform="translate(16,2)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4063-1"
-       xlink:href="#linearGradient4910-4-7-5"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient4910-4-7-5">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0"
-         offset="0"
-         id="stop4912-8-4-2" />
-      <stop
-         style="stop-color:#d1eeff;stop-opacity:1"
-         offset="1"
-         id="stop4914-8-0-7" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4818"
-       id="linearGradient4824"
-       x1="12.03229"
-       y1="1038.3472"
-       x2="14.871766"
-       y2="1041.3081"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-4,0)" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient4818">
-      <stop
-         style="stop-color:#eb9186;stop-opacity:1;"
-         offset="0"
-         id="stop4820" />
-      <stop
-         style="stop-color:#e06b5e;stop-opacity:1"
-         offset="1"
-         id="stop4822" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4962-2-7"
-       id="linearGradient4838-1"
-       x1="3.5628386"
-       y1="11.335736"
-       x2="3.5628386"
-       y2="13.61885"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient4962-2-7">
-      <stop
-         style="stop-color:#f6928e;stop-opacity:1"
-         offset="0"
-         id="stop4964-2-4" />
-      <stop
-         style="stop-color:#f13f53;stop-opacity:1"
-         offset="1"
-         id="stop4966-1-0" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4846"
-       id="linearGradient4852"
-       x1="5"
-       y1="1"
-       x2="5"
-       y2="6"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4898"
-       id="linearGradient4904"
-       x1="3"
-       y1="1039.8622"
-       x2="4"
-       y2="1039.8622"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4898"
-       id="linearGradient4906"
-       x1="4.5773602"
-       y1="1038.3622"
-       x2="4.5773602"
-       y2="1039.3622"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4898-9"
-       id="linearGradient4906-0"
-       x1="4.5773602"
-       y1="1038.3622"
-       x2="4.5773602"
-       y2="1039.3622"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,6)" />
-    <linearGradient
-       id="linearGradient4898-9">
-      <stop
-         style="stop-color:#ffd991;stop-opacity:1;"
-         offset="0"
-         id="stop4900-4" />
-      <stop
-         style="stop-color:#ffcd6f;stop-opacity:0;"
-         offset="1"
-         id="stop4902-8" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4898-9"
-       id="linearGradient4904-8"
-       x1="3"
-       y1="1039.8622"
-       x2="4"
-       y2="1039.8622"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,6)" />
-    <linearGradient
-       id="linearGradient4923">
-      <stop
-         style="stop-color:#ffd991;stop-opacity:1;"
-         offset="0"
-         id="stop4925" />
-      <stop
-         style="stop-color:#ffcd6f;stop-opacity:0;"
-         offset="1"
-         id="stop4927" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4846-4"
-       id="linearGradient4852-2"
-       x1="5"
-       y1="1"
-       x2="5"
-       y2="6"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient4846-4">
-      <stop
-         style="stop-color:#937e48;stop-opacity:1"
-         offset="0"
-         id="stop4848-5" />
-      <stop
-         style="stop-color:#7c724f;stop-opacity:1"
-         offset="1"
-         id="stop4850-5" />
-    </linearGradient>
-    <linearGradient
-       gradientTransform="translate(0,1042.3622)"
-       y2="6"
-       x2="5"
-       y1="1"
-       x1="5"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4937"
-       xlink:href="#linearGradient4846-4"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4898-7"
-       id="linearGradient4906-2"
-       x1="4.5773602"
-       y1="1038.3622"
-       x2="4.5773602"
-       y2="1039.3622"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(6,0)" />
-    <linearGradient
-       id="linearGradient4898-7">
-      <stop
-         style="stop-color:#ffd991;stop-opacity:1;"
-         offset="0"
-         id="stop4900-6" />
-      <stop
-         style="stop-color:#ffcd6f;stop-opacity:0;"
-         offset="1"
-         id="stop4902-1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4898-7"
-       id="linearGradient4904-4"
-       x1="3"
-       y1="1039.8622"
-       x2="4"
-       y2="1039.8622"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(6,0)" />
-    <linearGradient
-       id="linearGradient4923-2">
-      <stop
-         style="stop-color:#ffd991;stop-opacity:1;"
-         offset="0"
-         id="stop4925-3" />
-      <stop
-         style="stop-color:#ffcd6f;stop-opacity:0;"
-         offset="1"
-         id="stop4927-2" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4846-6"
-       id="linearGradient4852-21"
-       x1="5"
-       y1="1"
-       x2="5"
-       y2="6"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient4846-6">
-      <stop
-         style="stop-color:#937e48;stop-opacity:1"
-         offset="0"
-         id="stop4848-8" />
-      <stop
-         style="stop-color:#7c724f;stop-opacity:1"
-         offset="1"
-         id="stop4850-57" />
+         id="stop4875" />
     </linearGradient>
     <linearGradient
-       gradientTransform="translate(6,1036.3622)"
-       y2="6"
-       x2="5"
-       y1="1"
-       x1="5"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4937-6"
-       xlink:href="#linearGradient4846-6"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4871"
        id="linearGradient4877"
        x1="3"
@@ -4923,7 +67,6 @@
        y2="1045.8622"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4871"
        id="linearGradient4879"
        x1="4.4999781"
@@ -4932,7 +75,6 @@
        y2="1045.3433"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4871-7"
        id="linearGradient4877-1"
        x1="3"
@@ -4941,7 +83,6 @@
        y2="1045.8622"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4871-7">
       <stop
          style="stop-color:#ffffff;stop-opacity:1;"
@@ -4953,7 +94,6 @@
          id="stop4875-0" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4871-7"
        id="linearGradient4879-9"
        x1="4.4999781"
@@ -4962,7 +102,6 @@
        y2="1045.3433"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4871-7-1"
        id="linearGradient4877-1-7"
        x1="3"
@@ -4971,7 +110,6 @@
        y2="1045.8622"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4871-7-1">
       <stop
          style="stop-color:#ffffff;stop-opacity:1;"
@@ -4983,7 +121,6 @@
          id="stop4875-0-5" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4871-7-1"
        id="linearGradient4879-9-2"
        x1="4.4999781"
@@ -4992,49 +129,6 @@
        y2="1045.3433"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5232-9"
-       id="linearGradient5238-6"
-       x1="8"
-       y1="1050.3622"
-       x2="15"
-       y2="1043.3622"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient5232-9">
-      <stop
-         style="stop-color:#8f6939;stop-opacity:1"
-         offset="0"
-         id="stop5234-8" />
-      <stop
-         style="stop-color:#958160;stop-opacity:1"
-         offset="1"
-         id="stop5236-6" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5274-3"
-       id="linearGradient5280-2"
-       x1="11"
-       y1="1046.3622"
-       x2="12"
-       y2="1047.3622"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient5274-3">
-      <stop
-         style="stop-color:#f6e6c8;stop-opacity:1"
-         offset="0"
-         id="stop5276-8" />
-      <stop
-         style="stop-color:#e9c47e;stop-opacity:1"
-         offset="1"
-         id="stop5278-2" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4962"
        id="linearGradient4968"
        x1="11"
@@ -5044,7 +138,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(2.3333333,0,0,1,-18.666667,0)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4980"
        id="linearGradient4970"
        x1="11"
@@ -5054,7 +147,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(2.3333333,0,0,1,-18.666667,0)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4974"
        id="linearGradient4972"
        x1="7"
@@ -5063,31 +155,6 @@
        y2="1040.8622"
        gradientUnits="userSpaceOnUse" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="22.627416"
-     inkscape:cx="11.878392"
-     inkscape:cy="7.2651944"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1458"
-     inkscape:window-height="814"
-     inkscape:window-x="142"
-     inkscape:window-y="571"
-     inkscape:window-maximized="0"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3999" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -5101,32 +168,24 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
     <path
        style="fill:url(#linearGradient4970);fill-opacity:1;stroke:none;display:inline"
        d="m 7,1044.3622 7,0 0,1 -7,0 z"
-       id="rect4035-1-1-5-2-2-6-5"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+       id="rect4035-1-1-5-2-2-6-5" />
     <path
        style="fill:url(#linearGradient4968);fill-opacity:1;stroke:none;display:inline"
        d="m 7,1048.3622 7,0 0,1 -7,0 z"
-       id="rect4035-1-1-5-2-2-6-5-2"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+       id="rect4035-1-1-5-2-2-6-5-2" />
     <g
        id="g5029"
        transform="matrix(0.59562329,0,0,0.59562329,1.42626,418.31576)">
       <path
          id="rect4035-17"
          d="m 2.6421734,1042.6833 0,5.0367 5.0367406,0 0,-5.0367 z m 1.6789131,1.6789 1.6789135,0 0,1.6789 -1.6789135,0 z"
-         style="fill:#5c7aaa;fill-opacity:1;stroke:none;display:inline"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccccccc" />
+         style="fill:#5c7aaa;fill-opacity:1;stroke:none;display:inline" />
       <g
          id="g4094"
          transform="matrix(0.55964608,0,0,0.55963589,2.6421482,459.89962)">
@@ -5140,15 +199,11 @@
         <path
            style="opacity:0.5;fill:url(#linearGradient4877);fill-opacity:1;stroke:none;display:inline"
            d="m 3,1044.3622 1,1 0,2 -1,0 z"
-           id="rect4035-1-7-1"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
+           id="rect4035-1-7-1" />
         <path
            style="opacity:0.5;fill:url(#linearGradient4879);fill-opacity:1;stroke:none;display:inline"
            d="m 3,1044.3622 1,1 2,0 0,-1 z"
-           id="rect4035-1-7-4-5"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
+           id="rect4035-1-7-4-5" />
       </g>
     </g>
     <g
@@ -5158,9 +213,7 @@
       <path
          id="rect4035-17-2"
          d="m 2.6421734,1042.6833 0,5.0367 5.0367406,0 0,-5.0367 z m 1.6789131,1.6789 1.6789135,0 0,1.6789 -1.6789135,0 z"
-         style="fill:#5c7aaa;fill-opacity:1;stroke:none;display:inline"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccccccc" />
+         style="fill:#5c7aaa;fill-opacity:1;stroke:none;display:inline" />
       <g
          id="g4094-4"
          transform="matrix(0.55964608,0,0,0.55963589,2.6421482,459.89962)">
@@ -5174,15 +227,11 @@
         <path
            style="opacity:0.5;fill:url(#linearGradient4877-1);fill-opacity:1;stroke:none;display:inline"
            d="m 3,1044.3622 1,1 0,2 -1,0 z"
-           id="rect4035-1-7-1-5"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
+           id="rect4035-1-7-1-5" />
         <path
            style="opacity:0.5;fill:url(#linearGradient4879-9);fill-opacity:1;stroke:none;display:inline"
            d="m 3,1044.3622 1,1 2,0 0,-1 z"
-           id="rect4035-1-7-4-5-1"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
+           id="rect4035-1-7-4-5-1" />
       </g>
     </g>
     <g
@@ -5192,9 +241,7 @@
       <path
          id="rect4035-17-2-6"
          d="m 2.6421734,1042.6833 0,5.0367 5.0367406,0 0,-5.0367 z m 1.6789135,1.6912 1.6789135,0 0,1.6913 -1.6789135,0 z"
-         style="fill:#5c7aaa;fill-opacity:1;stroke:none;display:inline"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccccccc" />
+         style="fill:#5c7aaa;fill-opacity:1;stroke:none;display:inline" />
       <g
          id="g4094-4-1"
          transform="matrix(0.55964608,0,0,0.55963589,2.6421482,459.89962)">
@@ -5208,22 +255,16 @@
         <path
            style="opacity:0.5;fill:url(#linearGradient4877-1-7);fill-opacity:1;stroke:none;display:inline"
            d="m 3,1044.3622 1,1 0,2 -1,0 z"
-           id="rect4035-1-7-1-5-2"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
+           id="rect4035-1-7-1-5-2" />
         <path
            style="opacity:0.5;fill:url(#linearGradient4879-9-2);fill-opacity:1;stroke:none;display:inline"
            d="m 3,1044.3622 1,1 2,0 0,-1 z"
-           id="rect4035-1-7-4-5-1-3"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
+           id="rect4035-1-7-4-5-1-3" />
       </g>
     </g>
     <path
        style="fill:url(#linearGradient4972);fill-opacity:1;stroke:none;display:inline"
        d="m 7,1040.3622 7,0 0,1 -7,0 z"
-       id="rect4035-1-1-5-2-2-6"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+       id="rect4035-1-1-5-2-2-6" />
   </g>
 </svg>
diff --git a/ui/org.eclipse.pde.spy.preferences/icons/hierarchicalLayout.svg b/ui/org.eclipse.pde.spy.preferences/icons/hierarchicalLayout.svg
index c59ec4cbe3c..0b5ec088f2f 100644
--- a/ui/org.eclipse.pde.spy.preferences/icons/hierarchicalLayout.svg
+++ b/ui/org.eclipse.pde.spy.preferences/icons/hierarchicalLayout.svg
@@ -2,28 +2,20 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.48.0 r9654"
-   sodipodi:docname="hierarchicalLayout.svg"
-   inkscape:export-filename="C:\Users\jmietling\Documents\rect3997-9-1.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient4980"
-       inkscape:collect="always">
+       id="linearGradient4980">
       <stop
          id="stop4982"
          offset="0"
@@ -34,8 +26,7 @@
          style="stop-color:#607ead;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       id="linearGradient4974"
-       inkscape:collect="always">
+       id="linearGradient4974">
       <stop
          id="stop4976"
          offset="0"
@@ -46,7 +37,6 @@
          style="stop-color:#607ead;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4962">
       <stop
          style="stop-color:#6c8ab7;stop-opacity:1"
@@ -58,7 +48,6 @@
          id="stop4966" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4871">
       <stop
          style="stop-color:#ffffff;stop-opacity:1;"
@@ -70,7 +59,6 @@
          id="stop4875" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4871"
        id="linearGradient4877"
        x1="3"
@@ -79,7 +67,6 @@
        y2="1045.8622"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4871"
        id="linearGradient4879"
        x1="4.4999781"
@@ -88,7 +75,6 @@
        y2="1045.3433"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4871-7"
        id="linearGradient4877-1"
        x1="3"
@@ -97,7 +83,6 @@
        y2="1045.8622"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4871-7">
       <stop
          style="stop-color:#ffffff;stop-opacity:1;"
@@ -109,7 +94,6 @@
          id="stop4875-0" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4871-7"
        id="linearGradient4879-9"
        x1="4.4999781"
@@ -118,7 +102,6 @@
        y2="1045.3433"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4871-7-1"
        id="linearGradient4877-1-7"
        x1="3"
@@ -127,7 +110,6 @@
        y2="1045.8622"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4871-7-1">
       <stop
          style="stop-color:#ffffff;stop-opacity:1;"
@@ -139,7 +121,6 @@
          id="stop4875-0-5" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4871-7-1"
        id="linearGradient4879-9-2"
        x1="4.4999781"
@@ -148,7 +129,6 @@
        y2="1045.3433"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4962"
        id="linearGradient4968"
        x1="11"
@@ -157,7 +137,6 @@
        y2="1048.8622"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4980"
        id="linearGradient4970"
        x1="11"
@@ -166,7 +145,6 @@
        y2="1044.8622"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4974"
        id="linearGradient4972"
        x1="7"
@@ -175,31 +153,6 @@
        y2="1040.8622"
        gradientUnits="userSpaceOnUse" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="15.999999"
-     inkscape:cx="12.066523"
-     inkscape:cy="7.9808044"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1458"
-     inkscape:window-height="814"
-     inkscape:window-x="25"
-     inkscape:window-y="25"
-     inkscape:window-maximized="0"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3999" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -213,32 +166,24 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
     <path
        style="fill:url(#linearGradient4970);fill-opacity:1;stroke:none;display:inline"
        d="m 11,1044.3622 3,0 0,1 -3,0 z"
-       id="rect4035-1-1-5-2-2-6-5"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+       id="rect4035-1-1-5-2-2-6-5" />
     <path
        style="fill:url(#linearGradient4968);fill-opacity:1;stroke:none;display:inline"
        d="m 11,1048.3622 3,0 0,1 -3,0 z"
-       id="rect4035-1-1-5-2-2-6-5-2"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+       id="rect4035-1-1-5-2-2-6-5-2" />
     <g
        id="g5029"
        transform="matrix(0.59562329,0,0,0.59562329,1.42626,418.31576)">
       <path
          id="rect4035-17"
          d="m 2.6421734,1042.6833 0,5.0367 5.0367406,0 0,-5.0367 z m 1.6789131,1.6789 1.6789135,0 0,1.6789 -1.6789135,0 z"
-         style="fill:#5c7aaa;fill-opacity:1;stroke:none;display:inline"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccccccc" />
+         style="fill:#5c7aaa;fill-opacity:1;stroke:none;display:inline" />
       <g
          id="g4094"
          transform="matrix(0.55964608,0,0,0.55963589,2.6421482,459.89962)">
@@ -252,15 +197,11 @@
         <path
            style="opacity:0.5;fill:url(#linearGradient4877);fill-opacity:1;stroke:none;display:inline"
            d="m 3,1044.3622 1,1 0,2 -1,0 z"
-           id="rect4035-1-7-1"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
+           id="rect4035-1-7-1" />
         <path
            style="opacity:0.5;fill:url(#linearGradient4879);fill-opacity:1;stroke:none;display:inline"
            d="m 3,1044.3622 1,1 2,0 0,-1 z"
-           id="rect4035-1-7-4-5"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
+           id="rect4035-1-7-4-5" />
       </g>
     </g>
     <g
@@ -270,9 +211,7 @@
       <path
          id="rect4035-17-2"
          d="m 2.6421734,1042.6833 0,5.0367 5.0367406,0 0,-5.0367 z m 1.6789131,1.6789 1.6789135,0 0,1.6789 -1.6789135,0 z"
-         style="fill:#5c7aaa;fill-opacity:1;stroke:none;display:inline"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccccccc" />
+         style="fill:#5c7aaa;fill-opacity:1;stroke:none;display:inline" />
       <g
          id="g4094-4"
          transform="matrix(0.55964608,0,0,0.55963589,2.6421482,459.89962)">
@@ -286,15 +225,11 @@
         <path
            style="opacity:0.5;fill:url(#linearGradient4877-1);fill-opacity:1;stroke:none;display:inline"
            d="m 3,1044.3622 1,1 0,2 -1,0 z"
-           id="rect4035-1-7-1-5"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
+           id="rect4035-1-7-1-5" />
         <path
            style="opacity:0.5;fill:url(#linearGradient4879-9);fill-opacity:1;stroke:none;display:inline"
            d="m 3,1044.3622 1,1 2,0 0,-1 z"
-           id="rect4035-1-7-4-5-1"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
+           id="rect4035-1-7-4-5-1" />
       </g>
     </g>
     <g
@@ -304,9 +239,7 @@
       <path
          id="rect4035-17-2-6"
          d="m 2.6421734,1042.6833 0,5.0367 5.0367406,0 0,-5.0367 z m 1.6789135,1.6912 1.6789135,0 0,1.6913 -1.6789135,0 z"
-         style="fill:#5c7aaa;fill-opacity:1;stroke:none;display:inline"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccccccc" />
+         style="fill:#5c7aaa;fill-opacity:1;stroke:none;display:inline" />
       <g
          id="g4094-4-1"
          transform="matrix(0.55964608,0,0,0.55963589,2.6421482,459.89962)">
@@ -320,37 +253,28 @@
         <path
            style="opacity:0.5;fill:url(#linearGradient4877-1-7);fill-opacity:1;stroke:none;display:inline"
            d="m 3,1044.3622 1,1 0,2 -1,0 z"
-           id="rect4035-1-7-1-5-2"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
+           id="rect4035-1-7-1-5-2" />
         <path
            style="opacity:0.5;fill:url(#linearGradient4879-9-2);fill-opacity:1;stroke:none;display:inline"
            d="m 3,1044.3622 1,1 2,0 0,-1 z"
-           id="rect4035-1-7-4-5-1-3"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
+           id="rect4035-1-7-4-5-1-3" />
       </g>
     </g>
     <path
        style="fill:#5c7aaa;fill-opacity:1;stroke:none;display:inline"
        d="m 3.9999997,1042.3622 1.0000146,0 0,7 -1.0000146,0 z"
-       id="rect4035-1-1-5-2"
-       inkscape:connector-curvature="0" />
+       id="rect4035-1-1-5-2" />
     <path
        style="fill:#5c7aaa;fill-opacity:1;stroke:none;display:inline"
        d="m 3.9999997,1044.3622 3.0000003,0 0,1 -3.0000003,0 z"
-       id="rect4035-1-1-5-2-2"
-       inkscape:connector-curvature="0" />
+       id="rect4035-1-1-5-2-2" />
     <path
        style="fill:#5c7aaa;fill-opacity:1;stroke:none;display:inline"
        d="m 3.9999997,1048.3622 3.0000003,0 0,0.9999 -3.0000003,0 z"
-       id="rect4035-1-1-5-2-2-1"
-       inkscape:connector-curvature="0" />
+       id="rect4035-1-1-5-2-2-1" />
     <path
        style="fill:url(#linearGradient4972);fill-opacity:1;stroke:none;display:inline"
        d="m 7,1040.3622 7,0 0,1 -7,0 z"
-       id="rect4035-1-1-5-2-2-6"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+       id="rect4035-1-1-5-2-2-6" />
   </g>
 </svg>
diff --git a/ui/org.eclipse.pde.spy.preferences/icons/preference_spy.svg b/ui/org.eclipse.pde.spy.preferences/icons/preference_spy.svg
index 071c8a703fd..4e5e0afa05e 100644
--- a/ui/org.eclipse.pde.spy.preferences/icons/preference_spy.svg
+++ b/ui/org.eclipse.pde.spy.preferences/icons/preference_spy.svg
@@ -6,11 +6,7 @@
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="1.3 (0e150ed, 2023-07-21)"
-   sodipodi:docname="preference_spy.svg"
    xml:space="preserve"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:svg="http://www.w3.org/2000/svg"
@@ -18,7 +14,6 @@
    xmlns:cc="http://creativecommons.org/ns#"
    xmlns:dc="http://purl.org/dc/elements/1.1/"><defs
      id="defs4"><linearGradient
-       inkscape:collect="always"
        id="linearGradient4994"><stop
          style="stop-color:#f9fafc;stop-opacity:1;"
          offset="0"
@@ -26,7 +21,6 @@
          style="stop-color:#dce7f7;stop-opacity:1"
          offset="1"
          id="stop4998" /></linearGradient><linearGradient
-       inkscape:collect="always"
        id="linearGradient4902"><stop
          style="stop-color:#bfb688;stop-opacity:1"
          offset="0"
@@ -34,7 +28,6 @@
          style="stop-color:#8391b1;stop-opacity:1"
          offset="1"
          id="stop4906" /></linearGradient><radialGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4177"
        id="radialGradient4245"
        cx="14.311938"
@@ -44,7 +37,6 @@
        r="5.4497476"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(0.56661847,0,0,0.70718173,-0.07816061,309.04807)" /><linearGradient
-       inkscape:collect="always"
        id="linearGradient4177"><stop
          style="stop-color:#ffffff;stop-opacity:1"
          offset="0"
@@ -52,7 +44,6 @@
          style="stop-color:#e7f0f8;stop-opacity:1"
          offset="1"
          id="stop4181" /></linearGradient><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4167"
        id="linearGradient4173"
        x1="22.69014"
@@ -61,7 +52,6 @@
        y2="1045.7269"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(0.70710673,0,0,0.70718173,-7.1682751,309.04807)" /><linearGradient
-       inkscape:collect="always"
        id="linearGradient4167"><stop
          style="stop-color:#acaa94;stop-opacity:1"
          offset="0"
@@ -69,7 +59,6 @@
          style="stop-color:#a6a699;stop-opacity:1"
          offset="1"
          id="stop4171" /></linearGradient><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4902"
        id="linearGradient2"
        x1="2.9895229"
@@ -77,7 +66,6 @@
        x2="2.9372034"
        y2="1029.4574"
        gradientUnits="userSpaceOnUse" /><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4994"
        id="linearGradient4"
        gradientUnits="userSpaceOnUse"
@@ -85,45 +73,10 @@
        x1="9.8946028"
        y1="1039.153"
        x2="9.8946028"
-       y2="1051.8378" /></defs><sodipodi:namedview
-     id="base"
-     pagecolor="#c9c9c9"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="38.918918"
-     inkscape:cx="7.1045141"
-     inkscape:cy="6.2694446"
-     inkscape:document-units="px"
-     inkscape:current-layer="g4"
-     showgrid="true"
-     inkscape:window-width="1392"
-     inkscape:window-height="1027"
-     inkscape:window-x="0"
-     inkscape:window-y="25"
-     inkscape:window-maximized="0"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="true"
-     inkscape:snap-bbox="true"
-     inkscape:bbox-nodes="true"
-     inkscape:showpageshadow="2"
-     inkscape:pagecheckerboard="0"
-     inkscape:deskcolor="#d1d1d1"><inkscape:grid
-       type="xygrid"
-       id="grid3999"
-       originx="0"
-       originy="0"
-       spacingy="1"
-       spacingx="1"
-       units="px"
-       visible="true" /></sodipodi:namedview><metadata
+       y2="1051.8378" /></defs><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"
      style="display:inline"
      transform="translate(0,-1036.3622)"><g
@@ -131,18 +84,13 @@
        transform="translate(1.7632178,12.0054)"><path
          style="display:inline;fill:url(#linearGradient4);fill-opacity:1;stroke:none;stroke-width:0.963808"
          d="m -1.3696438,1024.5336 h 10 c 0,0 0.0054,6.2812 0.0054,10.6826 h -10.005435 z"
-         id="rect4001-3-7"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" /><path
+         id="rect4001-3-7" /><path
          id="path1-6-9"
          style="display:inline;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient2);stroke-linecap:square;stroke-miterlimit:3;stroke-opacity:0.921569"
-         d="m 8.7421723,1030.8622 -1.5053901,-4e-4 c -0.017244,-3.4717 -1.9339833,-3.5748 -2,0 l -1.0756099,4e-4 m -0.419,4 v -4.581 m -4.58099997,0.581 1.07560987,-0.01 c 0.0172444,2.598 1.9853722,2.7012 2,0 l 1.5053901,0.01 m 0,-5.581 -0.00539,1.0756 c -3.49748261,0.017 -3.49782588,1.934 0,2 l 0.00539,1.5054 m -5.0053901,-5.0054 H 8.7475616 v 10.0108 H -1.2632178 Z"
-         sodipodi:nodetypes="ccccccccccccccccccc" /></g><path
-       inkscape:connector-curvature="0"
+         d="m 8.7421723,1030.8622 -1.5053901,-4e-4 c -0.017244,-3.4717 -1.9339833,-3.5748 -2,0 l -1.0756099,4e-4 m -0.419,4 v -4.581 m -4.58099997,0.581 1.07560987,-0.01 c 0.0172444,2.598 1.9853722,2.7012 2,0 l 1.5053901,0.01 m 0,-5.581 -0.00539,1.0756 c -3.49748261,0.017 -3.49782588,1.934 0,2 l 0.00539,1.5054 m -5.0053901,-5.0054 H 8.7475616 v 10.0108 H -1.2632178 Z" /></g><path
        id="path4185"
        d="m 15.6438,1052.0064 0,-1.0287 -3.980969,-4.0836 -1.102083,1.0311 4.054422,4.0812 z"
-       style="fill:#677da9;fill-opacity:1;fill-rule:evenodd;stroke:#677da9;stroke-width:0.71592331;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       sodipodi:nodetypes="cccccc" /><ellipse
+       style="fill:#677da9;fill-opacity:1;fill-rule:evenodd;stroke:#677da9;stroke-width:0.71592331;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /><ellipse
        cy="1045.3625"
        cx="9"
        id="path4157"
diff --git a/ui/org.eclipse.pde.spy.preferences/icons/remove_co.svg b/ui/org.eclipse.pde.spy.preferences/icons/remove_co.svg
index 646eabf6710..c76f0bee3cd 100644
--- a/ui/org.eclipse.pde.spy.preferences/icons/remove_co.svg
+++ b/ui/org.eclipse.pde.spy.preferences/icons/remove_co.svg
@@ -2,24 +2,19 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.48.5 r10040"
-   sodipodi:docname="remove_exc.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4852-7">
       <stop
          style="stop-color:#707070;stop-opacity:1"
@@ -49,8 +44,7 @@
        gradientTransform="matrix(0.99104673,0,0,1.0377289,-0.03213967,-39.635801)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient4047"
-       xlink:href="#linearGradient4852-7"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4852-7" />
     <linearGradient
        y2="1037.7"
        x2="8.6566515"
@@ -59,34 +53,8 @@
        gradientTransform="matrix(0.99104673,0,0,1.0377289,-0.03213967,-39.635801)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient4049"
-       xlink:href="#linearGradient4844-4"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4844-4" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="31.999998"
-     inkscape:cx="5.5301136"
-     inkscape:cy="7.9227098"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1241"
-     inkscape:window-height="814"
-     inkscape:window-x="963"
-     inkscape:window-y="622"
-     inkscape:window-maximized="0"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3999" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -100,16 +68,12 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
     <path
        style="fill:url(#linearGradient4047);fill-opacity:1;stroke:url(#linearGradient4049);stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline"
        d="m 13.267004,1038.2068 c -0.463993,-0.4858 -1.211033,-0.4858 -1.675002,-10e-5 l -3.0849275,3.2304 -3.0849031,-3.2303 c -0.4639226,-0.4858 -1.2110333,-0.4858 -1.6750018,0 l -0.8523552,0.8927 c -0.4639479,0.4856 -0.463936,1.2678 3.62e-5,1.7537 l 3.0848535,3.2303 -3.084858,3.2302 c -0.4640179,0.4858 -0.4640062,1.268 -1.34e-5,1.7538 l 0.852401,0.8927 c 0.4639431,0.4858 1.2109842,0.4858 1.6750016,0 l 3.084908,-3.2302 3.1063417,3.2526 c 0.463945,0.4859 1.210985,0.4859 1.675003,0 l 0.852355,-0.8925 c 0.463969,-0.4859 0.459308,-1.2632 -3.6e-5,-1.7539 l -3.106344,-3.2527 3.084908,-3.2302 c 0.46399,-0.4859 0.463978,-1.2681 3.4e-5,-1.7538 z"
-       id="rect4043"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="sccccccccssccsccsccss" />
+       id="rect4043" />
   </g>
 </svg>
diff --git a/ui/org.eclipse.pde.spy.preferences/icons/removeall_co.svg b/ui/org.eclipse.pde.spy.preferences/icons/removeall_co.svg
index d3414206f16..c02c550702d 100644
--- a/ui/org.eclipse.pde.spy.preferences/icons/removeall_co.svg
+++ b/ui/org.eclipse.pde.spy.preferences/icons/removeall_co.svg
@@ -2,20 +2,16 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.48.5 r10040"
-   sodipodi:docname="removea_exc.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
@@ -30,8 +26,7 @@
          style="stop-color:#686861;stop-opacity:1;" />
     </linearGradient>
     <linearGradient
-       id="linearGradient4113"
-       inkscape:collect="always">
+       id="linearGradient4113">
       <stop
          id="stop4115"
          offset="0"
@@ -42,7 +37,6 @@
          style="stop-color:#d8d8d8;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4852-7">
       <stop
          style="stop-color:#707070;stop-opacity:1"
@@ -72,8 +66,7 @@
        gradientTransform="matrix(0.85131056,0,0,0.85131056,3.1105797,157.79848)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient4047"
-       xlink:href="#linearGradient4852-7"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4852-7" />
     <linearGradient
        y2="1037.7"
        x2="8.6566515"
@@ -82,10 +75,8 @@
        gradientTransform="matrix(0.85131056,0,0,0.85131056,3.1105797,157.79848)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient4049"
-       xlink:href="#linearGradient4844-4"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4844-4" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4113"
        id="linearGradient4109"
        gradientUnits="userSpaceOnUse"
@@ -95,7 +86,6 @@
        x2="4.7528968"
        y2="1038.5814" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4119"
        id="linearGradient4111"
        gradientUnits="userSpaceOnUse"
@@ -105,31 +95,6 @@
        x2="8.6566515"
        y2="1037.7" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="22.627416"
-     inkscape:cx="9.4041766"
-     inkscape:cy="9.0380727"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1241"
-     inkscape:window-height="814"
-     inkscape:window-x="199"
-     inkscape:window-y="506"
-     inkscape:window-maximized="0"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3999" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -143,22 +108,16 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
     <path
        style="fill:url(#linearGradient4109);fill-opacity:1;stroke:url(#linearGradient4111);stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline"
        d="m 10.611417,1037.0786 c -0.39857,-0.3986 -1.040279,-0.3986 -1.438829,-10e-5 l -2.649957,2.65 -2.6499362,-2.6499 c -0.3985102,-0.3986 -1.0402794,-0.3986 -1.4388289,0 l -0.7321744,0.7322 c -0.3985317,0.3984 -0.3985216,1.0401 3.12e-5,1.4388 l 2.6498934,2.65 -2.6498973,2.6498 c -0.398592,0.3986 -0.3985819,1.0403 -1.14e-5,1.4389 l 0.7322136,0.7322 c 0.3985277,0.3985 1.0402371,0.3985 1.4388286,0 l 2.6499404,-2.6499 2.668352,2.6683 c 0.398529,0.3986 1.040238,0.3986 1.43883,0 l 0.732174,-0.7321 c 0.39855,-0.3986 0.394547,-1.0363 -3.2e-5,-1.4389 l -2.668352,-2.6683 2.649939,-2.6499 c 0.398568,-0.3987 0.398558,-1.0404 2.9e-5,-1.4389 z"
-       id="rect4043-2-1"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="sccccccccssccsccsccss" />
+       id="rect4043-2-1" />
     <path
        style="fill:url(#linearGradient4047);fill-opacity:1;stroke:url(#linearGradient4049);stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline"
        d="m 14.534563,1042.0169 c -0.39857,-0.3986 -1.040279,-0.3986 -1.438829,-10e-5 l -2.649957,2.65 -2.6499365,-2.6499 c -0.3985102,-0.3986 -1.0402794,-0.3986 -1.4388289,0 l -0.7321744,0.7322 c -0.3985317,0.3984 -0.3985216,1.0401 3.12e-5,1.4388 l 2.6498934,2.65 -2.6498973,2.6498 c -0.398592,0.3986 -0.3985819,1.0403 -1.14e-5,1.4389 l 0.7322136,0.7322 c 0.3985277,0.3985 1.0402371,0.3985 1.4388286,0 l 2.6499407,-2.6499 2.668352,2.6683 c 0.398529,0.3986 1.040238,0.3986 1.43883,0 l 0.732174,-0.7321 c 0.39855,-0.3986 0.394547,-1.0363 -3.2e-5,-1.4389 l -2.668352,-2.6683 2.649939,-2.6499 c 0.398568,-0.3987 0.398558,-1.0404 2.9e-5,-1.4389 z"
-       id="rect4043-2"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="sccccccccssccsccsccss" />
+       id="rect4043-2" />
   </g>
 </svg>
diff --git a/ui/org.eclipse.pde.spy.preferences/icons/show_all_preferences.svg b/ui/org.eclipse.pde.spy.preferences/icons/show_all_preferences.svg
index 0ea71affd69..df66d5eeb06 100644
--- a/ui/org.eclipse.pde.spy.preferences/icons/show_all_preferences.svg
+++ b/ui/org.eclipse.pde.spy.preferences/icons/show_all_preferences.svg
@@ -2,25 +2,20 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.48.0 r9654"
-   sodipodi:docname="fldr_obj.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient4807"
-       inkscape:collect="always">
+       id="linearGradient4807">
       <stop
          id="stop4809"
          offset="0"
@@ -31,8 +26,7 @@
          style="stop-color:#bc8532;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       id="linearGradient3973"
-       inkscape:collect="always">
+       id="linearGradient3973">
       <stop
          id="stop3975"
          offset="0"
@@ -43,8 +37,7 @@
          style="stop-color:#f8f0c8;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       id="linearGradient3967"
-       inkscape:collect="always">
+       id="linearGradient3967">
       <stop
          id="stop3969"
          offset="0"
@@ -78,7 +71,6 @@
          style="stop-color:#ba772f;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3949">
       <stop
          style="stop-color:#9e6627;stop-opacity:1"
@@ -90,7 +82,6 @@
          id="stop3953" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient3967"
        id="linearGradient3939"
        gradientUnits="userSpaceOnUse"
@@ -100,7 +91,6 @@
        x2="531.09253"
        y2="371.17883" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient3955"
        id="linearGradient3945"
        gradientUnits="userSpaceOnUse"
@@ -110,8 +100,7 @@
        y2="373.2294"
        gradientTransform="translate(-60.558598,1.4188)" />
     <linearGradient
-       id="linearGradient3973-7"
-       inkscape:collect="always">
+       id="linearGradient3973-7">
       <stop
          id="stop3975-4"
          offset="0"
@@ -129,8 +118,7 @@
        gradientTransform="matrix(1,0,0,1.4165687,344.32442,-1.0061522e-6)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient4776"
-       xlink:href="#linearGradient3973-7"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient3973-7" />
     <linearGradient
        y2="381.19754"
        x2="548.01556"
@@ -139,32 +127,26 @@
        gradientTransform="matrix(1,0,0,1.4165687,344.32442,-1.0061522e-6)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient4778"
-       xlink:href="#linearGradient4807"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4807" />
     <mask
        maskUnits="userSpaceOnUse"
        id="mask4917">
       <path
          style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;display:inline"
          d="m 462.77563,373.22885 29.11636,0 c 1.45425,0 2.625,1.17075 2.625,2.625 l 0,18.76896 c 0,1.45425 -1.17412,2.52598 -2.625,2.625 l -29.11636,1.98708 c -1.45088,0.099 -2.625,-1.17075 -2.625,-2.625 l 0,-20.75604 c 0,-1.45425 1.17075,-2.625 2.625,-2.625 z"
-         id="path4919"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="sssssssss" />
+         id="path4919" />
     </mask>
     <filter
-       inkscape:collect="always"
        id="filter4929"
-       x="-0.13757156"
-       width="1.2751431"
-       y="-0.37744917"
-       height="1.7548983">
+       x="-0.39147933"
+       width="1.7829587"
+       y="-0.42999801"
+       height="1.859996">
       <feGaussianBlur
-         inkscape:collect="always"
          stdDeviation="3.5620748"
          id="feGaussianBlur4931" />
     </filter>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient3973"
        id="linearGradient4933"
        gradientUnits="userSpaceOnUse"
@@ -174,7 +156,6 @@
        x2="538.00562"
        y2="374.21222" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient3949"
        id="linearGradient4935"
        gradientUnits="userSpaceOnUse"
@@ -184,29 +165,6 @@
        x2="548.45923"
        y2="373.77069" />
   </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="-2.033873"
-     inkscape:cy="6.587213"
-     inkscape:document-units="px"
-     inkscape:current-layer="g13862"
-     showgrid="true"
-     inkscape:window-width="472"
-     inkscape:window-height="455"
-     inkscape:window-x="75"
-     inkscape:window-y="75"
-     inkscape:window-maximized="0"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3947" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -220,8 +178,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
@@ -244,14 +200,11 @@
         <path
            style="fill:url(#linearGradient4933);fill-opacity:1;stroke:url(#linearGradient4935);stroke-width:3.02792978;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
            d="m 463.24874,374.64819 28.07551,0 c 1.45425,0 2.625,1.17075 2.625,2.625 l 0,11.29376 c 0,1.45425 -1.22088,2.24642 -2.625,2.625 l -28.07551,7.56983 c -1.40411,0.37858 -2.625,-1.17075 -2.625,-2.625 l 0,-18.86359 c 0,-1.45425 1.17075,-2.625 2.625,-2.625 z"
-           id="rect13693"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="sssssssss" />
+           id="rect13693" />
         <path
            style="fill:none;stroke:url(#linearGradient3945);stroke-width:3.02792978;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
            d="m 462.26171,374.64819 20.09375,0"
-           id="path13797"
-           inkscape:connector-curvature="0" />
+           id="path13797" />
         <g
            id="g4914"
            mask="url(#mask4917)">
diff --git a/ui/org.eclipse.pde.spy.preferences/icons/trace_preferences.svg b/ui/org.eclipse.pde.spy.preferences/icons/trace_preferences.svg
index 79429f17cd4..8f30a47e8ae 100644
--- a/ui/org.eclipse.pde.spy.preferences/icons/trace_preferences.svg
+++ b/ui/org.eclipse.pde.spy.preferences/icons/trace_preferences.svg
@@ -2,20 +2,16 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.48.0 r9654"
-   sodipodi:docname="prop_ps.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
@@ -41,7 +37,6 @@
          id="stop7258" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient7254"
        id="linearGradient7260"
        x1="15.000595"
@@ -69,8 +64,7 @@
        x1="15.000595"
        gradientUnits="userSpaceOnUse"
        id="linearGradient7277"
-       xlink:href="#linearGradient7254-6"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient7254-6" />
     <linearGradient
        id="linearGradient7254-62">
       <stop
@@ -90,8 +84,7 @@
        x1="15.000595"
        gradientUnits="userSpaceOnUse"
        id="linearGradient7328"
-       xlink:href="#linearGradient7254-62"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient7254-62" />
     <linearGradient
        id="linearGradient7254-6-4">
       <stop
@@ -111,10 +104,8 @@
        gradientTransform="matrix(0.93721973,0,0,1,1036.3977,-16.624983)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient7362"
-       xlink:href="#linearGradient7254-6-4"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient7254-6-4" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient7491"
        id="linearGradient7497"
        x1="1.9445436"
@@ -124,30 +115,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(0.99637681,0,0,1,0.01998962,1035.7997)" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="32"
-     inkscape:cx="10.07852"
-     inkscape:cy="11.787627"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1171"
-     inkscape:window-height="959"
-     inkscape:window-x="1384"
-     inkscape:window-y="24"
-     inkscape:window-maximized="0"
-     showguides="true"
-     inkscape:guide-bbox="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid4046" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -161,8 +128,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
diff --git a/ui/org.eclipse.pde.ui.templates/META-INF/MANIFEST.MF b/ui/org.eclipse.pde.ui.templates/META-INF/MANIFEST.MF
index 96f6c6dbfe3..6a9721e92d8 100644
--- a/ui/org.eclipse.pde.ui.templates/META-INF/MANIFEST.MF
+++ b/ui/org.eclipse.pde.ui.templates/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %bundleName
 Bundle-SymbolicName: org.eclipse.pde.ui.templates;singleton:=true
-Bundle-Version: 3.9.200.qualifier
+Bundle-Version: 3.9.300.qualifier
 Bundle-Vendor: %bundleVendor
 Bundle-RequiredExecutionEnvironment: JavaSE-21
 Export-Package: org.eclipse.pde.internal.ui.templates;x-internal:=true,
diff --git a/ui/org.eclipse.pde.ui.templates/icons/etool16/e4.svg b/ui/org.eclipse.pde.ui.templates/icons/etool16/e4.svg
index 22eac73d472..52cc13ec372 100644
--- a/ui/org.eclipse.pde.ui.templates/icons/etool16/e4.svg
+++ b/ui/org.eclipse.pde.ui.templates/icons/etool16/e4.svg
@@ -6,14 +6,7 @@
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="1.3.2 (091e20e, 2023-11-25, custom)"
-   sodipodi:docname="e4.svg"
    xml:space="preserve"
-   inkscape:export-filename="e4.png"
-   inkscape:export-xdpi="96"
-   inkscape:export-ydpi="96"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:svg="http://www.w3.org/2000/svg"
@@ -21,512 +14,13 @@
    xmlns:cc="http://creativecommons.org/ns#"
    xmlns:dc="http://purl.org/dc/elements/1.1/"><defs
      id="defs4"><linearGradient
-       id="linearGradient2"
-       inkscape:collect="always"><stop
+       id="linearGradient2"><stop
          id="stop1"
          offset="0"
          style="stop-color:#4476aa;stop-opacity:1;" /><stop
          id="stop2"
          offset="1"
          style="stop-color:#5a9ccc;stop-opacity:1;" /></linearGradient><linearGradient
-       id="linearGradient3866"><stop
-         id="stop3868"
-         offset="0"
-         style="stop-color:#717188;stop-opacity:1" /><stop
-         id="stop3870"
-         offset="1"
-         style="stop-color:#6b6b6b;stop-opacity:1;" /></linearGradient><linearGradient
-       id="linearGradient3860"><stop
-         id="stop3862"
-         offset="0"
-         style="stop-color:#424242;stop-opacity:1" /><stop
-         id="stop3864"
-         offset="1"
-         style="stop-color:#6b6b6b;stop-opacity:1;" /></linearGradient><linearGradient
-       id="linearGradient3852"><stop
-         id="stop3854"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" /><stop
-         style="stop-color:#dddddd;stop-opacity:1;"
-         offset="0.66561043"
-         id="stop3856" /><stop
-         id="stop3858"
-         offset="1"
-         style="stop-color:#464646;stop-opacity:1;" /></linearGradient><linearGradient
-       id="linearGradient3844"><stop
-         id="stop3846"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" /><stop
-         style="stop-color:#dddddd;stop-opacity:1;"
-         offset="0.61245775"
-         id="stop3848" /><stop
-         id="stop3850"
-         offset="1"
-         style="stop-color:#464646;stop-opacity:1;" /></linearGradient><linearGradient
-       id="linearGradient5328-5"><stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop5330-9" /><stop
-         id="stop3842"
-         offset="0.5"
-         style="stop-color:#dddddd;stop-opacity:1;" /><stop
-         style="stop-color:#464646;stop-opacity:1;"
-         offset="1"
-         id="stop5332-8" /></linearGradient><linearGradient
-       id="linearGradient5209-0"><stop
-         style="stop-color:#4c4c4c;stop-opacity:1"
-         offset="0"
-         id="stop5211-9" /><stop
-         style="stop-color:#6b6b6b;stop-opacity:1;"
-         offset="1"
-         id="stop5213-4" /></linearGradient><linearGradient
-       y2="6.9843998"
-       x2="10.007812"
-       y1="5"
-       x1="10"
-       gradientTransform="translate(-15.015625,1046.6356)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient6323-7"
-       xlink:href="#linearGradient5068-6-9"
-       inkscape:collect="always" /><linearGradient
-       id="linearGradient5068-6-9"
-       inkscape:collect="always"><stop
-         id="stop5070-8-0"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" /><stop
-         id="stop5072-3-6"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" /></linearGradient><linearGradient
-       gradientTransform="translate(-15.015625,10.2734)"
-       gradientUnits="userSpaceOnUse"
-       y2="1045.3466"
-       x2="12"
-       y1="1043.3622"
-       x1="12"
-       id="linearGradient5084-3-3"
-       xlink:href="#linearGradient5068-6-9"
-       inkscape:collect="always" /><linearGradient
-       gradientTransform="translate(-15.015625,10.2734)"
-       gradientUnits="userSpaceOnUse"
-       y2="1043.3466"
-       x2="15.007812"
-       y1="1043.3622"
-       x1="13"
-       id="linearGradient5086-8-0"
-       xlink:href="#linearGradient5068-6-9"
-       inkscape:collect="always" /><linearGradient
-       gradientTransform="translate(-15.015625,10.2734)"
-       gradientUnits="userSpaceOnUse"
-       y2="1042.3622"
-       x2="10.007812"
-       y1="1042.3622"
-       x1="12"
-       id="linearGradient5082-1-0"
-       xlink:href="#linearGradient5068-6-9"
-       inkscape:collect="always" /><linearGradient
-       gradientTransform="translate(-15.015625,10.2734)"
-       gradientUnits="userSpaceOnUse"
-       y2="1041.3466"
-       x2="8.0078125"
-       y1="1041.3622"
-       x1="10"
-       id="linearGradient5078-8-2"
-       xlink:href="#linearGradient5068-6-9"
-       inkscape:collect="always" /><linearGradient
-       gradientTransform="translate(-15.015625,10.2734)"
-       gradientUnits="userSpaceOnUse"
-       y2="1038.3466"
-       x2="10.007812"
-       y1="1040.3622"
-       x1="10"
-       id="linearGradient5076-5-2"
-       xlink:href="#linearGradient5068-6-9"
-       inkscape:collect="always" /><linearGradient
-       gradientTransform="translate(-15.015625,10.2734)"
-       gradientUnits="userSpaceOnUse"
-       y2="1038.3466"
-       x2="10.007812"
-       y1="1038.3622"
-       x1="12"
-       id="linearGradient5074-2-1"
-       xlink:href="#linearGradient5068-6-9"
-       inkscape:collect="always" /><linearGradient
-       gradientTransform="translate(-15.015625,10.2734)"
-       gradientUnits="userSpaceOnUse"
-       y2="1043.3466"
-       x2="14"
-       y1="1041.3622"
-       x1="14"
-       id="linearGradient5088-1-4"
-       xlink:href="#linearGradient5068-6-9"
-       inkscape:collect="always" /><radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4528-9-5-7-9"
-       id="radialGradient3091-1-9-6"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.8508179,-8.813921e-6,8.4531434e-6,1.7750589,644.24981,572.63612)"
-       cx="-757.20496"
-       cy="-738.83777"
-       fx="-757.20496"
-       fy="-738.83777"
-       r="3.4803574" /><linearGradient
-       id="linearGradient4528-9-5-7-9"><stop
-         style="stop-color:#e0c576;stop-opacity:1;"
-         offset="0"
-         id="stop4530-0-5-0-5" /><stop
-         style="stop-color:#9e7916;stop-opacity:1"
-         offset="1"
-         id="stop4532-7-9-3-3" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6281-8-0-1-6-6-4-2"
-       id="linearGradient3093-5-2-7"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.3199889,0,0,2.3199889,10.199693,1043.1852)"
-       x1="0.9375"
-       y1="4.8437853"
-       x2="0.9375"
-       y2="7.549418" /><linearGradient
-       id="linearGradient6281-8-0-1-6-6-4-2"><stop
-         id="stop6283-0-2-2-1-2-0-1"
-         offset="0"
-         style="stop-color:#f7f9fb;stop-opacity:1" /><stop
-         id="stop6285-5-0-9-7-6-9-9"
-         offset="1"
-         style="stop-color:#ffd680;stop-opacity:1" /></linearGradient><radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3844-6"
-       id="radialGradient5366-0-9"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.3089145,0.02433326,-0.0270668,0.33136796,5.4628028,1.7171329)"
-       cx="7.7379637"
-       cy="2.4332652"
-       fx="7.7379637"
-       fy="2.4332652"
-       r="2.3503494" /><linearGradient
-       id="linearGradient3844-6"><stop
-         id="stop3846-3"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" /><stop
-         style="stop-color:#dddddd;stop-opacity:1;"
-         offset="0.61245775"
-         id="stop3848-7" /><stop
-         id="stop3850-1"
-         offset="1"
-         style="stop-color:#464646;stop-opacity:1;" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3860-2"
-       id="linearGradient5368-1-5"
-       gradientUnits="userSpaceOnUse"
-       x1="7.8304267"
-       y1="5.5753322"
-       x2="7.8018494"
-       y2="1.9306878" /><linearGradient
-       id="linearGradient3860-2"><stop
-         id="stop3862-3"
-         offset="0"
-         style="stop-color:#424242;stop-opacity:1" /><stop
-         id="stop3864-4"
-         offset="1"
-         style="stop-color:#6b6b6b;stop-opacity:1;" /></linearGradient><radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3844-0"
-       id="radialGradient5366-0-5"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.3089145,0.02433326,-0.0270668,0.33136796,5.4628028,1.7171329)"
-       cx="7.7379637"
-       cy="2.4332652"
-       fx="7.7379637"
-       fy="2.4332652"
-       r="2.3503494" /><linearGradient
-       id="linearGradient3844-0"><stop
-         id="stop3846-36"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" /><stop
-         style="stop-color:#dddddd;stop-opacity:1;"
-         offset="0.61245775"
-         id="stop3848-6" /><stop
-         id="stop3850-5"
-         offset="1"
-         style="stop-color:#464646;stop-opacity:1;" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3860-0"
-       id="linearGradient5368-1-0"
-       gradientUnits="userSpaceOnUse"
-       x1="7.8304267"
-       y1="5.5753322"
-       x2="7.8018494"
-       y2="1.9306878" /><linearGradient
-       id="linearGradient3860-0"><stop
-         id="stop3862-6"
-         offset="0"
-         style="stop-color:#424242;stop-opacity:1" /><stop
-         id="stop3864-0"
-         offset="1"
-         style="stop-color:#6b6b6b;stop-opacity:1;" /></linearGradient><radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3844-8"
-       id="radialGradient5366-0-7"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.3089145,0.02433326,-0.0270668,0.33136796,5.4628028,1.7171329)"
-       cx="7.7379637"
-       cy="2.4332652"
-       fx="7.7379637"
-       fy="2.4332652"
-       r="2.3503494" /><linearGradient
-       id="linearGradient3844-8"><stop
-         id="stop3846-1"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" /><stop
-         style="stop-color:#dddddd;stop-opacity:1;"
-         offset="0.61245775"
-         id="stop3848-4" /><stop
-         id="stop3850-19"
-         offset="1"
-         style="stop-color:#464646;stop-opacity:1;" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3860-4"
-       id="linearGradient5368-1-8"
-       gradientUnits="userSpaceOnUse"
-       x1="7.8304267"
-       y1="5.5753322"
-       x2="7.8018494"
-       y2="1.9306878" /><linearGradient
-       id="linearGradient3860-4"><stop
-         id="stop3862-30"
-         offset="0"
-         style="stop-color:#424242;stop-opacity:1" /><stop
-         id="stop3864-9"
-         offset="1"
-         style="stop-color:#6b6b6b;stop-opacity:1;" /></linearGradient><radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3844-3"
-       id="radialGradient5366-0-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.3089145,0.02433326,-0.0270668,0.33136796,5.4628028,1.7171329)"
-       cx="7.7379637"
-       cy="2.4332652"
-       fx="7.7379637"
-       fy="2.4332652"
-       r="2.3503494" /><linearGradient
-       id="linearGradient3844-3"><stop
-         id="stop3846-7"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" /><stop
-         style="stop-color:#dddddd;stop-opacity:1;"
-         offset="0.61245775"
-         id="stop3848-3" /><stop
-         id="stop3850-3"
-         offset="1"
-         style="stop-color:#464646;stop-opacity:1;" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3860-9"
-       id="linearGradient5368-1-7"
-       gradientUnits="userSpaceOnUse"
-       x1="7.8304267"
-       y1="5.5753322"
-       x2="7.8018494"
-       y2="1.9306878" /><linearGradient
-       id="linearGradient3860-9"><stop
-         id="stop3862-5"
-         offset="0"
-         style="stop-color:#424242;stop-opacity:1" /><stop
-         id="stop3864-2"
-         offset="1"
-         style="stop-color:#6b6b6b;stop-opacity:1;" /></linearGradient><radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3852-6"
-       id="radialGradient5374-4-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.35882709,-0.01458857,0.01251176,0.40537334,4.9838699,2.1071585)"
-       cx="7.7274323"
-       cy="2.8622203"
-       fx="7.7274323"
-       fy="2.8622203"
-       r="2.3503494" /><linearGradient
-       id="linearGradient3852-6"><stop
-         id="stop3854-9"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" /><stop
-         style="stop-color:#dddddd;stop-opacity:1;"
-         offset="0.66561043"
-         id="stop3856-8" /><stop
-         id="stop3858-2"
-         offset="1"
-         style="stop-color:#464646;stop-opacity:1;" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3866-8"
-       id="linearGradient5376-4-1"
-       gradientUnits="userSpaceOnUse"
-       x1="7.8451643"
-       y1="5.6525216"
-       x2="7.8451643"
-       y2="1.0179684" /><linearGradient
-       id="linearGradient3866-8"><stop
-         id="stop3868-1"
-         offset="0"
-         style="stop-color:#717188;stop-opacity:1" /><stop
-         id="stop3870-1"
-         offset="1"
-         style="stop-color:#6b6b6b;stop-opacity:1;" /></linearGradient><linearGradient
-       y2="1.0179684"
-       x2="7.8451643"
-       y1="5.6525216"
-       x1="7.8451643"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4515"
-       xlink:href="#linearGradient3866-8"
-       inkscape:collect="always" /><radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3852-4"
-       id="radialGradient5374-4-7"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.35882709,-0.01458857,0.01251176,0.40537334,4.9838699,2.1071585)"
-       cx="7.9300532"
-       cy="1.7860492"
-       fx="7.9300532"
-       fy="1.7860492"
-       r="2.3503494" /><linearGradient
-       id="linearGradient3852-4"><stop
-         id="stop3854-0"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" /><stop
-         style="stop-color:#dddddd;stop-opacity:1;"
-         offset="0.66561043"
-         id="stop3856-5" /><stop
-         id="stop3858-8"
-         offset="1"
-         style="stop-color:#464646;stop-opacity:1;" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3866-7"
-       id="linearGradient5376-4-6"
-       gradientUnits="userSpaceOnUse"
-       x1="7.8451643"
-       y1="5.6525216"
-       x2="7.8451643"
-       y2="1.0179684" /><linearGradient
-       id="linearGradient3866-7"><stop
-         id="stop3868-0"
-         offset="0"
-         style="stop-color:#717188;stop-opacity:1" /><stop
-         id="stop3870-7"
-         offset="1"
-         style="stop-color:#6b6b6b;stop-opacity:1;" /></linearGradient><radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3852-5"
-       id="radialGradient5374-4-3"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.35882709,-0.01458857,0.01251176,0.40537334,4.9838699,2.1071585)"
-       cx="7.9300532"
-       cy="1.7860492"
-       fx="7.9300532"
-       fy="1.7860492"
-       r="2.3503494" /><linearGradient
-       id="linearGradient3852-5"><stop
-         id="stop3854-1"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" /><stop
-         style="stop-color:#dddddd;stop-opacity:1;"
-         offset="0.66561043"
-         id="stop3856-6" /><stop
-         id="stop3858-4"
-         offset="1"
-         style="stop-color:#464646;stop-opacity:1;" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3866-3"
-       id="linearGradient5376-4-0"
-       gradientUnits="userSpaceOnUse"
-       x1="7.8451643"
-       y1="5.6525216"
-       x2="7.8451643"
-       y2="1.0179684" /><linearGradient
-       id="linearGradient3866-3"><stop
-         id="stop3868-6"
-         offset="0"
-         style="stop-color:#717188;stop-opacity:1" /><stop
-         id="stop3870-4"
-         offset="1"
-         style="stop-color:#6b6b6b;stop-opacity:1;" /></linearGradient><radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5328-5-9"
-       id="radialGradient5370-9-4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.37553419,-2.0140452e-8,1.7614747e-8,0.40297829,4.9079328,2.1932289)"
-       cx="7.9383807"
-       cy="3.451864"
-       fx="7.9383807"
-       fy="3.451864"
-       r="2.3503494" /><linearGradient
-       id="linearGradient5328-5-9"><stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop5330-9-7" /><stop
-         id="stop3842-2"
-         offset="0.5"
-         style="stop-color:#dddddd;stop-opacity:1;" /><stop
-         style="stop-color:#464646;stop-opacity:1;"
-         offset="1"
-         id="stop5332-8-3" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5209-0-2"
-       id="linearGradient5372-5-0"
-       gradientUnits="userSpaceOnUse"
-       x1="7.8304267"
-       y1="5.9680095"
-       x2="7.8890662"
-       y2="3.584255" /><linearGradient
-       id="linearGradient5209-0-2"><stop
-         style="stop-color:#4c4c4c;stop-opacity:1"
-         offset="0"
-         id="stop5211-9-4" /><stop
-         style="stop-color:#6b6b6b;stop-opacity:1;"
-         offset="1"
-         id="stop5213-4-2" /></linearGradient><radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5328-5-4"
-       id="radialGradient5370-9-6"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.37553419,-2.0140452e-8,1.7614747e-8,0.40297829,4.9079328,2.1932289)"
-       cx="7.9383807"
-       cy="3.451864"
-       fx="7.9383807"
-       fy="3.451864"
-       r="2.3503494" /><linearGradient
-       id="linearGradient5328-5-4"><stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop5330-9-9" /><stop
-         id="stop3842-7"
-         offset="0.5"
-         style="stop-color:#dddddd;stop-opacity:1;" /><stop
-         style="stop-color:#464646;stop-opacity:1;"
-         offset="1"
-         id="stop5332-8-0" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5209-0-7"
-       id="linearGradient5372-5-6"
-       gradientUnits="userSpaceOnUse"
-       x1="7.8304267"
-       y1="5.9680095"
-       x2="7.8890662"
-       y2="3.584255" /><linearGradient
-       id="linearGradient5209-0-7"><stop
-         style="stop-color:#4c4c4c;stop-opacity:1"
-         offset="0"
-         id="stop5211-9-9" /><stop
-         style="stop-color:#6b6b6b;stop-opacity:1;"
-         offset="1"
-         id="stop5213-4-4" /></linearGradient><linearGradient
-       id="linearGradient10798-1-9-3-7-1-15-1-7-6-1"><stop
-         style="stop-color:#4f9e55;stop-opacity:1"
-         offset="0"
-         id="stop10800-5-2-1-8-2-8-1-7-3-7" /><stop
-         id="stop10806-6-8-5-3-2-95-0-5-4-8"
-         offset="0.5"
-         style="stop-color:#3c8d49;stop-opacity:1;" /><stop
-         style="stop-color:#a4e173;stop-opacity:1;"
-         offset="1"
-         id="stop10802-1-5-3-0-2-0-9-8-4-3" /></linearGradient><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4157"
        id="linearGradient4163"
        x1="1.0037121"
@@ -535,7 +29,6 @@
        y2="1041.865"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1.2586471,0,0,0.95055328,-1.3457395,48.514119)" /><linearGradient
-       inkscape:collect="always"
        id="linearGradient4157"><stop
          style="stop-color:#58b6e8;stop-opacity:1;"
          offset="0"
@@ -543,7 +36,6 @@
          style="stop-color:#58b6e8;stop-opacity:0;"
          offset="1"
          id="stop4161" /></linearGradient><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4082-3"
        id="linearGradient8878"
        gradientUnits="userSpaceOnUse"
@@ -562,7 +54,6 @@
          style="stop-color:#4476aa;stop-opacity:1"
          offset="1"
          id="stop4086-2" /></linearGradient><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient2"
        id="linearGradient1"
        gradientUnits="userSpaceOnUse"
@@ -570,56 +61,19 @@
        x1="8.0137892"
        y1="1042.3622"
        x2="8.0137892"
-       y2="1050.0707" /></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="6.8279999"
-     inkscape:cy="3.7344077"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1920"
-     inkscape:window-height="991"
-     inkscape:window-x="-9"
-     inkscape:window-y="-9"
-     inkscape:window-maximized="1"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="false"
-     inkscape:showpageshadow="0"
-     inkscape:pagecheckerboard="0"
-     inkscape:deskcolor="#505050"><inkscape:grid
-       type="xygrid"
-       id="grid3006"
-       originx="0"
-       originy="0"
-       spacingy="1"
-       spacingx="1"
-       units="px"
-       visible="true" /></sodipodi:namedview><metadata
+       y2="1050.0707" /></defs><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" /></cc:Work></rdf:RDF></metadata><g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)"><path
        style="display:inline;fill:#f4fcff;fill-opacity:1;stroke:url(#linearGradient1);stroke-width:1.07067;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1"
        d="M 0.53533415,1039.8975 H 14.464666 v 9.9294 H 0.53533415 Z"
-       id="rect3997-9-97"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" /><path
+       id="rect3997-9-97" /><path
        style="display:inline;fill:url(#linearGradient4163);fill-opacity:1;stroke:url(#linearGradient8878);stroke-width:1.0938;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1"
        d="M 0.54690269,1037.9091 H 14.453099 v 1.9061 H 0.54690269 Z"
-       id="rect3997-9-9"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" /><image
+       id="rect3997-9-9" /><image
        width="16"
        height="16"
        preserveAspectRatio="none"
diff --git a/ui/org.eclipse.pde.ui.templates/icons/etool16/newex_wiz.svg b/ui/org.eclipse.pde.ui.templates/icons/etool16/newex_wiz.svg
index 559c6e8dbf2..64d88c0bacc 100644
--- a/ui/org.eclipse.pde.ui.templates/icons/etool16/newex_wiz.svg
+++ b/ui/org.eclipse.pde.ui.templates/icons/etool16/newex_wiz.svg
@@ -2,20 +2,16 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r"
-   sodipodi:docname="newex_wiz.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
@@ -80,7 +76,6 @@
          id="stop10452-1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10448-9-7-0-5"
        id="linearGradient10770-6"
        gradientUnits="userSpaceOnUse"
@@ -90,7 +85,6 @@
        x2="323.98331"
        y2="518.28192" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10748-8"
        id="linearGradient10774-5"
        gradientUnits="userSpaceOnUse"
@@ -100,7 +94,6 @@
        x2="324.1601"
        y2="515.53949" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10448-90"
        id="linearGradient10778-6"
        gradientUnits="userSpaceOnUse"
@@ -110,7 +103,6 @@
        y2="511.66458"
        gradientTransform="matrix(0.30039597,0,0,0.29632024,-93.823234,870.37106)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient6281-8-0-1-6"
        id="linearGradient3093-5-2-7-0-9"
        gradientUnits="userSpaceOnUse"
@@ -131,31 +123,6 @@
          style="stop-color:#ffd680;stop-opacity:1" />
     </linearGradient>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="15.999999"
-     inkscape:cx="1.6581998"
-     inkscape:cy="1.9975375"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="784"
-     inkscape:window-height="634"
-     inkscape:window-x="1607"
-     inkscape:window-y="915"
-     inkscape:window-maximized="0"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3999" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -169,8 +136,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
@@ -183,18 +148,14 @@
          style="display:inline"
          id="g4386">
         <path
-           sodipodi:nodetypes="ccccc"
            style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#9e7400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
            d="m 2.3385061,1041.3342 -3.4062511,0.031 0.0098,1 3.4062501,-0.031 z"
-           id="path4313-5-1-8-6"
-           inkscape:connector-curvature="0" />
+           id="path4313-5-1-8-6" />
       </g>
       <path
-         inkscape:connector-curvature="0"
          id="path4313-5-1-8-6-0"
          d="m 20.608712,1042.3225 3.421876,0.031 -0.0098,1 -3.421875,-0.031 z"
-         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#9e7400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-         sodipodi:nodetypes="ccccc" />
+         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#9e7400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
       <g
          style="display:inline"
          id="g4239"
@@ -209,23 +170,17 @@
            id="rect10007-0-74-2-7-6"
            style="display:inline;fill:url(#linearGradient10770-6);fill-opacity:1;stroke:none;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
         <path
-           inkscape:connector-curvature="0"
            id="path4313-8-8"
            d="m 5.9540546,1024.1006 0,1 8.2734374,0 0,-1 z"
-           style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-           sodipodi:nodetypes="ccccc" />
+           style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
         <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
            id="path4313-8-8-7"
            d="m 6.2874256,1024.0948 0,3.0195 1.01551,0 0,-3.0195 z"
            style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.94926554px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
         <path
-           inkscape:connector-curvature="0"
            id="path4313-5-1-8"
            d="m 14.275248,1026.0967 -8.0937514,0.031 0.0098,1 8.0937504,-0.031 z"
-           style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#9e7400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-           sodipodi:nodetypes="ccccc" />
+           style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#9e7400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
         <rect
            ry="0"
            rx="0"
@@ -236,12 +191,10 @@
            id="rect10007-0-74-2-7"
            style="display:inline;fill:url(#linearGradient10774-5);fill-opacity:1;stroke:none;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
         <path
-           inkscape:connector-curvature="0"
            id="path4313-5-1"
            d="m 6.3114756,1027.1065 -3.3593746,0.031 0.00977,1 3.3593746,-0.031 -0.0098,-1 z"
            style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#9e7400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
         <path
-           inkscape:connector-curvature="0"
            id="path4313-8"
            d="m 6.3017106,1023.0987 -3.3593752,0.031 0.00977,1 3.3593742,-0.031 -0.0098,-1 z"
            style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
@@ -255,26 +208,18 @@
            id="rect10007-0-74-2"
            style="display:inline;fill:url(#linearGradient10778-6);fill-opacity:1;stroke:none;stroke-width:1.50161433;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
         <path
-           inkscape:connector-curvature="0"
            id="path4313"
            d="m 4.3017106,1022.0967 -2.0335499,0.031 0.00977,1 2.0335489,-0.031 -0.0098,-1 z"
-           style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-           sodipodi:nodetypes="cccccc" />
+           style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
         <path
-           inkscape:connector-curvature="0"
            id="path4313-5"
            d="m 4.3075696,1028.0967 -1.9999998,0.031 0.00977,1 1.9999998,-0.031 -0.0098,-1 z"
-           style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#9e7400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-           sodipodi:nodetypes="cccccc" />
+           style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#9e7400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
         <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
            id="path4313-8-8-7-8"
            d="m 4.3092456,1024.1001 0,3.01 1.000277,0 0,-3.01 z"
            style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:0.64640886;fill-rule:evenodd;stroke:none;stroke-width:0.97351193px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
         <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
            id="path4313-8-8-7-8-8"
            d="m 1.3092454,1023.0922 0,5.0101 1.000277,0 0,-5.0101 z"
            style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.97351193px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
@@ -299,9 +244,7 @@
         <path
            style="display:inline;fill:url(#linearGradient3093-5-2-7-0-9);fill-opacity:1;stroke:none"
            d="m 12.471186,1054.309 1.001133,0 0,1.946 1.986639,0 0,1.0167 -1.986639,0 0,2.043 -1.001133,0 0,-2.043 -1.98664,0 0,-1.0167 1.98664,0 z"
-           id="path5581-5-5"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccccccccccc" />
+           id="path5581-5-5" />
       </g>
     </g>
   </g>
diff --git a/ui/org.eclipse.pde.ui.templates/icons/etool16/newexprj_wiz.svg b/ui/org.eclipse.pde.ui.templates/icons/etool16/newexprj_wiz.svg
index d4f1264fda0..b15034225cd 100644
--- a/ui/org.eclipse.pde.ui.templates/icons/etool16/newexprj_wiz.svg
+++ b/ui/org.eclipse.pde.ui.templates/icons/etool16/newexprj_wiz.svg
@@ -2,24 +2,19 @@
 <!-- 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="16"
    height="16"
    id="svg25490"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="newexprj_wiz.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs25492">
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient11290"
        id="linearGradient8238"
        gradientUnits="userSpaceOnUse"
@@ -28,7 +23,6 @@
        x2="12.51806"
        y2="1044.4806" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient11290">
       <stop
          style="stop-color:#567ead;stop-opacity:1"
@@ -46,8 +40,7 @@
        x1="12.51806"
        gradientUnits="userSpaceOnUse"
        id="linearGradient25569"
-       xlink:href="#linearGradient11290"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient11290" />
     <linearGradient
        y2="1044.4806"
        x2="12.51806"
@@ -55,11 +48,9 @@
        x1="12.51806"
        gradientUnits="userSpaceOnUse"
        id="linearGradient25571"
-       xlink:href="#linearGradient11290"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient11290" />
     <linearGradient
        gradientTransform="translate(-3.8518331,-1.9404214)"
-       inkscape:collect="always"
        xlink:href="#linearGradient4994-6"
        id="linearGradient4101"
        gradientUnits="userSpaceOnUse"
@@ -68,8 +59,7 @@
        x2="9.8946028"
        y2="1051.8378" />
     <linearGradient
-       id="linearGradient4994-6"
-       inkscape:collect="always">
+       id="linearGradient4994-6">
       <stop
          id="stop4996-1"
          offset="0"
@@ -80,8 +70,7 @@
          style="stop-color:#dce7f7;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       id="linearGradient4894-6"
-       inkscape:collect="always">
+       id="linearGradient4894-6">
       <stop
          id="stop4896-8"
          offset="0"
@@ -99,11 +88,9 @@
        y1="1042.2307"
        x1="7.9987183"
        id="linearGradient4900-1"
-       xlink:href="#linearGradient4894-6"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4894-6" />
     <linearGradient
-       id="linearGradient4902-3"
-       inkscape:collect="always">
+       id="linearGradient4902-3">
       <stop
          id="stop4904-2"
          offset="0"
@@ -121,10 +108,8 @@
        y1="1045.1774"
        x1="15.025873"
        id="linearGradient4908-2"
-       xlink:href="#linearGradient4902-3"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4902-3" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient6281-8-0-1-6"
        id="linearGradient3093-5-2-7-0-9"
        gradientUnits="userSpaceOnUse"
@@ -160,113 +145,6 @@
          style="stop-color:#ebb313;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       id="linearGradient10748-8">
-      <stop
-         style="stop-color:#ecac18;stop-opacity:1"
-         offset="0"
-         id="stop10750-5" />
-      <stop
-         id="stop10752-8"
-         offset="0.25"
-         style="stop-color:#f1ce66;stop-opacity:1" />
-      <stop
-         id="stop10754-8"
-         offset="0.5"
-         style="stop-color:#f6e5a6;stop-opacity:1" />
-      <stop
-         style="stop-color:#f1cf6c;stop-opacity:1"
-         offset="0.75"
-         id="stop10756-4" />
-      <stop
-         style="stop-color:#e5b630;stop-opacity:1"
-         offset="1"
-         id="stop10758-7" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10448-90">
-      <stop
-         id="stop10450-0"
-         offset="0"
-         style="stop-color:#ecac18;stop-opacity:1" />
-      <stop
-         style="stop-color:#ffe38d;stop-opacity:1"
-         offset="0.25"
-         id="stop10458-2" />
-      <stop
-         style="stop-color:#fdf5d2;stop-opacity:1"
-         offset="0.5"
-         id="stop10456-96" />
-      <stop
-         id="stop10460-3"
-         offset="0.75"
-         style="stop-color:#ffeba7;stop-opacity:1" />
-      <stop
-         id="stop10452-1"
-         offset="1"
-         style="stop-color:#e5b630;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10414-9">
-      <stop
-         id="stop10416-3"
-         offset="0"
-         style="stop-color:#5078b9;stop-opacity:1;" />
-      <stop
-         style="stop-color:#6d8cbd;stop-opacity:1"
-         offset="0.5"
-         id="stop10422-8" />
-      <stop
-         id="stop10418-4"
-         offset="1"
-         style="stop-color:#5f88c9;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10432-3">
-      <stop
-         style="stop-color:#1f4d9a;stop-opacity:1"
-         offset="0"
-         id="stop10434-4" />
-      <stop
-         id="stop10436-2"
-         offset="0.5"
-         style="stop-color:#4e6da1;stop-opacity:1" />
-      <stop
-         style="stop-color:#567ebc;stop-opacity:1"
-         offset="1"
-         id="stop10438-9" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10157-6">
-      <stop
-         id="stop10159-5"
-         offset="0"
-         style="stop-color:#6588c1;stop-opacity:1" />
-      <stop
-         style="stop-color:#becce3;stop-opacity:1"
-         offset="0.5"
-         id="stop10165-9" />
-      <stop
-         id="stop10161-55"
-         offset="1"
-         style="stop-color:#809dcb;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4284">
-      <stop
-         style="stop-color:#6588c1;stop-opacity:0"
-         offset="0"
-         id="stop4286" />
-      <stop
-         id="stop4288"
-         offset="0.49999967"
-         style="stop-color:#becce3;stop-opacity:1" />
-      <stop
-         style="stop-color:#809dcb;stop-opacity:0"
-         offset="1"
-         id="stop4290" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10448-9-7-0-5"
        id="linearGradient4424"
        gradientUnits="userSpaceOnUse"
@@ -276,7 +154,6 @@
        x2="323.98331"
        y2="518.28192" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10748-8-5"
        id="linearGradient4426"
        gradientUnits="userSpaceOnUse"
@@ -309,7 +186,6 @@
          style="stop-color:#e5b630;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10448-90-9"
        id="linearGradient4428"
        gradientUnits="userSpaceOnUse"
@@ -342,7 +218,6 @@
          id="stop10452-1-6" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4322"
        id="linearGradient4328"
        x1="10.003791"
@@ -352,7 +227,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(14.996209,-0.985039)" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4322">
       <stop
          style="stop-color:#a0b5d7;stop-opacity:1"
@@ -376,7 +250,6 @@
          id="stop4326" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4285"
        id="linearGradient4291"
        x1="11.923064"
@@ -386,7 +259,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(14.668084,-11.177808)" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4285">
       <stop
          style="stop-color:#a0b5d7;stop-opacity:1"
@@ -410,7 +282,6 @@
          id="stop4289" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4295"
        id="linearGradient4301"
        x1="13.425666"
@@ -420,7 +291,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(14.668084,-11.177808)" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4295">
       <stop
          style="stop-color:#7da0d5;stop-opacity:1"
@@ -432,33 +302,6 @@
          id="stop4299" />
     </linearGradient>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="2"
-     inkscape:cx="8.6028716"
-     inkscape:cy="7.5725979"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:snap-global="false"
-     inkscape:window-width="1199"
-     inkscape:window-height="704"
-     inkscape:window-x="889"
-     inkscape:window-y="832"
-     inkscape:window-maximized="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid26727"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
   <metadata
      id="metadata25495">
     <rdf:RDF>
@@ -472,15 +315,12 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      transform="translate(0,-1036.3622)">
     <g
        transform="translate(324.0078,-599.7683)"
        style="stroke:url(#linearGradient8238);stroke-opacity:1;display:inline"
-       id="layer1-2"
-       inkscape:label="Layer 1">
+       id="layer1-2">
       <g
          id="g11331-3-1-1-7"
          style="stroke:url(#linearGradient25569);display:inline"
@@ -504,7 +344,6 @@
           <g
              style="font-size:13.58917427px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#236298;fill-opacity:1;stroke:#236298;stroke-width:0.24860173;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline;font-family:Sans"
              id="layer1-9"
-             inkscape:label="Layer 1"
              transform="matrix(1.2778996,0,0.03747938,1.2778996,-58.56426,-297.79529)">
             <g
                transform="translate(20,0)"
@@ -513,28 +352,22 @@
               <g
                  transform="matrix(0.84893168,0,-0.02489823,0.84893168,-258.1493,627.19515)"
                  style="display:inline"
-                 id="layer1-95"
-                 inkscape:label="Layer 1">
+                 id="layer1-95">
                 <g
                    id="g4186"
                    transform="matrix(0,1,-1,0,1050.4513,1039.1256)">
                   <path
                      style="display:inline;fill:url(#linearGradient4101);fill-opacity:1;stroke:none"
                      d="m 2.3787264,1036.9635 6.2763925,0 3.0620571,3.0066 0,8.7325 -9.3384496,0 z"
-                     id="rect4001-3"
-                     inkscape:connector-curvature="0"
-                     sodipodi:nodetypes="cccccc" />
+                     id="rect4001-3" />
                   <path
                      style="display:inline;fill:#feec43;stroke:url(#linearGradient4908-2);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;fill-opacity:1"
                      d="m 2.3787264,1036.9635 6.2763925,0 3.0620571,3.0066 0,8.8139 -9.3384496,0 z"
-                     id="rect4001"
-                     inkscape:connector-curvature="0"
-                     sodipodi:nodetypes="cccccc" />
+                     id="rect4001" />
                   <path
                      style="display:inline;fill:url(#linearGradient4900-1);fill-opacity:1;stroke:none"
                      d="m 8.6543768,1036.2564 0,3.626 3.6108392,0 z"
-                     id="path4884"
-                     inkscape:connector-curvature="0" />
+                     id="path4884" />
                 </g>
                 <g
                    id="g4920"
@@ -560,25 +393,19 @@
          ry="0"
          transform="translate(20.125466,13.034661)" />
       <path
-         sodipodi:nodetypes="ccccc"
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ba9726;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
          d="m 10.665872,1046.3536 0,1 3.34593,0 0,-1 z"
          id="path4313-8-8-5"
-         inkscape:connector-curvature="0"
          transform="translate(20.125466,13.034661)" />
       <path
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.94926554px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
          d="m 10.999243,1046.3478 0,3.0195 1.01551,0 0,-3.0195 z"
          id="path4313-8-8-7-4"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc"
          transform="translate(20.125466,13.034661)" />
       <path
-         sodipodi:nodetypes="ccccc"
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ba9726;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
          d="m 14.005886,1048.3497 -3.35564,0.031 0.0098,1 3.355639,-0.031 z"
          id="path4313-5-1-8-9"
-         inkscape:connector-curvature="0"
          transform="translate(20.125466,13.034661)" />
       <rect
          style="display:inline;fill:url(#linearGradient4426);fill-opacity:1;stroke:none;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
@@ -594,13 +421,11 @@
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ba9726;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
          d="m 11.023293,1049.3595 -3.3593746,0.031 0.00977,1 3.3593746,-0.031 -0.0098,-1 z"
          id="path4313-5-1-2"
-         inkscape:connector-curvature="0"
          transform="translate(20.125466,13.034661)" />
       <path
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ba9726;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
          d="m 11.013528,1045.3517 -3.3593752,0.031 0.00977,1 3.3593742,-0.031 -0.0098,-1 z"
          id="path4313-8-0"
-         inkscape:connector-curvature="0"
          transform="translate(20.125466,13.034661)" />
       <rect
          style="display:inline;fill:url(#linearGradient4428);fill-opacity:1;stroke:none;stroke-width:1.50161433;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
@@ -616,38 +441,28 @@
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
          d="m 9.013528,1044.3497 -3.3593752,0.031 0.00977,1 3.3593742,-0.031 -0.0098,-1 z"
          id="path4313-54"
-         inkscape:connector-curvature="0"
          transform="translate(20.125466,13.034661)" />
       <path
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#9e7400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
          d="m 9.019387,1050.3497 -3.3593749,0.031 0.00977,1 3.3593749,-0.031 -0.0098,-1 z"
          id="path4313-5-0"
-         inkscape:connector-curvature="0"
          transform="translate(20.125466,13.034661)" />
       <path
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:0.64640886;fill-rule:evenodd;stroke:none;stroke-width:0.97351193px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
          d="m 9.021063,1046.3531 0,3.01 1.000277,0 0,-3.01 z"
          id="path4313-8-8-7-8-1"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc"
          transform="translate(20.125466,13.034661)" />
       <g
          id="g4294">
         <path
-           sodipodi:nodetypes="cccc"
-           inkscape:connector-curvature="0"
            id="rect4317-3"
            d="m 20.151278,1061.8671 5.39483,0 0,-1.9999 -5.39483,0"
            style="display:inline;opacity:1;fill:#93acd2;fill-opacity:1;stroke:#7698cf;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
         <path
-           sodipodi:nodetypes="cccc"
-           inkscape:connector-curvature="0"
            id="path4303"
            d="m 24,1058.9107 2.53125,0 0,3.9871 -2.532198,0"
            style="fill:url(#linearGradient4328);fill-opacity:1;fill-rule:evenodd;stroke:#698dc5;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
         <path
-           sodipodi:nodetypes="cscssccc"
-           inkscape:connector-curvature="0"
            id="path4274"
            d="m 25.5625,1060.3052 0,-2.1494 c 0,-0.4714 1.0625,-1.2031 1.0625,-1.2031 0,0 0.96875,0.4413 0.96875,0.8906 l 0,5.9219 c 0,0.5045 -1.070312,1.0547 -1.070312,1.0547 0,0 -1.039063,-0.5336 -1.039063,-1.0234 l 0,-2.4808"
            style="fill:url(#linearGradient4291);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4301);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
@@ -668,9 +483,7 @@
       <path
          style="display:inline;fill:url(#linearGradient3093-5-2-7-0-9);fill-opacity:1;stroke:none"
          d="m 12.471186,1054.309 1.001133,0 0,1.9791 1.986639,0 0,0.9836 -1.986639,0 0,2.043 -1.001133,0 0,-2.043 -1.98664,0 0,-0.9836 1.98664,0 z"
-         id="path5581-5-5"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccccccccccc" />
+         id="path5581-5-5" />
     </g>
   </g>
 </svg>
diff --git a/ui/org.eclipse.pde.ui.templates/templates_3.5/E4Application/bin/icons/home.svg b/ui/org.eclipse.pde.ui.templates/templates_3.5/E4Application/bin/icons/home.svg
index cee95b8d3e7..b637a0260e6 100644
--- a/ui/org.eclipse.pde.ui.templates/templates_3.5/E4Application/bin/icons/home.svg
+++ b/ui/org.eclipse.pde.ui.templates/templates_3.5/E4Application/bin/icons/home.svg
@@ -1 +1,20 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="20px" viewBox="0 0 24 24" width="20px" fill="#1f1f1f"><path d="M0 0h24v24H0z" fill="none"/><path d="M10 20v-6h4v6h5v-8h3L12 3 2 12h3v8z"/></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   height="20px"
+   viewBox="0 0 24 24"
+   width="20px"
+   fill="#1f1f1f"
+   version="1.1"
+   id="svg2"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs2" />
+  <path
+     d="M0 0h24v24H0z"
+     fill="none"
+     id="path1" />
+  <path
+     d="M10 20v-6h4v6h5v-8h3L12 3 2 12h3v8z"
+     id="path2" />
+</svg>
diff --git a/ui/org.eclipse.pde.ui.templates/templates_3.5/E4Application/bin/icons/open_in_app.svg b/ui/org.eclipse.pde.ui.templates/templates_3.5/E4Application/bin/icons/open_in_app.svg
index 73db078a54c..0798084a893 100644
--- a/ui/org.eclipse.pde.ui.templates/templates_3.5/E4Application/bin/icons/open_in_app.svg
+++ b/ui/org.eclipse.pde.ui.templates/templates_3.5/E4Application/bin/icons/open_in_app.svg
@@ -1 +1,20 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="20px" viewBox="0 0 24 24" width="20px" fill="#1f1f1f"><path d="M0 0h24v24H0z" fill="none"/><path d="M20 6h-8l-2-2H4c-1.1 0-1.99.9-1.99 2L2 18c0 1.1.9 2 2 2h16c1.1 0 2-.9 2-2V8c0-1.1-.9-2-2-2zm0 12H4V8h16v10z"/></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   height="20px"
+   viewBox="0 0 24 24"
+   width="20px"
+   fill="#1f1f1f"
+   version="1.1"
+   id="svg2"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs2" />
+  <path
+     d="M0 0h24v24H0z"
+     fill="none"
+     id="path1" />
+  <path
+     d="M20 6h-8l-2-2H4c-1.1 0-1.99.9-1.99 2L2 18c0 1.1.9 2 2 2h16c1.1 0 2-.9 2-2V8c0-1.1-.9-2-2-2zm0 12H4V8h16v10z"
+     id="path2" />
+</svg>
diff --git a/ui/org.eclipse.pde.ui.templates/templates_3.5/E4Application/bin/icons/save_edit.svg b/ui/org.eclipse.pde.ui.templates/templates_3.5/E4Application/bin/icons/save_edit.svg
index f741b04e464..637384110eb 100644
--- a/ui/org.eclipse.pde.ui.templates/templates_3.5/E4Application/bin/icons/save_edit.svg
+++ b/ui/org.eclipse.pde.ui.templates/templates_3.5/E4Application/bin/icons/save_edit.svg
@@ -1 +1,20 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="20px" viewBox="0 0 24 24" width="20px" fill="#1f1f1f"><path d="M0 0h24v24H0z" fill="none"/><path d="M14 2H6c-1.1 0-1.99.9-1.99 2L4 20c0 1.1.89 2 1.99 2H18c1.1 0 2-.9 2-2V8l-6-6zm2 16H8v-2h8v2zm0-4H8v-2h8v2zm-3-5V3.5L18.5 9H13z"/></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   height="20px"
+   viewBox="0 0 24 24"
+   width="20px"
+   fill="#1f1f1f"
+   version="1.1"
+   id="svg2"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs2" />
+  <path
+     d="M0 0h24v24H0z"
+     fill="none"
+     id="path1" />
+  <path
+     d="M14 2H6c-1.1 0-1.99.9-1.99 2L4 20c0 1.1.89 2 1.99 2H18c1.1 0 2-.9 2-2V8l-6-6zm2 16H8v-2h8v2zm0-4H8v-2h8v2zm-3-5V3.5L18.5 9H13z"
+     id="path2" />
+</svg>
diff --git a/ui/org.eclipse.pde.ui/icons/bndtools/bndrun.svg b/ui/org.eclipse.pde.ui/icons/bndtools/bndrun.svg
index 7a01fb63f88..7b28bf615ae 100644
--- a/ui/org.eclipse.pde.ui/icons/bndtools/bndrun.svg
+++ b/ui/org.eclipse.pde.ui/icons/bndtools/bndrun.svg
@@ -6,606 +6,38 @@
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="1.3.2 (091e20e, 2023-11-25, custom)"
-   sodipodi:docname="bundlerun.svg"
    xml:space="preserve"
-   inkscape:export-filename="bundlerun.png"
-   inkscape:export-xdpi="96"
-   inkscape:export-ydpi="96"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:cc="http://creativecommons.org/ns#"
    xmlns:dc="http://purl.org/dc/elements/1.1/"><defs
-     id="defs4"><inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="-1.4152894 : 2.604202 : 1"
-       inkscape:vp_y="12.396136 : 891.72087 : 1"
-       inkscape:vp_z="20.395063 : 1.760452 : 1"
-       inkscape:persp3d-origin="12.396136 : -0.8384562 : 1"
-       id="perspective1" /><linearGradient
-       id="linearGradient3866"><stop
-         id="stop3868"
-         offset="0"
-         style="stop-color:#717188;stop-opacity:1" /><stop
-         id="stop3870"
-         offset="1"
-         style="stop-color:#6b6b6b;stop-opacity:1;" /></linearGradient><linearGradient
-       id="linearGradient3860"><stop
-         id="stop3862"
-         offset="0"
-         style="stop-color:#424242;stop-opacity:1" /><stop
-         id="stop3864"
-         offset="1"
-         style="stop-color:#6b6b6b;stop-opacity:1;" /></linearGradient><linearGradient
-       id="linearGradient3852"><stop
-         id="stop3854"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" /><stop
-         style="stop-color:#dddddd;stop-opacity:1;"
-         offset="0.66561043"
-         id="stop3856" /><stop
-         id="stop3858"
-         offset="1"
-         style="stop-color:#464646;stop-opacity:1;" /></linearGradient><linearGradient
-       id="linearGradient3844"><stop
-         id="stop3846"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" /><stop
-         style="stop-color:#dddddd;stop-opacity:1;"
-         offset="0.61245775"
-         id="stop3848" /><stop
-         id="stop3850"
-         offset="1"
-         style="stop-color:#464646;stop-opacity:1;" /></linearGradient><linearGradient
-       id="linearGradient5328-5"><stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop5330-9" /><stop
-         id="stop3842"
-         offset="0.5"
-         style="stop-color:#dddddd;stop-opacity:1;" /><stop
-         style="stop-color:#464646;stop-opacity:1;"
-         offset="1"
-         id="stop5332-8" /></linearGradient><linearGradient
-       id="linearGradient5209-0"><stop
-         style="stop-color:#4c4c4c;stop-opacity:1"
-         offset="0"
-         id="stop5211-9" /><stop
-         style="stop-color:#6b6b6b;stop-opacity:1;"
-         offset="1"
-         id="stop5213-4" /></linearGradient><linearGradient
-       y2="6.9843998"
-       x2="10.007812"
-       y1="5"
-       x1="10"
-       gradientTransform="translate(-15.015625,1046.6356)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient6323-7"
-       xlink:href="#linearGradient5068-6-9"
-       inkscape:collect="always" /><linearGradient
-       id="linearGradient5068-6-9"
-       inkscape:collect="always"><stop
-         id="stop5070-8-0"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" /><stop
-         id="stop5072-3-6"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" /></linearGradient><linearGradient
-       gradientTransform="translate(-15.015625,10.2734)"
-       gradientUnits="userSpaceOnUse"
-       y2="1045.3466"
-       x2="12"
-       y1="1043.3622"
-       x1="12"
-       id="linearGradient5084-3-3"
-       xlink:href="#linearGradient5068-6-9"
-       inkscape:collect="always" /><linearGradient
-       gradientTransform="translate(-15.015625,10.2734)"
-       gradientUnits="userSpaceOnUse"
-       y2="1043.3466"
-       x2="15.007812"
-       y1="1043.3622"
-       x1="13"
-       id="linearGradient5086-8-0"
-       xlink:href="#linearGradient5068-6-9"
-       inkscape:collect="always" /><linearGradient
-       gradientTransform="translate(-15.015625,10.2734)"
-       gradientUnits="userSpaceOnUse"
-       y2="1042.3622"
-       x2="10.007812"
-       y1="1042.3622"
-       x1="12"
-       id="linearGradient5082-1-0"
-       xlink:href="#linearGradient5068-6-9"
-       inkscape:collect="always" /><linearGradient
-       gradientTransform="translate(-15.015625,10.2734)"
-       gradientUnits="userSpaceOnUse"
-       y2="1041.3466"
-       x2="8.0078125"
-       y1="1041.3622"
-       x1="10"
-       id="linearGradient5078-8-2"
-       xlink:href="#linearGradient5068-6-9"
-       inkscape:collect="always" /><linearGradient
-       gradientTransform="translate(-15.015625,10.2734)"
-       gradientUnits="userSpaceOnUse"
-       y2="1038.3466"
-       x2="10.007812"
-       y1="1040.3622"
-       x1="10"
-       id="linearGradient5076-5-2"
-       xlink:href="#linearGradient5068-6-9"
-       inkscape:collect="always" /><linearGradient
-       gradientTransform="translate(-15.015625,10.2734)"
-       gradientUnits="userSpaceOnUse"
-       y2="1038.3466"
-       x2="10.007812"
-       y1="1038.3622"
-       x1="12"
-       id="linearGradient5074-2-1"
-       xlink:href="#linearGradient5068-6-9"
-       inkscape:collect="always" /><linearGradient
-       gradientTransform="translate(-15.015625,10.2734)"
-       gradientUnits="userSpaceOnUse"
-       y2="1043.3466"
-       x2="14"
-       y1="1041.3622"
-       x1="14"
-       id="linearGradient5088-1-4"
-       xlink:href="#linearGradient5068-6-9"
-       inkscape:collect="always" /><radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4528-9-5-7-9"
-       id="radialGradient3091-1-9-6"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.8508179,-8.813921e-6,8.4531434e-6,1.7750589,644.24981,572.63612)"
-       cx="-757.20496"
-       cy="-738.83777"
-       fx="-757.20496"
-       fy="-738.83777"
-       r="3.4803574" /><linearGradient
-       id="linearGradient4528-9-5-7-9"><stop
-         style="stop-color:#e0c576;stop-opacity:1;"
-         offset="0"
-         id="stop4530-0-5-0-5" /><stop
-         style="stop-color:#9e7916;stop-opacity:1"
-         offset="1"
-         id="stop4532-7-9-3-3" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6281-8-0-1-6-6-4-2"
-       id="linearGradient3093-5-2-7"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.3199889,0,0,2.3199889,10.199693,1043.1852)"
-       x1="0.9375"
-       y1="4.8437853"
-       x2="0.9375"
-       y2="7.549418" /><linearGradient
-       id="linearGradient6281-8-0-1-6-6-4-2"><stop
-         id="stop6283-0-2-2-1-2-0-1"
-         offset="0"
-         style="stop-color:#f7f9fb;stop-opacity:1" /><stop
-         id="stop6285-5-0-9-7-6-9-9"
-         offset="1"
-         style="stop-color:#ffd680;stop-opacity:1" /></linearGradient><radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3844-6"
-       id="radialGradient5366-0-9"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.3089145,0.02433326,-0.0270668,0.33136796,5.4628028,1.7171329)"
-       cx="7.7379637"
-       cy="2.4332652"
-       fx="7.7379637"
-       fy="2.4332652"
-       r="2.3503494" /><linearGradient
-       id="linearGradient3844-6"><stop
-         id="stop3846-3"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" /><stop
-         style="stop-color:#dddddd;stop-opacity:1;"
-         offset="0.61245775"
-         id="stop3848-7" /><stop
-         id="stop3850-1"
-         offset="1"
-         style="stop-color:#464646;stop-opacity:1;" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3860-2"
-       id="linearGradient5368-1-5"
-       gradientUnits="userSpaceOnUse"
-       x1="7.8304267"
-       y1="5.5753322"
-       x2="7.8018494"
-       y2="1.9306878" /><linearGradient
-       id="linearGradient3860-2"><stop
-         id="stop3862-3"
-         offset="0"
-         style="stop-color:#424242;stop-opacity:1" /><stop
-         id="stop3864-4"
-         offset="1"
-         style="stop-color:#6b6b6b;stop-opacity:1;" /></linearGradient><radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3844-0"
-       id="radialGradient5366-0-5"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.3089145,0.02433326,-0.0270668,0.33136796,5.4628028,1.7171329)"
-       cx="7.7379637"
-       cy="2.4332652"
-       fx="7.7379637"
-       fy="2.4332652"
-       r="2.3503494" /><linearGradient
-       id="linearGradient3844-0"><stop
-         id="stop3846-36"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" /><stop
-         style="stop-color:#dddddd;stop-opacity:1;"
-         offset="0.61245775"
-         id="stop3848-6" /><stop
-         id="stop3850-5"
-         offset="1"
-         style="stop-color:#464646;stop-opacity:1;" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3860-0"
-       id="linearGradient5368-1-0"
-       gradientUnits="userSpaceOnUse"
-       x1="7.8304267"
-       y1="5.5753322"
-       x2="7.8018494"
-       y2="1.9306878" /><linearGradient
-       id="linearGradient3860-0"><stop
-         id="stop3862-6"
-         offset="0"
-         style="stop-color:#424242;stop-opacity:1" /><stop
-         id="stop3864-0"
-         offset="1"
-         style="stop-color:#6b6b6b;stop-opacity:1;" /></linearGradient><radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3844-8"
-       id="radialGradient5366-0-7"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.3089145,0.02433326,-0.0270668,0.33136796,5.4628028,1.7171329)"
-       cx="7.7379637"
-       cy="2.4332652"
-       fx="7.7379637"
-       fy="2.4332652"
-       r="2.3503494" /><linearGradient
-       id="linearGradient3844-8"><stop
-         id="stop3846-1"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" /><stop
-         style="stop-color:#dddddd;stop-opacity:1;"
-         offset="0.61245775"
-         id="stop3848-4" /><stop
-         id="stop3850-19"
-         offset="1"
-         style="stop-color:#464646;stop-opacity:1;" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3860-4"
-       id="linearGradient5368-1-8"
-       gradientUnits="userSpaceOnUse"
-       x1="7.8304267"
-       y1="5.5753322"
-       x2="7.8018494"
-       y2="1.9306878" /><linearGradient
-       id="linearGradient3860-4"><stop
-         id="stop3862-30"
-         offset="0"
-         style="stop-color:#424242;stop-opacity:1" /><stop
-         id="stop3864-9"
-         offset="1"
-         style="stop-color:#6b6b6b;stop-opacity:1;" /></linearGradient><radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3844-3"
-       id="radialGradient5366-0-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.3089145,0.02433326,-0.0270668,0.33136796,5.4628028,1.7171329)"
-       cx="7.7379637"
-       cy="2.4332652"
-       fx="7.7379637"
-       fy="2.4332652"
-       r="2.3503494" /><linearGradient
-       id="linearGradient3844-3"><stop
-         id="stop3846-7"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" /><stop
-         style="stop-color:#dddddd;stop-opacity:1;"
-         offset="0.61245775"
-         id="stop3848-3" /><stop
-         id="stop3850-3"
-         offset="1"
-         style="stop-color:#464646;stop-opacity:1;" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3860-9"
-       id="linearGradient5368-1-7"
-       gradientUnits="userSpaceOnUse"
-       x1="7.8304267"
-       y1="5.5753322"
-       x2="7.8018494"
-       y2="1.9306878" /><linearGradient
-       id="linearGradient3860-9"><stop
-         id="stop3862-5"
-         offset="0"
-         style="stop-color:#424242;stop-opacity:1" /><stop
-         id="stop3864-2"
-         offset="1"
-         style="stop-color:#6b6b6b;stop-opacity:1;" /></linearGradient><radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3852-6"
-       id="radialGradient5374-4-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.35882709,-0.01458857,0.01251176,0.40537334,4.9838699,2.1071585)"
-       cx="7.7274323"
-       cy="2.8622203"
-       fx="7.7274323"
-       fy="2.8622203"
-       r="2.3503494" /><linearGradient
-       id="linearGradient3852-6"><stop
-         id="stop3854-9"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" /><stop
-         style="stop-color:#dddddd;stop-opacity:1;"
-         offset="0.66561043"
-         id="stop3856-8" /><stop
-         id="stop3858-2"
-         offset="1"
-         style="stop-color:#464646;stop-opacity:1;" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3866-8"
-       id="linearGradient5376-4-1"
-       gradientUnits="userSpaceOnUse"
-       x1="7.8451643"
-       y1="5.6525216"
-       x2="7.8451643"
-       y2="1.0179684" /><linearGradient
-       id="linearGradient3866-8"><stop
-         id="stop3868-1"
-         offset="0"
-         style="stop-color:#717188;stop-opacity:1" /><stop
-         id="stop3870-1"
-         offset="1"
-         style="stop-color:#6b6b6b;stop-opacity:1;" /></linearGradient><linearGradient
-       y2="1.0179684"
-       x2="7.8451643"
-       y1="5.6525216"
-       x1="7.8451643"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4515"
-       xlink:href="#linearGradient3866-8"
-       inkscape:collect="always" /><radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3852-4"
-       id="radialGradient5374-4-7"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.35882709,-0.01458857,0.01251176,0.40537334,4.9838699,2.1071585)"
-       cx="7.9300532"
-       cy="1.7860492"
-       fx="7.9300532"
-       fy="1.7860492"
-       r="2.3503494" /><linearGradient
-       id="linearGradient3852-4"><stop
-         id="stop3854-0"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" /><stop
-         style="stop-color:#dddddd;stop-opacity:1;"
-         offset="0.66561043"
-         id="stop3856-5" /><stop
-         id="stop3858-8"
-         offset="1"
-         style="stop-color:#464646;stop-opacity:1;" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3866-7"
-       id="linearGradient5376-4-6"
-       gradientUnits="userSpaceOnUse"
-       x1="7.8451643"
-       y1="5.6525216"
-       x2="7.8451643"
-       y2="1.0179684" /><linearGradient
-       id="linearGradient3866-7"><stop
-         id="stop3868-0"
-         offset="0"
-         style="stop-color:#717188;stop-opacity:1" /><stop
-         id="stop3870-7"
-         offset="1"
-         style="stop-color:#6b6b6b;stop-opacity:1;" /></linearGradient><radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3852-5"
-       id="radialGradient5374-4-3"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.35882709,-0.01458857,0.01251176,0.40537334,4.9838699,2.1071585)"
-       cx="7.9300532"
-       cy="1.7860492"
-       fx="7.9300532"
-       fy="1.7860492"
-       r="2.3503494" /><linearGradient
-       id="linearGradient3852-5"><stop
-         id="stop3854-1"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" /><stop
-         style="stop-color:#dddddd;stop-opacity:1;"
-         offset="0.66561043"
-         id="stop3856-6" /><stop
-         id="stop3858-4"
-         offset="1"
-         style="stop-color:#464646;stop-opacity:1;" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3866-3"
-       id="linearGradient5376-4-0"
-       gradientUnits="userSpaceOnUse"
-       x1="7.8451643"
-       y1="5.6525216"
-       x2="7.8451643"
-       y2="1.0179684" /><linearGradient
-       id="linearGradient3866-3"><stop
-         id="stop3868-6"
-         offset="0"
-         style="stop-color:#717188;stop-opacity:1" /><stop
-         id="stop3870-4"
-         offset="1"
-         style="stop-color:#6b6b6b;stop-opacity:1;" /></linearGradient><radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5328-5-9"
-       id="radialGradient5370-9-4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.37553419,-2.0140452e-8,1.7614747e-8,0.40297829,4.9079328,2.1932289)"
-       cx="7.9383807"
-       cy="3.451864"
-       fx="7.9383807"
-       fy="3.451864"
-       r="2.3503494" /><linearGradient
-       id="linearGradient5328-5-9"><stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop5330-9-7" /><stop
-         id="stop3842-2"
-         offset="0.5"
-         style="stop-color:#dddddd;stop-opacity:1;" /><stop
-         style="stop-color:#464646;stop-opacity:1;"
-         offset="1"
-         id="stop5332-8-3" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5209-0-2"
-       id="linearGradient5372-5-0"
-       gradientUnits="userSpaceOnUse"
-       x1="7.8304267"
-       y1="5.9680095"
-       x2="7.8890662"
-       y2="3.584255" /><linearGradient
-       id="linearGradient5209-0-2"><stop
-         style="stop-color:#4c4c4c;stop-opacity:1"
-         offset="0"
-         id="stop5211-9-4" /><stop
-         style="stop-color:#6b6b6b;stop-opacity:1;"
-         offset="1"
-         id="stop5213-4-2" /></linearGradient><radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5328-5-4"
-       id="radialGradient5370-9-6"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.37553419,-2.0140452e-8,1.7614747e-8,0.40297829,4.9079328,2.1932289)"
-       cx="7.9383807"
-       cy="3.451864"
-       fx="7.9383807"
-       fy="3.451864"
-       r="2.3503494" /><linearGradient
-       id="linearGradient5328-5-4"><stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop5330-9-9" /><stop
-         id="stop3842-7"
-         offset="0.5"
-         style="stop-color:#dddddd;stop-opacity:1;" /><stop
-         style="stop-color:#464646;stop-opacity:1;"
-         offset="1"
-         id="stop5332-8-0" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5209-0-7"
-       id="linearGradient5372-5-6"
-       gradientUnits="userSpaceOnUse"
-       x1="7.8304267"
-       y1="5.9680095"
-       x2="7.8890662"
-       y2="3.584255" /><linearGradient
-       id="linearGradient5209-0-7"><stop
-         style="stop-color:#4c4c4c;stop-opacity:1"
-         offset="0"
-         id="stop5211-9-9" /><stop
-         style="stop-color:#6b6b6b;stop-opacity:1;"
-         offset="1"
-         id="stop5213-4-4" /></linearGradient><linearGradient
-       id="linearGradient10798-1-9-3-7-1-15-1-7-6-1"><stop
-         style="stop-color:#4f9e55;stop-opacity:1"
-         offset="0"
-         id="stop10800-5-2-1-8-2-8-1-7-3-7" /><stop
-         id="stop10806-6-8-5-3-2-95-0-5-4-8"
-         offset="0.5"
-         style="stop-color:#3c8d49;stop-opacity:1;" /><stop
-         style="stop-color:#a4e173;stop-opacity:1;"
-         offset="1"
-         id="stop10802-1-5-3-0-2-0-9-8-4-3" /></linearGradient><inkscape:path-effect
-       effect="fillet_chamfer"
-       id="path-effect1"
-       is_visible="true"
-       lpeversion="1"
-       nodesatellites_param="F,0,0,1,0,1,0,1 @ F,0,0,1,0,1,0,1 @ F,0,0,1,0,1,0,1"
-       radius="0.25"
-       unit="px"
-       method="auto"
-       mode="F"
-       chamfer_steps="1"
-       flexible="false"
-       use_knot_distance="true"
-       apply_no_radius="true"
-       apply_with_radius="true"
-       only_selected="false"
-       hide_knots="false" /></defs><sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="32"
-     inkscape:cx="8.046875"
-     inkscape:cy="6.203125"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1920"
-     inkscape:window-height="991"
-     inkscape:window-x="-9"
-     inkscape:window-y="-9"
-     inkscape:window-maximized="1"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="false"
-     inkscape:showpageshadow="0"
-     inkscape:pagecheckerboard="0"
-     inkscape:deskcolor="#505050"><inkscape:grid
-       type="xygrid"
-       id="grid3006"
-       originx="0"
-       originy="0"
-       spacingy="1"
-       spacingx="1"
-       units="px"
-       visible="true" /></sodipodi:namedview><metadata
+     id="defs4" /><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" /></cc:Work></rdf:RDF></metadata><g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)"><path
        id="rect1"
        style="display:inline;fill:#ececec;stroke:none;stroke-width:0.25;stroke-linecap:square;paint-order:markers stroke fill;fill-opacity:1"
-       d="m 8.0117188,1036.4897 c 0.1462828,0 0.2898997,0.01 0.4316406,0.023 0.7559552,0.083 1.4413549,0.3977 1.9902346,0.8555 l 0.04883,0.043 -0.002,0.6308 0.152343,0.068 -0.160156,0.07 v -0.012 c -0.08361,0.036 -0.168063,0.03 -0.251953,0.076 l 0.002,-0.4786 c -0.0079,0 -0.01537,0 -0.02539,0.016 -0.06772,0.045 -0.166386,0.1097 -0.291016,0.1777 -0.2492618,0.1373 -0.5998292,0.2995 -1.0117188,0.3945 -0.7854592,0.1804 -1.8005799,0.1 -2.6738281,-0.8632 l 0.00781,0.8632 c 0.02418,0.02 0.048596,0.039 0.072266,0.059 l 0.048828,0.043 -0.1374812,0.903 c 0.1313088,0.1125 0.1740236,0.1941 0.3102415,0.2761 -0.1036239,0.036 0.00964,0.062 -0.09464,0.108 -0.03133,-0.02 -0.060857,-0.044 -0.091797,-0.066 l -0.00195,0.1113 c -0.085924,0.04 -0.1736157,0.084 -0.2597656,0.1309 l 0.013672,-1.1074 c -0.0079,0 -0.013418,-0.023 -0.023437,-0.01 -0.067728,0.045 -0.1663857,0.1322 -0.2910156,0.2002 -0.2492608,0.1373 -0.5998282,0.2996 -1.0117187,0.3946 -0.7854593,0.1803 0.8431947,4.7711 -0.030055,3.8083 l -2.6261947,-2.8982 c 0.6117483,0.5699 1.2803218,0.7692 1.9707031,0.7422 0.6410003,-0.025 1.2878823,-0.2433 1.8867187,-0.4961 l -0.00391,-0.3203 0.068359,-0.037 c 0.6770083,-0.3803 -0.1820557,-3.1826 0.4518407,-3.1936 0.1462838,0 3.1220832,-0.058 3.2638241,-0.046 0.7559576,0.083 0.1417027,3.1022 0.6905856,3.56 l 0.04883,0.043 -0.0039,0.3769 c 0.582307,0.4964 1.215118,0.6725 1.865234,0.6465 0.678328,-0.026 -2.6468986,-2.0577 -2.019446,-2.329 l 4.031164,-0.01 c -0.0079,0 -0.01537,0.01 -0.02539,0.018 -0.06773,0.045 -0.164431,0.1078 -0.289062,0.1758 -0.249261,0.1373 -1.330488,2.1325 -1.742377,2.2275 -0.78546,0.1804 -1.071874,-1.733 -1.945123,-2.6963 l 1.679478,2.7764 c -0.08406,-0.067 -1.341843,-0.4695 -1.431703,-0.5294 l -0.49782,-1.4364 c -0.07589,0.031 -0.1217194,0.1692 -0.1992193,0.1992 l -0.033203,-0.1074 c -0.1090399,-0.062 -0.00439,0.084 -0.1200304,0.033 0.1928678,-0.067 0.1654663,-0.3475 0.3504987,-0.4255 l 0.04479,-0.9967 0.01577,0.046 c 0.67701,-0.3803 1.348529,-0.5456 1.982422,-0.5566 0.146283,0 0.291852,0.01 0.433594,0.022 0.755956,0.083 1.439401,0.3977 1.988281,0.8554 l 0.04883,0.045 -0.235173,0.9256 1.619904,0.6622 -0.06398,6.0186 -7.5864097,4.5518 h -0.00195 -0.00586 v -0.014 L 0.00390625,1046.4936 0,1040.2944 c 0.94417906,-0.3893 0.87046921,-0.3422 1.8320312,-0.7363 l -0.021484,-1.3047 0.070312,-0.037 c 0.6770093,-0.3803 1.3641535,-0.6668 1.9980468,-0.6778 0.1462829,-10e-4 0.2898988,0.01 0.4316407,0.025 0.6092624,0.067 1.1732625,0.284 1.65625,0.6055 l -0.00781,-1.0781 4.2152163,0.6992 c 0.677007,-0.3803 -2.7963767,-1.2819 -2.1624823,-1.2929 z m 0.015625,0.2559 c -0.5453485,0.01 -1.1248414,0.1563 -1.7148438,0.4589 0.8353342,0.9981 1.7718695,1.0623 2.5273438,0.8887 0.3819996,-0.088 -2.7168901,-0.9758 -2.4820054,-1.1053 0.1174439,-0.064 2.296908,-0.3174 2.3599379,-0.3594 0.03151,-0.021 1.4008537,0.8905 1.4169937,0.8785 0.008,0 0.02956,-0.072 0.03456,-0.072 -0.4917228,-0.3808 -3.4160485,-0.09 -4.0707388,-0.1632 -0.1281749,-0.019 2.0613724,-0.5223 1.9287606,-0.5223 z m 2.1875002,0.8105 v 0.01 c 0.0044,0.01 0.0048,0.01 0.0098,0.017 v -0.012 c -0.0035,0 -0.25431,-0.4102 -0.25771,-0.4102 z m -6.3203128,0.2461 c -0.5453484,0.01 2.3678382,-0.1227 1.7778328,0.1799 0.8353372,0.9981 -1.72081,1.3414 -0.9653328,1.1678 0.3819997,-0.088 0.714333,-0.2397 0.9492188,-0.3692 0.1174439,-0.064 0.2104076,-0.124 0.2734375,-0.166 0.0315,-0.021 0.056126,-0.039 0.072266,-0.051 0.00808,0 0.012578,-0.014 0.017578,-0.014 -0.4917215,-0.3808 -1.0777285,-0.6555 -1.7324218,-0.7285 -0.1281729,-0.019 -0.2599653,-0.017 -0.3925782,-0.017 z m 6.7217608,0.7861 c -0.545348,0.01 0.419025,-0.1942 -0.17098,0.1084 0.835337,0.998 1.771869,1.0643 2.527344,0.8907 0.382002,-0.088 -1.939757,0.013 -1.704871,-0.1161 0.117444,-0.064 -0.877654,-0.8309 -0.814625,-0.8729 0.03151,-0.021 3.798282,0.4128 3.814422,0.4008 0.008,0 0.349191,0.1527 0.354191,0.1527 -0.491722,-0.3809 -1.440901,0.5576 -2.095596,0.4846 -0.128173,-0.02 -0.246478,-0.5845 -0.37909,-0.5845 z m -4.5362139,0.015 v 0 c 0.0043,0.01 0.00477,0.01 0.00977,0.018 v -0.012 c -0.0034,0 -0.00637,-0.01 -0.00977,-0.01 z m 8.2675779,0.4375 v 0.01 c 0.0044,0.01 0.0048,0 0.0098,0.016 v -0.01 c -0.0035,0 -0.0064,-0.012 -0.0098,-0.012 z m -6.3203122,0.8691 c -0.5453505,0.01 2.5412232,0.194 1.9512186,0.4966 0.8353376,0.998 -1.8941959,1.0247 -1.1387186,0.8511 0.3819996,-0.088 0.7143329,-0.2397 0.9492187,-0.3692 0.1174429,-0.064 0.2104076,-0.124 0.2734375,-0.166 0.03151,-0.021 0.05613,-0.039 0.07227,-0.051 0.0081,0 0.01258,-0.014 0.01758,-0.014 h 0.0039 c -0.4919915,-0.3813 -1.0810468,-0.6536 -1.7363281,-0.7266 -0.1281739,-0.018 -0.2599663,-0.018 -0.3925781,-0.018 z m -6.1875,0.1348 -0.1203042,-0.2673 c 3.4111686,1.5188 2.8118577,-2.0258 4.3135162,-1.4245 l -0.068212,2.5121 c -0.5864355,0.2394 -1.2289359,0.4369 -1.8789063,0.4629 -0.7562002,0.029 -1.567909,-0.2205 -2.2402344,-0.8672 z m 12.8640542,0.8469 -0.108242,-0.015 0.369141,-0.1484 z m -8.4831949,-0.2413 3.9090129,0.212 c 0.61175,0.5699 -2.611114,2.3618 -1.9207317,2.3348 0.6783293,-0.026 -2.0233656,-0.3448 -1.395915,-0.6161 l 3.4095827,-1.6534 c -0.0079,0 -0.01537,0 -0.02539,0.014 -0.06773,0.045 -0.166385,0.1097 -0.2910161,0.1777 -0.2492618,0.1373 -0.5998272,0.2995 -1.0117188,0.3945 -0.7854602,0.1804 -1.8005769,0.1 -2.6738281,-0.8632 z m 3.9941409,0.059 v 0 c 0.0044,0.01 0.0048,0.01 0.0098,0.017 v -0.012 c -0.0035,0 -0.0064,-0.01 -0.0098,-0.01 z m -2.0642763,9.7023 -7.62908332,-4.2358 7.55664062,4.086 -0.029297,-6.3399 z m 7.3103703,-9.2963 0.15858,5.2832 -7.0179554,3.8613 6.8593754,-3.9843 z m -4.986329,0.1797 0.807134,0.3465 0.866693,0.2199 c -0.563166,-0.016 -1.147375,-0.1888 -1.673829,-0.5664 z"
-       sodipodi:nodetypes="cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccsccccccsccccccccccccccccsccccccccccccccccccccccccccsccccccccccccccccccc" /><path
+       d="m 8.0117188,1036.4897 c 0.1462828,0 0.2898997,0.01 0.4316406,0.023 0.7559552,0.083 1.4413549,0.3977 1.9902346,0.8555 l 0.04883,0.043 -0.002,0.6308 0.152343,0.068 -0.160156,0.07 v -0.012 c -0.08361,0.036 -0.168063,0.03 -0.251953,0.076 l 0.002,-0.4786 c -0.0079,0 -0.01537,0 -0.02539,0.016 -0.06772,0.045 -0.166386,0.1097 -0.291016,0.1777 -0.2492618,0.1373 -0.5998292,0.2995 -1.0117188,0.3945 -0.7854592,0.1804 -1.8005799,0.1 -2.6738281,-0.8632 l 0.00781,0.8632 c 0.02418,0.02 0.048596,0.039 0.072266,0.059 l 0.048828,0.043 -0.1374812,0.903 c 0.1313088,0.1125 0.1740236,0.1941 0.3102415,0.2761 -0.1036239,0.036 0.00964,0.062 -0.09464,0.108 -0.03133,-0.02 -0.060857,-0.044 -0.091797,-0.066 l -0.00195,0.1113 c -0.085924,0.04 -0.1736157,0.084 -0.2597656,0.1309 l 0.013672,-1.1074 c -0.0079,0 -0.013418,-0.023 -0.023437,-0.01 -0.067728,0.045 -0.1663857,0.1322 -0.2910156,0.2002 -0.2492608,0.1373 -0.5998282,0.2996 -1.0117187,0.3946 -0.7854593,0.1803 0.8431947,4.7711 -0.030055,3.8083 l -2.6261947,-2.8982 c 0.6117483,0.5699 1.2803218,0.7692 1.9707031,0.7422 0.6410003,-0.025 1.2878823,-0.2433 1.8867187,-0.4961 l -0.00391,-0.3203 0.068359,-0.037 c 0.6770083,-0.3803 -0.1820557,-3.1826 0.4518407,-3.1936 0.1462838,0 3.1220832,-0.058 3.2638241,-0.046 0.7559576,0.083 0.1417027,3.1022 0.6905856,3.56 l 0.04883,0.043 -0.0039,0.3769 c 0.582307,0.4964 1.215118,0.6725 1.865234,0.6465 0.678328,-0.026 -2.6468986,-2.0577 -2.019446,-2.329 l 4.031164,-0.01 c -0.0079,0 -0.01537,0.01 -0.02539,0.018 -0.06773,0.045 -0.164431,0.1078 -0.289062,0.1758 -0.249261,0.1373 -1.330488,2.1325 -1.742377,2.2275 -0.78546,0.1804 -1.071874,-1.733 -1.945123,-2.6963 l 1.679478,2.7764 c -0.08406,-0.067 -1.341843,-0.4695 -1.431703,-0.5294 l -0.49782,-1.4364 c -0.07589,0.031 -0.1217194,0.1692 -0.1992193,0.1992 l -0.033203,-0.1074 c -0.1090399,-0.062 -0.00439,0.084 -0.1200304,0.033 0.1928678,-0.067 0.1654663,-0.3475 0.3504987,-0.4255 l 0.04479,-0.9967 0.01577,0.046 c 0.67701,-0.3803 1.348529,-0.5456 1.982422,-0.5566 0.146283,0 0.291852,0.01 0.433594,0.022 0.755956,0.083 1.439401,0.3977 1.988281,0.8554 l 0.04883,0.045 -0.235173,0.9256 1.619904,0.6622 -0.06398,6.0186 -7.5864097,4.5518 h -0.00195 -0.00586 v -0.014 L 0.00390625,1046.4936 0,1040.2944 c 0.94417906,-0.3893 0.87046921,-0.3422 1.8320312,-0.7363 l -0.021484,-1.3047 0.070312,-0.037 c 0.6770093,-0.3803 1.3641535,-0.6668 1.9980468,-0.6778 0.1462829,-10e-4 0.2898988,0.01 0.4316407,0.025 0.6092624,0.067 1.1732625,0.284 1.65625,0.6055 l -0.00781,-1.0781 4.2152163,0.6992 c 0.677007,-0.3803 -2.7963767,-1.2819 -2.1624823,-1.2929 z m 0.015625,0.2559 c -0.5453485,0.01 -1.1248414,0.1563 -1.7148438,0.4589 0.8353342,0.9981 1.7718695,1.0623 2.5273438,0.8887 0.3819996,-0.088 -2.7168901,-0.9758 -2.4820054,-1.1053 0.1174439,-0.064 2.296908,-0.3174 2.3599379,-0.3594 0.03151,-0.021 1.4008537,0.8905 1.4169937,0.8785 0.008,0 0.02956,-0.072 0.03456,-0.072 -0.4917228,-0.3808 -3.4160485,-0.09 -4.0707388,-0.1632 -0.1281749,-0.019 2.0613724,-0.5223 1.9287606,-0.5223 z m 2.1875002,0.8105 v 0.01 c 0.0044,0.01 0.0048,0.01 0.0098,0.017 v -0.012 c -0.0035,0 -0.25431,-0.4102 -0.25771,-0.4102 z m -6.3203128,0.2461 c -0.5453484,0.01 2.3678382,-0.1227 1.7778328,0.1799 0.8353372,0.9981 -1.72081,1.3414 -0.9653328,1.1678 0.3819997,-0.088 0.714333,-0.2397 0.9492188,-0.3692 0.1174439,-0.064 0.2104076,-0.124 0.2734375,-0.166 0.0315,-0.021 0.056126,-0.039 0.072266,-0.051 0.00808,0 0.012578,-0.014 0.017578,-0.014 -0.4917215,-0.3808 -1.0777285,-0.6555 -1.7324218,-0.7285 -0.1281729,-0.019 -0.2599653,-0.017 -0.3925782,-0.017 z m 6.7217608,0.7861 c -0.545348,0.01 0.419025,-0.1942 -0.17098,0.1084 0.835337,0.998 1.771869,1.0643 2.527344,0.8907 0.382002,-0.088 -1.939757,0.013 -1.704871,-0.1161 0.117444,-0.064 -0.877654,-0.8309 -0.814625,-0.8729 0.03151,-0.021 3.798282,0.4128 3.814422,0.4008 0.008,0 0.349191,0.1527 0.354191,0.1527 -0.491722,-0.3809 -1.440901,0.5576 -2.095596,0.4846 -0.128173,-0.02 -0.246478,-0.5845 -0.37909,-0.5845 z m -4.5362139,0.015 v 0 c 0.0043,0.01 0.00477,0.01 0.00977,0.018 v -0.012 c -0.0034,0 -0.00637,-0.01 -0.00977,-0.01 z m 8.2675779,0.4375 v 0.01 c 0.0044,0.01 0.0048,0 0.0098,0.016 v -0.01 c -0.0035,0 -0.0064,-0.012 -0.0098,-0.012 z m -6.3203122,0.8691 c -0.5453505,0.01 2.5412232,0.194 1.9512186,0.4966 0.8353376,0.998 -1.8941959,1.0247 -1.1387186,0.8511 0.3819996,-0.088 0.7143329,-0.2397 0.9492187,-0.3692 0.1174429,-0.064 0.2104076,-0.124 0.2734375,-0.166 0.03151,-0.021 0.05613,-0.039 0.07227,-0.051 0.0081,0 0.01258,-0.014 0.01758,-0.014 h 0.0039 c -0.4919915,-0.3813 -1.0810468,-0.6536 -1.7363281,-0.7266 -0.1281739,-0.018 -0.2599663,-0.018 -0.3925781,-0.018 z m -6.1875,0.1348 -0.1203042,-0.2673 c 3.4111686,1.5188 2.8118577,-2.0258 4.3135162,-1.4245 l -0.068212,2.5121 c -0.5864355,0.2394 -1.2289359,0.4369 -1.8789063,0.4629 -0.7562002,0.029 -1.567909,-0.2205 -2.2402344,-0.8672 z m 12.8640542,0.8469 -0.108242,-0.015 0.369141,-0.1484 z m -8.4831949,-0.2413 3.9090129,0.212 c 0.61175,0.5699 -2.611114,2.3618 -1.9207317,2.3348 0.6783293,-0.026 -2.0233656,-0.3448 -1.395915,-0.6161 l 3.4095827,-1.6534 c -0.0079,0 -0.01537,0 -0.02539,0.014 -0.06773,0.045 -0.166385,0.1097 -0.2910161,0.1777 -0.2492618,0.1373 -0.5998272,0.2995 -1.0117188,0.3945 -0.7854602,0.1804 -1.8005769,0.1 -2.6738281,-0.8632 z m 3.9941409,0.059 v 0 c 0.0044,0.01 0.0048,0.01 0.0098,0.017 v -0.012 c -0.0035,0 -0.0064,-0.01 -0.0098,-0.01 z m -2.0642763,9.7023 -7.62908332,-4.2358 7.55664062,4.086 -0.029297,-6.3399 z m 7.3103703,-9.2963 0.15858,5.2832 -7.0179554,3.8613 6.8593754,-3.9843 z m -4.986329,0.1797 0.807134,0.3465 0.866693,0.2199 c -0.563166,-0.016 -1.147375,-0.1888 -1.673829,-0.5664 z" /><path
        id="path22"
        style="color:#000000;display:inline;fill:#878787;stroke-width:1.05078;stroke-linecap:square;-inkscape-stroke:none;paint-order:markers stroke fill;fill-opacity:1"
-       d="m 10.474267,1038.04 -0.0021,0.1398 0.161453,-0.069 z m -8.6316843,1.511 c -0.97770124,0.4009 -0.89342749,0.3495 -1.84258304436475,0.7409 l 0.004036064365,6.1984 8.33703258,4.5518 v 0.011 h 0.00606 0.00202 l 7.6286567,-4.4662 0.0222,-6.1024 -1.396569,-0.6178 -0.0061,0.6867 0.367306,0.1669 -0.369324,0.1482 -0.004,0.3674 -0.07669,0.035 c -0.659588,0.2906 -1.405254,0.5524 -2.161453,0.5823 h -0.201816 l -1.691221,0.6803 -0.0021,0.2458 c -1.6199922,0.8107 -2.9975053,0.8124 -4.4783041,-0.1915 v -0.096 c -1.5016605,-0.6013 -1.5635967,-0.6099 -4.9747724,-2.1287 l 0.9122098,-0.3591 c -0.089026,-0.057 -0.00332,-0.3961 -0.074672,-0.4528 z m -1.32189693,1.1833 7.52774903,3.1785 0.030273,6.3404 -7.55802142,-4.0864 z m 14.94046223,0.3715 v 5.1612 l -6.8597365,3.9841 -0.014127,-6.355 z"
-       sodipodi:nodetypes="ccccccccccccccccccccccccccccccccccccccc" /><path
+       d="m 10.474267,1038.04 -0.0021,0.1398 0.161453,-0.069 z m -8.6316843,1.511 c -0.97770124,0.4009 -0.89342749,0.3495 -1.84258304436475,0.7409 l 0.004036064365,6.1984 8.33703258,4.5518 v 0.011 h 0.00606 0.00202 l 7.6286567,-4.4662 0.0222,-6.1024 -1.396569,-0.6178 -0.0061,0.6867 0.367306,0.1669 -0.369324,0.1482 -0.004,0.3674 -0.07669,0.035 c -0.659588,0.2906 -1.405254,0.5524 -2.161453,0.5823 h -0.201816 l -1.691221,0.6803 -0.0021,0.2458 c -1.6199922,0.8107 -2.9975053,0.8124 -4.4783041,-0.1915 v -0.096 c -1.5016605,-0.6013 -1.5635967,-0.6099 -4.9747724,-2.1287 l 0.9122098,-0.3591 c -0.089026,-0.057 -0.00332,-0.3961 -0.074672,-0.4528 z m -1.32189693,1.1833 7.52774903,3.1785 0.030273,6.3404 -7.55802142,-4.0864 z m 14.94046223,0.3715 v 5.1612 l -6.8597365,3.9841 -0.014127,-6.355 z" /><path
        id="path25-8-8"
        style="color:#000000;display:inline;fill:#878787;stroke:#878787;stroke-width:0.248943;stroke-linecap:square;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill;fill-opacity:1"
-       d="m 12.145306,1037.9746 c -0.633895,0.011 -1.306844,0.1769 -1.983854,0.5572 l -0.06862,0.037 0.01211,1.4492 c 0.08986,0.06 0.176285,0.125 0.260343,0.192 l -0.01211,-1.2363 c 0.873251,0.9628 1.888605,1.0444 2.674067,0.864 0.411891,-0.095 0.763856,-0.2571 1.013117,-0.3944 0.124631,-0.068 0.222889,-0.1324 0.290615,-0.1774 0.01002,-0.011 0.01633,-0.011 0.02422,-0.015 l -0.02018,1.7934 c -0.627453,0.2713 -1.313598,0.5143 -1.991928,0.5406 -0.650908,0.026 -1.283906,-0.1512 -1.866801,-0.649 l -0.004,0.3484 c 0.591252,0.4249 1.255273,0.592 1.880927,0.5677 0.756202,-0.03 1.501862,-0.2917 2.161453,-0.5822 l 0.07669,-0.035 0.02422,-2.3403 -0.04843,-0.042 c -0.548882,-0.4577 -1.233951,-0.7725 -1.989909,-0.8557 -0.141742,-0.016 -0.285604,-0.026 -0.431887,-0.024 z m 0.01615,0.2629 v 0 c 0.132612,0 0.263348,-4e-4 0.391523,0.019 0.654695,0.073 1.241879,0.3454 1.733603,0.7263 -0.005,0 -0.01013,0.011 -0.01816,0.013 -0.01614,0.012 -0.04114,0.031 -0.07265,0.052 -0.06303,0.042 -0.155008,0.1005 -0.272452,0.1649 -0.234886,0.1295 -0.568553,0.2817 -0.950555,0.3694 -0.755477,0.1737 -1.691403,0.109 -2.52674,-0.889 0.590005,-0.3026 1.170089,-0.4508 1.715439,-0.4592 z m 2.185671,0.7951 c 0.0034,0 0.0067,0.011 0.01013,0.011 v 0.011 c -0.005,-0.011 -0.0058,-0.011 -0.01013,-0.017 z"
-       sodipodi:nodetypes="cccccccccccccccccccccccccccccccccccccc" /><path
+       d="m 12.145306,1037.9746 c -0.633895,0.011 -1.306844,0.1769 -1.983854,0.5572 l -0.06862,0.037 0.01211,1.4492 c 0.08986,0.06 0.176285,0.125 0.260343,0.192 l -0.01211,-1.2363 c 0.873251,0.9628 1.888605,1.0444 2.674067,0.864 0.411891,-0.095 0.763856,-0.2571 1.013117,-0.3944 0.124631,-0.068 0.222889,-0.1324 0.290615,-0.1774 0.01002,-0.011 0.01633,-0.011 0.02422,-0.015 l -0.02018,1.7934 c -0.627453,0.2713 -1.313598,0.5143 -1.991928,0.5406 -0.650908,0.026 -1.283906,-0.1512 -1.866801,-0.649 l -0.004,0.3484 c 0.591252,0.4249 1.255273,0.592 1.880927,0.5677 0.756202,-0.03 1.501862,-0.2917 2.161453,-0.5822 l 0.07669,-0.035 0.02422,-2.3403 -0.04843,-0.042 c -0.548882,-0.4577 -1.233951,-0.7725 -1.989909,-0.8557 -0.141742,-0.016 -0.285604,-0.026 -0.431887,-0.024 z m 0.01615,0.2629 v 0 c 0.132612,0 0.263348,-4e-4 0.391523,0.019 0.654695,0.073 1.241879,0.3454 1.733603,0.7263 -0.005,0 -0.01013,0.011 -0.01816,0.013 -0.01614,0.012 -0.04114,0.031 -0.07265,0.052 -0.06303,0.042 -0.155008,0.1005 -0.272452,0.1649 -0.234886,0.1295 -0.568553,0.2817 -0.950555,0.3694 -0.755477,0.1737 -1.691403,0.109 -2.52674,-0.889 0.590005,-0.3026 1.170089,-0.4508 1.715439,-0.4592 z m 2.185671,0.7951 c 0.0034,0 0.0067,0.011 0.01013,0.011 v 0.011 c -0.005,-0.011 -0.0058,-0.011 -0.01013,-0.017 z" /><path
        id="path25-8-8-6"
        style="color:#000000;display:inline;fill:#878787;stroke:#878787;stroke-width:0.248943;stroke-linecap:square;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill;fill-opacity:1"
-       d="m 8.0121079,1036.4902 c -0.6338944,0.011 -1.3068458,0.177 -1.9838546,0.5573 l -0.068618,0.038 0.00807,1.1062 c 0.089566,0.06 0.1765212,0.1212 0.260343,0.1878 l -0.00807,-0.8891 c 0.8732495,0.9627 1.8886059,1.0444 2.6740664,0.864 0.4118906,-0.095 0.7638567,-0.2571 1.0131179,-0.3944 0.1246304,-0.068 0.2228904,-0.1324 0.2906144,-0.1774 0.01002,-0.011 0.01633,-0.011 0.02422,-0.015 l -5.48e-4,0.48 c 0.08651,-0.047 0.172055,-0.041 0.258325,-0.081 l 0.0026,-0.756 -0.04843,-0.042 c -0.5488795,-0.4578 -1.2339515,-0.7726 -1.989908,-0.8557 -0.1417415,-0.016 -0.2856041,-0.026 -0.4318869,-0.024 z m 0.016145,0.2547 v 0 c 0.1326123,0 0.2633494,0 0.3915237,0.019 0.6546925,0.073 1.2418796,0.3455 1.7336024,0.7263 -0.005,0 -0.01013,0.011 -0.01816,0.013 -0.01614,0.012 -0.04114,0.031 -0.07265,0.052 -0.063032,0.042 -0.1550093,0.1004 -0.2724528,0.1649 -0.2348856,0.1295 -0.5685545,0.2816 -0.9505548,0.3694 -0.7554763,0.1736 -1.6914045,0.109 -2.5267404,-0.8891 0.5900043,-0.3026 1.1700898,-0.4508 1.7154387,-0.4591 z m 2.1856721,0.8034 c 0.0034,0 0.0067,0.011 0.01013,0.011 v 0.011 c -0.005,-0.011 -0.0058,-0.011 -0.01013,-0.017 z m -3.8768929,1.7794 -0.00202,0.3485 c 0.030942,0.022 0.061509,0.046 0.092836,0.066 0.1042791,-0.046 0.2091909,-0.087 0.3128153,-0.1231 -0.1369488,-0.082 -0.2716484,-0.1791 -0.4036326,-0.2923 z m 3.7638739,0.1565 c -0.1850345,0.078 -0.3742346,0.1542 -0.5671033,0.2212 0.1156436,0.051 0.2279936,0.1091 0.3370332,0.1712 l 0.033887,0.1058 c 0.077502,-0.03 0.1223051,-0.1671 0.1981991,-0.1981 z"
-       sodipodi:nodetypes="ccccccccccccccccccccccccccccccccccccccccccccc" /><path
+       d="m 8.0121079,1036.4902 c -0.6338944,0.011 -1.3068458,0.177 -1.9838546,0.5573 l -0.068618,0.038 0.00807,1.1062 c 0.089566,0.06 0.1765212,0.1212 0.260343,0.1878 l -0.00807,-0.8891 c 0.8732495,0.9627 1.8886059,1.0444 2.6740664,0.864 0.4118906,-0.095 0.7638567,-0.2571 1.0131179,-0.3944 0.1246304,-0.068 0.2228904,-0.1324 0.2906144,-0.1774 0.01002,-0.011 0.01633,-0.011 0.02422,-0.015 l -5.48e-4,0.48 c 0.08651,-0.047 0.172055,-0.041 0.258325,-0.081 l 0.0026,-0.756 -0.04843,-0.042 c -0.5488795,-0.4578 -1.2339515,-0.7726 -1.989908,-0.8557 -0.1417415,-0.016 -0.2856041,-0.026 -0.4318869,-0.024 z m 0.016145,0.2547 v 0 c 0.1326123,0 0.2633494,0 0.3915237,0.019 0.6546925,0.073 1.2418796,0.3455 1.7336024,0.7263 -0.005,0 -0.01013,0.011 -0.01816,0.013 -0.01614,0.012 -0.04114,0.031 -0.07265,0.052 -0.063032,0.042 -0.1550093,0.1004 -0.2724528,0.1649 -0.2348856,0.1295 -0.5685545,0.2816 -0.9505548,0.3694 -0.7554763,0.1736 -1.6914045,0.109 -2.5267404,-0.8891 0.5900043,-0.3026 1.1700898,-0.4508 1.7154387,-0.4591 z m 2.1856721,0.8034 c 0.0034,0 0.0067,0.011 0.01013,0.011 v 0.011 c -0.005,-0.011 -0.0058,-0.011 -0.01013,-0.017 z m -3.8768929,1.7794 -0.00202,0.3485 c 0.030942,0.022 0.061509,0.046 0.092836,0.066 0.1042791,-0.046 0.2091909,-0.087 0.3128153,-0.1231 -0.1369488,-0.082 -0.2716484,-0.1791 -0.4036326,-0.2923 z m 3.7638739,0.1565 c -0.1850345,0.078 -0.3742346,0.1542 -0.5671033,0.2212 0.1156436,0.051 0.2279936,0.1091 0.3370332,0.1712 l 0.033887,0.1058 c 0.077502,-0.03 0.1223051,-0.1671 0.1981991,-0.1981 z" /><path
        id="path25-8-0"
        style="color:#000000;display:inline;fill:#878787;stroke:#878787;stroke-width:0.248943;stroke-linecap:square;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill;fill-opacity:1"
-       d="m 3.8789095,1037.5357 c -0.6338957,0.011 -1.3218697,0.2972 -1.9988794,0.6775 l -0.068617,0.037 0.035207,2.201 c 0.6723268,0.6467 1.4839595,0.8974 2.2401613,0.8682 0.6499713,-0.026 1.292474,-0.224 1.87891,-0.4634 l -0.00201,-0.3004 c -0.5988376,0.2528 -1.2459804,0.4717 -1.8869826,0.4966 -0.6903831,0.027 -1.3599956,-0.173 -1.9717456,-0.7429 l -0.033189,-1.6543 c 0.8732515,0.9628 1.9036302,0.9242 2.6890912,0.7439 0.4118917,-0.095 0.7638563,-0.2571 1.0131179,-0.3944 0.1246307,-0.068 0.222888,-0.1324 0.2906155,-0.1774 0.010023,-0.011 0.016323,-0.011 0.024217,-0.015 l -0.014127,1.1065 c 0.086153,-0.047 0.1724014,-0.091 0.2583249,-0.1314 l 0.016145,-1.332 -0.048436,-0.042 c -0.5488823,-0.4578 -1.2339513,-0.7726 -1.989909,-0.8557 -0.1417421,-0.016 -0.2856034,-0.026 -0.431887,-0.024 z m 0.016145,0.263 v 0 c 0.1326125,0 0.2633492,-4e-4 0.3915237,0.019 0.654694,0.073 1.2418793,0.3455 1.7336023,0.7263 -0.00496,0 -0.010126,0.011 -0.018163,0.013 -0.01614,0.012 -0.041137,0.031 -0.072653,0.052 -0.063035,0.042 -0.1550088,0.1004 -0.2724521,0.1649 -0.2348864,0.1295 -0.5685539,0.2816 -0.9505548,0.3694 -0.7554781,0.1736 -1.7064277,0.2292 -2.5417653,-0.7689 0.5900055,-0.3026 1.1851137,-0.571 1.7304636,-0.5793 z m 2.1856708,0.7951 c 0.00341,0 0.00669,0.011 0.010095,0.011 v 0.011 c -0.00496,-0.011 -0.00576,-0.011 -0.010095,-0.017 z"
-       sodipodi:nodetypes="ccccccccccccccccccccccccccccccccccccc" /><path
+       d="m 3.8789095,1037.5357 c -0.6338957,0.011 -1.3218697,0.2972 -1.9988794,0.6775 l -0.068617,0.037 0.035207,2.201 c 0.6723268,0.6467 1.4839595,0.8974 2.2401613,0.8682 0.6499713,-0.026 1.292474,-0.224 1.87891,-0.4634 l -0.00201,-0.3004 c -0.5988376,0.2528 -1.2459804,0.4717 -1.8869826,0.4966 -0.6903831,0.027 -1.3599956,-0.173 -1.9717456,-0.7429 l -0.033189,-1.6543 c 0.8732515,0.9628 1.9036302,0.9242 2.6890912,0.7439 0.4118917,-0.095 0.7638563,-0.2571 1.0131179,-0.3944 0.1246307,-0.068 0.222888,-0.1324 0.2906155,-0.1774 0.010023,-0.011 0.016323,-0.011 0.024217,-0.015 l -0.014127,1.1065 c 0.086153,-0.047 0.1724014,-0.091 0.2583249,-0.1314 l 0.016145,-1.332 -0.048436,-0.042 c -0.5488823,-0.4578 -1.2339513,-0.7726 -1.989909,-0.8557 -0.1417421,-0.016 -0.2856034,-0.026 -0.431887,-0.024 z m 0.016145,0.263 v 0 c 0.1326125,0 0.2633492,-4e-4 0.3915237,0.019 0.654694,0.073 1.2418793,0.3455 1.7336023,0.7263 -0.00496,0 -0.010126,0.011 -0.018163,0.013 -0.01614,0.012 -0.041137,0.031 -0.072653,0.052 -0.063035,0.042 -0.1550088,0.1004 -0.2724521,0.1649 -0.2348864,0.1295 -0.5685539,0.2816 -0.9505548,0.3694 -0.7554781,0.1736 -1.7064277,0.2292 -2.5417653,-0.7689 0.5900055,-0.3026 1.1851137,-0.571 1.7304636,-0.5793 z m 2.1856708,0.7951 c 0.00341,0 0.00669,0.011 0.010095,0.011 v 0.011 c -0.00496,-0.011 -0.00576,-0.011 -0.010095,-0.017 z" /><path
        id="path25-8"
        style="color:#000000;display:inline;fill:#878787;fill-opacity:1;stroke:#878787;stroke-width:0.248943;stroke-linecap:square;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
-       d="m 8.0121076,1039.6411 c -0.6338962,0.011 -1.3068442,0.1769 -1.9838545,0.5572 l -0.068617,0.037 0.020181,2.3517 c 0.6723274,0.6467 1.4839587,0.8975 2.2401613,0.8682 0.7562024,-0.03 1.5018607,-0.2917 2.1614536,-0.5823 l 0.07669,-0.035 0.02422,-2.2766 -0.04843,-0.042 c -0.548883,-0.4578 -1.2339511,-0.7726 -1.9899096,-0.8557 -0.1417422,-0.016 -0.2856032,-0.025 -0.4318869,-0.023 z m 0.016145,0.2671 c 0.1326126,0 0.263349,0 0.3915236,0.019 0.6552824,0.073 1.2436287,0.345 1.7356208,0.7263 h -0.0021 c -0.005,0 -0.01013,0.011 -0.01817,0.013 -0.01614,0.012 -0.04114,0.031 -0.07265,0.052 -0.063035,0.042 -0.155009,0.1005 -0.2724524,0.1649 -0.2348867,0.1295 -0.5685536,0.2817 -0.950555,0.3694 -0.7554788,0.1736 -1.691402,0.109 -2.5267404,-0.889 0.5900061,-0.3026 1.1700883,-0.4509 1.7154389,-0.4592 z m -1.8082743,0.7326 c 0.8732523,0.9628 1.8886045,1.0444 2.6740663,0.864 0.4118921,-0.095 0.7638562,-0.2572 1.013118,-0.3945 0.1246314,-0.068 0.2228884,-0.1324 0.2906154,-0.1773 0.01002,-0.011 0.01633,-0.011 0.02422,-0.015 l -0.02018,1.7299 c -0.6274522,0.2713 -1.3135967,0.5142 -1.9919269,0.5404 -0.6903837,0.027 -1.359995,-0.173 -1.9717455,-0.7429 z m 3.9939457,0.059 c 0.0034,0 0.0067,0.011 0.01013,0.011 v 0.011 c -0.005,-0.011 -0.0058,-0.011 -0.01013,-0.018 z"
-       sodipodi:nodetypes="cccccccccccccccsccccccccccccccccccccc" /><path
+       d="m 8.0121076,1039.6411 c -0.6338962,0.011 -1.3068442,0.1769 -1.9838545,0.5572 l -0.068617,0.037 0.020181,2.3517 c 0.6723274,0.6467 1.4839587,0.8975 2.2401613,0.8682 0.7562024,-0.03 1.5018607,-0.2917 2.1614536,-0.5823 l 0.07669,-0.035 0.02422,-2.2766 -0.04843,-0.042 c -0.548883,-0.4578 -1.2339511,-0.7726 -1.9899096,-0.8557 -0.1417422,-0.016 -0.2856032,-0.025 -0.4318869,-0.023 z m 0.016145,0.2671 c 0.1326126,0 0.263349,0 0.3915236,0.019 0.6552824,0.073 1.2436287,0.345 1.7356208,0.7263 h -0.0021 c -0.005,0 -0.01013,0.011 -0.01817,0.013 -0.01614,0.012 -0.04114,0.031 -0.07265,0.052 -0.063035,0.042 -0.155009,0.1005 -0.2724524,0.1649 -0.2348867,0.1295 -0.5685536,0.2817 -0.950555,0.3694 -0.7554788,0.1736 -1.691402,0.109 -2.5267404,-0.889 0.5900061,-0.3026 1.1700883,-0.4509 1.7154389,-0.4592 z m -1.8082743,0.7326 c 0.8732523,0.9628 1.8886045,1.0444 2.6740663,0.864 0.4118921,-0.095 0.7638562,-0.2572 1.013118,-0.3945 0.1246314,-0.068 0.2228884,-0.1324 0.2906154,-0.1773 0.01002,-0.011 0.01633,-0.011 0.02422,-0.015 l -0.02018,1.7299 c -0.6274522,0.2713 -1.3135967,0.5142 -1.9919269,0.5404 -0.6903837,0.027 -1.359995,-0.173 -1.9717455,-0.7429 z m 3.9939457,0.059 c 0.0034,0 0.0067,0.011 0.01013,0.011 v 0.011 c -0.005,-0.011 -0.0058,-0.011 -0.01013,-0.018 z" /><path
        style="color:#000000;display:inline;fill:#008000;fill-opacity:1;stroke:none;stroke-width:0.571014;stroke-linecap:square;-inkscape-stroke:none;paint-order:markers stroke fill"
        d="M 9.4700011,15.152002 5.5299989,8.8479983 a 0.625,0.625 0 0 0 -1.0599978,0 L 0.52999894,15.152002 A 0.55424764,0.55424764 61.002692 0 0 1,16 h 8 a 0.55424764,0.55424764 118.99731 0 0 0.4700011,-0.847998 z"
        id="path40-3"
-       inkscape:path-effect="#path-effect1"
-       inkscape:original-d="M 10,16 5,8 0,16 Z"
        transform="matrix(0,0.71309172,-0.83520773,0,14.707073,1044.1742)" /></g></svg>
diff --git a/ui/org.eclipse.pde.ui/icons/bndtools/bundle.svg b/ui/org.eclipse.pde.ui/icons/bndtools/bundle.svg
index 39b0e97b5e0..3343477d1a6 100644
--- a/ui/org.eclipse.pde.ui/icons/bndtools/bundle.svg
+++ b/ui/org.eclipse.pde.ui/icons/bndtools/bundle.svg
@@ -6,587 +6,38 @@
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="1.3.2 (091e20e, 2023-11-25, custom)"
-   sodipodi:docname="bundle.svg"
    xml:space="preserve"
-   inkscape:export-filename="bundle@2x.png"
-   inkscape:export-xdpi="192"
-   inkscape:export-ydpi="192"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:cc="http://creativecommons.org/ns#"
    xmlns:dc="http://purl.org/dc/elements/1.1/"><defs
-     id="defs4"><inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="-1.4152894 : 2.604202 : 1"
-       inkscape:vp_y="12.396136 : 891.72087 : 1"
-       inkscape:vp_z="20.395063 : 1.760452 : 1"
-       inkscape:persp3d-origin="12.396136 : -0.8384562 : 1"
-       id="perspective1" /><linearGradient
-       id="linearGradient3866"><stop
-         id="stop3868"
-         offset="0"
-         style="stop-color:#717188;stop-opacity:1" /><stop
-         id="stop3870"
-         offset="1"
-         style="stop-color:#6b6b6b;stop-opacity:1;" /></linearGradient><linearGradient
-       id="linearGradient3860"><stop
-         id="stop3862"
-         offset="0"
-         style="stop-color:#424242;stop-opacity:1" /><stop
-         id="stop3864"
-         offset="1"
-         style="stop-color:#6b6b6b;stop-opacity:1;" /></linearGradient><linearGradient
-       id="linearGradient3852"><stop
-         id="stop3854"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" /><stop
-         style="stop-color:#dddddd;stop-opacity:1;"
-         offset="0.66561043"
-         id="stop3856" /><stop
-         id="stop3858"
-         offset="1"
-         style="stop-color:#464646;stop-opacity:1;" /></linearGradient><linearGradient
-       id="linearGradient3844"><stop
-         id="stop3846"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" /><stop
-         style="stop-color:#dddddd;stop-opacity:1;"
-         offset="0.61245775"
-         id="stop3848" /><stop
-         id="stop3850"
-         offset="1"
-         style="stop-color:#464646;stop-opacity:1;" /></linearGradient><linearGradient
-       id="linearGradient5328-5"><stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop5330-9" /><stop
-         id="stop3842"
-         offset="0.5"
-         style="stop-color:#dddddd;stop-opacity:1;" /><stop
-         style="stop-color:#464646;stop-opacity:1;"
-         offset="1"
-         id="stop5332-8" /></linearGradient><linearGradient
-       id="linearGradient5209-0"><stop
-         style="stop-color:#4c4c4c;stop-opacity:1"
-         offset="0"
-         id="stop5211-9" /><stop
-         style="stop-color:#6b6b6b;stop-opacity:1;"
-         offset="1"
-         id="stop5213-4" /></linearGradient><linearGradient
-       y2="6.9843998"
-       x2="10.007812"
-       y1="5"
-       x1="10"
-       gradientTransform="translate(-15.015625,1046.6356)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient6323-7"
-       xlink:href="#linearGradient5068-6-9"
-       inkscape:collect="always" /><linearGradient
-       id="linearGradient5068-6-9"
-       inkscape:collect="always"><stop
-         id="stop5070-8-0"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" /><stop
-         id="stop5072-3-6"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" /></linearGradient><linearGradient
-       gradientTransform="translate(-15.015625,10.2734)"
-       gradientUnits="userSpaceOnUse"
-       y2="1045.3466"
-       x2="12"
-       y1="1043.3622"
-       x1="12"
-       id="linearGradient5084-3-3"
-       xlink:href="#linearGradient5068-6-9"
-       inkscape:collect="always" /><linearGradient
-       gradientTransform="translate(-15.015625,10.2734)"
-       gradientUnits="userSpaceOnUse"
-       y2="1043.3466"
-       x2="15.007812"
-       y1="1043.3622"
-       x1="13"
-       id="linearGradient5086-8-0"
-       xlink:href="#linearGradient5068-6-9"
-       inkscape:collect="always" /><linearGradient
-       gradientTransform="translate(-15.015625,10.2734)"
-       gradientUnits="userSpaceOnUse"
-       y2="1042.3622"
-       x2="10.007812"
-       y1="1042.3622"
-       x1="12"
-       id="linearGradient5082-1-0"
-       xlink:href="#linearGradient5068-6-9"
-       inkscape:collect="always" /><linearGradient
-       gradientTransform="translate(-15.015625,10.2734)"
-       gradientUnits="userSpaceOnUse"
-       y2="1041.3466"
-       x2="8.0078125"
-       y1="1041.3622"
-       x1="10"
-       id="linearGradient5078-8-2"
-       xlink:href="#linearGradient5068-6-9"
-       inkscape:collect="always" /><linearGradient
-       gradientTransform="translate(-15.015625,10.2734)"
-       gradientUnits="userSpaceOnUse"
-       y2="1038.3466"
-       x2="10.007812"
-       y1="1040.3622"
-       x1="10"
-       id="linearGradient5076-5-2"
-       xlink:href="#linearGradient5068-6-9"
-       inkscape:collect="always" /><linearGradient
-       gradientTransform="translate(-15.015625,10.2734)"
-       gradientUnits="userSpaceOnUse"
-       y2="1038.3466"
-       x2="10.007812"
-       y1="1038.3622"
-       x1="12"
-       id="linearGradient5074-2-1"
-       xlink:href="#linearGradient5068-6-9"
-       inkscape:collect="always" /><linearGradient
-       gradientTransform="translate(-15.015625,10.2734)"
-       gradientUnits="userSpaceOnUse"
-       y2="1043.3466"
-       x2="14"
-       y1="1041.3622"
-       x1="14"
-       id="linearGradient5088-1-4"
-       xlink:href="#linearGradient5068-6-9"
-       inkscape:collect="always" /><radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4528-9-5-7-9"
-       id="radialGradient3091-1-9-6"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.8508179,-8.813921e-6,8.4531434e-6,1.7750589,644.24981,572.63612)"
-       cx="-757.20496"
-       cy="-738.83777"
-       fx="-757.20496"
-       fy="-738.83777"
-       r="3.4803574" /><linearGradient
-       id="linearGradient4528-9-5-7-9"><stop
-         style="stop-color:#e0c576;stop-opacity:1;"
-         offset="0"
-         id="stop4530-0-5-0-5" /><stop
-         style="stop-color:#9e7916;stop-opacity:1"
-         offset="1"
-         id="stop4532-7-9-3-3" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6281-8-0-1-6-6-4-2"
-       id="linearGradient3093-5-2-7"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.3199889,0,0,2.3199889,10.199693,1043.1852)"
-       x1="0.9375"
-       y1="4.8437853"
-       x2="0.9375"
-       y2="7.549418" /><linearGradient
-       id="linearGradient6281-8-0-1-6-6-4-2"><stop
-         id="stop6283-0-2-2-1-2-0-1"
-         offset="0"
-         style="stop-color:#f7f9fb;stop-opacity:1" /><stop
-         id="stop6285-5-0-9-7-6-9-9"
-         offset="1"
-         style="stop-color:#ffd680;stop-opacity:1" /></linearGradient><radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3844-6"
-       id="radialGradient5366-0-9"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.3089145,0.02433326,-0.0270668,0.33136796,5.4628028,1.7171329)"
-       cx="7.7379637"
-       cy="2.4332652"
-       fx="7.7379637"
-       fy="2.4332652"
-       r="2.3503494" /><linearGradient
-       id="linearGradient3844-6"><stop
-         id="stop3846-3"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" /><stop
-         style="stop-color:#dddddd;stop-opacity:1;"
-         offset="0.61245775"
-         id="stop3848-7" /><stop
-         id="stop3850-1"
-         offset="1"
-         style="stop-color:#464646;stop-opacity:1;" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3860-2"
-       id="linearGradient5368-1-5"
-       gradientUnits="userSpaceOnUse"
-       x1="7.8304267"
-       y1="5.5753322"
-       x2="7.8018494"
-       y2="1.9306878" /><linearGradient
-       id="linearGradient3860-2"><stop
-         id="stop3862-3"
-         offset="0"
-         style="stop-color:#424242;stop-opacity:1" /><stop
-         id="stop3864-4"
-         offset="1"
-         style="stop-color:#6b6b6b;stop-opacity:1;" /></linearGradient><radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3844-0"
-       id="radialGradient5366-0-5"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.3089145,0.02433326,-0.0270668,0.33136796,5.4628028,1.7171329)"
-       cx="7.7379637"
-       cy="2.4332652"
-       fx="7.7379637"
-       fy="2.4332652"
-       r="2.3503494" /><linearGradient
-       id="linearGradient3844-0"><stop
-         id="stop3846-36"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" /><stop
-         style="stop-color:#dddddd;stop-opacity:1;"
-         offset="0.61245775"
-         id="stop3848-6" /><stop
-         id="stop3850-5"
-         offset="1"
-         style="stop-color:#464646;stop-opacity:1;" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3860-0"
-       id="linearGradient5368-1-0"
-       gradientUnits="userSpaceOnUse"
-       x1="7.8304267"
-       y1="5.5753322"
-       x2="7.8018494"
-       y2="1.9306878" /><linearGradient
-       id="linearGradient3860-0"><stop
-         id="stop3862-6"
-         offset="0"
-         style="stop-color:#424242;stop-opacity:1" /><stop
-         id="stop3864-0"
-         offset="1"
-         style="stop-color:#6b6b6b;stop-opacity:1;" /></linearGradient><radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3844-8"
-       id="radialGradient5366-0-7"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.3089145,0.02433326,-0.0270668,0.33136796,5.4628028,1.7171329)"
-       cx="7.7379637"
-       cy="2.4332652"
-       fx="7.7379637"
-       fy="2.4332652"
-       r="2.3503494" /><linearGradient
-       id="linearGradient3844-8"><stop
-         id="stop3846-1"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" /><stop
-         style="stop-color:#dddddd;stop-opacity:1;"
-         offset="0.61245775"
-         id="stop3848-4" /><stop
-         id="stop3850-19"
-         offset="1"
-         style="stop-color:#464646;stop-opacity:1;" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3860-4"
-       id="linearGradient5368-1-8"
-       gradientUnits="userSpaceOnUse"
-       x1="7.8304267"
-       y1="5.5753322"
-       x2="7.8018494"
-       y2="1.9306878" /><linearGradient
-       id="linearGradient3860-4"><stop
-         id="stop3862-30"
-         offset="0"
-         style="stop-color:#424242;stop-opacity:1" /><stop
-         id="stop3864-9"
-         offset="1"
-         style="stop-color:#6b6b6b;stop-opacity:1;" /></linearGradient><radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3844-3"
-       id="radialGradient5366-0-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.3089145,0.02433326,-0.0270668,0.33136796,5.4628028,1.7171329)"
-       cx="7.7379637"
-       cy="2.4332652"
-       fx="7.7379637"
-       fy="2.4332652"
-       r="2.3503494" /><linearGradient
-       id="linearGradient3844-3"><stop
-         id="stop3846-7"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" /><stop
-         style="stop-color:#dddddd;stop-opacity:1;"
-         offset="0.61245775"
-         id="stop3848-3" /><stop
-         id="stop3850-3"
-         offset="1"
-         style="stop-color:#464646;stop-opacity:1;" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3860-9"
-       id="linearGradient5368-1-7"
-       gradientUnits="userSpaceOnUse"
-       x1="7.8304267"
-       y1="5.5753322"
-       x2="7.8018494"
-       y2="1.9306878" /><linearGradient
-       id="linearGradient3860-9"><stop
-         id="stop3862-5"
-         offset="0"
-         style="stop-color:#424242;stop-opacity:1" /><stop
-         id="stop3864-2"
-         offset="1"
-         style="stop-color:#6b6b6b;stop-opacity:1;" /></linearGradient><radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3852-6"
-       id="radialGradient5374-4-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.35882709,-0.01458857,0.01251176,0.40537334,4.9838699,2.1071585)"
-       cx="7.7274323"
-       cy="2.8622203"
-       fx="7.7274323"
-       fy="2.8622203"
-       r="2.3503494" /><linearGradient
-       id="linearGradient3852-6"><stop
-         id="stop3854-9"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" /><stop
-         style="stop-color:#dddddd;stop-opacity:1;"
-         offset="0.66561043"
-         id="stop3856-8" /><stop
-         id="stop3858-2"
-         offset="1"
-         style="stop-color:#464646;stop-opacity:1;" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3866-8"
-       id="linearGradient5376-4-1"
-       gradientUnits="userSpaceOnUse"
-       x1="7.8451643"
-       y1="5.6525216"
-       x2="7.8451643"
-       y2="1.0179684" /><linearGradient
-       id="linearGradient3866-8"><stop
-         id="stop3868-1"
-         offset="0"
-         style="stop-color:#717188;stop-opacity:1" /><stop
-         id="stop3870-1"
-         offset="1"
-         style="stop-color:#6b6b6b;stop-opacity:1;" /></linearGradient><linearGradient
-       y2="1.0179684"
-       x2="7.8451643"
-       y1="5.6525216"
-       x1="7.8451643"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4515"
-       xlink:href="#linearGradient3866-8"
-       inkscape:collect="always" /><radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3852-4"
-       id="radialGradient5374-4-7"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.35882709,-0.01458857,0.01251176,0.40537334,4.9838699,2.1071585)"
-       cx="7.9300532"
-       cy="1.7860492"
-       fx="7.9300532"
-       fy="1.7860492"
-       r="2.3503494" /><linearGradient
-       id="linearGradient3852-4"><stop
-         id="stop3854-0"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" /><stop
-         style="stop-color:#dddddd;stop-opacity:1;"
-         offset="0.66561043"
-         id="stop3856-5" /><stop
-         id="stop3858-8"
-         offset="1"
-         style="stop-color:#464646;stop-opacity:1;" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3866-7"
-       id="linearGradient5376-4-6"
-       gradientUnits="userSpaceOnUse"
-       x1="7.8451643"
-       y1="5.6525216"
-       x2="7.8451643"
-       y2="1.0179684" /><linearGradient
-       id="linearGradient3866-7"><stop
-         id="stop3868-0"
-         offset="0"
-         style="stop-color:#717188;stop-opacity:1" /><stop
-         id="stop3870-7"
-         offset="1"
-         style="stop-color:#6b6b6b;stop-opacity:1;" /></linearGradient><radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3852-5"
-       id="radialGradient5374-4-3"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.35882709,-0.01458857,0.01251176,0.40537334,4.9838699,2.1071585)"
-       cx="7.9300532"
-       cy="1.7860492"
-       fx="7.9300532"
-       fy="1.7860492"
-       r="2.3503494" /><linearGradient
-       id="linearGradient3852-5"><stop
-         id="stop3854-1"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" /><stop
-         style="stop-color:#dddddd;stop-opacity:1;"
-         offset="0.66561043"
-         id="stop3856-6" /><stop
-         id="stop3858-4"
-         offset="1"
-         style="stop-color:#464646;stop-opacity:1;" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3866-3"
-       id="linearGradient5376-4-0"
-       gradientUnits="userSpaceOnUse"
-       x1="7.8451643"
-       y1="5.6525216"
-       x2="7.8451643"
-       y2="1.0179684" /><linearGradient
-       id="linearGradient3866-3"><stop
-         id="stop3868-6"
-         offset="0"
-         style="stop-color:#717188;stop-opacity:1" /><stop
-         id="stop3870-4"
-         offset="1"
-         style="stop-color:#6b6b6b;stop-opacity:1;" /></linearGradient><radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5328-5-9"
-       id="radialGradient5370-9-4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.37553419,-2.0140452e-8,1.7614747e-8,0.40297829,4.9079328,2.1932289)"
-       cx="7.9383807"
-       cy="3.451864"
-       fx="7.9383807"
-       fy="3.451864"
-       r="2.3503494" /><linearGradient
-       id="linearGradient5328-5-9"><stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop5330-9-7" /><stop
-         id="stop3842-2"
-         offset="0.5"
-         style="stop-color:#dddddd;stop-opacity:1;" /><stop
-         style="stop-color:#464646;stop-opacity:1;"
-         offset="1"
-         id="stop5332-8-3" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5209-0-2"
-       id="linearGradient5372-5-0"
-       gradientUnits="userSpaceOnUse"
-       x1="7.8304267"
-       y1="5.9680095"
-       x2="7.8890662"
-       y2="3.584255" /><linearGradient
-       id="linearGradient5209-0-2"><stop
-         style="stop-color:#4c4c4c;stop-opacity:1"
-         offset="0"
-         id="stop5211-9-4" /><stop
-         style="stop-color:#6b6b6b;stop-opacity:1;"
-         offset="1"
-         id="stop5213-4-2" /></linearGradient><radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5328-5-4"
-       id="radialGradient5370-9-6"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.37553419,-2.0140452e-8,1.7614747e-8,0.40297829,4.9079328,2.1932289)"
-       cx="7.9383807"
-       cy="3.451864"
-       fx="7.9383807"
-       fy="3.451864"
-       r="2.3503494" /><linearGradient
-       id="linearGradient5328-5-4"><stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop5330-9-9" /><stop
-         id="stop3842-7"
-         offset="0.5"
-         style="stop-color:#dddddd;stop-opacity:1;" /><stop
-         style="stop-color:#464646;stop-opacity:1;"
-         offset="1"
-         id="stop5332-8-0" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5209-0-7"
-       id="linearGradient5372-5-6"
-       gradientUnits="userSpaceOnUse"
-       x1="7.8304267"
-       y1="5.9680095"
-       x2="7.8890662"
-       y2="3.584255" /><linearGradient
-       id="linearGradient5209-0-7"><stop
-         style="stop-color:#4c4c4c;stop-opacity:1"
-         offset="0"
-         id="stop5211-9-9" /><stop
-         style="stop-color:#6b6b6b;stop-opacity:1;"
-         offset="1"
-         id="stop5213-4-4" /></linearGradient><linearGradient
-       id="linearGradient10798-1-9-3-7-1-15-1-7-6-1"><stop
-         style="stop-color:#4f9e55;stop-opacity:1"
-         offset="0"
-         id="stop10800-5-2-1-8-2-8-1-7-3-7" /><stop
-         id="stop10806-6-8-5-3-2-95-0-5-4-8"
-         offset="0.5"
-         style="stop-color:#3c8d49;stop-opacity:1;" /><stop
-         style="stop-color:#a4e173;stop-opacity:1;"
-         offset="1"
-         id="stop10802-1-5-3-0-2-0-9-8-4-3" /></linearGradient></defs><sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="32"
-     inkscape:cx="8.078125"
-     inkscape:cy="6.1875"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1920"
-     inkscape:window-height="991"
-     inkscape:window-x="-9"
-     inkscape:window-y="-9"
-     inkscape:window-maximized="1"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="false"
-     inkscape:showpageshadow="0"
-     inkscape:pagecheckerboard="0"
-     inkscape:deskcolor="#505050"><inkscape:grid
-       type="xygrid"
-       id="grid3006"
-       originx="0"
-       originy="0"
-       spacingy="1"
-       spacingx="1"
-       units="px"
-       visible="true" /></sodipodi:namedview><metadata
+     id="defs4" /><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" /></cc:Work></rdf:RDF></metadata><g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)"><path
        id="rect1"
        style="display:inline;fill:#ececec;stroke:none;stroke-width:0.25;stroke-linecap:square;paint-order:markers stroke fill;fill-opacity:1"
-       d="m 8.0117188,1036.4897 c 0.1462828,0 0.2898997,0.01 0.4316406,0.023 0.7559552,0.083 1.4413549,0.3977 1.9902346,0.8555 l 0.04883,0.043 -0.002,0.6308 0.152343,0.068 -0.160156,0.07 v -0.012 c -0.08361,0.036 -0.168063,0.03 -0.251953,0.076 l 0.002,-0.4786 c -0.0079,0 -0.01537,0 -0.02539,0.016 -0.06772,0.045 -0.166386,0.1097 -0.291016,0.1777 -0.2492618,0.1373 -0.5998292,0.2995 -1.0117188,0.3945 -0.7854592,0.1804 -1.8005799,0.1 -2.6738281,-0.8632 l 0.00781,0.8632 c 0.02418,0.02 0.048596,0.039 0.072266,0.059 l 0.048828,0.043 -0.1374812,0.903 c 0.1313088,0.1125 0.1740236,0.1941 0.3102415,0.2761 -0.1036239,0.036 0.00964,0.062 -0.09464,0.108 -0.03133,-0.02 -0.060857,-0.044 -0.091797,-0.066 l -0.00195,0.1113 c -0.085924,0.04 -0.1736157,0.084 -0.2597656,0.1309 l 0.013672,-1.1074 c -0.0079,0 -0.013418,-0.023 -0.023437,-0.01 -0.067728,0.045 -0.1663857,0.1322 -0.2910156,0.2002 -0.2492608,0.1373 -0.5998282,0.2996 -1.0117187,0.3946 -0.7854593,0.1803 0.8431947,4.7711 -0.030055,3.8083 l -2.6261947,-2.8982 c 0.6117483,0.5699 1.2803218,0.7692 1.9707031,0.7422 0.6410003,-0.025 1.2878823,-0.2433 1.8867187,-0.4961 l -0.00391,-0.3203 0.068359,-0.037 c 0.6770083,-0.3803 -0.1820557,-3.1826 0.4518407,-3.1936 0.1462838,0 3.1220832,-0.058 3.2638241,-0.046 0.7559576,0.083 0.1417027,3.1022 0.6905856,3.56 l 0.04883,0.043 -0.0039,0.3769 c 0.582307,0.4964 1.215118,0.6725 1.865234,0.6465 0.678328,-0.026 -2.6468986,-2.0577 -2.019446,-2.329 l 4.031164,-0.01 c -0.0079,0 -0.01537,0.01 -0.02539,0.018 -0.06773,0.045 -0.164431,0.1078 -0.289062,0.1758 -0.249261,0.1373 -1.330488,2.1325 -1.742377,2.2275 -0.78546,0.1804 -1.071874,-1.733 -1.945123,-2.6963 l 1.679478,2.7764 c -0.08406,-0.067 -1.341843,-0.4695 -1.431703,-0.5294 l -0.49782,-1.4364 c -0.07589,0.031 -0.1217194,0.1692 -0.1992193,0.1992 l -0.033203,-0.1074 c -0.1090399,-0.062 -0.00439,0.084 -0.1200304,0.033 0.1928678,-0.067 0.1654663,-0.3475 0.3504987,-0.4255 l 0.04479,-0.9967 0.01577,0.046 c 0.67701,-0.3803 1.348529,-0.5456 1.982422,-0.5566 0.146283,0 0.291852,0.01 0.433594,0.022 0.755956,0.083 1.439401,0.3977 1.988281,0.8554 l 0.04883,0.045 -0.235173,0.9256 1.619904,0.6622 -0.06398,6.0186 -7.5864097,4.5518 h -0.00195 -0.00586 v -0.014 L 0.00390625,1046.4936 0,1040.2944 c 0.94417906,-0.3893 0.87046921,-0.3422 1.8320312,-0.7363 l -0.021484,-1.3047 0.070312,-0.037 c 0.6770093,-0.3803 1.3641535,-0.6668 1.9980468,-0.6778 0.1462829,-10e-4 0.2898988,0.01 0.4316407,0.025 0.6092624,0.067 1.1732625,0.284 1.65625,0.6055 l -0.00781,-1.0781 4.2152163,0.6992 c 0.677007,-0.3803 -2.7963767,-1.2819 -2.1624823,-1.2929 z m 0.015625,0.2559 c -0.5453485,0.01 -1.1248414,0.1563 -1.7148438,0.4589 0.8353342,0.9981 1.7718695,1.0623 2.5273438,0.8887 0.3819996,-0.088 -2.7168901,-0.9758 -2.4820054,-1.1053 0.1174439,-0.064 2.296908,-0.3174 2.3599379,-0.3594 0.03151,-0.021 1.4008537,0.8905 1.4169937,0.8785 0.008,0 0.02956,-0.072 0.03456,-0.072 -0.4917228,-0.3808 -3.4160485,-0.09 -4.0707388,-0.1632 -0.1281749,-0.019 2.0613724,-0.5223 1.9287606,-0.5223 z m 2.1875002,0.8105 v 0.01 c 0.0044,0.01 0.0048,0.01 0.0098,0.017 v -0.012 c -0.0035,0 -0.25431,-0.4102 -0.25771,-0.4102 z m -6.3203128,0.2461 c -0.5453484,0.01 2.3678382,-0.1227 1.7778328,0.1799 0.8353372,0.9981 -1.72081,1.3414 -0.9653328,1.1678 0.3819997,-0.088 0.714333,-0.2397 0.9492188,-0.3692 0.1174439,-0.064 0.2104076,-0.124 0.2734375,-0.166 0.0315,-0.021 0.056126,-0.039 0.072266,-0.051 0.00808,0 0.012578,-0.014 0.017578,-0.014 -0.4917215,-0.3808 -1.0777285,-0.6555 -1.7324218,-0.7285 -0.1281729,-0.019 -0.2599653,-0.017 -0.3925782,-0.017 z m 6.7217608,0.7861 c -0.545348,0.01 0.419025,-0.1942 -0.17098,0.1084 0.835337,0.998 1.771869,1.0643 2.527344,0.8907 0.382002,-0.088 -1.939757,0.013 -1.704871,-0.1161 0.117444,-0.064 -0.877654,-0.8309 -0.814625,-0.8729 0.03151,-0.021 3.798282,0.4128 3.814422,0.4008 0.008,0 0.349191,0.1527 0.354191,0.1527 -0.491722,-0.3809 -1.440901,0.5576 -2.095596,0.4846 -0.128173,-0.02 -0.246478,-0.5845 -0.37909,-0.5845 z m -4.5362139,0.015 v 0 c 0.0043,0.01 0.00477,0.01 0.00977,0.018 v -0.012 c -0.0034,0 -0.00637,-0.01 -0.00977,-0.01 z m 8.2675779,0.4375 v 0.01 c 0.0044,0.01 0.0048,0 0.0098,0.016 v -0.01 c -0.0035,0 -0.0064,-0.012 -0.0098,-0.012 z m -6.3203122,0.8691 c -0.5453505,0.01 2.5412232,0.194 1.9512186,0.4966 0.8353376,0.998 -1.8941959,1.0247 -1.1387186,0.8511 0.3819996,-0.088 0.7143329,-0.2397 0.9492187,-0.3692 0.1174429,-0.064 0.2104076,-0.124 0.2734375,-0.166 0.03151,-0.021 0.05613,-0.039 0.07227,-0.051 0.0081,0 0.01258,-0.014 0.01758,-0.014 h 0.0039 c -0.4919915,-0.3813 -1.0810468,-0.6536 -1.7363281,-0.7266 -0.1281739,-0.018 -0.2599663,-0.018 -0.3925781,-0.018 z m -6.1875,0.1348 -0.1203042,-0.2673 c 3.4111686,1.5188 2.8118577,-2.0258 4.3135162,-1.4245 l -0.068212,2.5121 c -0.5864355,0.2394 -1.2289359,0.4369 -1.8789063,0.4629 -0.7562002,0.029 -1.567909,-0.2205 -2.2402344,-0.8672 z m 12.8640542,0.8469 -0.108242,-0.015 0.369141,-0.1484 z m -8.4831949,-0.2413 3.9090129,0.212 c 0.61175,0.5699 -2.611114,2.3618 -1.9207317,2.3348 0.6783293,-0.026 -2.0233656,-0.3448 -1.395915,-0.6161 l 3.4095827,-1.6534 c -0.0079,0 -0.01537,0 -0.02539,0.014 -0.06773,0.045 -0.166385,0.1097 -0.2910161,0.1777 -0.2492618,0.1373 -0.5998272,0.2995 -1.0117188,0.3945 -0.7854602,0.1804 -1.8005769,0.1 -2.6738281,-0.8632 z m 3.9941409,0.059 v 0 c 0.0044,0.01 0.0048,0.01 0.0098,0.017 v -0.012 c -0.0035,0 -0.0064,-0.01 -0.0098,-0.01 z m -2.0642763,9.7023 -7.62908332,-4.2358 7.55664062,4.086 -0.029297,-6.3399 z m 7.3103703,-9.2963 0.15858,5.2832 -7.0179554,3.8613 6.8593754,-3.9843 z m -4.986329,0.1797 0.807134,0.3465 0.866693,0.2199 c -0.563166,-0.016 -1.147375,-0.1888 -1.673829,-0.5664 z"
-       sodipodi:nodetypes="cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccsccccccsccccccccccccccccsccccccccccccccccccccccccccsccccccccccccccccccc" /><path
+       d="m 8.0117188,1036.4897 c 0.1462828,0 0.2898997,0.01 0.4316406,0.023 0.7559552,0.083 1.4413549,0.3977 1.9902346,0.8555 l 0.04883,0.043 -0.002,0.6308 0.152343,0.068 -0.160156,0.07 v -0.012 c -0.08361,0.036 -0.168063,0.03 -0.251953,0.076 l 0.002,-0.4786 c -0.0079,0 -0.01537,0 -0.02539,0.016 -0.06772,0.045 -0.166386,0.1097 -0.291016,0.1777 -0.2492618,0.1373 -0.5998292,0.2995 -1.0117188,0.3945 -0.7854592,0.1804 -1.8005799,0.1 -2.6738281,-0.8632 l 0.00781,0.8632 c 0.02418,0.02 0.048596,0.039 0.072266,0.059 l 0.048828,0.043 -0.1374812,0.903 c 0.1313088,0.1125 0.1740236,0.1941 0.3102415,0.2761 -0.1036239,0.036 0.00964,0.062 -0.09464,0.108 -0.03133,-0.02 -0.060857,-0.044 -0.091797,-0.066 l -0.00195,0.1113 c -0.085924,0.04 -0.1736157,0.084 -0.2597656,0.1309 l 0.013672,-1.1074 c -0.0079,0 -0.013418,-0.023 -0.023437,-0.01 -0.067728,0.045 -0.1663857,0.1322 -0.2910156,0.2002 -0.2492608,0.1373 -0.5998282,0.2996 -1.0117187,0.3946 -0.7854593,0.1803 0.8431947,4.7711 -0.030055,3.8083 l -2.6261947,-2.8982 c 0.6117483,0.5699 1.2803218,0.7692 1.9707031,0.7422 0.6410003,-0.025 1.2878823,-0.2433 1.8867187,-0.4961 l -0.00391,-0.3203 0.068359,-0.037 c 0.6770083,-0.3803 -0.1820557,-3.1826 0.4518407,-3.1936 0.1462838,0 3.1220832,-0.058 3.2638241,-0.046 0.7559576,0.083 0.1417027,3.1022 0.6905856,3.56 l 0.04883,0.043 -0.0039,0.3769 c 0.582307,0.4964 1.215118,0.6725 1.865234,0.6465 0.678328,-0.026 -2.6468986,-2.0577 -2.019446,-2.329 l 4.031164,-0.01 c -0.0079,0 -0.01537,0.01 -0.02539,0.018 -0.06773,0.045 -0.164431,0.1078 -0.289062,0.1758 -0.249261,0.1373 -1.330488,2.1325 -1.742377,2.2275 -0.78546,0.1804 -1.071874,-1.733 -1.945123,-2.6963 l 1.679478,2.7764 c -0.08406,-0.067 -1.341843,-0.4695 -1.431703,-0.5294 l -0.49782,-1.4364 c -0.07589,0.031 -0.1217194,0.1692 -0.1992193,0.1992 l -0.033203,-0.1074 c -0.1090399,-0.062 -0.00439,0.084 -0.1200304,0.033 0.1928678,-0.067 0.1654663,-0.3475 0.3504987,-0.4255 l 0.04479,-0.9967 0.01577,0.046 c 0.67701,-0.3803 1.348529,-0.5456 1.982422,-0.5566 0.146283,0 0.291852,0.01 0.433594,0.022 0.755956,0.083 1.439401,0.3977 1.988281,0.8554 l 0.04883,0.045 -0.235173,0.9256 1.619904,0.6622 -0.06398,6.0186 -7.5864097,4.5518 h -0.00195 -0.00586 v -0.014 L 0.00390625,1046.4936 0,1040.2944 c 0.94417906,-0.3893 0.87046921,-0.3422 1.8320312,-0.7363 l -0.021484,-1.3047 0.070312,-0.037 c 0.6770093,-0.3803 1.3641535,-0.6668 1.9980468,-0.6778 0.1462829,-10e-4 0.2898988,0.01 0.4316407,0.025 0.6092624,0.067 1.1732625,0.284 1.65625,0.6055 l -0.00781,-1.0781 4.2152163,0.6992 c 0.677007,-0.3803 -2.7963767,-1.2819 -2.1624823,-1.2929 z m 0.015625,0.2559 c -0.5453485,0.01 -1.1248414,0.1563 -1.7148438,0.4589 0.8353342,0.9981 1.7718695,1.0623 2.5273438,0.8887 0.3819996,-0.088 -2.7168901,-0.9758 -2.4820054,-1.1053 0.1174439,-0.064 2.296908,-0.3174 2.3599379,-0.3594 0.03151,-0.021 1.4008537,0.8905 1.4169937,0.8785 0.008,0 0.02956,-0.072 0.03456,-0.072 -0.4917228,-0.3808 -3.4160485,-0.09 -4.0707388,-0.1632 -0.1281749,-0.019 2.0613724,-0.5223 1.9287606,-0.5223 z m 2.1875002,0.8105 v 0.01 c 0.0044,0.01 0.0048,0.01 0.0098,0.017 v -0.012 c -0.0035,0 -0.25431,-0.4102 -0.25771,-0.4102 z m -6.3203128,0.2461 c -0.5453484,0.01 2.3678382,-0.1227 1.7778328,0.1799 0.8353372,0.9981 -1.72081,1.3414 -0.9653328,1.1678 0.3819997,-0.088 0.714333,-0.2397 0.9492188,-0.3692 0.1174439,-0.064 0.2104076,-0.124 0.2734375,-0.166 0.0315,-0.021 0.056126,-0.039 0.072266,-0.051 0.00808,0 0.012578,-0.014 0.017578,-0.014 -0.4917215,-0.3808 -1.0777285,-0.6555 -1.7324218,-0.7285 -0.1281729,-0.019 -0.2599653,-0.017 -0.3925782,-0.017 z m 6.7217608,0.7861 c -0.545348,0.01 0.419025,-0.1942 -0.17098,0.1084 0.835337,0.998 1.771869,1.0643 2.527344,0.8907 0.382002,-0.088 -1.939757,0.013 -1.704871,-0.1161 0.117444,-0.064 -0.877654,-0.8309 -0.814625,-0.8729 0.03151,-0.021 3.798282,0.4128 3.814422,0.4008 0.008,0 0.349191,0.1527 0.354191,0.1527 -0.491722,-0.3809 -1.440901,0.5576 -2.095596,0.4846 -0.128173,-0.02 -0.246478,-0.5845 -0.37909,-0.5845 z m -4.5362139,0.015 v 0 c 0.0043,0.01 0.00477,0.01 0.00977,0.018 v -0.012 c -0.0034,0 -0.00637,-0.01 -0.00977,-0.01 z m 8.2675779,0.4375 v 0.01 c 0.0044,0.01 0.0048,0 0.0098,0.016 v -0.01 c -0.0035,0 -0.0064,-0.012 -0.0098,-0.012 z m -6.3203122,0.8691 c -0.5453505,0.01 2.5412232,0.194 1.9512186,0.4966 0.8353376,0.998 -1.8941959,1.0247 -1.1387186,0.8511 0.3819996,-0.088 0.7143329,-0.2397 0.9492187,-0.3692 0.1174429,-0.064 0.2104076,-0.124 0.2734375,-0.166 0.03151,-0.021 0.05613,-0.039 0.07227,-0.051 0.0081,0 0.01258,-0.014 0.01758,-0.014 h 0.0039 c -0.4919915,-0.3813 -1.0810468,-0.6536 -1.7363281,-0.7266 -0.1281739,-0.018 -0.2599663,-0.018 -0.3925781,-0.018 z m -6.1875,0.1348 -0.1203042,-0.2673 c 3.4111686,1.5188 2.8118577,-2.0258 4.3135162,-1.4245 l -0.068212,2.5121 c -0.5864355,0.2394 -1.2289359,0.4369 -1.8789063,0.4629 -0.7562002,0.029 -1.567909,-0.2205 -2.2402344,-0.8672 z m 12.8640542,0.8469 -0.108242,-0.015 0.369141,-0.1484 z m -8.4831949,-0.2413 3.9090129,0.212 c 0.61175,0.5699 -2.611114,2.3618 -1.9207317,2.3348 0.6783293,-0.026 -2.0233656,-0.3448 -1.395915,-0.6161 l 3.4095827,-1.6534 c -0.0079,0 -0.01537,0 -0.02539,0.014 -0.06773,0.045 -0.166385,0.1097 -0.2910161,0.1777 -0.2492618,0.1373 -0.5998272,0.2995 -1.0117188,0.3945 -0.7854602,0.1804 -1.8005769,0.1 -2.6738281,-0.8632 z m 3.9941409,0.059 v 0 c 0.0044,0.01 0.0048,0.01 0.0098,0.017 v -0.012 c -0.0035,0 -0.0064,-0.01 -0.0098,-0.01 z m -2.0642763,9.7023 -7.62908332,-4.2358 7.55664062,4.086 -0.029297,-6.3399 z m 7.3103703,-9.2963 0.15858,5.2832 -7.0179554,3.8613 6.8593754,-3.9843 z m -4.986329,0.1797 0.807134,0.3465 0.866693,0.2199 c -0.563166,-0.016 -1.147375,-0.1888 -1.673829,-0.5664 z" /><path
        id="path22"
        style="color:#000000;display:inline;fill:#878787;stroke-width:1.05078;stroke-linecap:square;-inkscape-stroke:none;paint-order:markers stroke fill;fill-opacity:1"
-       d="m 10.474267,1038.04 -0.0021,0.1398 0.161453,-0.069 z m -8.6316843,1.511 c -0.97770124,0.4009 -0.89342749,0.3495 -1.84258304436475,0.7409 l 0.004036064365,6.1984 8.33703258,4.5518 v 0.011 h 0.00606 0.00202 l 7.6286567,-4.4662 0.0222,-6.1024 -1.396569,-0.6178 -0.0061,0.6867 0.367306,0.1669 -0.369324,0.1482 -0.004,0.3674 -0.07669,0.035 c -0.659588,0.2906 -1.405254,0.5524 -2.161453,0.5823 h -0.201816 l -1.691221,0.6803 -0.0021,0.2458 c -1.6199922,0.8107 -2.9975053,0.8124 -4.4783041,-0.1915 v -0.096 c -1.5016605,-0.6013 -1.5635967,-0.6099 -4.9747724,-2.1287 l 0.9122098,-0.3591 c -0.089026,-0.057 -0.00332,-0.3961 -0.074672,-0.4528 z m -1.32189693,1.1833 7.52774903,3.1785 0.030273,6.3404 -7.55802142,-4.0864 z m 14.94046223,0.3715 v 5.1612 l -6.8597365,3.9841 -0.014127,-6.355 z"
-       sodipodi:nodetypes="ccccccccccccccccccccccccccccccccccccccc" /><path
+       d="m 10.474267,1038.04 -0.0021,0.1398 0.161453,-0.069 z m -8.6316843,1.511 c -0.97770124,0.4009 -0.89342749,0.3495 -1.84258304436475,0.7409 l 0.004036064365,6.1984 8.33703258,4.5518 v 0.011 h 0.00606 0.00202 l 7.6286567,-4.4662 0.0222,-6.1024 -1.396569,-0.6178 -0.0061,0.6867 0.367306,0.1669 -0.369324,0.1482 -0.004,0.3674 -0.07669,0.035 c -0.659588,0.2906 -1.405254,0.5524 -2.161453,0.5823 h -0.201816 l -1.691221,0.6803 -0.0021,0.2458 c -1.6199922,0.8107 -2.9975053,0.8124 -4.4783041,-0.1915 v -0.096 c -1.5016605,-0.6013 -1.5635967,-0.6099 -4.9747724,-2.1287 l 0.9122098,-0.3591 c -0.089026,-0.057 -0.00332,-0.3961 -0.074672,-0.4528 z m -1.32189693,1.1833 7.52774903,3.1785 0.030273,6.3404 -7.55802142,-4.0864 z m 14.94046223,0.3715 v 5.1612 l -6.8597365,3.9841 -0.014127,-6.355 z" /><path
        id="path25-8-8"
        style="color:#000000;display:inline;fill:#878787;stroke:#878787;stroke-width:0.248943;stroke-linecap:square;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill;fill-opacity:1"
-       d="m 12.145306,1037.9746 c -0.633895,0.011 -1.306844,0.1769 -1.983854,0.5572 l -0.06862,0.037 0.01211,1.4492 c 0.08986,0.06 0.176285,0.125 0.260343,0.192 l -0.01211,-1.2363 c 0.873251,0.9628 1.888605,1.0444 2.674067,0.864 0.411891,-0.095 0.763856,-0.2571 1.013117,-0.3944 0.124631,-0.068 0.222889,-0.1324 0.290615,-0.1774 0.01002,-0.011 0.01633,-0.011 0.02422,-0.015 l -0.02018,1.7934 c -0.627453,0.2713 -1.313598,0.5143 -1.991928,0.5406 -0.650908,0.026 -1.283906,-0.1512 -1.866801,-0.649 l -0.004,0.3484 c 0.591252,0.4249 1.255273,0.592 1.880927,0.5677 0.756202,-0.03 1.501862,-0.2917 2.161453,-0.5822 l 0.07669,-0.035 0.02422,-2.3403 -0.04843,-0.042 c -0.548882,-0.4577 -1.233951,-0.7725 -1.989909,-0.8557 -0.141742,-0.016 -0.285604,-0.026 -0.431887,-0.024 z m 0.01615,0.2629 v 0 c 0.132612,0 0.263348,-4e-4 0.391523,0.019 0.654695,0.073 1.241879,0.3454 1.733603,0.7263 -0.005,0 -0.01013,0.011 -0.01816,0.013 -0.01614,0.012 -0.04114,0.031 -0.07265,0.052 -0.06303,0.042 -0.155008,0.1005 -0.272452,0.1649 -0.234886,0.1295 -0.568553,0.2817 -0.950555,0.3694 -0.755477,0.1737 -1.691403,0.109 -2.52674,-0.889 0.590005,-0.3026 1.170089,-0.4508 1.715439,-0.4592 z m 2.185671,0.7951 c 0.0034,0 0.0067,0.011 0.01013,0.011 v 0.011 c -0.005,-0.011 -0.0058,-0.011 -0.01013,-0.017 z"
-       sodipodi:nodetypes="cccccccccccccccccccccccccccccccccccccc" /><path
+       d="m 12.145306,1037.9746 c -0.633895,0.011 -1.306844,0.1769 -1.983854,0.5572 l -0.06862,0.037 0.01211,1.4492 c 0.08986,0.06 0.176285,0.125 0.260343,0.192 l -0.01211,-1.2363 c 0.873251,0.9628 1.888605,1.0444 2.674067,0.864 0.411891,-0.095 0.763856,-0.2571 1.013117,-0.3944 0.124631,-0.068 0.222889,-0.1324 0.290615,-0.1774 0.01002,-0.011 0.01633,-0.011 0.02422,-0.015 l -0.02018,1.7934 c -0.627453,0.2713 -1.313598,0.5143 -1.991928,0.5406 -0.650908,0.026 -1.283906,-0.1512 -1.866801,-0.649 l -0.004,0.3484 c 0.591252,0.4249 1.255273,0.592 1.880927,0.5677 0.756202,-0.03 1.501862,-0.2917 2.161453,-0.5822 l 0.07669,-0.035 0.02422,-2.3403 -0.04843,-0.042 c -0.548882,-0.4577 -1.233951,-0.7725 -1.989909,-0.8557 -0.141742,-0.016 -0.285604,-0.026 -0.431887,-0.024 z m 0.01615,0.2629 v 0 c 0.132612,0 0.263348,-4e-4 0.391523,0.019 0.654695,0.073 1.241879,0.3454 1.733603,0.7263 -0.005,0 -0.01013,0.011 -0.01816,0.013 -0.01614,0.012 -0.04114,0.031 -0.07265,0.052 -0.06303,0.042 -0.155008,0.1005 -0.272452,0.1649 -0.234886,0.1295 -0.568553,0.2817 -0.950555,0.3694 -0.755477,0.1737 -1.691403,0.109 -2.52674,-0.889 0.590005,-0.3026 1.170089,-0.4508 1.715439,-0.4592 z m 2.185671,0.7951 c 0.0034,0 0.0067,0.011 0.01013,0.011 v 0.011 c -0.005,-0.011 -0.0058,-0.011 -0.01013,-0.017 z" /><path
        id="path25-8-8-6"
        style="color:#000000;display:inline;fill:#878787;stroke:#878787;stroke-width:0.248943;stroke-linecap:square;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill;fill-opacity:1"
-       d="m 8.0121079,1036.4902 c -0.6338944,0.011 -1.3068458,0.177 -1.9838546,0.5573 l -0.068618,0.038 0.00807,1.1062 c 0.089566,0.06 0.1765212,0.1212 0.260343,0.1878 l -0.00807,-0.8891 c 0.8732495,0.9627 1.8886059,1.0444 2.6740664,0.864 0.4118906,-0.095 0.7638567,-0.2571 1.0131179,-0.3944 0.1246304,-0.068 0.2228904,-0.1324 0.2906144,-0.1774 0.01002,-0.011 0.01633,-0.011 0.02422,-0.015 l -5.48e-4,0.48 c 0.08651,-0.047 0.172055,-0.041 0.258325,-0.081 l 0.0026,-0.756 -0.04843,-0.042 c -0.5488795,-0.4578 -1.2339515,-0.7726 -1.989908,-0.8557 -0.1417415,-0.016 -0.2856041,-0.026 -0.4318869,-0.024 z m 0.016145,0.2547 v 0 c 0.1326123,0 0.2633494,0 0.3915237,0.019 0.6546925,0.073 1.2418796,0.3455 1.7336024,0.7263 -0.005,0 -0.01013,0.011 -0.01816,0.013 -0.01614,0.012 -0.04114,0.031 -0.07265,0.052 -0.063032,0.042 -0.1550093,0.1004 -0.2724528,0.1649 -0.2348856,0.1295 -0.5685545,0.2816 -0.9505548,0.3694 -0.7554763,0.1736 -1.6914045,0.109 -2.5267404,-0.8891 0.5900043,-0.3026 1.1700898,-0.4508 1.7154387,-0.4591 z m 2.1856721,0.8034 c 0.0034,0 0.0067,0.011 0.01013,0.011 v 0.011 c -0.005,-0.011 -0.0058,-0.011 -0.01013,-0.017 z m -3.8768929,1.7794 -0.00202,0.3485 c 0.030942,0.022 0.061509,0.046 0.092836,0.066 0.1042791,-0.046 0.2091909,-0.087 0.3128153,-0.1231 -0.1369488,-0.082 -0.2716484,-0.1791 -0.4036326,-0.2923 z m 3.7638739,0.1565 c -0.1850345,0.078 -0.3742346,0.1542 -0.5671033,0.2212 0.1156436,0.051 0.2279936,0.1091 0.3370332,0.1712 l 0.033887,0.1058 c 0.077502,-0.03 0.1223051,-0.1671 0.1981991,-0.1981 z"
-       sodipodi:nodetypes="ccccccccccccccccccccccccccccccccccccccccccccc" /><path
+       d="m 8.0121079,1036.4902 c -0.6338944,0.011 -1.3068458,0.177 -1.9838546,0.5573 l -0.068618,0.038 0.00807,1.1062 c 0.089566,0.06 0.1765212,0.1212 0.260343,0.1878 l -0.00807,-0.8891 c 0.8732495,0.9627 1.8886059,1.0444 2.6740664,0.864 0.4118906,-0.095 0.7638567,-0.2571 1.0131179,-0.3944 0.1246304,-0.068 0.2228904,-0.1324 0.2906144,-0.1774 0.01002,-0.011 0.01633,-0.011 0.02422,-0.015 l -5.48e-4,0.48 c 0.08651,-0.047 0.172055,-0.041 0.258325,-0.081 l 0.0026,-0.756 -0.04843,-0.042 c -0.5488795,-0.4578 -1.2339515,-0.7726 -1.989908,-0.8557 -0.1417415,-0.016 -0.2856041,-0.026 -0.4318869,-0.024 z m 0.016145,0.2547 v 0 c 0.1326123,0 0.2633494,0 0.3915237,0.019 0.6546925,0.073 1.2418796,0.3455 1.7336024,0.7263 -0.005,0 -0.01013,0.011 -0.01816,0.013 -0.01614,0.012 -0.04114,0.031 -0.07265,0.052 -0.063032,0.042 -0.1550093,0.1004 -0.2724528,0.1649 -0.2348856,0.1295 -0.5685545,0.2816 -0.9505548,0.3694 -0.7554763,0.1736 -1.6914045,0.109 -2.5267404,-0.8891 0.5900043,-0.3026 1.1700898,-0.4508 1.7154387,-0.4591 z m 2.1856721,0.8034 c 0.0034,0 0.0067,0.011 0.01013,0.011 v 0.011 c -0.005,-0.011 -0.0058,-0.011 -0.01013,-0.017 z m -3.8768929,1.7794 -0.00202,0.3485 c 0.030942,0.022 0.061509,0.046 0.092836,0.066 0.1042791,-0.046 0.2091909,-0.087 0.3128153,-0.1231 -0.1369488,-0.082 -0.2716484,-0.1791 -0.4036326,-0.2923 z m 3.7638739,0.1565 c -0.1850345,0.078 -0.3742346,0.1542 -0.5671033,0.2212 0.1156436,0.051 0.2279936,0.1091 0.3370332,0.1712 l 0.033887,0.1058 c 0.077502,-0.03 0.1223051,-0.1671 0.1981991,-0.1981 z" /><path
        id="path25-8-0"
        style="color:#000000;display:inline;fill:#878787;stroke:#878787;stroke-width:0.248943;stroke-linecap:square;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill;fill-opacity:1"
-       d="m 3.8789095,1037.5357 c -0.6338957,0.011 -1.3218697,0.2972 -1.9988794,0.6775 l -0.068617,0.037 0.035207,2.201 c 0.6723268,0.6467 1.4839595,0.8974 2.2401613,0.8682 0.6499713,-0.026 1.292474,-0.224 1.87891,-0.4634 l -0.00201,-0.3004 c -0.5988376,0.2528 -1.2459804,0.4717 -1.8869826,0.4966 -0.6903831,0.027 -1.3599956,-0.173 -1.9717456,-0.7429 l -0.033189,-1.6543 c 0.8732515,0.9628 1.9036302,0.9242 2.6890912,0.7439 0.4118917,-0.095 0.7638563,-0.2571 1.0131179,-0.3944 0.1246307,-0.068 0.222888,-0.1324 0.2906155,-0.1774 0.010023,-0.011 0.016323,-0.011 0.024217,-0.015 l -0.014127,1.1065 c 0.086153,-0.047 0.1724014,-0.091 0.2583249,-0.1314 l 0.016145,-1.332 -0.048436,-0.042 c -0.5488823,-0.4578 -1.2339513,-0.7726 -1.989909,-0.8557 -0.1417421,-0.016 -0.2856034,-0.026 -0.431887,-0.024 z m 0.016145,0.263 v 0 c 0.1326125,0 0.2633492,-4e-4 0.3915237,0.019 0.654694,0.073 1.2418793,0.3455 1.7336023,0.7263 -0.00496,0 -0.010126,0.011 -0.018163,0.013 -0.01614,0.012 -0.041137,0.031 -0.072653,0.052 -0.063035,0.042 -0.1550088,0.1004 -0.2724521,0.1649 -0.2348864,0.1295 -0.5685539,0.2816 -0.9505548,0.3694 -0.7554781,0.1736 -1.7064277,0.2292 -2.5417653,-0.7689 0.5900055,-0.3026 1.1851137,-0.571 1.7304636,-0.5793 z m 2.1856708,0.7951 c 0.00341,0 0.00669,0.011 0.010095,0.011 v 0.011 c -0.00496,-0.011 -0.00576,-0.011 -0.010095,-0.017 z"
-       sodipodi:nodetypes="ccccccccccccccccccccccccccccccccccccc" /><path
+       d="m 3.8789095,1037.5357 c -0.6338957,0.011 -1.3218697,0.2972 -1.9988794,0.6775 l -0.068617,0.037 0.035207,2.201 c 0.6723268,0.6467 1.4839595,0.8974 2.2401613,0.8682 0.6499713,-0.026 1.292474,-0.224 1.87891,-0.4634 l -0.00201,-0.3004 c -0.5988376,0.2528 -1.2459804,0.4717 -1.8869826,0.4966 -0.6903831,0.027 -1.3599956,-0.173 -1.9717456,-0.7429 l -0.033189,-1.6543 c 0.8732515,0.9628 1.9036302,0.9242 2.6890912,0.7439 0.4118917,-0.095 0.7638563,-0.2571 1.0131179,-0.3944 0.1246307,-0.068 0.222888,-0.1324 0.2906155,-0.1774 0.010023,-0.011 0.016323,-0.011 0.024217,-0.015 l -0.014127,1.1065 c 0.086153,-0.047 0.1724014,-0.091 0.2583249,-0.1314 l 0.016145,-1.332 -0.048436,-0.042 c -0.5488823,-0.4578 -1.2339513,-0.7726 -1.989909,-0.8557 -0.1417421,-0.016 -0.2856034,-0.026 -0.431887,-0.024 z m 0.016145,0.263 v 0 c 0.1326125,0 0.2633492,-4e-4 0.3915237,0.019 0.654694,0.073 1.2418793,0.3455 1.7336023,0.7263 -0.00496,0 -0.010126,0.011 -0.018163,0.013 -0.01614,0.012 -0.041137,0.031 -0.072653,0.052 -0.063035,0.042 -0.1550088,0.1004 -0.2724521,0.1649 -0.2348864,0.1295 -0.5685539,0.2816 -0.9505548,0.3694 -0.7554781,0.1736 -1.7064277,0.2292 -2.5417653,-0.7689 0.5900055,-0.3026 1.1851137,-0.571 1.7304636,-0.5793 z m 2.1856708,0.7951 c 0.00341,0 0.00669,0.011 0.010095,0.011 v 0.011 c -0.00496,-0.011 -0.00576,-0.011 -0.010095,-0.017 z" /><path
        id="path25-8"
        style="color:#000000;display:inline;fill:#878787;fill-opacity:1;stroke:#878787;stroke-width:0.248943;stroke-linecap:square;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
-       d="m 8.0121076,1039.6411 c -0.6338962,0.011 -1.3068442,0.1769 -1.9838545,0.5572 l -0.068617,0.037 0.020181,2.3517 c 0.6723274,0.6467 1.4839587,0.8975 2.2401613,0.8682 0.7562024,-0.03 1.5018607,-0.2917 2.1614536,-0.5823 l 0.07669,-0.035 0.02422,-2.2766 -0.04843,-0.042 c -0.548883,-0.4578 -1.2339511,-0.7726 -1.9899096,-0.8557 -0.1417422,-0.016 -0.2856032,-0.025 -0.4318869,-0.023 z m 0.016145,0.2671 c 0.1326126,0 0.263349,0 0.3915236,0.019 0.6552824,0.073 1.2436287,0.345 1.7356208,0.7263 h -0.0021 c -0.005,0 -0.01013,0.011 -0.01817,0.013 -0.01614,0.012 -0.04114,0.031 -0.07265,0.052 -0.063035,0.042 -0.155009,0.1005 -0.2724524,0.1649 -0.2348867,0.1295 -0.5685536,0.2817 -0.950555,0.3694 -0.7554788,0.1736 -1.691402,0.109 -2.5267404,-0.889 0.5900061,-0.3026 1.1700883,-0.4509 1.7154389,-0.4592 z m -1.8082743,0.7326 c 0.8732523,0.9628 1.8886045,1.0444 2.6740663,0.864 0.4118921,-0.095 0.7638562,-0.2572 1.013118,-0.3945 0.1246314,-0.068 0.2228884,-0.1324 0.2906154,-0.1773 0.01002,-0.011 0.01633,-0.011 0.02422,-0.015 l -0.02018,1.7299 c -0.6274522,0.2713 -1.3135967,0.5142 -1.9919269,0.5404 -0.6903837,0.027 -1.359995,-0.173 -1.9717455,-0.7429 z m 3.9939457,0.059 c 0.0034,0 0.0067,0.011 0.01013,0.011 v 0.011 c -0.005,-0.011 -0.0058,-0.011 -0.01013,-0.018 z"
-       sodipodi:nodetypes="cccccccccccccccsccccccccccccccccccccc" /><image
+       d="m 8.0121076,1039.6411 c -0.6338962,0.011 -1.3068442,0.1769 -1.9838545,0.5572 l -0.068617,0.037 0.020181,2.3517 c 0.6723274,0.6467 1.4839587,0.8975 2.2401613,0.8682 0.7562024,-0.03 1.5018607,-0.2917 2.1614536,-0.5823 l 0.07669,-0.035 0.02422,-2.2766 -0.04843,-0.042 c -0.548883,-0.4578 -1.2339511,-0.7726 -1.9899096,-0.8557 -0.1417422,-0.016 -0.2856032,-0.025 -0.4318869,-0.023 z m 0.016145,0.2671 c 0.1326126,0 0.263349,0 0.3915236,0.019 0.6552824,0.073 1.2436287,0.345 1.7356208,0.7263 h -0.0021 c -0.005,0 -0.01013,0.011 -0.01817,0.013 -0.01614,0.012 -0.04114,0.031 -0.07265,0.052 -0.063035,0.042 -0.155009,0.1005 -0.2724524,0.1649 -0.2348867,0.1295 -0.5685536,0.2817 -0.950555,0.3694 -0.7554788,0.1736 -1.691402,0.109 -2.5267404,-0.889 0.5900061,-0.3026 1.1700883,-0.4509 1.7154389,-0.4592 z m -1.8082743,0.7326 c 0.8732523,0.9628 1.8886045,1.0444 2.6740663,0.864 0.4118921,-0.095 0.7638562,-0.2572 1.013118,-0.3945 0.1246314,-0.068 0.2228884,-0.1324 0.2906154,-0.1773 0.01002,-0.011 0.01633,-0.011 0.02422,-0.015 l -0.02018,1.7299 c -0.6274522,0.2713 -1.3135967,0.5142 -1.9919269,0.5404 -0.6903837,0.027 -1.359995,-0.173 -1.9717455,-0.7429 z m 3.9939457,0.059 c 0.0034,0 0.0067,0.011 0.01013,0.011 v 0.011 c -0.005,-0.011 -0.0058,-0.011 -0.01013,-0.018 z" /><image
        width="16"
        height="16"
        preserveAspectRatio="none"
diff --git a/ui/org.eclipse.pde.ui/icons/bndtools/database.svg b/ui/org.eclipse.pde.ui/icons/bndtools/database.svg
index 049990d20b0..c1a1e05342f 100644
--- a/ui/org.eclipse.pde.ui/icons/bndtools/database.svg
+++ b/ui/org.eclipse.pde.ui/icons/bndtools/database.svg
@@ -6,14 +6,7 @@
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="1.3.2 (091e20e, 2023-11-25, custom)"
-   sodipodi:docname="database.svg"
    xml:space="preserve"
-   inkscape:export-filename="database.png"
-   inkscape:export-xdpi="96"
-   inkscape:export-ydpi="96"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:svg="http://www.w3.org/2000/svg"
@@ -21,622 +14,31 @@
    xmlns:cc="http://creativecommons.org/ns#"
    xmlns:dc="http://purl.org/dc/elements/1.1/"><defs
      id="defs4"><linearGradient
-       id="linearGradient2"
-       inkscape:collect="always"><stop
+       id="linearGradient2"><stop
          style="stop-color:#a4a4a4;stop-opacity:1;"
          offset="0"
          id="stop2" /><stop
          style="stop-color:#adadad;stop-opacity:0;"
          offset="1"
-         id="stop3" /></linearGradient><inkscape:path-effect
-       effect="fillet_chamfer"
-       id="path-effect2"
-       is_visible="true"
-       lpeversion="1"
-       nodesatellites_param="F,0,0,1,0,0,0,1 @ F,0,0,1,0,0.84207108,0,1 @ F,0,0,1,0,1.5145515,0,1 @ F,0,0,1,0,1.51794,0,1 @ F,0,0,1,0,0.75524322,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,1.7991562,0,1 @ F,0,0,1,0,2.2570419,0,1 @ F,0,0,1,0,0,0,1"
-       radius="0"
-       unit="px"
-       method="auto"
-       mode="F"
-       chamfer_steps="1"
-       flexible="false"
-       use_knot_distance="true"
-       apply_no_radius="true"
-       apply_with_radius="true"
-       only_selected="false"
-       hide_knots="false" /><inkscape:path-effect
-       effect="fillet_chamfer"
-       id="path-effect1"
-       is_visible="true"
-       lpeversion="1"
-       nodesatellites_param="F,0,0,1,0,2.45625,0,1 @ F,0,0,1,0,0.80509967,0,1 @ F,0,0,1,0,1.163255,0,1 @ F,0,0,1,0,1.1062567,0,1 @ F,0,0,1,0,1.37747,0,1 @ F,0,0,1,0,2.2555719,0,1 @ F,0,0,1,0,1.952656,0,1 @ F,0,0,1,0,2.4412264,0,1"
-       radius="0"
-       unit="px"
-       method="auto"
-       mode="F"
-       chamfer_steps="1"
-       flexible="false"
-       use_knot_distance="true"
-       apply_no_radius="true"
-       apply_with_radius="true"
-       only_selected="false"
-       hide_knots="false" /><inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="-1.4152894 : 2.604202 : 1"
-       inkscape:vp_y="12.396136 : 891.72087 : 1"
-       inkscape:vp_z="20.395063 : 1.760452 : 1"
-       inkscape:persp3d-origin="12.396136 : -0.8384562 : 1"
-       id="perspective1" /><linearGradient
-       id="linearGradient3866"><stop
-         id="stop3868"
-         offset="0"
-         style="stop-color:#717188;stop-opacity:1" /><stop
-         id="stop3870"
-         offset="1"
-         style="stop-color:#6b6b6b;stop-opacity:1;" /></linearGradient><linearGradient
-       id="linearGradient3860"><stop
-         id="stop3862"
-         offset="0"
-         style="stop-color:#424242;stop-opacity:1" /><stop
-         id="stop3864"
-         offset="1"
-         style="stop-color:#6b6b6b;stop-opacity:1;" /></linearGradient><linearGradient
-       id="linearGradient3852"><stop
-         id="stop3854"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" /><stop
-         style="stop-color:#dddddd;stop-opacity:1;"
-         offset="0.66561043"
-         id="stop3856" /><stop
-         id="stop3858"
-         offset="1"
-         style="stop-color:#464646;stop-opacity:1;" /></linearGradient><linearGradient
-       id="linearGradient3844"><stop
-         id="stop3846"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" /><stop
-         style="stop-color:#dddddd;stop-opacity:1;"
-         offset="0.61245775"
-         id="stop3848" /><stop
-         id="stop3850"
-         offset="1"
-         style="stop-color:#464646;stop-opacity:1;" /></linearGradient><linearGradient
-       id="linearGradient5328-5"><stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop5330-9" /><stop
-         id="stop3842"
-         offset="0.5"
-         style="stop-color:#dddddd;stop-opacity:1;" /><stop
-         style="stop-color:#464646;stop-opacity:1;"
-         offset="1"
-         id="stop5332-8" /></linearGradient><linearGradient
-       id="linearGradient5209-0"><stop
-         style="stop-color:#4c4c4c;stop-opacity:1"
-         offset="0"
-         id="stop5211-9" /><stop
-         style="stop-color:#6b6b6b;stop-opacity:1;"
-         offset="1"
-         id="stop5213-4" /></linearGradient><linearGradient
-       y2="6.9843998"
-       x2="10.007812"
-       y1="5"
-       x1="10"
-       gradientTransform="translate(-15.015625,1046.6356)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient6323-7"
-       xlink:href="#linearGradient5068-6-9"
-       inkscape:collect="always" /><linearGradient
-       id="linearGradient5068-6-9"
-       inkscape:collect="always"><stop
-         id="stop5070-8-0"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" /><stop
-         id="stop5072-3-6"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" /></linearGradient><linearGradient
-       gradientTransform="translate(-15.015625,10.2734)"
-       gradientUnits="userSpaceOnUse"
-       y2="1045.3466"
-       x2="12"
-       y1="1043.3622"
-       x1="12"
-       id="linearGradient5084-3-3"
-       xlink:href="#linearGradient5068-6-9"
-       inkscape:collect="always" /><linearGradient
-       gradientTransform="translate(-15.015625,10.2734)"
-       gradientUnits="userSpaceOnUse"
-       y2="1043.3466"
-       x2="15.007812"
-       y1="1043.3622"
-       x1="13"
-       id="linearGradient5086-8-0"
-       xlink:href="#linearGradient5068-6-9"
-       inkscape:collect="always" /><linearGradient
-       gradientTransform="translate(-15.015625,10.2734)"
-       gradientUnits="userSpaceOnUse"
-       y2="1042.3622"
-       x2="10.007812"
-       y1="1042.3622"
-       x1="12"
-       id="linearGradient5082-1-0"
-       xlink:href="#linearGradient5068-6-9"
-       inkscape:collect="always" /><linearGradient
-       gradientTransform="translate(-15.015625,10.2734)"
-       gradientUnits="userSpaceOnUse"
-       y2="1041.3466"
-       x2="8.0078125"
-       y1="1041.3622"
-       x1="10"
-       id="linearGradient5078-8-2"
-       xlink:href="#linearGradient5068-6-9"
-       inkscape:collect="always" /><linearGradient
-       gradientTransform="translate(-15.015625,10.2734)"
-       gradientUnits="userSpaceOnUse"
-       y2="1038.3466"
-       x2="10.007812"
-       y1="1040.3622"
-       x1="10"
-       id="linearGradient5076-5-2"
-       xlink:href="#linearGradient5068-6-9"
-       inkscape:collect="always" /><linearGradient
-       gradientTransform="translate(-15.015625,10.2734)"
-       gradientUnits="userSpaceOnUse"
-       y2="1038.3466"
-       x2="10.007812"
-       y1="1038.3622"
-       x1="12"
-       id="linearGradient5074-2-1"
-       xlink:href="#linearGradient5068-6-9"
-       inkscape:collect="always" /><linearGradient
-       gradientTransform="translate(-15.015625,10.2734)"
-       gradientUnits="userSpaceOnUse"
-       y2="1043.3466"
-       x2="14"
-       y1="1041.3622"
-       x1="14"
-       id="linearGradient5088-1-4"
-       xlink:href="#linearGradient5068-6-9"
-       inkscape:collect="always" /><radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4528-9-5-7-9"
-       id="radialGradient3091-1-9-6"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.8508179,-8.813921e-6,8.4531434e-6,1.7750589,644.24981,572.63612)"
-       cx="-757.20496"
-       cy="-738.83777"
-       fx="-757.20496"
-       fy="-738.83777"
-       r="3.4803574" /><linearGradient
-       id="linearGradient4528-9-5-7-9"><stop
-         style="stop-color:#e0c576;stop-opacity:1;"
-         offset="0"
-         id="stop4530-0-5-0-5" /><stop
-         style="stop-color:#9e7916;stop-opacity:1"
-         offset="1"
-         id="stop4532-7-9-3-3" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6281-8-0-1-6-6-4-2"
-       id="linearGradient3093-5-2-7"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.3199889,0,0,2.3199889,10.199693,1043.1852)"
-       x1="0.9375"
-       y1="4.8437853"
-       x2="0.9375"
-       y2="7.549418" /><linearGradient
-       id="linearGradient6281-8-0-1-6-6-4-2"><stop
-         id="stop6283-0-2-2-1-2-0-1"
-         offset="0"
-         style="stop-color:#f7f9fb;stop-opacity:1" /><stop
-         id="stop6285-5-0-9-7-6-9-9"
-         offset="1"
-         style="stop-color:#ffd680;stop-opacity:1" /></linearGradient><radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3844-6"
-       id="radialGradient5366-0-9"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.3089145,0.02433326,-0.0270668,0.33136796,5.4628028,1.7171329)"
-       cx="7.7379637"
-       cy="2.4332652"
-       fx="7.7379637"
-       fy="2.4332652"
-       r="2.3503494" /><linearGradient
-       id="linearGradient3844-6"><stop
-         id="stop3846-3"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" /><stop
-         style="stop-color:#dddddd;stop-opacity:1;"
-         offset="0.61245775"
-         id="stop3848-7" /><stop
-         id="stop3850-1"
-         offset="1"
-         style="stop-color:#464646;stop-opacity:1;" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3860-2"
-       id="linearGradient5368-1-5"
-       gradientUnits="userSpaceOnUse"
-       x1="7.8304267"
-       y1="5.5753322"
-       x2="7.8018494"
-       y2="1.9306878" /><linearGradient
-       id="linearGradient3860-2"><stop
-         id="stop3862-3"
-         offset="0"
-         style="stop-color:#424242;stop-opacity:1" /><stop
-         id="stop3864-4"
-         offset="1"
-         style="stop-color:#6b6b6b;stop-opacity:1;" /></linearGradient><radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3844-0"
-       id="radialGradient5366-0-5"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.3089145,0.02433326,-0.0270668,0.33136796,5.4628028,1.7171329)"
-       cx="7.7379637"
-       cy="2.4332652"
-       fx="7.7379637"
-       fy="2.4332652"
-       r="2.3503494" /><linearGradient
-       id="linearGradient3844-0"><stop
-         id="stop3846-36"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" /><stop
-         style="stop-color:#dddddd;stop-opacity:1;"
-         offset="0.61245775"
-         id="stop3848-6" /><stop
-         id="stop3850-5"
-         offset="1"
-         style="stop-color:#464646;stop-opacity:1;" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3860-0"
-       id="linearGradient5368-1-0"
-       gradientUnits="userSpaceOnUse"
-       x1="7.8304267"
-       y1="5.5753322"
-       x2="7.8018494"
-       y2="1.9306878" /><linearGradient
-       id="linearGradient3860-0"><stop
-         id="stop3862-6"
-         offset="0"
-         style="stop-color:#424242;stop-opacity:1" /><stop
-         id="stop3864-0"
-         offset="1"
-         style="stop-color:#6b6b6b;stop-opacity:1;" /></linearGradient><radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3844-8"
-       id="radialGradient5366-0-7"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.3089145,0.02433326,-0.0270668,0.33136796,5.4628028,1.7171329)"
-       cx="7.7379637"
-       cy="2.4332652"
-       fx="7.7379637"
-       fy="2.4332652"
-       r="2.3503494" /><linearGradient
-       id="linearGradient3844-8"><stop
-         id="stop3846-1"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" /><stop
-         style="stop-color:#dddddd;stop-opacity:1;"
-         offset="0.61245775"
-         id="stop3848-4" /><stop
-         id="stop3850-19"
-         offset="1"
-         style="stop-color:#464646;stop-opacity:1;" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3860-4"
-       id="linearGradient5368-1-8"
-       gradientUnits="userSpaceOnUse"
-       x1="7.8304267"
-       y1="5.5753322"
-       x2="7.8018494"
-       y2="1.9306878" /><linearGradient
-       id="linearGradient3860-4"><stop
-         id="stop3862-30"
-         offset="0"
-         style="stop-color:#424242;stop-opacity:1" /><stop
-         id="stop3864-9"
-         offset="1"
-         style="stop-color:#6b6b6b;stop-opacity:1;" /></linearGradient><radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3844-3"
-       id="radialGradient5366-0-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.3089145,0.02433326,-0.0270668,0.33136796,5.4628028,1.7171329)"
-       cx="7.7379637"
-       cy="2.4332652"
-       fx="7.7379637"
-       fy="2.4332652"
-       r="2.3503494" /><linearGradient
-       id="linearGradient3844-3"><stop
-         id="stop3846-7"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" /><stop
-         style="stop-color:#dddddd;stop-opacity:1;"
-         offset="0.61245775"
-         id="stop3848-3" /><stop
-         id="stop3850-3"
-         offset="1"
-         style="stop-color:#464646;stop-opacity:1;" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3860-9"
-       id="linearGradient5368-1-7"
-       gradientUnits="userSpaceOnUse"
-       x1="7.8304267"
-       y1="5.5753322"
-       x2="7.8018494"
-       y2="1.9306878" /><linearGradient
-       id="linearGradient3860-9"><stop
-         id="stop3862-5"
-         offset="0"
-         style="stop-color:#424242;stop-opacity:1" /><stop
-         id="stop3864-2"
-         offset="1"
-         style="stop-color:#6b6b6b;stop-opacity:1;" /></linearGradient><radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3852-6"
-       id="radialGradient5374-4-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.35882709,-0.01458857,0.01251176,0.40537334,4.9838699,2.1071585)"
-       cx="7.7274323"
-       cy="2.8622203"
-       fx="7.7274323"
-       fy="2.8622203"
-       r="2.3503494" /><linearGradient
-       id="linearGradient3852-6"><stop
-         id="stop3854-9"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" /><stop
-         style="stop-color:#dddddd;stop-opacity:1;"
-         offset="0.66561043"
-         id="stop3856-8" /><stop
-         id="stop3858-2"
-         offset="1"
-         style="stop-color:#464646;stop-opacity:1;" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3866-8"
-       id="linearGradient5376-4-1"
-       gradientUnits="userSpaceOnUse"
-       x1="7.8451643"
-       y1="5.6525216"
-       x2="7.8451643"
-       y2="1.0179684" /><linearGradient
-       id="linearGradient3866-8"><stop
-         id="stop3868-1"
-         offset="0"
-         style="stop-color:#717188;stop-opacity:1" /><stop
-         id="stop3870-1"
-         offset="1"
-         style="stop-color:#6b6b6b;stop-opacity:1;" /></linearGradient><linearGradient
-       y2="1.0179684"
-       x2="7.8451643"
-       y1="5.6525216"
-       x1="7.8451643"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4515"
-       xlink:href="#linearGradient3866-8"
-       inkscape:collect="always" /><radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3852-4"
-       id="radialGradient5374-4-7"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.35882709,-0.01458857,0.01251176,0.40537334,4.9838699,2.1071585)"
-       cx="7.9300532"
-       cy="1.7860492"
-       fx="7.9300532"
-       fy="1.7860492"
-       r="2.3503494" /><linearGradient
-       id="linearGradient3852-4"><stop
-         id="stop3854-0"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" /><stop
-         style="stop-color:#dddddd;stop-opacity:1;"
-         offset="0.66561043"
-         id="stop3856-5" /><stop
-         id="stop3858-8"
-         offset="1"
-         style="stop-color:#464646;stop-opacity:1;" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3866-7"
-       id="linearGradient5376-4-6"
-       gradientUnits="userSpaceOnUse"
-       x1="7.8451643"
-       y1="5.6525216"
-       x2="7.8451643"
-       y2="1.0179684" /><linearGradient
-       id="linearGradient3866-7"><stop
-         id="stop3868-0"
-         offset="0"
-         style="stop-color:#717188;stop-opacity:1" /><stop
-         id="stop3870-7"
-         offset="1"
-         style="stop-color:#6b6b6b;stop-opacity:1;" /></linearGradient><radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3852-5"
-       id="radialGradient5374-4-3"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.35882709,-0.01458857,0.01251176,0.40537334,4.9838699,2.1071585)"
-       cx="7.9300532"
-       cy="1.7860492"
-       fx="7.9300532"
-       fy="1.7860492"
-       r="2.3503494" /><linearGradient
-       id="linearGradient3852-5"><stop
-         id="stop3854-1"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" /><stop
-         style="stop-color:#dddddd;stop-opacity:1;"
-         offset="0.66561043"
-         id="stop3856-6" /><stop
-         id="stop3858-4"
-         offset="1"
-         style="stop-color:#464646;stop-opacity:1;" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3866-3"
-       id="linearGradient5376-4-0"
-       gradientUnits="userSpaceOnUse"
-       x1="7.8451643"
-       y1="5.6525216"
-       x2="7.8451643"
-       y2="1.0179684" /><linearGradient
-       id="linearGradient3866-3"><stop
-         id="stop3868-6"
-         offset="0"
-         style="stop-color:#717188;stop-opacity:1" /><stop
-         id="stop3870-4"
-         offset="1"
-         style="stop-color:#6b6b6b;stop-opacity:1;" /></linearGradient><radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5328-5-9"
-       id="radialGradient5370-9-4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.37553419,-2.0140452e-8,1.7614747e-8,0.40297829,4.9079328,2.1932289)"
-       cx="7.9383807"
-       cy="3.451864"
-       fx="7.9383807"
-       fy="3.451864"
-       r="2.3503494" /><linearGradient
-       id="linearGradient5328-5-9"><stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop5330-9-7" /><stop
-         id="stop3842-2"
-         offset="0.5"
-         style="stop-color:#dddddd;stop-opacity:1;" /><stop
-         style="stop-color:#464646;stop-opacity:1;"
-         offset="1"
-         id="stop5332-8-3" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5209-0-2"
-       id="linearGradient5372-5-0"
-       gradientUnits="userSpaceOnUse"
-       x1="7.8304267"
-       y1="5.9680095"
-       x2="7.8890662"
-       y2="3.584255" /><linearGradient
-       id="linearGradient5209-0-2"><stop
-         style="stop-color:#4c4c4c;stop-opacity:1"
-         offset="0"
-         id="stop5211-9-4" /><stop
-         style="stop-color:#6b6b6b;stop-opacity:1;"
-         offset="1"
-         id="stop5213-4-2" /></linearGradient><radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5328-5-4"
-       id="radialGradient5370-9-6"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.37553419,-2.0140452e-8,1.7614747e-8,0.40297829,4.9079328,2.1932289)"
-       cx="7.9383807"
-       cy="3.451864"
-       fx="7.9383807"
-       fy="3.451864"
-       r="2.3503494" /><linearGradient
-       id="linearGradient5328-5-4"><stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop5330-9-9" /><stop
-         id="stop3842-7"
-         offset="0.5"
-         style="stop-color:#dddddd;stop-opacity:1;" /><stop
-         style="stop-color:#464646;stop-opacity:1;"
-         offset="1"
-         id="stop5332-8-0" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5209-0-7"
-       id="linearGradient5372-5-6"
-       gradientUnits="userSpaceOnUse"
-       x1="7.8304267"
-       y1="5.9680095"
-       x2="7.8890662"
-       y2="3.584255" /><linearGradient
-       id="linearGradient5209-0-7"><stop
-         style="stop-color:#4c4c4c;stop-opacity:1"
-         offset="0"
-         id="stop5211-9-9" /><stop
-         style="stop-color:#6b6b6b;stop-opacity:1;"
-         offset="1"
-         id="stop5213-4-4" /></linearGradient><linearGradient
-       id="linearGradient10798-1-9-3-7-1-15-1-7-6-1"><stop
-         style="stop-color:#4f9e55;stop-opacity:1"
-         offset="0"
-         id="stop10800-5-2-1-8-2-8-1-7-3-7" /><stop
-         id="stop10806-6-8-5-3-2-95-0-5-4-8"
-         offset="0.5"
-         style="stop-color:#3c8d49;stop-opacity:1;" /><stop
-         style="stop-color:#a4e173;stop-opacity:1;"
-         offset="1"
-         id="stop10802-1-5-3-0-2-0-9-8-4-3" /></linearGradient><inkscape:path-effect
-       effect="fillet_chamfer"
-       id="path-effect1-3"
-       is_visible="true"
-       lpeversion="1"
-       nodesatellites_param="F,0,0,1,0,2.45625,0,1 @ F,0,0,1,0,1.6988903,0,1 @ F,0,0,1,0,1.895273,0,1 @ F,0,0,1,0,2.2490959,0,1 @ F,0,0,1,0,1.8064895,0,1 @ F,0,0,1,0,2.5467854,0,1 @ F,0,0,1,0,1.952656,0,1 @ F,0,0,1,0,2.4412264,0,1"
-       radius="0"
-       unit="px"
-       method="auto"
-       mode="F"
-       chamfer_steps="1"
-       flexible="false"
-       use_knot_distance="true"
-       apply_no_radius="true"
-       apply_with_radius="true"
-       only_selected="false"
-       hide_knots="false" /><linearGradient
-       inkscape:collect="always"
+         id="stop3" /></linearGradient><linearGradient
        xlink:href="#linearGradient2"
        id="linearGradient3"
        x1="12"
        y1="9.0829706"
        x2="4.0783348"
        y2="9.0517206"
-       gradientUnits="userSpaceOnUse" /></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="11.733553"
-     inkscape:cy="5.8115338"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1920"
-     inkscape:window-height="991"
-     inkscape:window-x="-9"
-     inkscape:window-y="-9"
-     inkscape:window-maximized="1"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="false"
-     inkscape:showpageshadow="0"
-     inkscape:pagecheckerboard="0"
-     inkscape:deskcolor="#505050"><inkscape:grid
-       type="xygrid"
-       id="grid3006"
-       originx="0"
-       originy="0"
-       spacingy="1"
-       spacingx="1"
-       units="px"
-       visible="true" /></sodipodi:namedview><metadata
+       gradientUnits="userSpaceOnUse" /></defs><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" /></cc:Work></rdf:RDF></metadata><g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)"><path
        style="display:inline;fill:url(#linearGradient3);stroke-width:2;stroke-linecap:square;paint-order:markers stroke fill"
        d="m 4.0091529,6.03125 0.00393,5.088957 a 1.3622931,1.3622931 58.234397 0 0 0.7541631,1.217973 6.2675945,6.2675945 12.902726 0 0 2.7785476,0.636511 l 0.9519074,0.0037 a 6.4640069,6.4640069 167.00946 0 0 2.879844,-0.664363 1.1782966,1.1782966 120.82581 0 0 0.638084,-1.0693 L 12.015629,5 11.601696,5.2117792 A 7.4028374,7.4028374 166.56459 0 1 8.2008576,6.0241945 9.4263923,9.4263923 13.701749 0 1 4,5 v 0 z"
        id="path2"
-       inkscape:path-effect="#path-effect2"
-       inkscape:original-d="m 4.0091529,6.03125 0.00458,5.931028 2.0175206,1.006472 3.9843755,0.01563 2,-0.984375 V 5 L 10,6.03125 6.015625,6.015625 4,5 Z"
-       sodipodi:nodetypes="cccccccccc"
        transform="translate(0,1036.3622)" /><path
        style="display:inline;fill:none;stroke:#a4a4a4;stroke-width:1.15285;stroke-linecap:square;stroke-dasharray:none;stroke-opacity:0.968627;paint-order:markers stroke fill"
        d="m 2.0625,1041.9435 v 5.7198 a 3.2192398,3.2192398 62.178033 0 0 1.4025129,2.6576 6.1005839,6.1005839 17.07978 0 0 3.424189,1.0521 l 1.8660663,0.01 A 7.3160371,7.3160371 163.12125 0 0 12.869653,1050.1315 2.9865864,2.9865864 113.75766 0 0 14,1047.5635 v -5.6714 a 4.1088163,4.1088163 58.207944 0 0 -2.280872,-3.6798 8.1942173,8.1942173 13.006265 0 0 -3.6717752,-0.8481 8.9729399,8.9729399 164.52466 0 0 -4.1975321,1.1621 3.7581572,3.7581572 117.6115 0 0 -1.7873207,3.4172 z"
        id="path1-1"
-       transform="matrix(0.86079379,0,0,0.87408611,1.0891885,131.48931)"
-       inkscape:path-effect="#path-effect1-3"
-       inkscape:original-d="m 2.0625,1039.4872 v 9.875 l 2.9314416,2.0039 6.0104074,0.022 L 14,1049.37 v -10.0247 l -4,-1.987 -4,0.012 z" /></g></svg>
+       transform="matrix(0.86079379,0,0,0.87408611,1.0891885,131.48931)" /></g></svg>
diff --git a/ui/org.eclipse.pde.ui/icons/elcl16/add_att.svg b/ui/org.eclipse.pde.ui/icons/elcl16/add_att.svg
index 9e8eee27ec5..3e3a4b8a2a2 100644
--- a/ui/org.eclipse.pde.ui/icons/elcl16/add_att.svg
+++ b/ui/org.eclipse.pde.ui/icons/elcl16/add_att.svg
@@ -2,20 +2,16 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="add_att.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
@@ -48,8 +44,7 @@
        x1="2.03125"
        gradientUnits="userSpaceOnUse"
        id="linearGradient5618"
-       xlink:href="#linearGradient5591-4"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient5591-4" />
     <linearGradient
        gradientTransform="matrix(1.9375158,0,0,2.0245922,3.6918121,1029.0994)"
        y2="4.671875"
@@ -58,34 +53,8 @@
        x1="2.03125"
        gradientUnits="userSpaceOnUse"
        id="linearGradient5620"
-       xlink:href="#linearGradient5583-2"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient5583-2" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="32.000001"
-     inkscape:cx="9.1487089"
-     inkscape:cy="7.1700733"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1241"
-     inkscape:window-height="814"
-     inkscape:window-x="1150"
-     inkscape:window-y="671"
-     inkscape:window-maximized="0"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3971" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -99,16 +68,12 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
     <path
        style="display:inline;fill:url(#linearGradient5618);fill-opacity:1;stroke:url(#linearGradient5620);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="m 6.5082332,1038.906 2.9961264,0 0,3.9228 4.0000314,0 0,2.8944 -3.9629234,0 0,4.2064 -3.0332344,0 0,-4.2064 -3.9961262,0 0,-2.8311 3.935579,0 z"
-       id="path5581"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccccccccc" />
+       id="path5581" />
   </g>
 </svg>
diff --git a/ui/org.eclipse.pde.ui/icons/elcl16/alphab_sort_co.svg b/ui/org.eclipse.pde.ui/icons/elcl16/alphab_sort_co.svg
index 7e075901f8c..bee4d073723 100644
--- a/ui/org.eclipse.pde.ui/icons/elcl16/alphab_sort_co.svg
+++ b/ui/org.eclipse.pde.ui/icons/elcl16/alphab_sort_co.svg
@@ -2,33 +2,18 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="alphab_sort_co.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
-    <linearGradient
-       id="linearGradient4789">
-      <stop
-         style="stop-color:#4e8fbd;stop-opacity:1;"
-         offset="0"
-         id="stop4791" />
-      <stop
-         style="stop-color:#30495a;stop-opacity:1;"
-         offset="1"
-         id="stop4793" />
-    </linearGradient>
     <linearGradient
        id="linearGradient4773">
       <stop
@@ -52,7 +37,6 @@
          id="stop4767" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4763"
        id="linearGradient4769"
        x1="4.8479562"
@@ -62,7 +46,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1.202507,0,0,1.1456525,-1.151621,-151.52504)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4773"
        id="linearGradient4779"
        x1="14.683416"
@@ -71,26 +54,6 @@
        y2="11.370661"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1.1372459,0,0,1.1494028,-0.51614402,1035.7772)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4789"
-       id="linearGradient4795"
-       x1="-2.2873085"
-       y1="1044.6919"
-       x2="-2.2873085"
-       y2="1049.5981"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(4.9742695,1.0602)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4789-1"
-       id="linearGradient3041"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.1126308,0,0,1.1126308,-15.752685,-116.8453)"
-       x1="-2.2873085"
-       y1="1044.6919"
-       x2="-2.2873085"
-       y2="1049.5981" />
     <linearGradient
        id="linearGradient4789-1">
       <stop
@@ -110,32 +73,8 @@
        gradientTransform="translate(4.9742691,1.060117)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient3058"
-       xlink:href="#linearGradient4789-1"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4789-1" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1"
-     inkscape:cx="10.206363"
-     inkscape:cy="4.3980937"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="1184"
-     inkscape:window-height="961"
-     inkscape:window-x="1200"
-     inkscape:window-y="561"
-     inkscape:window-maximized="0"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3909" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -149,27 +88,20 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
     <path
        style="fill:url(#linearGradient4769);fill-opacity:1;stroke:none"
        d="m 8.1567592,1037.3502 c -0.421829,0.011 -0.7139886,0.035 -0.7139886,0.035 0,0 -0.3868943,0.03 -0.837905,0.4318 -0.4510107,0.4018 -0.5856127,0.3914 -0.570291,0.9137 0.015322,0.5222 0.2050854,0.6206 0.6388984,0.6206 0.433813,0 0.3812665,-0.3285 0.806876,-0.6445 0.3154103,-0.234 1.3061981,-0.4867 1.6081281,0.5869 0.079771,0.2837 -0.037579,1.1457 -0.037579,1.1457 0,0 -1.8953484,-0.073 -2.536538,0.1253 -0.6411895,0.1988 -0.8346682,0.2646 -1.2199608,0.8469 -0.2643448,0.4362 -0.3336462,1.2957 -0.2007866,1.7006 0.1328595,0.4052 0.8911979,1.2653 1.6086391,1.2653 0.7174414,0 5.3361252,-0.035 5.3361252,-0.035 l 0,-1.0025 -1.052194,0 0,-4.2245 c 0,-0.7526 -0.516052,-1.6978 -1.260066,-1.7737 -0.7036207,0 -1.1475294,-8e-4 -1.5693583,0.01 z m -0.1945741,4.0923 c 1.2676785,0 1.0600143,-0.2126 1.0600143,0.9309 0,1.2126 0.2076642,0.9666 -1.0600143,0.9666 -1.1951288,0 -0.9283099,0.3151 -0.9283099,-0.9666 0,-1.1896 -0.3151853,-0.9309 0.9283099,-0.9309 z"
-       id="path4758"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cczzzcsczccscccscccsssss" />
+       id="path4758" />
     <path
        style="fill:url(#linearGradient4779);fill-opacity:1;stroke:none"
        d="m 10.063511,1045.3797 5.905508,0 0,1.6001 -3.719214,3.759 0,0.635 2.110905,0 1.633439,-1.9304 0,2.9209 -5.980898,0 0,-2.0065 4.071032,-3.9366 -2.261684,0 -1.834477,1.854 z"
-       id="path4771"
-       inkscape:connector-curvature="0" />
+       id="path4771" />
     <path
        style="fill:url(#linearGradient3058);fill-opacity:1;stroke:none;display:inline"
        d="m 1.9797422,1038.3503 1.0827571,0 0,10.0119 1.8119613,0 -2.4057108,3 -2.43355109,-2.9779 1.96664059,0 z"
-       id="path3986"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccccc" />
+       id="path3986" />
   </g>
 </svg>
diff --git a/ui/org.eclipse.pde.ui/icons/elcl16/alphab_sort_co_mini.svg b/ui/org.eclipse.pde.ui/icons/elcl16/alphab_sort_co_mini.svg
index 5aec746f9a8..c3762789c9d 100644
--- a/ui/org.eclipse.pde.ui/icons/elcl16/alphab_sort_co_mini.svg
+++ b/ui/org.eclipse.pde.ui/icons/elcl16/alphab_sort_co_mini.svg
@@ -2,20 +2,16 @@
 <!-- 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="9"
    height="9"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="alphab_sort_co_mini.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
@@ -52,68 +48,6 @@
          style="stop-color:#848484;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       id="linearGradient4789">
-      <stop
-         style="stop-color:#4e8fbd;stop-opacity:1;"
-         offset="0"
-         id="stop4791" />
-      <stop
-         style="stop-color:#30495a;stop-opacity:1;"
-         offset="1"
-         id="stop4793" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4773">
-      <stop
-         style="stop-color:#8e4694;stop-opacity:1;"
-         offset="0"
-         id="stop4775" />
-      <stop
-         style="stop-color:#bc7bc1;stop-opacity:1;"
-         offset="1"
-         id="stop4777" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4763">
-      <stop
-         style="stop-color:#77a29d;stop-opacity:1;"
-         offset="0"
-         id="stop4765" />
-      <stop
-         style="stop-color:#1b867b;stop-opacity:1;"
-         offset="1"
-         id="stop4767" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4763"
-       id="linearGradient4769"
-       x1="4.8479562"
-       y1="1040.7981"
-       x2="10.96875"
-       y2="1040.7981"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4773"
-       id="linearGradient4779"
-       x1="14.683416"
-       y1="11.370661"
-       x2="9.6459417"
-       y2="11.370661"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4789"
-       id="linearGradient4795"
-       x1="-2.2873085"
-       y1="1044.6919"
-       x2="-2.2873085"
-       y2="1049.5981"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(5.09375,0)" />
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4153"
        id="linearGradient3003"
        gradientUnits="userSpaceOnUse"
@@ -123,7 +57,6 @@
        x2="-2.2873085"
        y2="1047.1511" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4170"
        id="linearGradient3005"
        gradientUnits="userSpaceOnUse"
@@ -133,7 +66,6 @@
        y2="1040.7981"
        gradientTransform="matrix(1.0712324,0,0,1.0282379,-0.17376606,-30.208105)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4156"
        id="linearGradient3007"
        gradientUnits="userSpaceOnUse"
@@ -143,33 +75,6 @@
        y2="11.370661"
        gradientTransform="matrix(1.1965831,0,0,1.0284752,-2.6774402,1036.0687)" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="31.999999"
-     inkscape:cx="2.6999308"
-     inkscape:cy="2.4729599"
-     inkscape:document-units="px"
-     inkscape:current-layer="g2998"
-     showgrid="true"
-     inkscape:window-width="1184"
-     inkscape:window-height="961"
-     inkscape:window-x="1156"
-     inkscape:window-y="543"
-     inkscape:window-maximized="0"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3909"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -183,8 +88,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1043.3622)">
@@ -192,23 +95,17 @@
        id="g2998"
        transform="matrix(0.63852412,0,0,0.63852412,-0.37560512,381.32698)">
       <path
-         inkscape:connector-curvature="0"
          id="path3986"
          d="m 2.1047065,1038.3486 1.6156248,0 -0.017303,9.4183 1.5427857,0 -2.3416018,3.2053 -2.32489384,-3.1832 1.53018214,0 z"
-         style="fill:url(#linearGradient3003);fill-opacity:1;stroke:none"
-         sodipodi:nodetypes="cccccccc" />
+         style="fill:url(#linearGradient3003);fill-opacity:1;stroke:none" />
       <path
-         sodipodi:nodetypes="cccccccsccscccsssss"
-         inkscape:connector-curvature="0"
          id="path4758"
          d="m 8.1282847,1036.8326 -2.8319879,-0.01 c 0,0 -0.016012,0.9967 0.1023433,1.2012 0.1183555,0.2044 0.1325288,0.393 0.5634397,0.393 2.0148165,0 2.166765,1.5161 0.6932606,1.5161 -0.325824,0.087 -0.7435496,0.013 -1.0867808,0.5352 -0.235487,0.3915 -0.2972229,1.1629 -0.1788672,1.5263 0.1183555,0.3636 0.793908,1.1356 1.4330281,1.1356 0.6391201,0 4.7535935,-0.032 4.7535935,-0.032 l 0.06626,-3.7409 0,-0.9505 c 0,-0.6754 -0.918496,-1.4742 -1.581287,-1.5423 -0.3313952,-0.034 -1.9330021,-0.032 -1.9330021,-0.032 z m -0.4916199,3.1613 c 0.633795,0 0.7921194,0.3156 0.7921194,0.7835 0,0.468 -0.175628,0.8331 -0.8094226,0.8331 -0.6337949,0 -0.7736856,-0.3305 -0.7736856,-0.7985 0,-0.4679 0.1571939,-0.8181 0.7909888,-0.8181 z"
          style="fill:url(#linearGradient3005);fill-opacity:1;stroke:none" />
       <path
-         inkscape:connector-curvature="0"
          id="path4771"
          d="m 8.4542208,1044.6611 6.2136342,0 0,1.4317 -3.117318,2.7406 0,0.5682 1.598127,0 1.545632,-1.1043 0,2.6134 -6.2929572,0 0,-1.7953 3.1414272,-2.8651 -1.5491335,0 -1.6187346,1.0015 z"
-         style="fill:url(#linearGradient3007);fill-opacity:1;stroke:none"
-         sodipodi:nodetypes="cccccccccccccc" />
+         style="fill:url(#linearGradient3007);fill-opacity:1;stroke:none" />
     </g>
   </g>
 </svg>
diff --git a/ui/org.eclipse.pde.ui/icons/elcl16/ch_callees.svg b/ui/org.eclipse.pde.ui/icons/elcl16/ch_callees.svg
index 95d0ea054ed..cf2c1e967b2 100644
--- a/ui/org.eclipse.pde.ui/icons/elcl16/ch_callees.svg
+++ b/ui/org.eclipse.pde.ui/icons/elcl16/ch_callees.svg
@@ -2,96 +2,19 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.48.5 r10040"
-   sodipodi:docname="ch_callees.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient10798-1-9-3-7-6-6-6-2-6-7-98-9-4-1"
-       id="linearGradient6117-6-8-4-1"
-       gradientUnits="userSpaceOnUse"
-       x1="388.63736"
-       y1="478.18777"
-       x2="388.63736"
-       y2="457.95499" />
-    <linearGradient
-       id="linearGradient10798-1-9-3-7-6-6-6-2-6-7-98-9-4-1">
-      <stop
-         style="stop-color:#5aad60;stop-opacity:1;"
-         offset="0"
-         id="stop10800-5-2-1-8-20-4-0-2-1-9-0-0-1-1" />
-      <stop
-         id="stop10806-6-8-5-3-9-2-2-7-0-4-2-7-8-9"
-         offset="0.5"
-         style="stop-color:#5bb26a;stop-opacity:1;" />
-      <stop
-         style="stop-color:#a4c589;stop-opacity:1"
-         offset="1"
-         id="stop10802-1-5-3-0-4-6-8-5-5-6-69-6-4-0" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient10798-1-9-3-7-6-6-6-2-6-7-98-9-4-8-9"
-       id="linearGradient6117-6-8-4-3-2"
-       gradientUnits="userSpaceOnUse"
-       x1="388.63736"
-       y1="478.18777"
-       x2="388.63736"
-       y2="457.95499" />
-    <linearGradient
-       id="linearGradient10798-1-9-3-7-6-6-6-2-6-7-98-9-4-8-9">
-      <stop
-         style="stop-color:#5aad60;stop-opacity:1;"
-         offset="0"
-         id="stop10800-5-2-1-8-20-4-0-2-1-9-0-0-1-7-0" />
-      <stop
-         id="stop10806-6-8-5-3-9-2-2-7-0-4-2-7-8-3-7"
-         offset="0.5"
-         style="stop-color:#5bb26a;stop-opacity:1;" />
-      <stop
-         style="stop-color:#a4c589;stop-opacity:1"
-         offset="1"
-         id="stop10802-1-5-3-0-4-6-8-5-5-6-69-6-4-3-8" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient10798-1-9-3-7-6-6-6-2-6-7-98-9-4-8-0-1"
-       id="linearGradient6117-6-8-4-3-8-1"
-       gradientUnits="userSpaceOnUse"
-       x1="388.63736"
-       y1="478.18777"
-       x2="388.63736"
-       y2="457.95499" />
-    <linearGradient
-       id="linearGradient10798-1-9-3-7-6-6-6-2-6-7-98-9-4-8-0-1">
-      <stop
-         style="stop-color:#5aad60;stop-opacity:1;"
-         offset="0"
-         id="stop10800-5-2-1-8-20-4-0-2-1-9-0-0-1-7-7-1" />
-      <stop
-         id="stop10806-6-8-5-3-9-2-2-7-0-4-2-7-8-3-0-3"
-         offset="0.5"
-         style="stop-color:#5bb26a;stop-opacity:1;" />
-      <stop
-         style="stop-color:#a4c589;stop-opacity:1"
-         offset="1"
-         id="stop10802-1-5-3-0-4-6-8-5-5-6-69-6-4-3-88-3" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10798-1-9-3-7-6-6-6-2-6-7-5"
        id="linearGradient6266-97"
        gradientUnits="userSpaceOnUse"
@@ -115,7 +38,6 @@
          id="stop10802-1-5-3-0-4-6-8-5-5-6-24" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10798-1-9-3-7-6-6-6-2-6-7-9"
        id="linearGradient6266-6"
        gradientUnits="userSpaceOnUse"
@@ -139,7 +61,6 @@
          id="stop10802-1-5-3-0-4-6-8-5-5-6-9" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10798-1-9-3-7-6-6-6-2-6-7"
        id="linearGradient6266"
        gradientUnits="userSpaceOnUse"
@@ -163,29 +84,6 @@
          id="stop10802-1-5-3-0-4-6-8-5-5-6" />
     </linearGradient>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="32"
-     inkscape:cx="7.8237975"
-     inkscape:cy="8.6206433"
-     inkscape:document-units="px"
-     inkscape:current-layer="g4803"
-     showgrid="true"
-     inkscape:window-width="925"
-     inkscape:window-height="862"
-     inkscape:window-x="1337"
-     inkscape:window-y="530"
-     inkscape:window-maximized="0"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3943" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -199,8 +97,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
@@ -217,7 +113,6 @@
        style="display:inline"
        id="g4803">
       <path
-         inkscape:connector-curvature="0"
          id="path4012"
          transform="matrix(3.5838051,0,0,3.5838051,360.28738,445.40673)"
          d="m 8.9375,2 0,1.9375 -3.09375,0 0,4.0625 -1.28125,0 0.03125,0.96875 1.25,0 0,4.0625 3.09375,0 0,2.03125 2.59375,-2.59375 -2.59375,-2.4375 0,1.9375 -1.96875,0 0,-6.96875 1.96875,0 0,2.03125 2.59375,-2.625 L 8.9375,2 z"
@@ -227,13 +122,8 @@
          style="display:inline"
          id="g6124-3-4-9-7">
         <path
-           sodipodi:type="arc"
            style="opacity:0.46218489;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
            id="path6115-5-5-9-0"
-           sodipodi:cx="13.265625"
-           sodipodi:cy="3.140625"
-           sodipodi:rx="1.484375"
-           sodipodi:ry="0.640625"
            d="m 14.75,3.140625 c 0,0.3538074 -0.664577,0.640625 -1.484375,0.640625 -0.819798,0 -1.484375,-0.2868176 -1.484375,-0.640625 C 11.78125,2.7868176 12.445827,2.5 13.265625,2.5 14.085423,2.5 14.75,2.7868176 14.75,3.140625 z"
            transform="matrix(0.8105263,0,0,1,2.5447359,1036.4247)" />
         <g
@@ -241,23 +131,13 @@
            id="g6124"
            transform="translate(5.7965713,-9.8362033)">
           <path
-             sodipodi:type="arc"
              style="fill:url(#linearGradient6266);fill-opacity:1;stroke:#14733c;stroke-width:4.55839109;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline"
              id="path10796-2-6-3-8"
-             sodipodi:cx="388.125"
-             sodipodi:cy="468.23718"
-             sodipodi:rx="10.625"
-             sodipodi:ry="10.625"
              d="m 398.75,468.23718 c 0,5.86803 -4.75697,10.625 -10.625,10.625 -5.86803,0 -10.625,-4.75697 -10.625,-10.625 0,-5.86802 4.75697,-10.625 10.625,-10.625 5.86803,0 10.625,4.75698 10.625,10.625 z"
              transform="matrix(0.19771052,0,0,0.19623993,-63.175437,948.96728)" />
           <path
-             sodipodi:type="arc"
              style="opacity:0.46218489;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
              id="path6115-3"
-             sodipodi:cx="13.265625"
-             sodipodi:cy="3.140625"
-             sodipodi:rx="1.484375"
-             sodipodi:ry="0.640625"
              d="m 14.75,3.140625 c 0,0.3538074 -0.664577,0.640625 -1.484375,0.640625 -0.819798,0 -1.484375,-0.2868176 -1.484375,-0.640625 C 11.78125,2.7868176 12.445827,2.5 13.265625,2.5 14.085423,2.5 14.75,2.7868176 14.75,3.140625 z"
              transform="matrix(0.8105263,0,0,1,2.8247471,1036.7685)" />
         </g>
@@ -266,23 +146,13 @@
            id="g6124-8"
            transform="translate(5.7965713,-1.7737033)">
           <path
-             sodipodi:type="arc"
              style="fill:url(#linearGradient6266-6);fill-opacity:1;stroke:#14733c;stroke-width:4.55839109;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline"
              id="path10796-2-6-3-8-4"
-             sodipodi:cx="388.125"
-             sodipodi:cy="468.23718"
-             sodipodi:rx="10.625"
-             sodipodi:ry="10.625"
              d="m 398.75,468.23718 c 0,5.86803 -4.75697,10.625 -10.625,10.625 -5.86803,0 -10.625,-4.75697 -10.625,-10.625 0,-5.86802 4.75697,-10.625 10.625,-10.625 5.86803,0 10.625,4.75698 10.625,10.625 z"
              transform="matrix(0.19771052,0,0,0.19623993,-63.175437,948.96728)" />
           <path
-             sodipodi:type="arc"
              style="opacity:0.46218489;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
              id="path6115-1"
-             sodipodi:cx="13.265625"
-             sodipodi:cy="3.140625"
-             sodipodi:rx="1.484375"
-             sodipodi:ry="0.640625"
              d="m 14.75,3.140625 c 0,0.3538074 -0.664577,0.640625 -1.484375,0.640625 -0.819798,0 -1.484375,-0.2868176 -1.484375,-0.640625 C 11.78125,2.7868176 12.445827,2.5 13.265625,2.5 14.085423,2.5 14.75,2.7868176 14.75,3.140625 z"
              transform="matrix(0.8105263,0,0,1,2.8247471,1036.7685)" />
         </g>
@@ -291,23 +161,13 @@
            id="g6124-3"
            transform="matrix(0.98161488,0,0,1,-4.9225579,-5.7969033)">
           <path
-             sodipodi:type="arc"
              style="fill:url(#linearGradient6266-97);fill-opacity:1;stroke:#14733c;stroke-width:4.55839109;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline"
              id="path10796-2-6-3-8-2"
-             sodipodi:cx="388.125"
-             sodipodi:cy="468.23718"
-             sodipodi:rx="10.625"
-             sodipodi:ry="10.625"
              d="m 398.75,468.23718 c 0,5.86803 -4.75697,10.625 -10.625,10.625 -5.86803,0 -10.625,-4.75697 -10.625,-10.625 0,-5.86802 4.75697,-10.625 10.625,-10.625 5.86803,0 10.625,4.75698 10.625,10.625 z"
              transform="matrix(0.19771052,0,0,0.19623993,-63.175437,948.96728)" />
           <path
-             sodipodi:type="arc"
              style="opacity:0.46218489;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
              id="path6115-2"
-             sodipodi:cx="13.265625"
-             sodipodi:cy="3.140625"
-             sodipodi:rx="1.484375"
-             sodipodi:ry="0.640625"
              d="m 14.75,3.140625 c 0,0.3538074 -0.664577,0.640625 -1.484375,0.640625 -0.819798,0 -1.484375,-0.2868176 -1.484375,-0.640625 C 11.78125,2.7868176 12.445827,2.5 13.265625,2.5 14.085423,2.5 14.75,2.7868176 14.75,3.140625 z"
              transform="matrix(0.8105263,0,0,1,2.8247471,1036.7685)" />
         </g>
diff --git a/ui/org.eclipse.pde.ui/icons/elcl16/ch_callers.svg b/ui/org.eclipse.pde.ui/icons/elcl16/ch_callers.svg
index d0e0483d788..12f1b11ef99 100644
--- a/ui/org.eclipse.pde.ui/icons/elcl16/ch_callers.svg
+++ b/ui/org.eclipse.pde.ui/icons/elcl16/ch_callers.svg
@@ -2,20 +2,16 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.48.5 r10040"
-   sodipodi:docname="ch_callers.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
@@ -34,55 +30,6 @@
          id="stop10802-1-5-3-0-4-6-8-5-5-6" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient10798-1-9-3-7-6-6-6-2-6-7-98-7"
-       id="linearGradient6117-6-9"
-       gradientUnits="userSpaceOnUse"
-       x1="388.63736"
-       y1="478.18777"
-       x2="388.63736"
-       y2="457.95499" />
-    <linearGradient
-       id="linearGradient10798-1-9-3-7-6-6-6-2-6-7-98-7">
-      <stop
-         style="stop-color:#5aad60;stop-opacity:1;"
-         offset="0"
-         id="stop10800-5-2-1-8-20-4-0-2-1-9-0-7" />
-      <stop
-         id="stop10806-6-8-5-3-9-2-2-7-0-4-2-3"
-         offset="0.5"
-         style="stop-color:#5bb26a;stop-opacity:1;" />
-      <stop
-         style="stop-color:#a4c589;stop-opacity:1"
-         offset="1"
-         id="stop10802-1-5-3-0-4-6-8-5-5-6-69-4" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient10798-1-9-3-7-6-6-6-2-6-7-98-9-4"
-       id="linearGradient6117-6-8-4"
-       gradientUnits="userSpaceOnUse"
-       x1="388.63736"
-       y1="478.18777"
-       x2="388.63736"
-       y2="457.95499" />
-    <linearGradient
-       id="linearGradient10798-1-9-3-7-6-6-6-2-6-7-98-9-4">
-      <stop
-         style="stop-color:#5aad60;stop-opacity:1;"
-         offset="0"
-         id="stop10800-5-2-1-8-20-4-0-2-1-9-0-0-1" />
-      <stop
-         id="stop10806-6-8-5-3-9-2-2-7-0-4-2-7-8"
-         offset="0.5"
-         style="stop-color:#5bb26a;stop-opacity:1;" />
-      <stop
-         style="stop-color:#a4c589;stop-opacity:1"
-         offset="1"
-         id="stop10802-1-5-3-0-4-6-8-5-5-6-69-6-4" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10798-1-9-3-7-6-6-6-2-6-7"
        id="linearGradient6266"
        gradientUnits="userSpaceOnUse"
@@ -91,31 +38,6 @@
        x2="388.63736"
        y2="457.95499" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient10798-1-9-3-7-6-6-6-2-6-7-6"
-       id="linearGradient6266-9"
-       gradientUnits="userSpaceOnUse"
-       x1="388.63736"
-       y1="478.18777"
-       x2="388.63736"
-       y2="457.95499" />
-    <linearGradient
-       id="linearGradient10798-1-9-3-7-6-6-6-2-6-7-6">
-      <stop
-         style="stop-color:#5aad60;stop-opacity:1;"
-         offset="0"
-         id="stop10800-5-2-1-8-20-4-0-2-1-9-3" />
-      <stop
-         id="stop10806-6-8-5-3-9-2-2-7-0-4-9"
-         offset="0.5"
-         style="stop-color:#5bb26a;stop-opacity:1;" />
-      <stop
-         style="stop-color:#a4c589;stop-opacity:1"
-         offset="1"
-         id="stop10802-1-5-3-0-4-6-8-5-5-6-2" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10798-1-9-3-7-6-6-6-2-6-7-9"
        id="linearGradient6266-6"
        gradientUnits="userSpaceOnUse"
@@ -139,7 +61,6 @@
          id="stop10802-1-5-3-0-4-6-8-5-5-6-9" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10798-1-9-3-7-6-6-6-2-6-7-5"
        id="linearGradient6266-97"
        gradientUnits="userSpaceOnUse"
@@ -163,29 +84,6 @@
          id="stop10802-1-5-3-0-4-6-8-5-5-6-24" />
     </linearGradient>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="32"
-     inkscape:cx="7.023167"
-     inkscape:cy="8.7905374"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="925"
-     inkscape:window-height="862"
-     inkscape:window-x="1072"
-     inkscape:window-y="535"
-     inkscape:window-maximized="0"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3947" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -199,8 +97,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
@@ -216,30 +112,18 @@
        style="fill:#6f7684;fill-opacity:1;stroke:none"
        d="m 4.53125,3.9375 0,1.0625 2.375,0 0,6.96875 -2.375,0 0,1.0625 3.5,0 0,-4.0625 1,0 0,0.03125 0,2.03125 L 11.625,8.4375 9.03125,6 l 0,1.9375 0,0.0625 -1,0 0,-4.0625 z"
        transform="translate(0,1036.3622)"
-       id="path4012"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccccccccccccccc" />
+       id="path4012" />
     <g
        id="g6124"
        transform="matrix(-1,0,0,1,16.108135,0)">
       <path
-         sodipodi:type="arc"
          style="fill:url(#linearGradient6266);fill-opacity:1;stroke:#14733c;stroke-width:4.55839109;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline"
          id="path10796-2-6-3-8"
-         sodipodi:cx="388.125"
-         sodipodi:cy="468.23718"
-         sodipodi:rx="10.625"
-         sodipodi:ry="10.625"
          d="m 398.75,468.23718 c 0,5.86803 -4.75697,10.625 -10.625,10.625 -5.86803,0 -10.625,-4.75697 -10.625,-10.625 0,-5.86802 4.75697,-10.625 10.625,-10.625 5.86803,0 10.625,4.75698 10.625,10.625 z"
          transform="matrix(0.19771052,0,0,0.19623993,-63.175437,948.96728)" />
       <path
-         sodipodi:type="arc"
          style="opacity:0.46218489;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
          id="path6115"
-         sodipodi:cx="13.265625"
-         sodipodi:cy="3.140625"
-         sodipodi:rx="1.484375"
-         sodipodi:ry="0.640625"
          d="m 14.75,3.140625 c 0,0.3538074 -0.664577,0.640625 -1.484375,0.640625 -0.819798,0 -1.484375,-0.2868176 -1.484375,-0.640625 C 11.78125,2.7868176 12.445827,2.5 13.265625,2.5 14.085423,2.5 14.75,2.7868176 14.75,3.140625 z"
          transform="matrix(0.8105263,0,0,1,2.8247471,1036.7685)" />
     </g>
@@ -248,23 +132,13 @@
        id="g6124-8"
        transform="matrix(-1,0,0,1,16.108135,8.0625002)">
       <path
-         sodipodi:type="arc"
          style="fill:url(#linearGradient6266-6);fill-opacity:1;stroke:#14733c;stroke-width:4.55839109;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline"
          id="path10796-2-6-3-8-4"
-         sodipodi:cx="388.125"
-         sodipodi:cy="468.23718"
-         sodipodi:rx="10.625"
-         sodipodi:ry="10.625"
          d="m 398.75,468.23718 c 0,5.86803 -4.75697,10.625 -10.625,10.625 -5.86803,0 -10.625,-4.75697 -10.625,-10.625 0,-5.86802 4.75697,-10.625 10.625,-10.625 5.86803,0 10.625,4.75698 10.625,10.625 z"
          transform="matrix(0.19771052,0,0,0.19623993,-63.175437,948.96728)" />
       <path
-         sodipodi:type="arc"
          style="opacity:0.46218489;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
          id="path6115-1"
-         sodipodi:cx="13.265625"
-         sodipodi:cy="3.140625"
-         sodipodi:rx="1.484375"
-         sodipodi:ry="0.640625"
          d="m 14.75,3.140625 c 0,0.3538074 -0.664577,0.640625 -1.484375,0.640625 -0.819798,0 -1.484375,-0.2868176 -1.484375,-0.640625 C 11.78125,2.7868176 12.445827,2.5 13.265625,2.5 14.085423,2.5 14.75,2.7868176 14.75,3.140625 z"
          transform="matrix(0.8105263,0,0,1,2.8247471,1036.7685)" />
     </g>
@@ -273,23 +147,13 @@
        id="g6124-3"
        transform="matrix(-0.98161488,0,0,1,26.827264,4.0393381)">
       <path
-         sodipodi:type="arc"
          style="fill:url(#linearGradient6266-97);fill-opacity:1;stroke:#14733c;stroke-width:4.55839109;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline"
          id="path10796-2-6-3-8-2"
-         sodipodi:cx="388.125"
-         sodipodi:cy="468.23718"
-         sodipodi:rx="10.625"
-         sodipodi:ry="10.625"
          d="m 398.75,468.23718 c 0,5.86803 -4.75697,10.625 -10.625,10.625 -5.86803,0 -10.625,-4.75697 -10.625,-10.625 0,-5.86802 4.75697,-10.625 10.625,-10.625 5.86803,0 10.625,4.75698 10.625,10.625 z"
          transform="matrix(0.19771052,0,0,0.19623993,-63.175437,948.96728)" />
       <path
-         sodipodi:type="arc"
          style="opacity:0.46218489;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
          id="path6115-2"
-         sodipodi:cx="13.265625"
-         sodipodi:cy="3.140625"
-         sodipodi:rx="1.484375"
-         sodipodi:ry="0.640625"
          d="m 14.75,3.140625 c 0,0.3538074 -0.664577,0.640625 -1.484375,0.640625 -0.819798,0 -1.484375,-0.2868176 -1.484375,-0.640625 C 11.78125,2.7868176 12.445827,2.5 13.265625,2.5 14.085423,2.5 14.75,2.7868176 14.75,3.140625 z"
          transform="matrix(0.8105263,0,0,1,2.8247471,1036.7685)" />
     </g>
diff --git a/ui/org.eclipse.pde.ui/icons/elcl16/cleanmanifest.svg b/ui/org.eclipse.pde.ui/icons/elcl16/cleanmanifest.svg
index dedd6b81c1d..83f61d9d737 100644
--- a/ui/org.eclipse.pde.ui/icons/elcl16/cleanmanifest.svg
+++ b/ui/org.eclipse.pde.ui/icons/elcl16/cleanmanifest.svg
@@ -6,14 +6,7 @@
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="1.3.2 (091e20e, 2023-11-25, custom)"
-   sodipodi:docname="cleanmanifest.svg"
    xml:space="preserve"
-   inkscape:export-filename="application_lightning@2x.png"
-   inkscape:export-xdpi="192"
-   inkscape:export-ydpi="192"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:svg="http://www.w3.org/2000/svg"
@@ -21,532 +14,6 @@
    xmlns:cc="http://creativecommons.org/ns#"
    xmlns:dc="http://purl.org/dc/elements/1.1/"><defs
      id="defs4"><linearGradient
-       id="linearGradient3866"><stop
-         id="stop3868"
-         offset="0"
-         style="stop-color:#717188;stop-opacity:1" /><stop
-         id="stop3870"
-         offset="1"
-         style="stop-color:#6b6b6b;stop-opacity:1;" /></linearGradient><linearGradient
-       id="linearGradient3860"><stop
-         id="stop3862"
-         offset="0"
-         style="stop-color:#424242;stop-opacity:1" /><stop
-         id="stop3864"
-         offset="1"
-         style="stop-color:#6b6b6b;stop-opacity:1;" /></linearGradient><linearGradient
-       id="linearGradient3852"><stop
-         id="stop3854"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" /><stop
-         style="stop-color:#dddddd;stop-opacity:1;"
-         offset="0.66561043"
-         id="stop3856" /><stop
-         id="stop3858"
-         offset="1"
-         style="stop-color:#464646;stop-opacity:1;" /></linearGradient><linearGradient
-       id="linearGradient3844"><stop
-         id="stop3846"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" /><stop
-         style="stop-color:#dddddd;stop-opacity:1;"
-         offset="0.61245775"
-         id="stop3848" /><stop
-         id="stop3850"
-         offset="1"
-         style="stop-color:#464646;stop-opacity:1;" /></linearGradient><linearGradient
-       id="linearGradient5328-5"><stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop5330-9" /><stop
-         id="stop3842"
-         offset="0.5"
-         style="stop-color:#dddddd;stop-opacity:1;" /><stop
-         style="stop-color:#464646;stop-opacity:1;"
-         offset="1"
-         id="stop5332-8" /></linearGradient><linearGradient
-       id="linearGradient5209-0"><stop
-         style="stop-color:#4c4c4c;stop-opacity:1"
-         offset="0"
-         id="stop5211-9" /><stop
-         style="stop-color:#6b6b6b;stop-opacity:1;"
-         offset="1"
-         id="stop5213-4" /></linearGradient><linearGradient
-       y2="6.9843998"
-       x2="10.007812"
-       y1="5"
-       x1="10"
-       gradientTransform="translate(-15.015625,1046.6356)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient6323-7"
-       xlink:href="#linearGradient5068-6-9"
-       inkscape:collect="always" /><linearGradient
-       id="linearGradient5068-6-9"
-       inkscape:collect="always"><stop
-         id="stop5070-8-0"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" /><stop
-         id="stop5072-3-6"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" /></linearGradient><linearGradient
-       gradientTransform="translate(-15.015625,10.2734)"
-       gradientUnits="userSpaceOnUse"
-       y2="1045.3466"
-       x2="12"
-       y1="1043.3622"
-       x1="12"
-       id="linearGradient5084-3-3"
-       xlink:href="#linearGradient5068-6-9"
-       inkscape:collect="always" /><linearGradient
-       gradientTransform="translate(-15.015625,10.2734)"
-       gradientUnits="userSpaceOnUse"
-       y2="1043.3466"
-       x2="15.007812"
-       y1="1043.3622"
-       x1="13"
-       id="linearGradient5086-8-0"
-       xlink:href="#linearGradient5068-6-9"
-       inkscape:collect="always" /><linearGradient
-       gradientTransform="translate(-15.015625,10.2734)"
-       gradientUnits="userSpaceOnUse"
-       y2="1042.3622"
-       x2="10.007812"
-       y1="1042.3622"
-       x1="12"
-       id="linearGradient5082-1-0"
-       xlink:href="#linearGradient5068-6-9"
-       inkscape:collect="always" /><linearGradient
-       gradientTransform="translate(-15.015625,10.2734)"
-       gradientUnits="userSpaceOnUse"
-       y2="1041.3466"
-       x2="8.0078125"
-       y1="1041.3622"
-       x1="10"
-       id="linearGradient5078-8-2"
-       xlink:href="#linearGradient5068-6-9"
-       inkscape:collect="always" /><linearGradient
-       gradientTransform="translate(-15.015625,10.2734)"
-       gradientUnits="userSpaceOnUse"
-       y2="1038.3466"
-       x2="10.007812"
-       y1="1040.3622"
-       x1="10"
-       id="linearGradient5076-5-2"
-       xlink:href="#linearGradient5068-6-9"
-       inkscape:collect="always" /><linearGradient
-       gradientTransform="translate(-15.015625,10.2734)"
-       gradientUnits="userSpaceOnUse"
-       y2="1038.3466"
-       x2="10.007812"
-       y1="1038.3622"
-       x1="12"
-       id="linearGradient5074-2-1"
-       xlink:href="#linearGradient5068-6-9"
-       inkscape:collect="always" /><linearGradient
-       gradientTransform="translate(-15.015625,10.2734)"
-       gradientUnits="userSpaceOnUse"
-       y2="1043.3466"
-       x2="14"
-       y1="1041.3622"
-       x1="14"
-       id="linearGradient5088-1-4"
-       xlink:href="#linearGradient5068-6-9"
-       inkscape:collect="always" /><radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4528-9-5-7-9"
-       id="radialGradient3091-1-9-6"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.8508179,-8.813921e-6,8.4531434e-6,1.7750589,644.24981,572.63612)"
-       cx="-757.20496"
-       cy="-738.83777"
-       fx="-757.20496"
-       fy="-738.83777"
-       r="3.4803574" /><linearGradient
-       id="linearGradient4528-9-5-7-9"><stop
-         style="stop-color:#e0c576;stop-opacity:1;"
-         offset="0"
-         id="stop4530-0-5-0-5" /><stop
-         style="stop-color:#9e7916;stop-opacity:1"
-         offset="1"
-         id="stop4532-7-9-3-3" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6281-8-0-1-6-6-4-2"
-       id="linearGradient3093-5-2-7"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.3199889,0,0,2.3199889,10.199693,1043.1852)"
-       x1="0.9375"
-       y1="4.8437853"
-       x2="0.9375"
-       y2="7.549418" /><linearGradient
-       id="linearGradient6281-8-0-1-6-6-4-2"><stop
-         id="stop6283-0-2-2-1-2-0-1"
-         offset="0"
-         style="stop-color:#f7f9fb;stop-opacity:1" /><stop
-         id="stop6285-5-0-9-7-6-9-9"
-         offset="1"
-         style="stop-color:#ffd680;stop-opacity:1" /></linearGradient><radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3844-6"
-       id="radialGradient5366-0-9"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.3089145,0.02433326,-0.0270668,0.33136796,5.4628028,1.7171329)"
-       cx="7.7379637"
-       cy="2.4332652"
-       fx="7.7379637"
-       fy="2.4332652"
-       r="2.3503494" /><linearGradient
-       id="linearGradient3844-6"><stop
-         id="stop3846-3"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" /><stop
-         style="stop-color:#dddddd;stop-opacity:1;"
-         offset="0.61245775"
-         id="stop3848-7" /><stop
-         id="stop3850-1"
-         offset="1"
-         style="stop-color:#464646;stop-opacity:1;" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3860-2"
-       id="linearGradient5368-1-5"
-       gradientUnits="userSpaceOnUse"
-       x1="7.8304267"
-       y1="5.5753322"
-       x2="7.8018494"
-       y2="1.9306878" /><linearGradient
-       id="linearGradient3860-2"><stop
-         id="stop3862-3"
-         offset="0"
-         style="stop-color:#424242;stop-opacity:1" /><stop
-         id="stop3864-4"
-         offset="1"
-         style="stop-color:#6b6b6b;stop-opacity:1;" /></linearGradient><radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3844-0"
-       id="radialGradient5366-0-5"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.3089145,0.02433326,-0.0270668,0.33136796,5.4628028,1.7171329)"
-       cx="7.7379637"
-       cy="2.4332652"
-       fx="7.7379637"
-       fy="2.4332652"
-       r="2.3503494" /><linearGradient
-       id="linearGradient3844-0"><stop
-         id="stop3846-36"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" /><stop
-         style="stop-color:#dddddd;stop-opacity:1;"
-         offset="0.61245775"
-         id="stop3848-6" /><stop
-         id="stop3850-5"
-         offset="1"
-         style="stop-color:#464646;stop-opacity:1;" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3860-0"
-       id="linearGradient5368-1-0"
-       gradientUnits="userSpaceOnUse"
-       x1="7.8304267"
-       y1="5.5753322"
-       x2="7.8018494"
-       y2="1.9306878" /><linearGradient
-       id="linearGradient3860-0"><stop
-         id="stop3862-6"
-         offset="0"
-         style="stop-color:#424242;stop-opacity:1" /><stop
-         id="stop3864-0"
-         offset="1"
-         style="stop-color:#6b6b6b;stop-opacity:1;" /></linearGradient><radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3844-8"
-       id="radialGradient5366-0-7"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.3089145,0.02433326,-0.0270668,0.33136796,5.4628028,1.7171329)"
-       cx="7.7379637"
-       cy="2.4332652"
-       fx="7.7379637"
-       fy="2.4332652"
-       r="2.3503494" /><linearGradient
-       id="linearGradient3844-8"><stop
-         id="stop3846-1"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" /><stop
-         style="stop-color:#dddddd;stop-opacity:1;"
-         offset="0.61245775"
-         id="stop3848-4" /><stop
-         id="stop3850-19"
-         offset="1"
-         style="stop-color:#464646;stop-opacity:1;" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3860-4"
-       id="linearGradient5368-1-8"
-       gradientUnits="userSpaceOnUse"
-       x1="7.8304267"
-       y1="5.5753322"
-       x2="7.8018494"
-       y2="1.9306878" /><linearGradient
-       id="linearGradient3860-4"><stop
-         id="stop3862-30"
-         offset="0"
-         style="stop-color:#424242;stop-opacity:1" /><stop
-         id="stop3864-9"
-         offset="1"
-         style="stop-color:#6b6b6b;stop-opacity:1;" /></linearGradient><radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3844-3"
-       id="radialGradient5366-0-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.3089145,0.02433326,-0.0270668,0.33136796,5.4628028,1.7171329)"
-       cx="7.7379637"
-       cy="2.4332652"
-       fx="7.7379637"
-       fy="2.4332652"
-       r="2.3503494" /><linearGradient
-       id="linearGradient3844-3"><stop
-         id="stop3846-7"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" /><stop
-         style="stop-color:#dddddd;stop-opacity:1;"
-         offset="0.61245775"
-         id="stop3848-3" /><stop
-         id="stop3850-3"
-         offset="1"
-         style="stop-color:#464646;stop-opacity:1;" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3860-9"
-       id="linearGradient5368-1-7"
-       gradientUnits="userSpaceOnUse"
-       x1="7.8304267"
-       y1="5.5753322"
-       x2="7.8018494"
-       y2="1.9306878" /><linearGradient
-       id="linearGradient3860-9"><stop
-         id="stop3862-5"
-         offset="0"
-         style="stop-color:#424242;stop-opacity:1" /><stop
-         id="stop3864-2"
-         offset="1"
-         style="stop-color:#6b6b6b;stop-opacity:1;" /></linearGradient><radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3852-6"
-       id="radialGradient5374-4-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.35882709,-0.01458857,0.01251176,0.40537334,4.9838699,2.1071585)"
-       cx="7.7274323"
-       cy="2.8622203"
-       fx="7.7274323"
-       fy="2.8622203"
-       r="2.3503494" /><linearGradient
-       id="linearGradient3852-6"><stop
-         id="stop3854-9"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" /><stop
-         style="stop-color:#dddddd;stop-opacity:1;"
-         offset="0.66561043"
-         id="stop3856-8" /><stop
-         id="stop3858-2"
-         offset="1"
-         style="stop-color:#464646;stop-opacity:1;" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3866-8"
-       id="linearGradient5376-4-1"
-       gradientUnits="userSpaceOnUse"
-       x1="7.8451643"
-       y1="5.6525216"
-       x2="7.8451643"
-       y2="1.0179684" /><linearGradient
-       id="linearGradient3866-8"><stop
-         id="stop3868-1"
-         offset="0"
-         style="stop-color:#717188;stop-opacity:1" /><stop
-         id="stop3870-1"
-         offset="1"
-         style="stop-color:#6b6b6b;stop-opacity:1;" /></linearGradient><linearGradient
-       y2="1.0179684"
-       x2="7.8451643"
-       y1="5.6525216"
-       x1="7.8451643"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4515"
-       xlink:href="#linearGradient3866-8"
-       inkscape:collect="always" /><radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3852-4"
-       id="radialGradient5374-4-7"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.35882709,-0.01458857,0.01251176,0.40537334,4.9838699,2.1071585)"
-       cx="7.9300532"
-       cy="1.7860492"
-       fx="7.9300532"
-       fy="1.7860492"
-       r="2.3503494" /><linearGradient
-       id="linearGradient3852-4"><stop
-         id="stop3854-0"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" /><stop
-         style="stop-color:#dddddd;stop-opacity:1;"
-         offset="0.66561043"
-         id="stop3856-5" /><stop
-         id="stop3858-8"
-         offset="1"
-         style="stop-color:#464646;stop-opacity:1;" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3866-7"
-       id="linearGradient5376-4-6"
-       gradientUnits="userSpaceOnUse"
-       x1="7.8451643"
-       y1="5.6525216"
-       x2="7.8451643"
-       y2="1.0179684" /><linearGradient
-       id="linearGradient3866-7"><stop
-         id="stop3868-0"
-         offset="0"
-         style="stop-color:#717188;stop-opacity:1" /><stop
-         id="stop3870-7"
-         offset="1"
-         style="stop-color:#6b6b6b;stop-opacity:1;" /></linearGradient><radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3852-5"
-       id="radialGradient5374-4-3"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.35882709,-0.01458857,0.01251176,0.40537334,4.9838699,2.1071585)"
-       cx="7.9300532"
-       cy="1.7860492"
-       fx="7.9300532"
-       fy="1.7860492"
-       r="2.3503494" /><linearGradient
-       id="linearGradient3852-5"><stop
-         id="stop3854-1"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" /><stop
-         style="stop-color:#dddddd;stop-opacity:1;"
-         offset="0.66561043"
-         id="stop3856-6" /><stop
-         id="stop3858-4"
-         offset="1"
-         style="stop-color:#464646;stop-opacity:1;" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3866-3"
-       id="linearGradient5376-4-0"
-       gradientUnits="userSpaceOnUse"
-       x1="7.8451643"
-       y1="5.6525216"
-       x2="7.8451643"
-       y2="1.0179684" /><linearGradient
-       id="linearGradient3866-3"><stop
-         id="stop3868-6"
-         offset="0"
-         style="stop-color:#717188;stop-opacity:1" /><stop
-         id="stop3870-4"
-         offset="1"
-         style="stop-color:#6b6b6b;stop-opacity:1;" /></linearGradient><radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5328-5-9"
-       id="radialGradient5370-9-4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.37553419,-2.0140452e-8,1.7614747e-8,0.40297829,4.9079328,2.1932289)"
-       cx="7.9383807"
-       cy="3.451864"
-       fx="7.9383807"
-       fy="3.451864"
-       r="2.3503494" /><linearGradient
-       id="linearGradient5328-5-9"><stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop5330-9-7" /><stop
-         id="stop3842-2"
-         offset="0.5"
-         style="stop-color:#dddddd;stop-opacity:1;" /><stop
-         style="stop-color:#464646;stop-opacity:1;"
-         offset="1"
-         id="stop5332-8-3" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5209-0-2"
-       id="linearGradient5372-5-0"
-       gradientUnits="userSpaceOnUse"
-       x1="7.8304267"
-       y1="5.9680095"
-       x2="7.8890662"
-       y2="3.584255" /><linearGradient
-       id="linearGradient5209-0-2"><stop
-         style="stop-color:#4c4c4c;stop-opacity:1"
-         offset="0"
-         id="stop5211-9-4" /><stop
-         style="stop-color:#6b6b6b;stop-opacity:1;"
-         offset="1"
-         id="stop5213-4-2" /></linearGradient><radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5328-5-4"
-       id="radialGradient5370-9-6"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.37553419,-2.0140452e-8,1.7614747e-8,0.40297829,4.9079328,2.1932289)"
-       cx="7.9383807"
-       cy="3.451864"
-       fx="7.9383807"
-       fy="3.451864"
-       r="2.3503494" /><linearGradient
-       id="linearGradient5328-5-4"><stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop5330-9-9" /><stop
-         id="stop3842-7"
-         offset="0.5"
-         style="stop-color:#dddddd;stop-opacity:1;" /><stop
-         style="stop-color:#464646;stop-opacity:1;"
-         offset="1"
-         id="stop5332-8-0" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5209-0-7"
-       id="linearGradient5372-5-6"
-       gradientUnits="userSpaceOnUse"
-       x1="7.8304267"
-       y1="5.9680095"
-       x2="7.8890662"
-       y2="3.584255" /><linearGradient
-       id="linearGradient5209-0-7"><stop
-         style="stop-color:#4c4c4c;stop-opacity:1"
-         offset="0"
-         id="stop5211-9-9" /><stop
-         style="stop-color:#6b6b6b;stop-opacity:1;"
-         offset="1"
-         id="stop5213-4-4" /></linearGradient><linearGradient
-       id="linearGradient10798-1-9-3-7-1-15-1-7-6-1"><stop
-         style="stop-color:#4f9e55;stop-opacity:1"
-         offset="0"
-         id="stop10800-5-2-1-8-2-8-1-7-3-7" /><stop
-         id="stop10806-6-8-5-3-2-95-0-5-4-8"
-         offset="0.5"
-         style="stop-color:#3c8d49;stop-opacity:1;" /><stop
-         style="stop-color:#a4e173;stop-opacity:1;"
-         offset="1"
-         id="stop10802-1-5-3-0-2-0-9-8-4-3" /></linearGradient><linearGradient
-       id="linearGradient4929"><stop
-         style="stop-color:#d5f3ff;stop-opacity:1;"
-         offset="0"
-         id="stop4931" /><stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop4934" /></linearGradient><linearGradient
-       id="linearGradient4900"><stop
-         style="stop-color:#8fb7e6;stop-opacity:1;"
-         offset="0"
-         id="stop4902" /><stop
-         style="stop-color:#89b2e3;stop-opacity:1;"
-         offset="1"
-         id="stop4904" /></linearGradient><linearGradient
-       id="linearGradient4839"><stop
-         style="stop-color:#8db6e5;stop-opacity:1;"
-         offset="0"
-         id="stop4841" /><stop
-         style="stop-color:#8eb6e5;stop-opacity:1;"
-         offset="1"
-         id="stop4843" /></linearGradient><linearGradient
-       id="linearGradient4881"><stop
-         style="stop-color:#68b3e1;stop-opacity:1;"
-         offset="0"
-         id="stop4883" /><stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop4885" /></linearGradient><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4994"
        id="linearGradient4499"
        gradientUnits="userSpaceOnUse"
@@ -555,15 +22,13 @@
        y1="1052.4476"
        x2="22.530088"
        y2="1014.1386" /><linearGradient
-       id="linearGradient4994"
-       inkscape:collect="always"><stop
+       id="linearGradient4994"><stop
          id="stop4996"
          offset="0"
          style="stop-color:#ffffff;stop-opacity:1" /><stop
          id="stop4998"
          offset="1"
          style="stop-color:#dbe2eb;stop-opacity:1" /></linearGradient><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4902"
        id="linearGradient4501"
        gradientUnits="userSpaceOnUse"
@@ -572,15 +37,13 @@
        y1="1038.5779"
        x2="10.544736"
        y2="1052.3228" /><linearGradient
-       id="linearGradient4902"
-       inkscape:collect="always"><stop
+       id="linearGradient4902"><stop
          id="stop4904-7"
          offset="0"
          style="stop-color:#c7b571;stop-opacity:1;" /><stop
          id="stop4906"
          offset="1"
          style="stop-color:#9a9a8f;stop-opacity:1" /></linearGradient><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient6411"
        id="linearGradient4503"
        gradientUnits="userSpaceOnUse"
@@ -589,7 +52,6 @@
        y1="1020.8994"
        x2="47.429596"
        y2="1023.1616" /><linearGradient
-       inkscape:collect="always"
        id="linearGradient6411"><stop
          style="stop-color:#4f605c;stop-opacity:1"
          offset="0"
@@ -597,7 +59,6 @@
          style="stop-color:#dbe2eb;stop-opacity:0"
          offset="1"
          id="stop6415" /></linearGradient><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4258"
        id="linearGradient4505"
        gradientUnits="userSpaceOnUse"
@@ -606,7 +67,6 @@
        y1="1021.2669"
        x2="62.220116"
        y2="1025.2668" /><linearGradient
-       inkscape:collect="always"
        id="linearGradient4258"><stop
          style="stop-color:#f4ae5f;stop-opacity:1;"
          offset="0"
@@ -617,7 +77,6 @@
          style="stop-color:#c7700e;stop-opacity:1"
          offset="1"
          id="stop4262" /></linearGradient><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient5726"
        id="linearGradient5732"
        x1="71.496254"
@@ -626,7 +85,6 @@
        y2="1042.7766"
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-37.146475,-0.81699625)" /><linearGradient
-       inkscape:collect="always"
        id="linearGradient5726"><stop
          style="stop-color:#fdf4c5;stop-opacity:1"
          offset="0"
@@ -634,7 +92,6 @@
          style="stop-color:#d6ba65;stop-opacity:1"
          offset="1"
          id="stop5730" /></linearGradient><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient5714"
        id="linearGradient5720"
        x1="62.826176"
@@ -643,7 +100,6 @@
        y2="1024.3622"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1.0368001,0,0,1,-28.330414,12.000004)" /><linearGradient
-       inkscape:collect="always"
        id="linearGradient5714"><stop
          style="stop-color:#cb9b77;stop-opacity:1"
          offset="0"
@@ -651,7 +107,6 @@
          style="stop-color:#89460e;stop-opacity:1"
          offset="1"
          id="stop5718" /></linearGradient><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient5706"
        id="linearGradient5712"
        x1="89"
@@ -660,149 +115,81 @@
        y2="1014.3622"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1.0368001,0,0,1,-28.330414,12.000004)" /><linearGradient
-       inkscape:collect="always"
        id="linearGradient5706"><stop
          style="stop-color:#613307;stop-opacity:1"
          offset="0"
          id="stop5708" /><stop
          style="stop-color:#c19f85;stop-opacity:1"
          offset="1"
-         id="stop5710" /></linearGradient></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="8.4631843"
-     inkscape:cy="12.882602"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1920"
-     inkscape:window-height="991"
-     inkscape:window-x="-9"
-     inkscape:window-y="-9"
-     inkscape:window-maximized="1"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="false"
-     inkscape:showpageshadow="0"
-     inkscape:pagecheckerboard="0"
-     inkscape:deskcolor="#505050"><inkscape:grid
-       type="xygrid"
-       id="grid3006"
-       originx="0"
-       originy="0"
-       spacingy="1"
-       spacingx="1"
-       units="px"
-       visible="true" /></sodipodi:namedview><metadata
+         id="stop5710" /></linearGradient></defs><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" /></cc:Work></rdf:RDF></metadata><g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)"><g
        id="g1"
-       transform="matrix(1.444096,0,0,1.3765721,-6.0328203,-394.90457)"
-       sodipodi:insensitive="true"><path
-         sodipodi:nodetypes="cccccc"
-         inkscape:connector-curvature="0"
+       transform="matrix(1.444096,0,0,1.3765721,-6.0328203,-394.90457)"><path
          id="rect4001-3-4-3"
          d="m 4.9963339,1039.8884 5.6632511,-0.067 2.18126,2.4967 0.02117,8.0069 -7.8233301,0.067 z"
          style="display:inline;fill:url(#linearGradient4499);fill-opacity:1;stroke:none;stroke-width:0.28669" /><path
-         sodipodi:nodetypes="ccscccc"
-         inkscape:connector-curvature="0"
          id="rect4001-1-8"
          d="m 5.0103352,1039.9147 h 5.5864778 c 0,0 1.679697,0.3457 1.25372,1.1422 -0.01321,0.025 1.155397,1.3582 1.155397,1.3582 v 8.0672 H 5.0103352 Z"
          style="display:inline;fill:none;stroke:url(#linearGradient4501);stroke-width:0.28669;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1" /><path
-         sodipodi:nodetypes="cccccc"
-         inkscape:connector-curvature="0"
          id="rect4001-3-9-0-0"
          d="m 10.659585,1039.9074 2.172528,2.4335 v 2.5289 l -3.1883185,-2.2122 c 0.4181605,-0.8871 0.7211025,-1.8137 1.0157725,-2.7502 z"
          style="display:inline;fill:url(#linearGradient4503);fill-opacity:1;stroke:none;stroke-width:0.28669" /><path
-         sodipodi:nodetypes="cccc"
          id="path5675-4-7"
          d="m 10.601497,1039.7345 c 0.468793,0.6387 1.034107,1.4556 0.615109,2.8515 0.964155,-0.5454 1.963141,-0.2561 1.963141,-0.2561 0,-1.3032 -1.582066,-2.6568 -2.57825,-2.5954 z"
-         style="display:inline;fill:url(#linearGradient4505);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.28669px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         inkscape:connector-curvature="0" /><path
+         style="display:inline;fill:url(#linearGradient4505);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.28669px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /><path
          style="display:inline;fill:none;fill-rule:evenodd;stroke:#bbc5d8;stroke-width:0.57338;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
          d="M 6.0124214,1049.1908 H 8.7934971"
-         id="path4696-88"
-         inkscape:connector-curvature="0" /><path
+         id="path4696-88" /><path
          style="display:inline;fill:none;fill-rule:evenodd;stroke:#bbc5d8;stroke-width:0.57338;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
          d="M 6.0124214,1048.0441 H 9.8364005"
-         id="path4696-5-1"
-         inkscape:connector-curvature="0" /><path
+         id="path4696-5-1" /><path
          style="display:inline;fill:none;fill-rule:evenodd;stroke:#bbc5d8;stroke-width:0.57338;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
          d="M 6.0124214,1046.8973 H 10.184036"
-         id="path4696-4-0"
-         inkscape:connector-curvature="0" /><path
+         id="path4696-4-0" /><path
          style="display:inline;fill:none;fill-rule:evenodd;stroke:#bbc5d8;stroke-width:0.57338;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
          d="M 6.0124214,1042.0236 H 9.8364005"
-         id="path4696-0-9"
-         inkscape:connector-curvature="0" /><path
+         id="path4696-0-9" /><path
          style="display:inline;fill:none;fill-rule:evenodd;stroke:#bbc5d8;stroke-width:0.57338;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
          d="M 6.0124214,1043.1703 H 9.8364005"
-         id="path4696-9-9"
-         inkscape:connector-curvature="0" /><path
+         id="path4696-9-9" /><path
          style="display:inline;fill:none;fill-rule:evenodd;stroke:#bbc5d8;stroke-width:0.57338;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
          d="M 6.0124214,1044.3171 H 9.8364005"
-         id="path4696-8-8"
-         inkscape:connector-curvature="0" /><path
+         id="path4696-8-8" /><path
          style="display:inline;fill:none;fill-rule:evenodd;stroke:#bbc5d8;stroke-width:0.57338;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
          d="M 6.0124214,1045.4639 H 9.1411315"
-         id="path4696-2-9"
-         inkscape:connector-curvature="0" /></g><g
+         id="path4696-2-9" /></g><g
        transform="matrix(0.30997053,0,0,0.29887109,-6.6474193,738.52011)"
        style="display:inline"
        id="g5842"><path
-         sodipodi:nodetypes="czc"
-         inkscape:connector-curvature="0"
          id="path5724"
          d="m 37.853525,1037.5452 c -9.367718,8.3752 5.421071,8.8112 13.8565,8.6197 8.435429,-0.1915 22.9996,2.035 12.1435,-8.6197"
          style="opacity:1;fill:url(#linearGradient5732);fill-opacity:1;fill-rule:evenodd;stroke:#ac7404;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /><path
-         sodipodi:nodetypes="sssss"
-         inkscape:connector-curvature="0"
          id="path5704"
          d="M 64.412584,1038.8622 H 38.492575 c -1.555202,0 -1.555202,-5 0,-5 h 25.920009 c 1.34029,0 1.55519,5 0,5 z"
          style="fill:url(#linearGradient5720);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient5712);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /><path
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
          id="path5734"
          d="m 41.915555,1045.9174 c -0.726314,-0.2736 -1.34618,-2.1481 -1.558271,-3.3722"
          style="fill:none;fill-rule:evenodd;stroke:#ac7404;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /><path
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
          id="path5736"
          d="m 45.357285,1046.173 c 1.066029,-0.6187 1.898784,-2.173 2.12406,-3"
          style="fill:none;fill-rule:evenodd;stroke:#ac7404;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /><path
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
          id="path5738"
          d="m 48.729465,1046.173 c -0.695075,-0.4472 -1.037533,-2.6869 -1.43421,-4.1785"
          style="fill:none;fill-rule:evenodd;stroke:#ac7404;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /><path
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
          id="path5740"
          d="m 50.791495,1046.049 c -0.190241,-0.8602 -0.893537,-2.0396 -0.31015,-3.0545"
          style="fill:none;fill-rule:evenodd;stroke:#ac7404;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /><path
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
          id="path5742"
          d="m 56.736984,1045.9869 c -0.650626,-1.5502 -0.626444,-3.0822 -0.310151,-4.3101"
          style="fill:none;fill-rule:evenodd;stroke:#ac7404;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /><path
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
          id="path5744"
          d="m 60.674953,1046.1655 c -0.637596,-0.5133 -0.469257,-2.484 -0.12406,-3.4887"
          style="fill:none;fill-rule:evenodd;stroke:#ac7404;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /><path
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
          id="path5746"
          d="m 65.054653,1045.6072 c -2.603123,-0.7126 -1.47242,-2.1661 -1.68985,-3.0545"
          style="fill:none;fill-rule:evenodd;stroke:#ac7404;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /></g></g></svg>
diff --git a/ui/org.eclipse.pde.ui/icons/elcl16/clear.svg b/ui/org.eclipse.pde.ui/icons/elcl16/clear.svg
index 9fc6462b642..1a21dbf46d7 100644
--- a/ui/org.eclipse.pde.ui/icons/elcl16/clear.svg
+++ b/ui/org.eclipse.pde.ui/icons/elcl16/clear.svg
@@ -2,25 +2,20 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.48.5 r10040"
-   sodipodi:docname="clear_co.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient5147"
-       inkscape:collect="always">
+       id="linearGradient5147">
       <stop
          id="stop5149"
          offset="0"
@@ -31,8 +26,7 @@
          style="stop-color:#637aa7;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       id="linearGradient5141"
-       inkscape:collect="always">
+       id="linearGradient5141">
       <stop
          id="stop5143"
          offset="0"
@@ -43,8 +37,7 @@
          style="stop-color:#637aa7;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       id="linearGradient5135"
-       inkscape:collect="always">
+       id="linearGradient5135">
       <stop
          id="stop5137"
          offset="0"
@@ -55,7 +48,6 @@
          style="stop-color:#637aa7;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4994">
       <stop
          style="stop-color:#f9fafc;stop-opacity:1;"
@@ -67,7 +59,6 @@
          id="stop4998" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4902">
       <stop
          style="stop-color:#c7b571;stop-opacity:1;"
@@ -79,7 +70,6 @@
          id="stop4906" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4894">
       <stop
          style="stop-color:#e0c88f;stop-opacity:1"
@@ -91,8 +81,7 @@
          id="stop4898" />
     </linearGradient>
     <linearGradient
-       id="linearGradient4877"
-       inkscape:collect="always">
+       id="linearGradient4877">
       <stop
          id="stop4879"
          offset="0"
@@ -103,7 +92,6 @@
          style="stop-color:#5e76a3;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4861">
       <stop
          style="stop-color:#91a5c7;stop-opacity:1;"
@@ -115,7 +103,6 @@
          id="stop4865" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4877"
        id="linearGradient4867"
        x1="7.0070496"
@@ -125,7 +112,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-4,-4)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4861"
        id="linearGradient4869"
        x1="7.0070496"
@@ -135,7 +121,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-4,-4)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient5147"
        id="linearGradient4871"
        x1="7.0070496"
@@ -145,7 +130,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-4,-4)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient5135"
        id="linearGradient4873"
        x1="7.0070496"
@@ -155,7 +139,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-4,-4)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient5141"
        id="linearGradient4875"
        x1="7.0070496"
@@ -165,7 +148,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-4,-4)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4894"
        id="linearGradient4900"
        x1="7.9987183"
@@ -175,7 +157,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(0,-2)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4902"
        id="linearGradient4908"
        x1="10.544736"
@@ -185,7 +166,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-4,-2)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4994"
        id="linearGradient5000"
        x1="9.8946028"
@@ -195,8 +175,7 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-4,-2)" />
     <linearGradient
-       id="linearGradient4852-7-8"
-       inkscape:collect="always">
+       id="linearGradient4852-7-8">
       <stop
          id="stop4854-4-1"
          offset="0"
@@ -225,8 +204,7 @@
        gradientTransform="translate(1.9961442e-6,-9.9830355e-5)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient6120"
-       xlink:href="#linearGradient4852-7-8"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4852-7-8" />
     <linearGradient
        y2="1037.7"
        x2="8.6566515"
@@ -235,141 +213,26 @@
        gradientTransform="translate(1.9961442e-6,-9.9830355e-5)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient6122"
-       xlink:href="#linearGradient4844-4-1"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4844-4-1" />
     <mask
        maskUnits="userSpaceOnUse"
        id="mask6204">
       <path
          style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
          d="m 1,1036.3935 0,0.5 0,12.9687 0,0.5 0.5,0 10.0625,0 0.5,0 0,-0.5 0,-9.9687 0,-0.2188 -0.15625,-0.125 -3.0625,-3 -0.125,-0.1562 -0.21875,0 -7,0 -0.5,0 z"
-         id="path6206"
-         inkscape:connector-curvature="0" />
+         id="path6206" />
     </mask>
     <filter
-       inkscape:collect="always"
        id="filter6988"
-       x="-0.24001802"
-       width="1.480036"
-       y="-0.23998199"
-       height="1.479964">
+       x="-0.39259929"
+       width="1.7850301"
+       y="-0.39254203"
+       height="1.7850802">
       <feGaussianBlur
-         inkscape:collect="always"
          stdDeviation="1.2049008"
          id="feGaussianBlur6990" />
     </filter>
-    <linearGradient
-       y2="1038.5814"
-       x2="4.7528968"
-       y1="1051.0466"
-       x1="4.7528968"
-       gradientTransform="translate(1.9961442e-6,-9.9830355e-5)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient6120-1"
-       xlink:href="#linearGradient4852-7-8-1"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient4852-7-8-1"
-       inkscape:collect="always">
-      <stop
-         id="stop4854-4-1-9"
-         offset="0"
-         style="stop-color:#707070;stop-opacity:1" />
-      <stop
-         id="stop4856-0-2-1"
-         offset="1"
-         style="stop-color:#a0a0a0;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       y2="1037.7"
-       x2="8.6566515"
-       y1="1050.7386"
-       x1="8.6566515"
-       gradientTransform="translate(1.9961442e-6,-9.9830355e-5)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient6122-0"
-       xlink:href="#linearGradient4844-4-1-4"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient4844-4-1-4">
-      <stop
-         id="stop4846-8-4-2"
-         offset="0"
-         style="stop-color:#3f3f3f;stop-opacity:1;" />
-      <stop
-         id="stop4848-8-9-2"
-         offset="1"
-         style="stop-color:#303030;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       y2="1038.5814"
-       x2="4.7528968"
-       y1="1051.0466"
-       x1="4.7528968"
-       gradientTransform="translate(1.9961442e-6,-9.9830355e-5)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient6120-4"
-       xlink:href="#linearGradient4852-7-8-6"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient4852-7-8-6"
-       inkscape:collect="always">
-      <stop
-         id="stop4854-4-1-5"
-         offset="0"
-         style="stop-color:#707070;stop-opacity:1" />
-      <stop
-         id="stop4856-0-2-9"
-         offset="1"
-         style="stop-color:#a0a0a0;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       y2="1037.7"
-       x2="8.6566515"
-       y1="1050.7386"
-       x1="8.6566515"
-       gradientTransform="translate(1.9961442e-6,-9.9830355e-5)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient6122-8"
-       xlink:href="#linearGradient4844-4-1-7"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient4844-4-1-7">
-      <stop
-         id="stop4846-8-4-5"
-         offset="0"
-         style="stop-color:#3f3f3f;stop-opacity:1;" />
-      <stop
-         id="stop4848-8-9-3"
-         offset="1"
-         style="stop-color:#303030;stop-opacity:1;" />
-    </linearGradient>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="4.0000002"
-     inkscape:cx="18.223534"
-     inkscape:cy="-36.6021"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1-8-8"
-     showgrid="true"
-     inkscape:window-width="1542"
-     inkscape:window-height="975"
-     inkscape:window-x="1006"
-     inkscape:window-y="492"
-     inkscape:window-maximized="0"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3999" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -383,28 +246,21 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
     <path
        style="fill:url(#linearGradient5000);fill-opacity:1;stroke:none;display:inline"
        d="m 1.4972825,1036.9037 7.0096685,0 3.062057,3.0066 0,9.9546 -10.0717255,0 z"
-       id="rect4001-3"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccc" />
+       id="rect4001-3" />
     <path
        style="fill:url(#linearGradient4900);fill-opacity:1;stroke:none"
        d="m 7.976621,1036.441 0,3.9112 3.977476,0 z"
-       id="path4884"
-       inkscape:connector-curvature="0" />
+       id="path4884" />
     <path
        style="fill:none;stroke:url(#linearGradient4908);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
        d="m 1.4972825,1036.9037 7.0096685,0 3.062057,3.0066 0,9.9546 -10.0717255,0 z"
-       id="rect4001"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccc" />
+       id="rect4001" />
     <rect
        style="fill:url(#linearGradient4867);fill-opacity:1;stroke:none;display:inline"
        id="rect4001-1"
@@ -446,32 +302,24 @@
        transform="matrix(1.4660179,0,0,1.2212682,-5.6373987,-232.07964)">
       <g
          transform="matrix(0.53947849,0,0,0.53947849,7.846281,484.46953)"
-         inkscape:label="Layer 1"
          id="layer1-8"
          style="opacity:0.75;fill:#ffffff;stroke:#ffffff;stroke-width:3.70728397;stroke-miterlimit:4;stroke-dasharray:none;display:inline;filter:url(#filter6988)">
         <path
            style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:3.70728397;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline"
            d="m 13.419292,1038.6553 c -0.468185,-0.4682 -1.221974,-0.4682 -1.690135,-10e-5 l -3.1127968,3.1129 -3.1127723,-3.1128 c -0.4681138,-0.4682 -1.221974,-0.4682 -1.690134,0 l -0.8600555,0.8601 c -0.4681391,0.468 -0.4681272,1.2218 3.66e-5,1.6901 l 3.1127223,3.1128 -3.1127269,3.1127 c -0.4682099,0.4682 -0.468198,1.222 -1.34e-5,1.6902 l 0.8601016,0.8601 c 0.4681344,0.4681 1.2219244,0.4681 1.6901337,0 l 3.1127774,-3.1128 3.1344053,3.1344 c 0.468135,0.4682 1.221925,0.4682 1.690135,0 l 0.860055,-0.86 c 0.46816,-0.4682 0.463458,-1.2173 -3.7e-5,-1.6902 l -3.134406,-3.1344 3.112777,-3.1127 c 0.468181,-0.4683 0.468169,-1.2221 3.4e-5,-1.6902 z"
-           id="rect4043"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="sccccccccssccsccsccss" />
+           id="rect4043" />
       </g>
     </g>
     <g
        style="display:inline"
        id="layer1-8-8"
-       inkscape:label="Layer 1"
        transform="matrix(0.50767387,0,0,0.5061245,8.120638,519.33645)">
       <path
          style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:0.50689858;stroke-opacity:1"
          d="m 10.09375,7.0489054 c -0.3172668,0.031974 -0.6221509,0.15383 -0.78125,0.3125 l -0.59375,0.5625 C 8.400566,8.241043 8.3380492,9.7451599 8.65625,10.0625 L 10.25,11.59375 8.59375,13.1875 C 8.4346339,13.346119 8.405526,13.69178 8.4375,14.03125 l 3.59375,0 0,-5.7010946 -1.125,-1.09375 c -0.159083,-0.15867 -0.495233,-0.2194744 -0.8125,-0.1875 z"
          transform="matrix(1.9697685,0,0,1.9757984,-15.995777,1021.5387)"
-         id="rect3911"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="scccccccccs" />
+         id="rect3911" />
       <path
-         sodipodi:nodetypes="sccccccccssccsccsccss"
-         inkscape:connector-curvature="0"
          id="rect4043-2"
          d="m 13.419292,1038.6553 c -0.468185,-0.4682 -1.221974,-0.4682 -1.690135,-10e-5 l -3.1127968,3.1129 -3.1127723,-3.1128 c -0.4681138,-0.4682 -1.221974,-0.4682 -1.690134,0 l -0.8600555,0.8601 c -0.4681391,0.468 -0.4681272,1.2218 3.66e-5,1.6901 l 3.1127223,3.1128 -3.1127269,3.1127 c -0.4682099,0.4682 -0.468198,1.222 -1.34e-5,1.6902 l 0.8601016,0.8601 c 0.4681344,0.4681 1.2219244,0.4681 1.6901337,0 l 3.1127774,-3.1128 3.1344053,3.1344 c 0.468135,0.4682 1.221925,0.4682 1.690135,0 l 0.860055,-0.86 c 0.46816,-0.4682 0.463458,-1.2173 -3.7e-5,-1.6902 l -3.134406,-3.1344 3.112777,-3.1127 c 0.468181,-0.4683 0.468169,-1.2221 3.4e-5,-1.6902 z"
          style="fill:url(#linearGradient6120);fill-opacity:1;stroke:url(#linearGradient6122);stroke-width:1.97278117;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline" />
diff --git a/ui/org.eclipse.pde.ui/icons/elcl16/clone_att.svg b/ui/org.eclipse.pde.ui/icons/elcl16/clone_att.svg
index 6e6d160ce70..f0c52678dd1 100644
--- a/ui/org.eclipse.pde.ui/icons/elcl16/clone_att.svg
+++ b/ui/org.eclipse.pde.ui/icons/elcl16/clone_att.svg
@@ -2,74 +2,17 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="clone_att.svg">
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
-     id="defs4">
-    <linearGradient
-       y2="462.11539"
-       x2="388.63736"
-       y1="478.18777"
-       x1="388.63736"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3929-5"
-       xlink:href="#linearGradient10798-1-9-3-7-6-8-9-0-9-1"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient10798-1-9-3-7-6-8-9-0-9-1">
-      <stop
-         style="stop-color:#7564b1;stop-opacity:1"
-         offset="0"
-         id="stop10800-5-2-1-8-20-6-4-9-8-2" />
-      <stop
-         id="stop10806-6-8-5-3-9-24-8-4-3-2"
-         offset="0.5"
-         style="stop-color:#5d4aa1;stop-opacity:1" />
-      <stop
-         style="stop-color:#9283c3;stop-opacity:1"
-         offset="1"
-         id="stop10802-1-5-3-0-4-8-4-2-9-2" />
-    </linearGradient>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1.4142135"
-     inkscape:cx="-28.904038"
-     inkscape:cy="-88.346096"
-     inkscape:document-units="px"
-     inkscape:current-layer="g3353"
-     showgrid="true"
-     inkscape:window-width="918"
-     inkscape:window-height="900"
-     inkscape:window-x="1335"
-     inkscape:window-y="567"
-     inkscape:window-maximized="0"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2985"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
+     id="defs4" />
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -83,8 +26,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      transform="translate(0,-1036.3622)">
     <g
@@ -100,17 +41,15 @@
            id="path10796-2-6-2-0" />
         <text
            xml:space="preserve"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:9.80188751px;line-height:125%;font-family:Serif;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#808080;fill-opacity:1;stroke:#828282;stroke-width:0.45867574;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:0%;font-family:serif;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#808080;fill-opacity:1;stroke:#828282;stroke-width:0.458676;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
            x="19.381119"
            y="965.96344"
            id="text3773-0"
-           sodipodi:linespacing="125%"
            transform="scale(0.9223234,1.0842184)"><tspan
-             sodipodi:role="line"
              id="tspan3775-9"
              x="19.381119"
              y="965.96344"
-             style="fill:#808080;fill-opacity:1;stroke:#828282;stroke-width:0.45867574;stroke-opacity:1">a</tspan></text>
+             style="font-size:9.80189px;line-height:1.25;font-family:serif;fill:#808080;fill-opacity:1;stroke:#828282;stroke-width:0.458676;stroke-opacity:1">a</tspan></text>
       </g>
       <g
          transform="translate(-11.53638,2.679593)"
@@ -123,17 +62,15 @@
            id="path10796-2-6-2-0-7" />
         <text
            xml:space="preserve"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:9.80188751px;line-height:125%;font-family:Serif;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#808080;fill-opacity:1;stroke:#828282;stroke-width:0.45867574;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:0%;font-family:serif;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#808080;fill-opacity:1;stroke:#828282;stroke-width:0.458676;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
            x="19.381119"
            y="965.96344"
            id="text3773-0-0"
-           sodipodi:linespacing="125%"
            transform="scale(0.9223234,1.0842184)"><tspan
-             sodipodi:role="line"
              id="tspan3775-9-4"
              x="19.381119"
              y="965.96344"
-             style="fill:#808080;fill-opacity:1;stroke:#828282;stroke-width:0.45867574;stroke-opacity:1">a</tspan></text>
+             style="font-size:9.80189px;line-height:1.25;font-family:serif;fill:#808080;fill-opacity:1;stroke:#828282;stroke-width:0.458676;stroke-opacity:1">a</tspan></text>
       </g>
       <g
          transform="translate(-15.55635,-0.44194176)"
@@ -150,24 +87,14 @@
              id="path10796-2-6-2-9"
              transform="matrix(1.0012483,0,0,0.88600469,0.97175283,73.294583)" />
           <path
-             sodipodi:open="true"
              d="m 24.43155,1046.9864 a 4.4886336,4.4886336 0 0 1 -1.642954,1.6429"
-             sodipodi:end="1.0471976"
-             sodipodi:start="0.52359878"
-             sodipodi:ry="4.4886336"
-             sodipodi:rx="4.4886336"
-             sodipodi:cy="1044.7421"
-             sodipodi:cx="20.544279"
-             sodipodi:type="arc"
              style="font-style:normal;font-weight:normal;font-size:13.58917427px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;display:inline;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
              id="path10796-2-6-2-2"
              transform="matrix(1.0012483,0,0,0.88600469,0.97175283,73.294583)" />
           <path
              d="m 22.620507,999.74158 0,-0.98021 -1.040788,0 c -0.401091,0 -0.699714,0.0857 -0.895868,0.25704 -0.196155,0.17135 -0.294232,0.43419 -0.294232,0.78852 0,0.32237 0.09954,0.57797 0.298623,0.76677 0.199082,0.1887 0.468428,0.2831 0.808038,0.2831 0.336682,0 0.607492,-0.1031 0.812429,-0.3093 0.207865,-0.2062 0.311798,-0.4748 0.311798,-0.80592 z m 0.808037,-1.43764 -0.01946,1.97066 1.6957,1.5699 -0.444853,0.3635 -1.601857,-1.6986 -0.459711,0.2744 c -0.244962,0.1855 -0.362864,0.285 -0.597079,0.3867 -0.234214,0.1017 -0.507951,0.1525 -0.821211,0.1525 -0.518199,0 -0.929537,-0.1365 -1.234015,-0.4095 -0.304478,-0.2731 -0.456717,-0.6419 -0.456717,-1.10657 0,-0.47921 0.174196,-0.85097 0.522589,-1.11526 0.348394,-0.26429 0.840243,-0.39644 1.475548,-0.39644 l 1.13301,0 0,-0.31802 c 0,-0.35143 -0.108324,-0.62298 -0.324973,-0.81467 -0.213719,-0.19459 -0.51527,-0.29188 -0.904651,-0.29188 -0.322044,0 -0.578215,0.0726 -0.768514,0.21782 -0.190299,0.14521 -0.308869,0.36013 -0.355712,0.64476 l -0.417193,0 0,-0.93664 c 0.281057,-0.11908 0.55333,-0.20766 0.816821,-0.26575 0.266418,-0.061 0.525517,-0.0915 0.777297,-0.0915 0.647015,0 1.138864,0.15974 1.475547,0.47921 0.33961,0.31657 0.509415,0.77836 0.509415,1.38537 z"
              style="fill:#266923;fill-opacity:1;stroke:#266923;stroke-width:0.27716896;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-             id="path4156"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="scscscscsccccccsscssscscssccccscsc" />
+             id="path4156" />
         </g>
       </g>
     </g>
diff --git a/ui/org.eclipse.pde.ui/icons/elcl16/clone_el.svg b/ui/org.eclipse.pde.ui/icons/elcl16/clone_el.svg
index 1dbd5110b6e..a8c70a07e59 100644
--- a/ui/org.eclipse.pde.ui/icons/elcl16/clone_el.svg
+++ b/ui/org.eclipse.pde.ui/icons/elcl16/clone_el.svg
@@ -2,24 +2,19 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="clone_el.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4994">
       <stop
          style="stop-color:#f9fafc;stop-opacity:1;"
@@ -31,7 +26,6 @@
          id="stop4998" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4902">
       <stop
          style="stop-color:#c7b571;stop-opacity:1;"
@@ -43,7 +37,6 @@
          id="stop4906" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4894">
       <stop
          style="stop-color:#e0c88f;stop-opacity:1"
@@ -55,7 +48,6 @@
          id="stop4898" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4894"
        id="linearGradient4900"
        x1="7.9987183"
@@ -65,7 +57,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(0.96071629,0,0,0.88015211,-2.5874812,123.38494)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4902"
        id="linearGradient4908"
        x1="10.544736"
@@ -75,7 +66,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-3.0056311,-1.0387767)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4994"
        id="linearGradient5000"
        x1="9.8946028"
@@ -85,113 +75,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-2.9945826,-1.0387767)" />
     <linearGradient
-       id="linearGradient4844-4-1">
-      <stop
-         id="stop4846-8-4"
-         offset="0"
-         style="stop-color:#3f3f3f;stop-opacity:1;" />
-      <stop
-         id="stop4848-8-9"
-         offset="1"
-         style="stop-color:#303030;stop-opacity:1;" />
-    </linearGradient>
-    <mask
-       maskUnits="userSpaceOnUse"
-       id="mask6204">
-      <path
-         style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-         d="m 1,1036.3935 0,0.5 0,12.9687 0,0.5 0.5,0 10.0625,0 0.5,0 0,-0.5 0,-9.9687 0,-0.2188 -0.15625,-0.125 -3.0625,-3 -0.125,-0.1562 -0.21875,0 -7,0 -0.5,0 z"
-         id="path6206"
-         inkscape:connector-curvature="0" />
-    </mask>
-    <linearGradient
-       y2="1038.5814"
-       x2="4.7528968"
-       y1="1051.0466"
-       x1="4.7528968"
-       gradientTransform="translate(1.9961442e-6,-9.9830355e-5)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient6120-1"
-       xlink:href="#linearGradient4852-7-8-1"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient4852-7-8-1"
-       inkscape:collect="always">
-      <stop
-         id="stop4854-4-1-9"
-         offset="0"
-         style="stop-color:#707070;stop-opacity:1" />
-      <stop
-         id="stop4856-0-2-1"
-         offset="1"
-         style="stop-color:#a0a0a0;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       y2="1037.7"
-       x2="8.6566515"
-       y1="1050.7386"
-       x1="8.6566515"
-       gradientTransform="translate(1.9961442e-6,-9.9830355e-5)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient6122-0"
-       xlink:href="#linearGradient4844-4-1-4"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient4844-4-1-4">
-      <stop
-         id="stop4846-8-4-2"
-         offset="0"
-         style="stop-color:#3f3f3f;stop-opacity:1;" />
-      <stop
-         id="stop4848-8-9-2"
-         offset="1"
-         style="stop-color:#303030;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       y2="1038.5814"
-       x2="4.7528968"
-       y1="1051.0466"
-       x1="4.7528968"
-       gradientTransform="translate(1.9961442e-6,-9.9830355e-5)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient6120-4"
-       xlink:href="#linearGradient4852-7-8-6"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient4852-7-8-6"
-       inkscape:collect="always">
-      <stop
-         id="stop4854-4-1-5"
-         offset="0"
-         style="stop-color:#707070;stop-opacity:1" />
-      <stop
-         id="stop4856-0-2-9"
-         offset="1"
-         style="stop-color:#a0a0a0;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       y2="1037.7"
-       x2="8.6566515"
-       y1="1050.7386"
-       x1="8.6566515"
-       gradientTransform="translate(1.9961442e-6,-9.9830355e-5)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient6122-8"
-       xlink:href="#linearGradient4844-4-1-7"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient4844-4-1-7">
-      <stop
-         id="stop4846-8-4-5"
-         offset="0"
-         style="stop-color:#3f3f3f;stop-opacity:1;" />
-      <stop
-         id="stop4848-8-9-3"
-         offset="1"
-         style="stop-color:#303030;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4994"
        id="linearGradient4274"
        gradientUnits="userSpaceOnUse"
@@ -201,7 +84,6 @@
        x2="9.8946028"
        y2="1051.8378" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4994"
        id="linearGradient4312"
        gradientUnits="userSpaceOnUse"
@@ -211,7 +93,6 @@
        x2="9.8946028"
        y2="1051.8378" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4994"
        id="linearGradient4346"
        gradientUnits="userSpaceOnUse"
@@ -221,31 +102,6 @@
        x2="9.8946028"
        y2="1051.8378" />
   </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.9573619"
-     inkscape:cy="0.47227903"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1542"
-     inkscape:window-height="975"
-     inkscape:window-x="407"
-     inkscape:window-y="480"
-     inkscape:window-maximized="0"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3999" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -259,8 +115,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
@@ -268,20 +122,14 @@
        id="g4219"
        transform="translate(-0.0078125,0)">
       <path
-         sodipodi:nodetypes="cccccc"
-         inkscape:connector-curvature="0"
          id="rect4001-3"
          d="m 2.5026999,1037.8649 2.5409187,0 2.7026816,3.0066 0,3.1421 -5.2436003,0 z"
          style="display:inline;fill:url(#linearGradient5000);fill-opacity:1;stroke:none" />
       <path
-         sodipodi:nodetypes="cccccc"
-         inkscape:connector-curvature="0"
          id="rect4001"
          d="m 2.4916514,1037.8649 2.7909187,0 2.1870566,2.6199 0,3.3882 -4.9779753,0 z"
          style="fill:none;stroke:url(#linearGradient4908);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1" />
       <path
-         sodipodi:nodetypes="cccc"
-         inkscape:connector-curvature="0"
          id="path4884"
          d="m 4.9963429,1037.3619 0.013154,2.9986 2.972114,0.01 -1.9867832,-3.0028"
          style="fill:url(#linearGradient4900);fill-opacity:1;stroke:none" />
@@ -298,20 +146,14 @@
        id="g4219-0"
        transform="translate(8.022583,0)">
       <path
-         sodipodi:nodetypes="cccccc"
-         inkscape:connector-curvature="0"
          id="rect4001-3-1"
          d="m 2.5026999,1037.8649 2.5409187,0 2.8745566,3.0066 0,3.1421 -5.4154753,0 z"
          style="display:inline;fill:url(#linearGradient4274);fill-opacity:1;stroke:none" />
       <path
-         sodipodi:nodetypes="cccccc"
-         inkscape:connector-curvature="0"
          id="rect4001-6"
          d="m 2.4916514,1037.8649 2.7909187,0 2.1870566,2.6199 0,3.3882 -4.9779753,0 z"
          style="fill:#d0d0d0;stroke:#a9a9a9;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;fill-opacity:1" />
       <path
-         sodipodi:nodetypes="cccc"
-         inkscape:connector-curvature="0"
          id="path4884-8"
          d="m 4.9963429,1037.3619 0.013154,2.9986 2.972114,0.01 -1.9867832,-3.0028"
          style="fill:#aaaaaa;fill-opacity:1;stroke:none" />
@@ -321,20 +163,14 @@
        id="g4219-0-8"
        transform="translate(8.0225826,7.9991455)">
       <path
-         sodipodi:nodetypes="cccccc"
-         inkscape:connector-curvature="0"
          id="rect4001-3-1-2"
          d="m 2.5026999,1037.8649 2.5409187,0 2.8745566,3.0066 0,3.1421 -5.4154753,0 z"
          style="display:inline;fill:url(#linearGradient4312);fill-opacity:1;stroke:none" />
       <path
-         sodipodi:nodetypes="cccccc"
-         inkscape:connector-curvature="0"
          id="rect4001-6-2"
          d="m 2.4916514,1037.8649 2.7909187,0 2.1870566,2.6199 0,3.3882 -4.9779753,0 z"
          style="fill:#d0d0d0;fill-opacity:1;stroke:#a9a9a9;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1" />
       <path
-         sodipodi:nodetypes="cccc"
-         inkscape:connector-curvature="0"
          id="path4884-8-0"
          d="m 4.9963429,1037.3619 0.013154,2.9986 2.972114,0.01 -1.9867832,-3.0028"
          style="fill:#aaaaaa;fill-opacity:1;stroke:none" />
@@ -344,20 +180,14 @@
        id="g4219-0-8-1"
        transform="translate(0.01562465,7.9991455)">
       <path
-         sodipodi:nodetypes="cccccc"
-         inkscape:connector-curvature="0"
          id="rect4001-3-1-2-6"
          d="m 2.5026999,1037.8649 2.5409187,0 2.8745566,3.0066 0,3.1421 -5.4154753,0 z"
          style="display:inline;fill:url(#linearGradient4346);fill-opacity:1;stroke:none" />
       <path
-         sodipodi:nodetypes="cccccc"
-         inkscape:connector-curvature="0"
          id="rect4001-6-2-9"
          d="m 2.4916514,1037.8649 2.7909187,0 2.1870566,2.6199 0,3.3882 -4.9779753,0 z"
          style="fill:#d0d0d0;fill-opacity:1;stroke:#a9a9a9;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1" />
       <path
-         sodipodi:nodetypes="cccc"
-         inkscape:connector-curvature="0"
          id="path4884-8-0-3"
          d="m 4.9963429,1037.3619 0.013154,2.9986 2.972114,0.01 -1.9867832,-3.0028"
          style="fill:#aaaaaa;fill-opacity:1;stroke:none" />
diff --git a/ui/org.eclipse.pde.ui/icons/elcl16/collapse_all_mini.svg b/ui/org.eclipse.pde.ui/icons/elcl16/collapse_all_mini.svg
index ce1a0e62785..eb99477f1b9 100644
--- a/ui/org.eclipse.pde.ui/icons/elcl16/collapse_all_mini.svg
+++ b/ui/org.eclipse.pde.ui/icons/elcl16/collapse_all_mini.svg
@@ -2,24 +2,19 @@
 <!-- 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="9"
    height="9"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="collapse_all_mini.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4883-4"
        id="linearGradient4889-2"
        x1="28"
@@ -29,7 +24,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(0.9,0,0,0.9,-23.685485,104.95453)" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4883-4">
       <stop
          style="stop-color:#ebf9ff;stop-opacity:1"
@@ -41,7 +35,6 @@
          id="stop4887-5" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4883-4-7"
        id="linearGradient4889-2-1"
        x1="28"
@@ -51,7 +44,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(0.9,0,0,0.9,-21.685485,106.95453)" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4883-4-7">
       <stop
          style="stop-color:#ebf9ff;stop-opacity:1"
@@ -70,8 +62,7 @@
        gradientTransform="translate(19.768869,7.0314126)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient4970"
-       xlink:href="#linearGradient4989"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4989" />
     <linearGradient
        id="linearGradient4989">
       <stop
@@ -88,7 +79,6 @@
          id="stop4993" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4910-4-4-2">
       <stop
          style="stop-color:#ffffff;stop-opacity:0"
@@ -100,8 +90,7 @@
          id="stop4914-8-8-6" />
     </linearGradient>
     <linearGradient
-       id="linearGradient4994-4-7-4"
-       inkscape:collect="always">
+       id="linearGradient4994-4-7-4">
       <stop
          id="stop4996-5-4-2"
          offset="0"
@@ -112,7 +101,6 @@
          style="stop-color:#ffffff;stop-opacity:0;" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4910-4-4-2"
        id="linearGradient4243"
        gradientUnits="userSpaceOnUse"
@@ -122,7 +110,6 @@
        x2="-15"
        y2="1047.3622" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4994-4-7-4"
        id="linearGradient4245"
        gradientUnits="userSpaceOnUse"
@@ -132,31 +119,6 @@
        x2="-11"
        y2="1045.3622" />
   </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.5798991"
-     inkscape:cy="2.3528943"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1241"
-     inkscape:window-height="809"
-     inkscape:window-x="1159"
-     inkscape:window-y="450"
-     inkscape:window-maximized="0"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3999" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -165,44 +127,31 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1043.3622)">
     <path
        style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#a6afc4;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate"
        d="m -0.0011104,1043.3571 0,7.0234 7.015625,0 0,-7.0234 z m 1,1 5.015625,0 0,5.0234 -5.015625,0 z"
-       id="rect3997-9-1"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccccccc"
-       inkscape:export-filename="C:\Users\jmietling\Documents\rect3997-9-1.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
+       id="rect3997-9-1" />
     <path
        style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient4889-2);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate"
        d="m 1.0022536,1044.3359 5.0075735,0 0.02812,5.0446 -5.0075735,0 z"
-       id="rect3997-9-1-1"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+       id="rect3997-9-1-1" />
     <g
        style="display:inline"
        id="g4202-8"
        transform="translate(-2.0121753,-1.9990012)">
       <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
          id="rect4853-82-7-1-2"
          d="m 5.0119371,1048.3602 0,3.0017 -2,0 0,-5.0017 z"
          style="display:inline;fill:url(#linearGradient4243);fill-opacity:1;stroke:none" />
       <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
          id="rect4853-82-0-6-7"
          d="m 5.0119371,1048.3602 3.0124909,0 0,-2 -5.0124909,0 z"
          style="display:inline;fill:url(#linearGradient4245);fill-opacity:1;stroke:none" />
@@ -210,24 +159,15 @@
     <path
        style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#8b96ab;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate"
        d="m 2.0361844,1045.4118 0,6.9687 6.9783302,0 0,-6.9687 z m 1,1 4.9783302,0 0,4.9687 -4.9783302,0 z"
-       id="rect3997-9-1-2"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccccccc"
-       inkscape:export-filename="C:\Users\jmietling\Documents\rect3997-9-1.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
+       id="rect3997-9-1-2" />
     <path
        style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient4889-2-1);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate"
        d="m 3.0145146,1046.3493 4.971875,0 0.02812,5.0312 -4.971875,0 z"
-       id="rect3997-9-1-1-2"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+       id="rect3997-9-1-1-2" />
     <path
        style="display:inline;fill:url(#linearGradient4970);fill-opacity:1;stroke:none"
        d="m 5.7688691,1050.3936 1.4865631,0 c 1,0 1,-1 0,-1 l -1.4865631,0 c -1,0 -1,1 0,1 z"
-       id="rect4853-82-0-6-8"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+       id="rect4853-82-0-6-8" />
     <rect
        style="display:inline;fill:#01467a;fill-opacity:1;stroke:none"
        id="rect4167-8"
diff --git a/ui/org.eclipse.pde.ui/icons/elcl16/collapseall.svg b/ui/org.eclipse.pde.ui/icons/elcl16/collapseall.svg
index be071f93029..699e12e67f0 100644
--- a/ui/org.eclipse.pde.ui/icons/elcl16/collapseall.svg
+++ b/ui/org.eclipse.pde.ui/icons/elcl16/collapseall.svg
@@ -2,24 +2,19 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.48.0 r9654"
-   sodipodi:docname="collapseall.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4883-4"
        id="linearGradient4889-2"
        x1="28"
@@ -29,7 +24,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(0.9,0,0,0.9,-17.7,103.93622)" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4883-4">
       <stop
          style="stop-color:#ebf9ff;stop-opacity:1"
@@ -48,10 +42,8 @@
        gradientTransform="translate(18,-3)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient5062-9"
-       xlink:href="#linearGradient4910-4-4"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4910-4-4" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4910-4-4">
       <stop
          style="stop-color:#ffffff;stop-opacity:0"
@@ -70,11 +62,9 @@
        gradientUnits="userSpaceOnUse"
        id="linearGradient4975-2-1"
        xlink:href="#linearGradient4994-4-7-7"
-       inkscape:collect="always"
        gradientTransform="translate(18,-3)" />
     <linearGradient
-       id="linearGradient4994-4-7-7"
-       inkscape:collect="always">
+       id="linearGradient4994-4-7-7">
       <stop
          id="stop4996-5-4"
          offset="0"
@@ -85,7 +75,6 @@
          style="stop-color:#ffffff;stop-opacity:0;" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4883-4-7"
        id="linearGradient4889-2-1"
        x1="28"
@@ -95,7 +84,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(0.9,0,0,0.9,-15.7,105.93622)" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4883-4-7">
       <stop
          style="stop-color:#ebf9ff;stop-opacity:1"
@@ -114,8 +102,7 @@
        gradientTransform="translate(22,4)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient4970"
-       xlink:href="#linearGradient4989"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4989" />
     <linearGradient
        id="linearGradient4989">
       <stop
@@ -139,10 +126,8 @@
        gradientTransform="translate(20,-1)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient5062-9-5"
-       xlink:href="#linearGradient4910-4-4-2"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4910-4-4-2" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4910-4-4-2">
       <stop
          style="stop-color:#ffffff;stop-opacity:0"
@@ -161,11 +146,9 @@
        gradientUnits="userSpaceOnUse"
        id="linearGradient4975-2-1-1"
        xlink:href="#linearGradient4994-4-7-4"
-       inkscape:collect="always"
        gradientTransform="translate(20,-1)" />
     <linearGradient
-       id="linearGradient4994-4-7-4"
-       inkscape:collect="always">
+       id="linearGradient4994-4-7-4">
       <stop
          id="stop4996-5-4-2"
          offset="0"
@@ -176,31 +159,6 @@
          style="stop-color:#ffffff;stop-opacity:0;" />
     </linearGradient>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="16"
-     inkscape:cx="9.8506072"
-     inkscape:cy="9.9346296"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1241"
-     inkscape:window-height="809"
-     inkscape:window-x="1159"
-     inkscape:window-y="450"
-     inkscape:window-maximized="0"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3999" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -214,69 +172,45 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
     <path
        style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#a6afc4;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
        d="m 2,1038.3622 0,11 11,0 0,-11 z m 1,1 9,0 0,9 -9,0 z"
-       id="rect3997-9-1"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccccccc"
-       inkscape:export-filename="C:\Users\jmietling\Documents\rect3997-9-1.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
+       id="rect3997-9-1" />
     <path
        style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:url(#linearGradient4889-2);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
        d="m 3,1039.3622 8.971875,0 0.02812,9 -8.971875,0 z"
-       id="rect3997-9-1-1"
-       inkscape:connector-curvature="0" />
+       id="rect3997-9-1-1" />
     <path
        style="fill:url(#linearGradient5062-9);fill-opacity:1;stroke:none;display:inline"
        d="m 5,1041.3622 0,7 -2,0 0,-9 z"
-       id="rect4853-82-7-6"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+       id="rect4853-82-7-6" />
     <path
        style="fill:url(#linearGradient4975-2-1);fill-opacity:1;stroke:none;display:inline"
        d="m 5,1041.3622 7,0 0,-2 -9,0 z"
-       id="rect4853-82-0-1"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+       id="rect4853-82-0-1" />
     <path
        style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#8b96ab;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
        d="m 4,1040.3622 0,11 11,0 0,-11 z m 1,1 9,0 0,9 -9,0 z"
-       id="rect3997-9-1-2"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccccccc"
-       inkscape:export-filename="C:\Users\jmietling\Documents\rect3997-9-1.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
+       id="rect3997-9-1-2" />
     <path
        style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:url(#linearGradient4889-2-1);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
        d="m 5,1041.3622 8.971875,0 0.02812,9 -8.971875,0 z"
-       id="rect3997-9-1-1-2"
-       inkscape:connector-curvature="0" />
+       id="rect3997-9-1-1-2" />
     <path
        style="fill:url(#linearGradient4970);fill-opacity:1;stroke:none;display:inline"
        d="m 8,1047.3622 5,0 c 1,0 1,-1 0,-1 l -5,0 c -1,0 -1,1 0,1 z"
-       id="rect4853-82-0-6-8"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+       id="rect4853-82-0-6-8" />
     <path
        style="fill:url(#linearGradient5062-9-5);fill-opacity:1;stroke:none;display:inline"
        d="m 7,1043.3622 0,7 -2,0 0,-9 z"
-       id="rect4853-82-7-1"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+       id="rect4853-82-7-1" />
     <path
        style="fill:url(#linearGradient4975-2-1-1);fill-opacity:1;stroke:none;display:inline"
        d="m 7,1043.3622 7,0 0,-2 -9,0 z"
-       id="rect4853-82-0-6"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+       id="rect4853-82-0-6" />
     <rect
        style="fill:#01467a;fill-opacity:1;stroke:none;display:inline"
        id="rect4167-8"
diff --git a/ui/org.eclipse.pde.ui/icons/elcl16/configure_problem_severity.svg b/ui/org.eclipse.pde.ui/icons/elcl16/configure_problem_severity.svg
index 1077c3cf372..ba38eaa9652 100644
--- a/ui/org.eclipse.pde.ui/icons/elcl16/configure_problem_severity.svg
+++ b/ui/org.eclipse.pde.ui/icons/elcl16/configure_problem_severity.svg
@@ -2,20 +2,16 @@
 <!-- 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="16"
    height="16"
    id="svg3156"
    version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="New document 3">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs3158">
     <linearGradient
@@ -25,8 +21,7 @@
        y1="7.0159616"
        x1="3.3833356"
        id="linearGradient5087"
-       xlink:href="#linearGradient5081"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient5081" />
     <linearGradient
        id="linearGradient5081">
       <stop
@@ -49,11 +44,9 @@
        y1="7.2369323"
        x1="6.3885393"
        id="linearGradient5097"
-       xlink:href="#linearGradient5091"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient5091" />
     <linearGradient
-       id="linearGradient5091"
-       inkscape:collect="always">
+       id="linearGradient5091">
       <stop
          id="stop5093"
          offset="0"
@@ -69,7 +62,6 @@
       <g
          id="g25146">
         <g
-           inkscape:label="Layer 1"
            id="g25148"
            style="fill:#ffffff;stroke:none;display:inline"
            transform="translate(8.9848537,-0.99390417)">
@@ -85,7 +77,6 @@
                x="15.590192"
                y="1043.4797" />
             <path
-               inkscape:connector-curvature="0"
                style="font-size:7.68999243px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:0px;word-spacing:0px;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.27519909;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
                d="m 1.25,1.78125 0,0.125 0,0.5 0,0.125 0.125,0 0.375,0 1.1875,1.40625 -1.21875,1.53125 -0.34375,0 -0.125,0 0,0.125 0,0.5 0,0.125 0.125,0 1.5,0 0.125,0 0,-0.125 0,-0.5 0,-0.125 -0.125,0 L 3.5,4.625 l 0.625,0.84375 -0.125,0 0,0.125 0,0.5 0,0.125 0.125,0 1.5,0 0.125,0 0,-0.125 0,-0.5 0,-0.125 -0.125,0 -0.3125,0 -1.25,-1.5625 1.15625,-1.375 0.40625,0 0.125,0 0,-0.125 0,-0.5 0,-0.125 -0.125,0 -1.5,0 -0.125,0 0,0.125 0,0.5 0,0.125 0.0625,0 L 3.5,3.25 2.9375,2.53125 l 0.0625,0 0,-0.125 0,-0.5 0,-0.125 -0.125,0 -1.5,0 -0.125,0 z"
                transform="matrix(1.0698871,0,0,1.0698871,15.590192,1043.4798)"
@@ -93,7 +84,6 @@
           </g>
         </g>
         <g
-           inkscape:label="Layer 1"
            id="g25156"
            style="fill:#ffffff;stroke:#ffffff;display:inline"
            transform="translate(4.9852807,-7.9432158)">
@@ -105,69 +95,32 @@
                style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
                d="M 2.8125,0.90625 0.78125,5 C 0.17522066,6.0251238 0.58843406,7.4816983 1.71875,7.5 L 3,7.5 l 1,0 1.28125,0 C 6.4115665,7.4817738 6.8247794,6.0250615 6.21875,5 L 4.1875,0.90625 c -0.2942923,-0.55673837 -1.1188077,-0.46727236 -1.375,0 z"
                id="path25160"
-               inkscape:connector-curvature="0"
-               sodipodi:nodetypes="ccccccccc"
                transform="matrix(1.0698871,0,0,1.0698871,15.590192,1043.4798)" />
             <path
-               sodipodi:type="arc"
                style="fill:#ffffff;fill-opacity:1;stroke:#ffffff"
                id="path25162"
-               sodipodi:cx="3.484375"
-               sodipodi:cy="5.484375"
-               sodipodi:rx="0.625"
-               sodipodi:ry="0.625"
                d="m 4.109375,5.484375 c 0,0.345178 -0.279822,0.625 -0.625,0.625 -0.345178,0 -0.625,-0.279822 -0.625,-0.625 0,-0.345178 0.279822,-0.625 0.625,-0.625 0.345178,0 0.625,0.279822 0.625,0.625 z"
                transform="matrix(1.125929,0,0,1.125929,15.411638,1043.3738)" />
             <path
                style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;display:inline"
                d="m 19.350026,1045.5028 c -0.378471,0 -0.700512,0.3368 -0.700512,0.774 l 0.09137,1.4889 c 0,0.3887 0.272722,0.7037 0.609141,0.7037 0.336419,0 0.609139,-0.315 0.609139,-0.7037 l 0.06091,-1.4889 c 0,-0.4372 -0.291583,-0.774 -0.670056,-0.774 z"
-               id="path25164"
-               inkscape:connector-curvature="0"
-               sodipodi:nodetypes="sccsccs" />
+               id="path25164" />
           </g>
         </g>
       </g>
     </mask>
     <filter
        color-interpolation-filters="sRGB"
-       inkscape:collect="always"
        id="filter25166"
-       x="-0.23445988"
-       width="1.4689198"
-       y="-0.24580829"
-       height="1.4916166">
+       x="-0.3241778"
+       width="1.6760303"
+       y="-0.36202789"
+       height="1.7240558">
       <feGaussianBlur
-         inkscape:collect="always"
          stdDeviation="1.0667455"
          id="feGaussianBlur25168" />
     </filter>
   </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.0256044"
-     inkscape:cy="1.3124776"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="668"
-     inkscape:window-height="604"
-     inkscape:window-x="1652"
-     inkscape:window-y="473"
-     inkscape:window-maximized="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3164"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
   <metadata
      id="metadata3161">
     <rdf:RDF>
@@ -176,20 +129,17 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      transform="translate(0,-1036.3622)">
     <g
        transform="translate(8.9848532,-0.99391581)"
        style="display:inline"
-       id="layer1-3"
-       inkscape:label="Layer 1">
+       id="layer1-3">
       <g
          transform="matrix(0.9346781,0,0,0.9346781,-14.571811,69.044514)"
          id="g8472-2"
@@ -205,39 +155,28 @@
            id="path4187"
            transform="matrix(1.0698871,0,0,1.0698871,15.590192,1043.4798)"
            d="m 1.25,1.78125 0,0.125 0,0.5 0,0.125 0.125,0 0.375,0 1.1875,1.40625 -1.21875,1.53125 -0.34375,0 -0.125,0 0,0.125 0,0.5 0,0.125 0.125,0 1.5,0 0.125,0 0,-0.125 0,-0.5 0,-0.125 -0.125,0 L 3.5,4.625 l 0.625,0.84375 -0.125,0 0,0.125 0,0.5 0,0.125 0.125,0 1.5,0 0.125,0 0,-0.125 0,-0.5 0,-0.125 -0.125,0 -0.3125,0 -1.25,-1.5625 1.15625,-1.375 0.40625,0 0.125,0 0,-0.125 0,-0.5 0,-0.125 -0.125,0 -1.5,0 -0.125,0 0,0.125 0,0.5 0,0.125 0.0625,0 L 3.5,3.25 2.9375,2.53125 l 0.0625,0 0,-0.125 0,-0.5 0,-0.125 -0.125,0 -1.5,0 -0.125,0 z"
-           style="font-size:7.68999243px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:0px;word-spacing:0px;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.27519909;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-           inkscape:connector-curvature="0" />
+           style="font-size:7.68999243px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:0px;word-spacing:0px;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.27519909;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" />
       </g>
     </g>
     <g
        transform="translate(4.9852807,-7.9432158)"
        style="display:inline"
-       id="layer1-8"
-       inkscape:label="Layer 1">
+       id="layer1-8">
       <g
          transform="matrix(0.9346781,0,0,0.9346781,-14.571811,69.044514)"
          id="g8472"
          style="display:inline">
         <path
            transform="matrix(1.0698871,0,0,1.0698871,15.590192,1043.4798)"
-           sodipodi:nodetypes="ccccccccc"
-           inkscape:connector-curvature="0"
            id="path4292"
            d="M 2.8125,0.90625 0.78125,5 C 0.17522066,6.0251238 0.58843406,7.4816983 1.71875,7.5 L 3,7.5 l 1,0 1.28125,0 C 6.4115665,7.4817738 6.8247794,6.0250615 6.21875,5 L 4.1875,0.90625 c -0.2942923,-0.55673837 -1.1188077,-0.46727236 -1.375,0 z"
            style="fill:url(#linearGradient5087);fill-opacity:1;stroke:url(#linearGradient5097);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
         <path
            transform="matrix(1.125929,0,0,1.125929,15.411638,1043.3738)"
            d="m 4.109375,5.484375 c 0,0.345178 -0.279822,0.625 -0.625,0.625 -0.345178,0 -0.625,-0.279822 -0.625,-0.625 0,-0.345178 0.279822,-0.625 0.625,-0.625 0.345178,0 0.625,0.279822 0.625,0.625 z"
-           sodipodi:ry="0.625"
-           sodipodi:rx="0.625"
-           sodipodi:cy="5.484375"
-           sodipodi:cx="3.484375"
            id="path4253"
-           style="fill:#502800;fill-opacity:1;stroke:none"
-           sodipodi:type="arc" />
+           style="fill:#502800;fill-opacity:1;stroke:none" />
         <path
-           sodipodi:nodetypes="sccsccs"
-           inkscape:connector-curvature="0"
            id="path4253-7"
            d="m 19.350026,1045.5028 c -0.378471,0 -0.700512,0.3368 -0.700512,0.774 l 0.09137,1.4889 c 0,0.3887 0.272722,0.7037 0.609141,0.7037 0.336419,0 0.609139,-0.315 0.609139,-0.7037 l 0.06091,-1.4889 c 0,-0.4372 -0.291583,-0.774 -0.670056,-0.774 z"
            style="fill:#502800;fill-opacity:1;stroke:none;display:inline" />
@@ -250,7 +189,6 @@
        mask="url(#mask25144)">
       <g
          transform="matrix(0.8261236,0,0,0.8261236,-0.70848,186.15135)"
-         inkscape:label="Layer 1"
          id="layer1-4-9"
          style="fill:#ffffff;stroke:#ffffff;stroke-width:2.42094517;stroke-miterlimit:4;stroke-dasharray:none;display:inline;filter:url(#filter25166)">
         <g
@@ -258,24 +196,15 @@
            id="g17594-4"
            transform="matrix(1.2065384,0,0,1.2065384,1.2248827,-221.37405)">
           <path
-             sodipodi:type="arc"
              style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:2.00652146;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
              id="path6139-9"
-             sodipodi:cx="-6.7838054"
-             sodipodi:cy="9.7465248"
-             sodipodi:rx="4.3089318"
-             sodipodi:ry="4.3089318"
              d="m -2.4748735,9.7465248 c 0,2.3797572 -1.9291745,4.3089322 -4.3089319,4.3089322 -2.3797573,0 -4.3089316,-1.929175 -4.3089316,-4.3089322 0,-2.3797573 1.9291743,-4.3089318 4.3089316,-4.3089318 2.3797574,0 4.3089319,1.9291745 4.3089319,4.3089318 z"
              transform="translate(12.005651,1037.2461)" />
           <path
-             sodipodi:nodetypes="scccccscccccccccccccccsccccccccccscccccccccccccccccsccc"
-             inkscape:connector-curvature="0"
              id="path6139-5-5"
              d="m 5.2901155,1042.6691 c -0.4193865,0 -0.827937,0.074 -1.2109584,0.1863 l 0.4968033,0.6521 0.8073063,1.0246 0.7762559,-1.0246 0.4968036,-0.59 c -0.429042,-0.1444 -0.8885091,-0.2484 -1.3662107,-0.2484 z m -2.1114149,0.59 c -0.7184889,0.4103 -1.2964352,1.0016 -1.6767124,1.7388 l 0.6520553,0.093 1.2730592,0.1553 -0.1552509,-1.2731 -0.093148,-0.7141 z m 4.2228311,0 -0.093148,0.7141 -0.155251,1.2731 1.3041096,-0.1553 0.6210049,-0.061 c -0.3798299,-0.7481 -0.9503317,-1.3549 -1.6767123,-1.7698 z m -6.2100454,2.484 c -0.112404,0.383 -0.1863014,0.7916 -0.1863014,1.2109 0,0.433 0.09783,0.8481 0.2173518,1.2421 l 0.5278537,-0.4348 1.0246571,-0.7761 -1.0246571,-0.8074 z m 8.1972597,0.031 -0.5278537,0.4037 -1.024658,0.8074 1.024658,0.7762 0.4968033,0.4036 c 0.1140598,-0.3856 0.2173518,-0.7884 0.2173518,-1.211 0,-0.409 -0.079196,-0.8053 -0.1863014,-1.1799 z m -5.9616433,2.9499 -1.2730592,0.1552 -0.6210049,0.062 c 0.3807416,0.7204 0.9395255,1.3044 1.645662,1.7079 l 0.093148,-0.6522 0.155251,-1.273 z m 3.7260268,0 0.155251,1.2729 0.093148,0.6522 c 0.7061365,-0.4034 1.2649204,-0.9875 1.645662,-1.7079 l -0.5899545,-0.062 c -0.4345689,-0.052 -0.8703802,-0.1039 -1.3041096,-0.1557 z m -1.7698628,0.7141 -0.8073063,0.9936 -0.4657529,0.6209 c 0.3746086,0.1072 0.7709056,0.1864 1.179908,0.1864 0.4641221,0 0.9166457,-0.081 1.3351603,-0.2173 l -0.4657532,-0.59 z"
              style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:2.00652146;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
           <path
-             sodipodi:nodetypes="ccccccscccs"
-             inkscape:connector-curvature="0"
              id="rect9436-2"
              d="m 0.524759,1042.9675 3.79253,5.2259 c 0,0 1.216807,0.4672 1.684108,-1e-4 l 0.19297,-0.193 c 0.467299,-0.4673 -8e-6,-1.6841 -8e-6,-1.6841 z m 4.055643,3.5242 c 0.376798,-0.3768 0.991528,-0.3769 1.368362,0 0.376788,0.3767 0.376773,0.9914 -2.5e-5,1.3682 -0.376798,0.3769 -0.991507,0.3769 -1.368294,0 -0.376855,-0.3768 -0.376841,-0.9915 -4.3e-5,-1.3682 z"
              style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:2.00652146;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
@@ -285,7 +214,6 @@
     <g
        style="display:inline"
        id="layer1-4"
-       inkscape:label="Layer 1"
        transform="matrix(0.8261236,0,0,0.8261236,-0.70848002,186.15128)">
       <g
          transform="matrix(1.2065384,0,0,1.2065384,1.2248827,-221.37405)"
@@ -293,25 +221,16 @@
         <path
            transform="translate(12.005651,1037.2461)"
            d="m -2.4748735,9.7465248 c 0,2.3797572 -1.9291745,4.3089322 -4.3089319,4.3089322 -2.3797573,0 -4.3089316,-1.929175 -4.3089316,-4.3089322 0,-2.3797573 1.9291743,-4.3089318 4.3089316,-4.3089318 2.3797574,0 4.3089319,1.9291745 4.3089319,4.3089318 z"
-           sodipodi:ry="4.3089318"
-           sodipodi:rx="4.3089318"
-           sodipodi:cy="9.7465248"
-           sodipodi:cx="-6.7838054"
            id="path6139"
-           style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#4d607b;stroke-width:0.82881737;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           sodipodi:type="arc" />
+           style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#4d607b;stroke-width:0.82881737;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
         <path
            style="color:#000000;fill:#4e8fbd;fill-opacity:1;fill-rule:nonzero;stroke:#4d607b;stroke-width:0.59773082;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
            d="m 5.2901155,1042.6691 c -0.4193865,0 -0.827937,0.074 -1.2109584,0.1863 l 0.4968033,0.6521 0.8073063,1.0246 0.7762559,-1.0246 0.4968036,-0.59 c -0.429042,-0.1444 -0.8885091,-0.2484 -1.3662107,-0.2484 z m -2.1114149,0.59 c -0.7184889,0.4103 -1.2964352,1.0016 -1.6767124,1.7388 l 0.6520553,0.093 1.2730592,0.1553 -0.1552509,-1.2731 -0.093148,-0.7141 z m 4.2228311,0 -0.093148,0.7141 -0.155251,1.2731 1.3041096,-0.1553 0.6210049,-0.061 c -0.3798299,-0.7481 -0.9503317,-1.3549 -1.6767123,-1.7698 z m -6.2100454,2.484 c -0.112404,0.383 -0.1863014,0.7916 -0.1863014,1.2109 0,0.433 0.09783,0.8481 0.2173518,1.2421 l 0.5278537,-0.4348 1.0246571,-0.7761 -1.0246571,-0.8074 z m 8.1972597,0.031 -0.5278537,0.4037 -1.024658,0.8074 1.024658,0.7762 0.4968033,0.4036 c 0.1140598,-0.3856 0.2173518,-0.7884 0.2173518,-1.211 0,-0.409 -0.079196,-0.8053 -0.1863014,-1.1799 z m -5.9616433,2.9499 -1.2730592,0.1552 -0.6210049,0.062 c 0.3807416,0.7204 0.9395255,1.3044 1.645662,1.7079 l 0.093148,-0.6522 0.155251,-1.273 z m 3.7260268,0 0.155251,1.2729 0.093148,0.6522 c 0.7061365,-0.4034 1.2649204,-0.9875 1.645662,-1.7079 l -0.5899545,-0.062 c -0.4345689,-0.052 -0.8703802,-0.1039 -1.3041096,-0.1557 z m -1.7698628,0.7141 -0.8073063,0.9936 -0.4657529,0.6209 c 0.3746086,0.1072 0.7709056,0.1864 1.179908,0.1864 0.4641221,0 0.9166457,-0.081 1.3351603,-0.2173 l -0.4657532,-0.59 z"
-           id="path6139-5"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="scccccscccccccccccccccsccccccccccscccccccccccccccccsccc" />
+           id="path6139-5" />
         <path
            style="color:#000000;fill:#4d607b;fill-opacity:1;fill-rule:nonzero;stroke:#384e6e;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
            d="m 0.524759,1042.9675 3.79253,5.2259 c 0,0 1.216807,0.4672 1.684108,-1e-4 l 0.19297,-0.193 c 0.467299,-0.4673 -8e-6,-1.6841 -8e-6,-1.6841 z m 4.055643,3.5242 c 0.376798,-0.3768 0.991528,-0.3769 1.368362,0 0.376788,0.3767 0.376773,0.9914 -2.5e-5,1.3682 -0.376798,0.3769 -0.991507,0.3769 -1.368294,0 -0.376855,-0.3768 -0.376841,-0.9915 -4.3e-5,-1.3682 z"
-           id="rect9436"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccccscccs" />
+           id="rect9436" />
       </g>
     </g>
   </g>
diff --git a/ui/org.eclipse.pde.ui/icons/elcl16/delete_edit.svg b/ui/org.eclipse.pde.ui/icons/elcl16/delete_edit.svg
index bf196fff571..fe8c94fe80b 100644
--- a/ui/org.eclipse.pde.ui/icons/elcl16/delete_edit.svg
+++ b/ui/org.eclipse.pde.ui/icons/elcl16/delete_edit.svg
@@ -2,24 +2,19 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.48.0 r9654"
-   sodipodi:docname="delete_edit.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4852">
       <stop
          style="stop-color:#df2c33;stop-opacity:1"
@@ -31,7 +26,6 @@
          id="stop4856" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4844">
       <stop
          style="stop-color:#c51325;stop-opacity:1;"
@@ -43,7 +37,6 @@
          id="stop4848" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4844"
        id="linearGradient4850"
        x1="8.6566515"
@@ -53,7 +46,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(1.962068e-6,-2.1458883e-5)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4852"
        id="linearGradient4858"
        x1="4.7528968"
@@ -63,31 +55,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(1.962068e-6,-2.1458883e-5)" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7.9999996"
-     inkscape:cx="-16.40091"
-     inkscape:cy="-0.10638011"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1241"
-     inkscape:window-height="814"
-     inkscape:window-x="250"
-     inkscape:window-y="250"
-     inkscape:window-maximized="0"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3999" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -101,16 +68,12 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
     <path
        style="fill:url(#linearGradient4858);fill-opacity:1;stroke:url(#linearGradient4850);stroke-width:0.98060334;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
        d="m 13.419292,1038.6553 c -0.468185,-0.4682 -1.221974,-0.4682 -1.690135,-10e-5 l -3.1127968,3.1129 -3.1127723,-3.1128 c -0.4681138,-0.4682 -1.221974,-0.4682 -1.690134,0 l -0.8600555,0.8601 c -0.4681391,0.468 -0.4681272,1.2218 3.66e-5,1.6901 l 3.1127223,3.1128 -3.1127269,3.1127 c -0.4682099,0.4682 -0.468198,1.222 -1.34e-5,1.6902 l 0.8601016,0.8601 c 0.4681344,0.4681 1.2219244,0.4681 1.6901337,0 l 3.1127774,-3.1128 3.1344053,3.1344 c 0.468135,0.4682 1.221925,0.4682 1.690135,0 l 0.860055,-0.86 c 0.46816,-0.4682 0.463458,-1.2173 -3.7e-5,-1.6902 l -3.134406,-3.1344 3.112777,-3.1127 c 0.468181,-0.4683 0.468169,-1.2221 3.4e-5,-1.6902 z"
-       id="rect4043"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="sccccccccssccsccsccss" />
+       id="rect4043" />
   </g>
 </svg>
diff --git a/ui/org.eclipse.pde.ui/icons/elcl16/dep_loop.svg b/ui/org.eclipse.pde.ui/icons/elcl16/dep_loop.svg
index f76f97a3057..236c90e0521 100644
--- a/ui/org.eclipse.pde.ui/icons/elcl16/dep_loop.svg
+++ b/ui/org.eclipse.pde.ui/icons/elcl16/dep_loop.svg
@@ -2,24 +2,19 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.48.0 r9654"
-   sodipodi:docname="dep_loop.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4879">
       <stop
          style="stop-color:#edd1a6;stop-opacity:1"
@@ -31,7 +26,6 @@
          id="stop4883" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4871">
       <stop
          style="stop-color:#d0a17f;stop-opacity:1;"
@@ -43,7 +37,6 @@
          id="stop4875" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4871"
        id="linearGradient4877"
        x1="8.3496704"
@@ -53,7 +46,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(3,-1)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4879"
        id="linearGradient4885"
        x1="10.454525"
@@ -63,7 +55,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(3,-1)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4879-7"
        id="linearGradient4885-1"
        x1="10.454525"
@@ -73,7 +64,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-5,-8.03125)" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4879-7">
       <stop
          style="stop-color:#edd1a6;stop-opacity:1"
@@ -85,7 +75,6 @@
          id="stop4883-0" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4871-4"
        id="linearGradient4877-9"
        x1="8.3496704"
@@ -95,7 +84,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-5,-8.03125)" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4871-4">
       <stop
          style="stop-color:#d0a17f;stop-opacity:1;"
@@ -107,31 +95,6 @@
          id="stop4875-8" />
     </linearGradient>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="15.999999"
-     inkscape:cx="4.3191212"
-     inkscape:cy="5.6383852"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1241"
-     inkscape:window-height="814"
-     inkscape:window-x="620"
-     inkscape:window-y="386"
-     inkscape:window-maximized="0"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3999" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -145,23 +108,17 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
     <path
        style="fill:#005596;fill-opacity:1;stroke:#005596;stroke-width:0.93913352px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
        d="m 10.360192,1042.8138 4.279616,0 -2.139808,2.0608 z"
-       id="path4097"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccc" />
+       id="path4097" />
     <path
        style="fill:none;stroke:#005596;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
        d="m 12.483266,1043.3644 c 0,-3.9753 -1.506698,-4.5038 -4.483266,-4.5038"
-       id="path4867"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc" />
+       id="path4867" />
     <rect
        style="fill:url(#linearGradient4885);fill-opacity:1;stroke:url(#linearGradient4877);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
        id="rect4869"
@@ -172,15 +129,11 @@
     <path
        style="fill:#005596;fill-opacity:1;stroke:#005596;stroke-width:0.93913352px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;display:inline"
        d="m 6.6554328,1045.8581 -4.279616,0 2.139808,-2.0608 z"
-       id="path4097-2"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccc" />
+       id="path4097-2" />
     <path
        style="fill:none;stroke:#005596;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
        d="m 4.5323588,1045.3075 c 0,3.9753 1.506698,4.5038 4.4832662,4.5038"
-       id="path4867-4"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc" />
+       id="path4867-4" />
     <rect
        style="fill:url(#linearGradient4885-1);fill-opacity:1;stroke:url(#linearGradient4877-9);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline"
        id="rect4869-5"
diff --git a/ui/org.eclipse.pde.ui/icons/elcl16/filter_ps.svg b/ui/org.eclipse.pde.ui/icons/elcl16/filter_ps.svg
index 67c16bb3096..4d6d8e583f7 100644
--- a/ui/org.eclipse.pde.ui/icons/elcl16/filter_ps.svg
+++ b/ui/org.eclipse.pde.ui/icons/elcl16/filter_ps.svg
@@ -2,27 +2,19 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
-   sodipodi:docname="filter_ps.svg"
-   inkscape:export-filename="C:\Users\jmietling\Documents\rect3997-9-1.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient1047">
       <stop
          style="stop-color:#96a0b9;stop-opacity:1"
@@ -34,7 +26,6 @@
          id="stop1045" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient1039">
       <stop
          style="stop-color:#fbffff;stop-opacity:1"
@@ -46,22 +37,6 @@
          id="stop1037" />
     </linearGradient>
     <linearGradient
-       id="linearGradient4989">
-      <stop
-         id="stop4991"
-         offset="0"
-         style="stop-color:#c3e9ff;stop-opacity:0.49019608;" />
-      <stop
-         style="stop-color:#c3e9ff;stop-opacity:1;"
-         offset="0.5"
-         id="stop4995" />
-      <stop
-         id="stop4993"
-         offset="1"
-         style="stop-color:#c3e9ff;stop-opacity:0.49019608;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient1039"
        id="linearGradient1041"
        x1="2.1048543"
@@ -70,7 +45,6 @@
        y2="1039.2937"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient1047"
        id="linearGradient1049"
        x1="1"
@@ -79,38 +53,6 @@
        y2="1044.8622"
        gradientUnits="userSpaceOnUse" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#444248"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="22.627416"
-     inkscape:cx="2.7020062"
-     inkscape:cy="8.7735937"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1920"
-     inkscape:window-height="1017"
-     inkscape:window-x="-8"
-     inkscape:window-y="-8"
-     inkscape:window-maximized="1"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="true"
-     inkscape:snap-bbox="true"
-     inkscape:bbox-nodes="true"
-     inkscape:snap-nodes="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3999"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -119,13 +61,11 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
diff --git a/ui/org.eclipse.pde.ui/icons/elcl16/filter_related.svg b/ui/org.eclipse.pde.ui/icons/elcl16/filter_related.svg
index 769a04d7883..6687584c043 100644
--- a/ui/org.eclipse.pde.ui/icons/elcl16/filter_related.svg
+++ b/ui/org.eclipse.pde.ui/icons/elcl16/filter_related.svg
@@ -2,27 +2,19 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
-   sodipodi:docname="filter_related.svg"
-   inkscape:export-filename="C:\Users\jmietling\Documents\rect3997-9-1.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10448-90"
        id="linearGradient10778-6"
        gradientUnits="userSpaceOnUse"
@@ -55,7 +47,6 @@
          id="stop10452-1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10748-8"
        id="linearGradient10774-5"
        gradientUnits="userSpaceOnUse"
@@ -88,7 +79,6 @@
          style="stop-color:#e5b630;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10448-9-7-0-5"
        id="linearGradient10770-6"
        gradientUnits="userSpaceOnUse"
@@ -120,11 +110,9 @@
        y1="1039.3379"
        x1="2.1048543"
        id="linearGradient1041"
-       xlink:href="#linearGradient1039"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient1039" />
     <linearGradient
-       id="linearGradient1039"
-       inkscape:collect="always">
+       id="linearGradient1039">
       <stop
          id="stop1035"
          offset="0"
@@ -142,11 +130,9 @@
        y1="1044.8622"
        x1="1"
        id="linearGradient1049"
-       xlink:href="#linearGradient1047"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient1047" />
     <linearGradient
-       id="linearGradient1047"
-       inkscape:collect="always">
+       id="linearGradient1047">
       <stop
          id="stop1043"
          offset="0"
@@ -157,38 +143,6 @@
          style="stop-color:#77849d;stop-opacity:1" />
     </linearGradient>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="22.627416"
-     inkscape:cx="-2.7402363"
-     inkscape:cy="10.386582"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1920"
-     inkscape:window-height="1017"
-     inkscape:window-x="-8"
-     inkscape:window-y="-8"
-     inkscape:window-maximized="1"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="true"
-     inkscape:snap-bbox="true"
-     inkscape:bbox-nodes="true"
-     inkscape:object-nodes="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3999"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -202,13 +156,10 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
     <path
-       inkscape:connector-curvature="0"
        id="path859"
        style="display:inline;fill:url(#linearGradient1041);fill-opacity:1;stroke:url(#linearGradient1049);stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
        d="m 6.504725,1043.8623 h 1.99055 M 0.5,1037.8622 h 12 v 2 l -4,4 v 6 l -3.0000002,2 H 4.5000004 v -8 l -4.0000004,-4 z" />
@@ -218,18 +169,14 @@
       <g
          id="g4386">
         <path
-           inkscape:connector-curvature="0"
            id="path4313-5-1-8-6"
            d="m 2.3385061,1041.3342 -2.343751,0.031 0.0098,1 2.34375,-0.031 z"
-           style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#9e7400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-           sodipodi:nodetypes="ccccc" />
+           style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#9e7400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
       </g>
       <path
-         sodipodi:nodetypes="ccccc"
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#9e7400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
          d="m 2.3385061,1039.3381 -2.343751,0.031 0.0098,1 2.34375,-0.031 z"
-         id="path4313-5-1-8-6-0"
-         inkscape:connector-curvature="0" />
+         id="path4313-5-1-8-6-0" />
       <g
          transform="translate(-0.30832699,15.266507)"
          id="g4239">
@@ -243,23 +190,17 @@
            rx="0"
            ry="0" />
         <path
-           sodipodi:nodetypes="ccccc"
            style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
            d="m 5.9540546,1024.1006 v 1 h 2.3359369 v -1 z"
-           id="path4313-8-8"
-           inkscape:connector-curvature="0" />
+           id="path4313-8-8" />
         <path
            style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.94926554px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
            d="m 6.2874256,1024.0948 v 3.0195 h 1.01551 v -3.0195 z"
-           id="path4313-8-8-7"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
+           id="path4313-8-8-7" />
         <path
-           sodipodi:nodetypes="ccccc"
            style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#9e7400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
            d="m 8.2821795,1026.0967 -2.3437509,0.031 0.0098,1 2.3437499,-0.031 z"
-           id="path4313-5-1-8"
-           inkscape:connector-curvature="0" />
+           id="path4313-5-1-8" />
         <rect
            style="display:inline;fill:url(#linearGradient10774-5);fill-opacity:1;stroke:none;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
            id="rect10007-0-74-2-7"
@@ -272,13 +213,11 @@
         <path
            style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#9e7400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
            d="m 6.3114756,1027.1065 -3.3593746,0.031 0.00977,1 3.3593746,-0.031 -0.0098,-1 z"
-           id="path4313-5-1"
-           inkscape:connector-curvature="0" />
+           id="path4313-5-1" />
         <path
            style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
            d="m 6.3017106,1023.0987 -3.3593752,0.031 0.00977,1 3.3593742,-0.031 -0.0098,-1 z"
-           id="path4313-8"
-           inkscape:connector-curvature="0" />
+           id="path4313-8" />
         <rect
            style="display:inline;fill:url(#linearGradient10778-6);fill-opacity:1;stroke:none;stroke-width:1.50161433;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
            id="rect10007-0-74-2"
@@ -289,29 +228,21 @@
            rx="0"
            ry="0" />
         <path
-           sodipodi:nodetypes="cccccc"
            style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
            d="m 4.3017106,1022.0967 -2.0335499,0.031 0.00977,1 2.0335489,-0.031 -0.0098,-1 z"
-           id="path4313"
-           inkscape:connector-curvature="0" />
+           id="path4313" />
         <path
-           sodipodi:nodetypes="cccccc"
            style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#9e7400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
            d="m 4.3075696,1028.0967 -1.9999998,0.031 0.00977,1 1.9999998,-0.031 -0.0098,-1 z"
-           id="path4313-5"
-           inkscape:connector-curvature="0" />
+           id="path4313-5" />
         <path
            style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:0.64640886;fill-rule:evenodd;stroke:none;stroke-width:0.97351193px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
            d="m 4.3092456,1024.1001 v 3.01 h 1.000277 v -3.01 z"
-           id="path4313-8-8-7-8"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
+           id="path4313-8-8-7-8" />
         <path
            style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.97351193px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
            d="m 1.3092454,1023.0922 v 5.0101 h 1.000277 v -5.0101 z"
-           id="path4313-8-8-7-8-8"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
+           id="path4313-8-8-7-8-8" />
       </g>
     </g>
   </g>
diff --git a/ui/org.eclipse.pde.ui/icons/elcl16/find_obj.svg b/ui/org.eclipse.pde.ui/icons/elcl16/find_obj.svg
index 4a0357cee42..a0c09d8991e 100644
--- a/ui/org.eclipse.pde.ui/icons/elcl16/find_obj.svg
+++ b/ui/org.eclipse.pde.ui/icons/elcl16/find_obj.svg
@@ -2,24 +2,19 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="find_obj.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4245">
       <stop
          style="stop-color:#b99866;stop-opacity:1"
@@ -31,26 +26,6 @@
          id="stop4249" />
     </linearGradient>
     <linearGradient
-       id="linearGradient4235">
-      <stop
-         style="stop-color:#f4d684;stop-opacity:0"
-         offset="0"
-         id="stop4237" />
-      <stop
-         id="stop4239"
-         offset="0.25"
-         style="stop-color:#fcf4c6;stop-opacity:1" />
-      <stop
-         id="stop4241"
-         offset="0.5"
-         style="stop-color:#fbeebc;stop-opacity:1" />
-      <stop
-         style="stop-color:#eeb960;stop-opacity:1"
-         offset="1"
-         id="stop4243" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        id="linearGradient5448">
       <stop
          style="stop-color:#ad8e5f;stop-opacity:1"
@@ -62,7 +37,6 @@
          id="stop5452" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient5440">
       <stop
          style="stop-color:#ad8e5f;stop-opacity:1"
@@ -112,7 +86,6 @@
          style="stop-color:#eeb960;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient5351">
       <stop
          style="stop-color:#e4a239;stop-opacity:1;"
@@ -162,7 +135,6 @@
          id="stop5210" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient5109">
       <stop
          style="stop-color:#906f4e;stop-opacity:1"
@@ -174,7 +146,6 @@
          id="stop5113" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient5109"
        id="linearGradient5368"
        gradientUnits="userSpaceOnUse"
@@ -184,7 +155,6 @@
        x2="29.714636"
        y2="1039.1387" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient5378"
        id="linearGradient5370"
        gradientUnits="userSpaceOnUse"
@@ -193,7 +163,6 @@
        x2="32.176903"
        y2="1046.1316" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient5331"
        id="linearGradient5372"
        gradientUnits="userSpaceOnUse"
@@ -202,7 +171,6 @@
        x2="32.471878"
        y2="1056.9694" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient5351"
        id="linearGradient5374"
        gradientUnits="userSpaceOnUse"
@@ -211,7 +179,6 @@
        x2="33.275511"
        y2="1056.9694" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient5206"
        id="linearGradient5376"
        gradientUnits="userSpaceOnUse"
@@ -221,7 +188,6 @@
        x2="32.842041"
        y2="1052.0043" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient5428"
        id="linearGradient5434"
        x1="26.107269"
@@ -230,7 +196,6 @@
        y2="1045.9496"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient5440"
        id="linearGradient5446"
        x1="25.367371"
@@ -239,7 +204,6 @@
        y2="1051.4068"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient5448"
        id="linearGradient5454"
        x1="25.367543"
@@ -248,7 +212,6 @@
        y2="1054.8198"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4245"
        id="linearGradient4251"
        x1="30.011103"
@@ -258,31 +221,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(0.04728278,-0.09456555)" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="32"
-     inkscape:cx="13.423122"
-     inkscape:cy="8.4136027"
-     inkscape:document-units="px"
-     inkscape:current-layer="g5359"
-     showgrid="true"
-     inkscape:window-width="1009"
-     inkscape:window-height="947"
-     inkscape:window-x="1032"
-     inkscape:window-y="557"
-     inkscape:window-maximized="0"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid4161" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -296,8 +234,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
@@ -312,44 +248,30 @@
            id="g5359"
            transform="matrix(0.70710678,0.70710678,-0.70710678,0.70710678,730.34515,280.80707)">
           <path
-             sodipodi:nodetypes="ccccc"
-             inkscape:connector-curvature="0"
              id="rect4221-4"
              d="m 28.565245,1040.0695 -1.069887,2.1398 4.279549,0 -1.069887,-2.1398 c -0.472828,-0.9477 -1.844257,-0.7625 -2.139775,0 z"
              style="fill:none;stroke:url(#linearGradient5368);stroke-width:1.06988706;stroke-miterlimit:3.79999995;stroke-opacity:1;stroke-dasharray:none;display:inline" />
           <path
-             sodipodi:nodetypes="ccccc"
-             inkscape:connector-curvature="0"
              id="rect4221"
              d="m 26.607269,1042.2428 c 1.259438,-1.6377 4.858466,-1.5046 6.055728,0 l 0,8.5925 -6.055728,0 z"
              style="fill:url(#linearGradient5370);fill-opacity:1;stroke:url(#linearGradient5434);stroke-opacity:1;stroke-width:1.06988706;stroke-miterlimit:3.79999995;stroke-dasharray:none" />
           <path
-             sodipodi:nodetypes="ccccc"
-             inkscape:connector-curvature="0"
              id="path5028"
              d="m 29.526238,1042.1318 c -0.440696,0.012 -0.86969,0.051 -1.279613,0.12 l 0,2.8791 c 0.409923,-0.068 0.838917,-0.1076 1.279613,-0.1199 z"
              style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#496da1;fill-opacity:1;stroke:none;stroke-width:1.06988704;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" />
           <path
-             sodipodi:nodetypes="sccccs"
-             inkscape:connector-curvature="0"
              id="rect4221-7-1"
              d="m 29.645582,1053.51 c -1.546954,0 -3.096933,0.3554 -3.778039,1.0365 l 0,0.5683 c 1.362214,1.3622 6.178977,1.3438 7.522644,0 l 0,-0.5683 c -0.671834,-0.6719 -2.197651,-1.0342 -3.744605,-1.0365 z"
              style="fill:#ffffc9;fill-opacity:1;stroke:url(#linearGradient5454);stroke-width:1.06988706;stroke-opacity:1;display:inline;stroke-miterlimit:3.79999995;stroke-dasharray:none" />
           <path
-             sodipodi:nodetypes="ccccc"
-             inkscape:connector-curvature="0"
              id="rect4221-7-1-2"
              d="m 26.422196,1052.4196 0,12.1257 6.413338,0 0,-12.1257 z"
              style="fill:url(#linearGradient5372);fill-opacity:1;stroke:url(#linearGradient5374);stroke-width:1.06988706;stroke-opacity:1;display:inline;stroke-miterlimit:3.79999995;stroke-dasharray:none" />
           <path
-             inkscape:connector-curvature="0"
              id="rect4221-7"
              d="m 25.867543,1050.1666 0,4.3799 c 1.778049,-1.9187 5.89609,-1.8666 7.522644,0 l 0,-4.3799 c -1.258456,-2.537 -6.051006,-2.5281 -7.522644,0 z"
-             style="fill:url(#linearGradient5376);fill-opacity:1;stroke:url(#linearGradient5446);stroke-width:1.06988706;stroke-linejoin:round;stroke-miterlimit:3.79999995;stroke-opacity:1;stroke-dasharray:none;display:inline"
-             sodipodi:nodetypes="ccccc" />
+             style="fill:url(#linearGradient5376);fill-opacity:1;stroke:url(#linearGradient5446);stroke-width:1.06988706;stroke-linejoin:round;stroke-miterlimit:3.79999995;stroke-opacity:1;stroke-dasharray:none;display:inline" />
           <path
-             sodipodi:nodetypes="cccc"
-             inkscape:connector-curvature="0"
              id="rect4221-9"
              d="m 26.678193,1042.8208 -0.02364,-0.6726 c 1.259438,-1.6377 4.858466,-1.5046 6.055728,0 l 0.02364,0.6726"
              style="display:inline;fill:none;fill-opacity:1;stroke:url(#linearGradient4251);stroke-width:0.96289837;stroke-miterlimit:3.79999995;stroke-dasharray:none;stroke-opacity:1" />
diff --git a/ui/org.eclipse.pde.ui/icons/elcl16/flatLayout.svg b/ui/org.eclipse.pde.ui/icons/elcl16/flatLayout.svg
index 627fbc2bfaf..fce121df55f 100644
--- a/ui/org.eclipse.pde.ui/icons/elcl16/flatLayout.svg
+++ b/ui/org.eclipse.pde.ui/icons/elcl16/flatLayout.svg
@@ -2,28 +2,20 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.48.0 r9654"
-   sodipodi:docname="flatLayout.svg"
-   inkscape:export-filename="C:\Users\jmietling\Documents\rect3997-9-1.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient4980"
-       inkscape:collect="always">
+       id="linearGradient4980">
       <stop
          id="stop4982"
          offset="0"
@@ -34,8 +26,7 @@
          style="stop-color:#607ead;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       id="linearGradient4974"
-       inkscape:collect="always">
+       id="linearGradient4974">
       <stop
          id="stop4976"
          offset="0"
@@ -46,7 +37,6 @@
          style="stop-color:#607ead;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4962">
       <stop
          style="stop-color:#7694be;stop-opacity:1"
@@ -58,7 +48,6 @@
          id="stop4966" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4871">
       <stop
          style="stop-color:#ffffff;stop-opacity:1;"
@@ -70,7 +59,6 @@
          id="stop4875" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4871"
        id="linearGradient4877"
        x1="3"
@@ -79,7 +67,6 @@
        y2="1045.8622"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4871"
        id="linearGradient4879"
        x1="4.4999781"
@@ -88,7 +75,6 @@
        y2="1045.3433"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4871-7"
        id="linearGradient4877-1"
        x1="3"
@@ -97,7 +83,6 @@
        y2="1045.8622"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4871-7">
       <stop
          style="stop-color:#ffffff;stop-opacity:1;"
@@ -109,7 +94,6 @@
          id="stop4875-0" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4871-7"
        id="linearGradient4879-9"
        x1="4.4999781"
@@ -118,7 +102,6 @@
        y2="1045.3433"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4871-7-1"
        id="linearGradient4877-1-7"
        x1="3"
@@ -127,7 +110,6 @@
        y2="1045.8622"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4871-7-1">
       <stop
          style="stop-color:#ffffff;stop-opacity:1;"
@@ -139,7 +121,6 @@
          id="stop4875-0-5" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4871-7-1"
        id="linearGradient4879-9-2"
        x1="4.4999781"
@@ -148,7 +129,6 @@
        y2="1045.3433"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4962"
        id="linearGradient4968"
        x1="11"
@@ -158,7 +138,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(2.3333333,0,0,1,-18.666667,0)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4980"
        id="linearGradient4970"
        x1="11"
@@ -168,7 +147,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(2.3333333,0,0,1,-18.666667,0)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4974"
        id="linearGradient4972"
        x1="7"
@@ -177,31 +155,6 @@
        y2="1040.8622"
        gradientUnits="userSpaceOnUse" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="22.627416"
-     inkscape:cx="11.878392"
-     inkscape:cy="7.2651944"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1458"
-     inkscape:window-height="814"
-     inkscape:window-x="142"
-     inkscape:window-y="571"
-     inkscape:window-maximized="0"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3999" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -215,32 +168,24 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
     <path
        style="fill:url(#linearGradient4970);fill-opacity:1;stroke:none;display:inline"
        d="m 7,1044.3622 7,0 0,1 -7,0 z"
-       id="rect4035-1-1-5-2-2-6-5"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+       id="rect4035-1-1-5-2-2-6-5" />
     <path
        style="fill:url(#linearGradient4968);fill-opacity:1;stroke:none;display:inline"
        d="m 7,1048.3622 7,0 0,1 -7,0 z"
-       id="rect4035-1-1-5-2-2-6-5-2"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+       id="rect4035-1-1-5-2-2-6-5-2" />
     <g
        id="g5029"
        transform="matrix(0.59562329,0,0,0.59562329,1.42626,418.31576)">
       <path
          id="rect4035-17"
          d="m 2.6421734,1042.6833 0,5.0367 5.0367406,0 0,-5.0367 z m 1.6789131,1.6789 1.6789135,0 0,1.6789 -1.6789135,0 z"
-         style="fill:#5c7aaa;fill-opacity:1;stroke:none;display:inline"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccccccc" />
+         style="fill:#5c7aaa;fill-opacity:1;stroke:none;display:inline" />
       <g
          id="g4094"
          transform="matrix(0.55964608,0,0,0.55963589,2.6421482,459.89962)">
@@ -254,15 +199,11 @@
         <path
            style="opacity:0.5;fill:url(#linearGradient4877);fill-opacity:1;stroke:none;display:inline"
            d="m 3,1044.3622 1,1 0,2 -1,0 z"
-           id="rect4035-1-7-1"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
+           id="rect4035-1-7-1" />
         <path
            style="opacity:0.5;fill:url(#linearGradient4879);fill-opacity:1;stroke:none;display:inline"
            d="m 3,1044.3622 1,1 2,0 0,-1 z"
-           id="rect4035-1-7-4-5"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
+           id="rect4035-1-7-4-5" />
       </g>
     </g>
     <g
@@ -272,9 +213,7 @@
       <path
          id="rect4035-17-2"
          d="m 2.6421734,1042.6833 0,5.0367 5.0367406,0 0,-5.0367 z m 1.6789131,1.6789 1.6789135,0 0,1.6789 -1.6789135,0 z"
-         style="fill:#5c7aaa;fill-opacity:1;stroke:none;display:inline"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccccccc" />
+         style="fill:#5c7aaa;fill-opacity:1;stroke:none;display:inline" />
       <g
          id="g4094-4"
          transform="matrix(0.55964608,0,0,0.55963589,2.6421482,459.89962)">
@@ -288,15 +227,11 @@
         <path
            style="opacity:0.5;fill:url(#linearGradient4877-1);fill-opacity:1;stroke:none;display:inline"
            d="m 3,1044.3622 1,1 0,2 -1,0 z"
-           id="rect4035-1-7-1-5"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
+           id="rect4035-1-7-1-5" />
         <path
            style="opacity:0.5;fill:url(#linearGradient4879-9);fill-opacity:1;stroke:none;display:inline"
            d="m 3,1044.3622 1,1 2,0 0,-1 z"
-           id="rect4035-1-7-4-5-1"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
+           id="rect4035-1-7-4-5-1" />
       </g>
     </g>
     <g
@@ -306,9 +241,7 @@
       <path
          id="rect4035-17-2-6"
          d="m 2.6421734,1042.6833 0,5.0367 5.0367406,0 0,-5.0367 z m 1.6789135,1.6912 1.6789135,0 0,1.6913 -1.6789135,0 z"
-         style="fill:#5c7aaa;fill-opacity:1;stroke:none;display:inline"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccccccc" />
+         style="fill:#5c7aaa;fill-opacity:1;stroke:none;display:inline" />
       <g
          id="g4094-4-1"
          transform="matrix(0.55964608,0,0,0.55963589,2.6421482,459.89962)">
@@ -322,22 +255,16 @@
         <path
            style="opacity:0.5;fill:url(#linearGradient4877-1-7);fill-opacity:1;stroke:none;display:inline"
            d="m 3,1044.3622 1,1 0,2 -1,0 z"
-           id="rect4035-1-7-1-5-2"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
+           id="rect4035-1-7-1-5-2" />
         <path
            style="opacity:0.5;fill:url(#linearGradient4879-9-2);fill-opacity:1;stroke:none;display:inline"
            d="m 3,1044.3622 1,1 2,0 0,-1 z"
-           id="rect4035-1-7-4-5-1-3"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
+           id="rect4035-1-7-4-5-1-3" />
       </g>
     </g>
     <path
        style="fill:url(#linearGradient4972);fill-opacity:1;stroke:none;display:inline"
        d="m 7,1040.3622 7,0 0,1 -7,0 z"
-       id="rect4035-1-1-5-2-2-6"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+       id="rect4035-1-1-5-2-2-6" />
   </g>
 </svg>
diff --git a/ui/org.eclipse.pde.ui/icons/elcl16/full_hierarchy.svg b/ui/org.eclipse.pde.ui/icons/elcl16/full_hierarchy.svg
index 59e0cda42e3..ea113397faa 100644
--- a/ui/org.eclipse.pde.ui/icons/elcl16/full_hierarchy.svg
+++ b/ui/org.eclipse.pde.ui/icons/elcl16/full_hierarchy.svg
@@ -2,20 +2,16 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.48.5 r10040"
-   sodipodi:docname="full_hierarchy.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
@@ -25,8 +21,7 @@
        x1="388.63736"
        gradientUnits="userSpaceOnUse"
        id="linearGradient3929-5"
-       xlink:href="#linearGradient10798-1-9-3-7-6-8-9-0-9-1"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient10798-1-9-3-7-6-8-9-0-9-1" />
     <linearGradient
        id="linearGradient10798-1-9-3-7-6-8-9-0-9-1">
       <stop
@@ -50,10 +45,8 @@
        x1="-2.12959"
        gradientUnits="userSpaceOnUse"
        id="linearGradient6939-8"
-       xlink:href="#linearGradient6916-8-4"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient6916-8-4" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient6916-8-4">
       <stop
          style="stop-color:#c4a543;stop-opacity:1;"
@@ -65,7 +58,6 @@
          id="stop6920-0-9" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient6916-07">
       <stop
          style="stop-color:#c4a543;stop-opacity:1;"
@@ -84,10 +76,8 @@
        x1="-2.12959"
        gradientUnits="userSpaceOnUse"
        id="linearGradient6939-5-1"
-       xlink:href="#linearGradient6916-0-8"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient6916-0-8" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient6916-0-8">
       <stop
          style="stop-color:#c4a543;stop-opacity:1;"
@@ -106,34 +96,8 @@
        x1="-2.12959"
        gradientUnits="userSpaceOnUse"
        id="linearGradient7000"
-       xlink:href="#linearGradient6916-07"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient6916-07" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="45.254834"
-     inkscape:cx="2.5689458"
-     inkscape:cy="5.5971741"
-     inkscape:document-units="px"
-     inkscape:current-layer="g6438"
-     showgrid="true"
-     inkscape:window-width="1283"
-     inkscape:window-height="862"
-     inkscape:window-x="750"
-     inkscape:window-y="184"
-     inkscape:window-maximized="0"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3960" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -147,8 +111,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
@@ -173,43 +135,28 @@
          style="font-size:13.58917427px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;display:inline;font-family:Sans"
          id="g6438">
         <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
            id="path4108-9-0"
            d="m -8.12959,1039.3481 1,0 0,-4 -1,0 z"
            style="font-size:13.58917427px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#6f7684;fill-opacity:1;stroke:none;display:inline;font-family:Sans" />
         <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
            id="path4108-9-0-2"
            d="m -7.2179784,1038.3481 0,1 4,0 0,-1 z"
            style="font-size:13.58917427000000100px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#6f7684;fill-opacity:1;stroke:none;display:inline;font-family:Sans" />
         <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
            id="path4108-9-0-2-2"
            d="m -13.12959,1042.3481 0,1 4.7629903,0 0,-1 z"
            style="font-size:13.58917427px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#6f7684;fill-opacity:1;stroke:none;display:inline;font-family:Sans" />
         <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
            id="path4108-9-0-2-29"
            d="m -14.12959,1033.3481 0,1 4,0 0,-1 z"
            style="font-size:13.58917427000000100px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#6f7684;fill-opacity:1;stroke:none;display:inline;font-family:Sans" />
         <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
            id="path4108-9-0-2-29-2"
            d="m -13.12959,1030.3481 -1,0 0,13 1,0 z"
            style="font-size:13.58917427px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#6f7684;fill-opacity:1;stroke:none;display:inline;font-family:Sans" />
         <path
-           sodipodi:type="arc"
            style="fill:url(#linearGradient3929-5);fill-opacity:1;stroke:#14733c;stroke-width:5.25411463;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline"
            id="path10796-2-6-2"
-           sodipodi:cx="388.125"
-           sodipodi:cy="468.23718"
-           sodipodi:rx="10.625"
-           sodipodi:ry="10.625"
            d="m 398.75,468.23718 c 0,5.86803 -4.75697,10.625 -10.625,10.625 -5.86803,0 -10.625,-4.75697 -10.625,-10.625 0,-5.86802 4.75697,-10.625 10.625,-10.625 5.86803,0 10.625,4.75698 10.625,10.625 z"
            transform="matrix(0.18865958,0,0,0.18865958,-80.888848,945.51071)" />
         <rect
diff --git a/ui/org.eclipse.pde.ui/icons/elcl16/generate_class.svg b/ui/org.eclipse.pde.ui/icons/elcl16/generate_class.svg
index 0359888d4f6..45662819f36 100644
--- a/ui/org.eclipse.pde.ui/icons/elcl16/generate_class.svg
+++ b/ui/org.eclipse.pde.ui/icons/elcl16/generate_class.svg
@@ -2,37 +2,18 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.48.5 r10040"
-   sodipodi:docname="class_obj.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
-    <linearGradient
-       id="linearGradient3827">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="0"
-         id="stop3829" />
-      <stop
-         id="stop3835"
-         offset="0.60149658"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop3831" />
-    </linearGradient>
     <linearGradient
        y2="462.11539"
        x2="388.63736"
@@ -40,8 +21,7 @@
        x1="388.63736"
        gradientUnits="userSpaceOnUse"
        id="linearGradient3929-5"
-       xlink:href="#linearGradient10798-1-9-3-7-6-8-9-0-9-1"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient10798-1-9-3-7-6-8-9-0-9-1" />
     <linearGradient
        id="linearGradient10798-1-9-3-7-6-8-9-0-9-1">
       <stop
@@ -58,43 +38,6 @@
          id="stop10802-1-5-3-0-4-8-4-2-9-2" />
     </linearGradient>
   </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="10.162091"
-     inkscape:cy="3.1082683"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="925"
-     inkscape:window-height="862"
-     inkscape:window-x="1048"
-     inkscape:window-y="232"
-     inkscape:window-maximized="0"
-     inkscape:snap-global="false"
-     showguides="true"
-     inkscape:guide-bbox="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3950" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="5,3.25"
-       id="guide3797" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="6.4375,3.75"
-       id="guide3801" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="12.0625,5.3125"
-       id="guide3803" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -108,8 +51,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
@@ -138,13 +79,8 @@
           <path
              transform="matrix(0.66884336,0,0,0.67139756,-267.18268,722.47026)"
              d="m 397.08368,468.23718 c 0,4.94775 -4.01094,8.95868 -8.95868,8.95868 -4.94774,0 -8.95868,-4.01093 -8.95868,-8.95868 0,-4.94774 4.01094,-8.95868 8.95868,-8.95868 4.94774,0 8.95868,4.01094 8.95868,8.95868 z"
-             sodipodi:ry="8.9586821"
-             sodipodi:rx="8.9586821"
-             sodipodi:cy="468.23718"
-             sodipodi:cx="388.125"
              id="path10796-2-6-2"
-             style="fill:url(#linearGradient3929-5);fill-opacity:1;stroke:#14733c;stroke-width:1.49227173;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline"
-             sodipodi:type="arc" />
+             style="fill:url(#linearGradient3929-5);fill-opacity:1;stroke:#14733c;stroke-width:1.49227173;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline" />
           <g
              id="text3782"
              style="font-size:15.56941891px;fill:#ffffff;font-family:Sans"
@@ -152,8 +88,6 @@
         </g>
       </g>
       <path
-         sodipodi:nodetypes="ccscscscccsscscsccc"
-         inkscape:connector-curvature="0"
          id="path3817"
          style="font-size:15.56941891px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;display:inline;font-family:Arial;-inkscape-font-specification:Arial Bold"
          d="m 9.9582435,1043.873 c -0.068736,-0.4207 -0.2258257,-0.7375 -0.4712765,-0.9505 -0.2405524,-0.2129 -0.5547364,-0.3192 -0.9425527,-0.3192 -0.5154625,0 -0.927829,0.185 -1.2371006,0.5551 -0.3043689,0.3648 -0.4565517,0.6031 -0.4565489,1.4648 -2.8e-6,0.958 0.1546346,1.3845 0.4639127,1.7799 0.3141807,0.3954 0.7339108,0.593 1.2591915,0.593 0.3927255,0 0.7142731,-0.114 0.9646439,-0.3422 0.2503599,-0.2332 0.4270885,-0.6309 0.5301861,-1.1937 l 2.032379,-0.017 c -0.211101,0.9629 -0.616102,2.0653 -1.215009,2.557 -0.598921,0.4917 -1.401562,0.7374 -2.407928,0.7374 -1.1438303,0 -2.0569271,-0.3724 -2.7392935,-1.1176 -0.6774613,-0.7449 -1.0161905,-1.5264 -1.0161905,-2.8443 0,-1.333 0.3411837,-1.9946 1.0235539,-2.7344 0.6823664,-0.7452 1.6052818,-1.1177 2.7687486,-1.1177 0.9523657,0 1.7083715,0.2129 2.2680175,0.6387 0.564543,0.4205 1.032045,1.4081 1.277509,2.2745 z" />
diff --git a/ui/org.eclipse.pde.ui/icons/elcl16/generate_interface.svg b/ui/org.eclipse.pde.ui/icons/elcl16/generate_interface.svg
index 96d9bc789bb..22394aff380 100644
--- a/ui/org.eclipse.pde.ui/icons/elcl16/generate_interface.svg
+++ b/ui/org.eclipse.pde.ui/icons/elcl16/generate_interface.svg
@@ -2,283 +2,18 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.48.5 r10040"
-   sodipodi:docname="generate_interface.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
-    <linearGradient
-       y2="462.11539"
-       x2="388.63736"
-       y1="478.18777"
-       x1="388.63736"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3929-5"
-       xlink:href="#linearGradient10798-1-9-3-7-6-8-9-0-9-1"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient10798-1-9-3-7-6-8-9-0-9-1">
-      <stop
-         style="stop-color:#7564b1;stop-opacity:1"
-         offset="0"
-         id="stop10800-5-2-1-8-20-6-4-9-8-2" />
-      <stop
-         id="stop10806-6-8-5-3-9-24-8-4-3-2"
-         offset="0.5"
-         style="stop-color:#5d4aa1;stop-opacity:1" />
-      <stop
-         style="stop-color:#9283c3;stop-opacity:1"
-         offset="1"
-         id="stop10802-1-5-3-0-4-8-4-2-9-2" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient7540-2-3-8-7">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.502"
-         offset="0"
-         id="stop7542-8-7-5-3" />
-      <stop
-         id="stop7544-8-2-0-5"
-         offset="0.47623286"
-         style="stop-color:#ffffff;stop-opacity:1" />
-      <stop
-         id="stop7546-1-7-9-5"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop7548-98-9-2-4" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient7540-6-33-6-3-7">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.502"
-         offset="0"
-         id="stop7542-4-4-3-3-3" />
-      <stop
-         id="stop7544-5-3-8-5-1"
-         offset="0.47623286"
-         style="stop-color:#ffffff;stop-opacity:1" />
-      <stop
-         id="stop7546-2-9-1-2-20"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop7548-9-2-0-9-1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient7272-66-4-5-5-5-8"
-       inkscape:collect="always">
-      <stop
-         id="stop7274-6-0-1-7-4-7"
-         offset="0"
-         style="stop-color:#8f6c10;stop-opacity:1" />
-      <stop
-         id="stop7276-66-6-3-9-1-4"
-         offset="1"
-         style="stop-color:#c9a645;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient7540-2-3-8-7"
-       id="linearGradient10540"
-       gradientUnits="userSpaceOnUse"
-       x1="-22.453552"
-       y1="1030.3411"
-       x2="-10.159802"
-       y2="1030.3411" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient7540-6-33-6-3-7"
-       id="linearGradient10542"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0,1,-1,0,1014.0344,1046.6478)"
-       x1="-22.453552"
-       y1="1030.3411"
-       x2="-10.159802"
-       y2="1030.3411" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient7272-66-4-5-5-5-8"
-       id="linearGradient10544"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.95585117,0,0,0.95585117,-0.71992063,45.488394)"
-       x1="-15.945988"
-       y1="1037.4661"
-       x2="-15.945988"
-       y2="1023.2569" />
-    <mask
-       maskUnits="userSpaceOnUse"
-       id="mask10620">
-      <path
-         sodipodi:type="arc"
-         style="font-size:13.58917427px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:2.16621375;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline;font-family:Sans"
-         id="path10622"
-         sodipodi:cx="388.125"
-         sodipodi:cy="468.23718"
-         sodipodi:rx="10.625"
-         sodipodi:ry="10.625"
-         d="m 398.75,468.23718 a 10.625,10.625 0 1 1 -21.25,0 10.625,10.625 0 1 1 21.25,0 z"
-         transform="matrix(0.55482947,0,0,0.55482947,-206.96039,787.08655)" />
-    </mask>
-    <linearGradient
-       y2="6.9843998"
-       x2="10.007812"
-       y1="5"
-       x1="10"
-       gradientTransform="translate(-15.015625,1046.6356)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient6323-7-1-1"
-       xlink:href="#linearGradient5068-6-9-4-9"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient5068-6-9-4-9"
-       inkscape:collect="always">
-      <stop
-         id="stop5070-8-0-4-9"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         id="stop5072-3-6-1-7"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       gradientTransform="translate(-15.015625,10.2734)"
-       gradientUnits="userSpaceOnUse"
-       y2="1045.3466"
-       x2="12"
-       y1="1043.3622"
-       x1="12"
-       id="linearGradient5084-3-3-2-6"
-       xlink:href="#linearGradient5068-6-9-4-9"
-       inkscape:collect="always" />
-    <linearGradient
-       gradientTransform="translate(-15.015625,10.2734)"
-       gradientUnits="userSpaceOnUse"
-       y2="1043.3466"
-       x2="15.007812"
-       y1="1043.3622"
-       x1="13"
-       id="linearGradient5086-8-0-8-5"
-       xlink:href="#linearGradient5068-6-9-4-9"
-       inkscape:collect="always" />
-    <linearGradient
-       gradientTransform="translate(-15.015625,10.2734)"
-       gradientUnits="userSpaceOnUse"
-       y2="1042.3622"
-       x2="10.007812"
-       y1="1042.3622"
-       x1="12"
-       id="linearGradient5082-1-0-8-1"
-       xlink:href="#linearGradient5068-6-9-4-9"
-       inkscape:collect="always" />
-    <linearGradient
-       gradientTransform="translate(-15.015625,10.2734)"
-       gradientUnits="userSpaceOnUse"
-       y2="1041.3466"
-       x2="8.0078125"
-       y1="1041.3622"
-       x1="10"
-       id="linearGradient5078-8-2-1-4"
-       xlink:href="#linearGradient5068-6-9-4-9"
-       inkscape:collect="always" />
-    <linearGradient
-       gradientTransform="translate(-15.015625,10.2734)"
-       gradientUnits="userSpaceOnUse"
-       y2="1038.3466"
-       x2="10.007812"
-       y1="1040.3622"
-       x1="10"
-       id="linearGradient5076-5-2-9-8"
-       xlink:href="#linearGradient5068-6-9-4-9"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5068-6-9-4-9"
-       id="linearGradient3500-5"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-15.015625,10.2734)"
-       x1="12"
-       y1="1038.3622"
-       x2="10.007812"
-       y2="1038.3466" />
-    <linearGradient
-       gradientTransform="translate(-15.015625,10.2734)"
-       gradientUnits="userSpaceOnUse"
-       y2="1043.3466"
-       x2="14"
-       y1="1041.3622"
-       x1="14"
-       id="linearGradient5088-1-4-8-6"
-       xlink:href="#linearGradient5068-6-9-4-9"
-       inkscape:collect="always" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4528-9-5-7-9-7-3"
-       id="radialGradient3091-1-9-6-4-6"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.8508179,-8.813921e-6,8.4531434e-6,1.7750589,644.24981,572.63612)"
-       cx="-757.20496"
-       cy="-738.83777"
-       fx="-757.20496"
-       fy="-738.83777"
-       r="3.4803574" />
-    <linearGradient
-       id="linearGradient4528-9-5-7-9-7-3">
-      <stop
-         style="stop-color:#e0c576;stop-opacity:1;"
-         offset="0"
-         id="stop4530-0-5-0-5-8-4" />
-      <stop
-         style="stop-color:#9e7916;stop-opacity:1"
-         offset="1"
-         id="stop4532-7-9-3-3-6-1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6281-8-0-1-6-6-4-2-8-0"
-       id="linearGradient3093-5-2-7-0-9"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.3199889,0,0,2.3199889,10.199693,1043.1852)"
-       x1="0.9375"
-       y1="4.8437853"
-       x2="0.9375"
-       y2="7.549418" />
-    <linearGradient
-       id="linearGradient6281-8-0-1-6-6-4-2-8-0">
-      <stop
-         id="stop6283-0-2-2-1-2-0-1-6-0"
-         offset="0"
-         style="stop-color:#f7f9fb;stop-opacity:1" />
-      <stop
-         id="stop6285-5-0-9-7-6-9-9-1-9"
-         offset="1"
-         style="stop-color:#ffd680;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       y2="462.11539"
-       x2="388.63736"
-       y1="478.18777"
-       x1="388.63736"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3046"
-       xlink:href="#linearGradient10798-1-9-3-7-6-8-9-0-9-1-9"
-       inkscape:collect="always" />
     <linearGradient
        id="linearGradient10798-1-9-3-7-6-8-9-0-9-1-9">
       <stop
@@ -295,16 +30,6 @@
          id="stop10802-1-5-3-0-4-8-4-2-9-2-3" />
     </linearGradient>
     <linearGradient
-       y2="462.11539"
-       x2="388.63736"
-       y1="478.18777"
-       x1="388.63736"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3016"
-       xlink:href="#linearGradient10798-1-9-3-7-6-8-9-0-9-1-9"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10798-1-9-3-7-6-8-9-0-9-1-9"
        id="linearGradient3097"
        gradientUnits="userSpaceOnUse"
@@ -313,29 +38,6 @@
        x2="388.63736"
        y2="462.11539" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="22.627416"
-     inkscape:cx="15.763713"
-     inkscape:cy="7.9239226"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="925"
-     inkscape:window-height="847"
-     inkscape:window-x="553"
-     inkscape:window-y="568"
-     inkscape:window-maximized="0"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid10382" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -349,8 +51,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
@@ -368,16 +68,9 @@
       <path
          transform="matrix(0.55482947,0,0,0.55482947,-191.34575,775.68824)"
          d="m 398.75,468.23718 c 0,5.86803 -4.75697,10.625 -10.625,10.625 -5.86803,0 -10.625,-4.75697 -10.625,-10.625 0,-5.86802 4.75697,-10.625 10.625,-10.625 5.86803,0 10.625,4.75698 10.625,10.625 z"
-         sodipodi:ry="10.625"
-         sodipodi:rx="10.625"
-         sodipodi:cy="468.23718"
-         sodipodi:cx="388.125"
          id="path10796-2-6-2"
-         style="font-size:13.58917427px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:url(#linearGradient3097);fill-opacity:1;stroke:#55429f;stroke-width:2.16621375;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline;font-family:Sans"
-         sodipodi:type="arc" />
+         style="font-size:13.58917427px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:url(#linearGradient3097);fill-opacity:1;stroke:#55429f;stroke-width:2.16621375;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline;font-family:Sans" />
       <path
-         sodipodi:nodetypes="ccccccccccccc"
-         inkscape:connector-curvature="0"
          id="rect7222"
          d="m 21.535823,1031.9047 0,1.0313 0.888066,0 0,4.9687 -0.93226,0 0,1.0313 4.789695,0 0,-1.0313 -1.285812,0 0,-4.9687 1.285812,0 0,-1.0313 z"
          style="font-size:13.58917427px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;display:inline;font-family:Sans" />
diff --git a/ui/org.eclipse.pde.ui/icons/elcl16/goto_obj.svg b/ui/org.eclipse.pde.ui/icons/elcl16/goto_obj.svg
index e61bd2c2c55..c3dfb49c5b2 100644
--- a/ui/org.eclipse.pde.ui/icons/elcl16/goto_obj.svg
+++ b/ui/org.eclipse.pde.ui/icons/elcl16/goto_obj.svg
@@ -2,24 +2,19 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.48.0 r9654"
-   sodipodi:docname="goto_input.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient16147">
       <stop
          style="stop-color:#a66b10;stop-opacity:1"
@@ -31,7 +26,6 @@
          id="stop16151" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient5097">
       <stop
          style="stop-color:#778cb4;stop-opacity:1"
@@ -43,7 +37,6 @@
          id="stop5101" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient5089">
       <stop
          style="stop-color:#f9fafc;stop-opacity:1"
@@ -55,7 +48,6 @@
          id="stop5093" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4315">
       <stop
          style="stop-color:#c7b571;stop-opacity:1"
@@ -67,7 +59,6 @@
          id="stop4319" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4315"
        id="linearGradient4060"
        gradientUnits="userSpaceOnUse"
@@ -77,7 +68,6 @@
        x2="8.0137892"
        y2="1050.0707" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient5089"
        id="linearGradient5095"
        x1="14"
@@ -86,7 +76,6 @@
        y2="1051.3622"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient5097"
        id="linearGradient5103"
        x1="11"
@@ -95,7 +84,6 @@
        y2="1044.8623"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient5103-6-0"
        id="linearGradient5109-2-1"
        x1="12.178074"
@@ -130,34 +118,8 @@
        gradientTransform="translate(0,-20)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient16112"
-       xlink:href="#linearGradient16147"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient16147" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7.9999997"
-     inkscape:cx="-0.90164703"
-     inkscape:cy="16.695777"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1241"
-     inkscape:window-height="814"
-     inkscape:window-x="150"
-     inkscape:window-y="150"
-     inkscape:window-maximized="0"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3999" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -171,88 +133,61 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
     <path
        style="fill:url(#linearGradient5095);fill-opacity:1;stroke:url(#linearGradient4060);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;display:inline"
        d="m 4.9700418,1037.8621 10.5299582,0 0,14.0018 -10.5299582,0"
-       id="rect3997-9"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccc" />
+       id="rect3997-9" />
     <path
        style="fill:#a9b7d2;fill-opacity:1;stroke:none;display:inline"
        d="m 7,1049.3621 0,0.091 0,0.9091 7,0 0,-0.9091 0,-0.091 z"
-       id="rect4816-1-1-4"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccc" />
+       id="rect4816-1-1-4" />
     <path
        style="fill:#a9b7d2;fill-opacity:1;stroke:none;display:inline"
        d="m 12,1047.3621 0,0.091 0,0.9091 2,0 0,-0.9091 0,-0.091 z"
-       id="rect4816-1-1-4-8"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccc" />
+       id="rect4816-1-1-4-8" />
     <path
        style="fill:#c1c6d9;fill-opacity:1;stroke:none;display:inline"
        d="m 12,1041.3621 0,0.091 0,0.9091 2,0 0,-0.9091 0,-0.091 z"
-       id="rect4816-1-1-4-8-5"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccc" />
+       id="rect4816-1-1-4-8-5" />
     <path
        style="fill:#c1c6d9;fill-opacity:1;stroke:none;display:inline"
        d="m 7,1039.3621 0,0.091 0,0.9091 7,0 0,-0.9091 0,-0.091 z"
-       id="rect4816-1-1-4-8-5-5"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccc" />
+       id="rect4816-1-1-4-8-5-5" />
     <path
        style="fill:#286296;fill-opacity:1;stroke:none;display:inline"
        d="m 11,1043.3621 0,0.091 0,0.9091 3,0 0,-0.9091 0,-0.091 z"
-       id="rect4816-1-1-4-8-5-5-4"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccc" />
+       id="rect4816-1-1-4-8-5-5-4" />
     <path
        style="fill:#286296;fill-opacity:1;stroke:none;display:inline"
        d="m 11,1045.3621 0,0.091 0,0.9091 3,0 0,-0.9091 0,-0.091 z"
-       id="rect4816-1-1-4-8-5-5-4-1"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccc" />
+       id="rect4816-1-1-4-8-5-5-4-1" />
     <path
        style="fill:url(#linearGradient5103);fill-opacity:1;stroke:none;display:inline"
        d="m 11,1044.3622 0,0.091 0,0.9091 3,0 0,-0.9091 0,-0.091 z"
-       id="rect4816-1-1-4-8-5-5-4-1-6"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccc" />
+       id="rect4816-1-1-4-8-5-5-4-1-6" />
     <path
        style="fill:#a9b7d2;fill-opacity:1;stroke:none;display:inline"
        d="m 9,1047.3621 0,0.091 0,0.9091 2,0 0,-0.9091 0,-0.091 z"
-       id="rect4816-1-1-4-8-2"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccc" />
+       id="rect4816-1-1-4-8-2" />
     <path
        style="fill:#c1c6d9;fill-opacity:1;stroke:none;display:inline"
        d="m 9,1041.3621 0,0.091 0,0.9091 2,0 0,-0.9091 0,-0.091 z"
-       id="rect4816-1-1-4-8-5-3"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccc" />
+       id="rect4816-1-1-4-8-5-3" />
     <g
        transform="matrix(1,0,0,-1,-5.178074,2089.6931)"
-       inkscape:label="Layer 1"
        id="layer1-7-8"
        style="display:inline">
       <path
          style="fill:url(#linearGradient5109-2-1);fill-opacity:1;stroke:none;display:inline"
          d="m 5.6629126,1043.3309 0,2.9844 5.5870874,0 0,1.5313 3.781143,-2.9844 -3.781143,-3.0469 0,1.5156 z"
-         id="path4108-1-2"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccccc" />
+         id="path4108-1-2" />
       <path
          style="fill:url(#linearGradient16112);fill-opacity:1;stroke:none;display:inline"
          d="m 10.25,1040.8153 0,1.5156 -3.4103107,0 -1,0 c -0.99185,0.9918 -0.986324,3.9981 0,4.9844 l 1,0 3.4103107,0 0,1.5313 c 0,0.6519 0.740915,0.6375 1.5,0 l 4.71875,-3.9844 -4.71875,-4.0469 c -0.760225,-0.7602 -1.5,-0.5203 -1.5,0 z m 1,1 3.78125,3.0469 -3.78125,2.9844 0,-1.5313 -4.8478107,0 c -0.276214,-0.2099 -0.277444,-2.7126 0,-2.9844 l 4.8478107,0 z"
-         id="path4108-1-6-4"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccccccccccccccccc" />
+         id="path4108-1-6-4" />
     </g>
   </g>
 </svg>
diff --git a/ui/org.eclipse.pde.ui/icons/elcl16/help.svg b/ui/org.eclipse.pde.ui/icons/elcl16/help.svg
index 11d4e4981b0..d2c83ede04f 100644
--- a/ui/org.eclipse.pde.ui/icons/elcl16/help.svg
+++ b/ui/org.eclipse.pde.ui/icons/elcl16/help.svg
@@ -2,24 +2,19 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="linkto_help.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4877">
       <stop
          style="stop-color:#f7fdff;stop-opacity:1"
@@ -31,7 +26,6 @@
          id="stop4881" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4877"
        id="linearGradient4883"
        x1="12.108335"
@@ -40,35 +34,6 @@
        y2="17.832731"
        gradientUnits="userSpaceOnUse" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="31.999999"
-     inkscape:cx="9.2128289"
-     inkscape:cy="8.5632458"
-     inkscape:document-units="px"
-     inkscape:current-layer="g8159"
-     showgrid="true"
-     inkscape:window-width="1171"
-     inkscape:window-height="900"
-     inkscape:window-x="210"
-     inkscape:window-y="25"
-     inkscape:window-maximized="0"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid4112"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -82,8 +47,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
@@ -92,29 +55,17 @@
        id="g8159"
        transform="translate(-8.2201163,-12.904699)">
       <path
-         sodipodi:type="arc"
          style="fill:url(#linearGradient4883);fill-opacity:1;stroke:#546782;stroke-width:1.51549268;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
          id="path4110"
-         sodipodi:cx="11.9375"
-         sodipodi:cy="11.6875"
-         sodipodi:rx="9.875"
-         sodipodi:ry="9.875"
          d="m 21.8125,11.6875 a 9.875,9.875 0 1 1 -19.75,0 9.875,9.875 0 1 1 19.75,0 z"
          transform="matrix(0.65985142,0,0,0.65985142,8.3743896,1049.555)" />
       <path
          style="font-size:20.03678703px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#475b78;fill-opacity:1;stroke:none;font-family:Reznor;-inkscape-font-specification:Reznor Bold"
          d="m 16.198558,1052.2089 c -0.989362,0 -1.779246,0.2751 -2.381946,0.8285 -0.602703,0.5534 -0.916817,1.32 -0.952778,2.2784 l 1.636293,0.2071 c 0.0538,-1.185 0.596173,-1.7606 1.594868,-1.7606 0.422752,0 0.765773,0.1082 1.035628,0.3522 0.269846,0.244 0.393533,0.5573 0.393539,0.932 -6e-6,0.3486 -0.120825,0.6499 -0.372826,0.9113 -0.134793,0.1394 -0.402883,0.3481 -0.80779,0.6008 -0.36868,0.2265 -0.607999,0.4852 -0.72494,0.8077 -0.108163,0.2702 -0.165704,0.6852 -0.165701,1.2428 l 0,0.7456 1.512018,0 0,-0.4764 c -5e-6,-0.5489 0.236445,-0.9703 0.704227,-1.2841 0.611892,-0.4183 1.029572,-0.7896 1.263467,-1.0771 0.323648,-0.4183 0.497094,-0.9226 0.497101,-1.5327 -7e-6,-0.8366 -0.33497,-1.5277 -0.97349,-2.0505 -0.611904,-0.488 -1.367142,-0.725 -2.25767,-0.725 z"
-         id="text4882"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="csccccccccsccsccccc" />
+         id="text4882" />
       <path
-         sodipodi:type="arc"
          style="fill:#475b78;fill-opacity:1;stroke:none;display:inline"
          id="path4908-1"
-         sodipodi:cx="11.932427"
-         sodipodi:cy="16.531185"
-         sodipodi:rx="0.64356911"
-         sodipodi:ry="0.39774758"
          d="m 12.575997,16.531185 a 0.64356911,0.39774758 0 1 1 -1.287139,0 0.64356911,0.39774758 0 1 1 1.287139,0 z"
          transform="matrix(1.7775683,0,0,2.4520496,-5.0999685,1020.5689)" />
     </g>
diff --git a/ui/org.eclipse.pde.ui/icons/elcl16/hierarchicalLayout.svg b/ui/org.eclipse.pde.ui/icons/elcl16/hierarchicalLayout.svg
index 41d3f9068b8..0b5ec088f2f 100644
--- a/ui/org.eclipse.pde.ui/icons/elcl16/hierarchicalLayout.svg
+++ b/ui/org.eclipse.pde.ui/icons/elcl16/hierarchicalLayout.svg
@@ -2,28 +2,20 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.48.0 r9654"
-   sodipodi:docname="hierarchicalLayout.svg"
-   inkscape:export-filename="C:\Users\jmietling\Documents\rect3997-9-1.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient4980"
-       inkscape:collect="always">
+       id="linearGradient4980">
       <stop
          id="stop4982"
          offset="0"
@@ -34,8 +26,7 @@
          style="stop-color:#607ead;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       id="linearGradient4974"
-       inkscape:collect="always">
+       id="linearGradient4974">
       <stop
          id="stop4976"
          offset="0"
@@ -46,7 +37,6 @@
          style="stop-color:#607ead;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4962">
       <stop
          style="stop-color:#6c8ab7;stop-opacity:1"
@@ -58,7 +48,6 @@
          id="stop4966" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4871">
       <stop
          style="stop-color:#ffffff;stop-opacity:1;"
@@ -70,7 +59,6 @@
          id="stop4875" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4871"
        id="linearGradient4877"
        x1="3"
@@ -79,7 +67,6 @@
        y2="1045.8622"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4871"
        id="linearGradient4879"
        x1="4.4999781"
@@ -88,7 +75,6 @@
        y2="1045.3433"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4871-7"
        id="linearGradient4877-1"
        x1="3"
@@ -97,7 +83,6 @@
        y2="1045.8622"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4871-7">
       <stop
          style="stop-color:#ffffff;stop-opacity:1;"
@@ -109,7 +94,6 @@
          id="stop4875-0" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4871-7"
        id="linearGradient4879-9"
        x1="4.4999781"
@@ -118,7 +102,6 @@
        y2="1045.3433"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4871-7-1"
        id="linearGradient4877-1-7"
        x1="3"
@@ -127,7 +110,6 @@
        y2="1045.8622"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4871-7-1">
       <stop
          style="stop-color:#ffffff;stop-opacity:1;"
@@ -139,7 +121,6 @@
          id="stop4875-0-5" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4871-7-1"
        id="linearGradient4879-9-2"
        x1="4.4999781"
@@ -148,7 +129,6 @@
        y2="1045.3433"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4962"
        id="linearGradient4968"
        x1="11"
@@ -157,7 +137,6 @@
        y2="1048.8622"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4980"
        id="linearGradient4970"
        x1="11"
@@ -166,7 +145,6 @@
        y2="1044.8622"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4974"
        id="linearGradient4972"
        x1="7"
@@ -175,31 +153,6 @@
        y2="1040.8622"
        gradientUnits="userSpaceOnUse" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="15.999999"
-     inkscape:cx="12.066523"
-     inkscape:cy="7.9808044"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1458"
-     inkscape:window-height="814"
-     inkscape:window-x="865"
-     inkscape:window-y="645"
-     inkscape:window-maximized="0"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3999" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -213,32 +166,24 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
     <path
        style="fill:url(#linearGradient4970);fill-opacity:1;stroke:none;display:inline"
        d="m 11,1044.3622 3,0 0,1 -3,0 z"
-       id="rect4035-1-1-5-2-2-6-5"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+       id="rect4035-1-1-5-2-2-6-5" />
     <path
        style="fill:url(#linearGradient4968);fill-opacity:1;stroke:none;display:inline"
        d="m 11,1048.3622 3,0 0,1 -3,0 z"
-       id="rect4035-1-1-5-2-2-6-5-2"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+       id="rect4035-1-1-5-2-2-6-5-2" />
     <g
        id="g5029"
        transform="matrix(0.59562329,0,0,0.59562329,1.42626,418.31576)">
       <path
          id="rect4035-17"
          d="m 2.6421734,1042.6833 0,5.0367 5.0367406,0 0,-5.0367 z m 1.6789131,1.6789 1.6789135,0 0,1.6789 -1.6789135,0 z"
-         style="fill:#5c7aaa;fill-opacity:1;stroke:none;display:inline"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccccccc" />
+         style="fill:#5c7aaa;fill-opacity:1;stroke:none;display:inline" />
       <g
          id="g4094"
          transform="matrix(0.55964608,0,0,0.55963589,2.6421482,459.89962)">
@@ -252,15 +197,11 @@
         <path
            style="opacity:0.5;fill:url(#linearGradient4877);fill-opacity:1;stroke:none;display:inline"
            d="m 3,1044.3622 1,1 0,2 -1,0 z"
-           id="rect4035-1-7-1"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
+           id="rect4035-1-7-1" />
         <path
            style="opacity:0.5;fill:url(#linearGradient4879);fill-opacity:1;stroke:none;display:inline"
            d="m 3,1044.3622 1,1 2,0 0,-1 z"
-           id="rect4035-1-7-4-5"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
+           id="rect4035-1-7-4-5" />
       </g>
     </g>
     <g
@@ -270,9 +211,7 @@
       <path
          id="rect4035-17-2"
          d="m 2.6421734,1042.6833 0,5.0367 5.0367406,0 0,-5.0367 z m 1.6789131,1.6789 1.6789135,0 0,1.6789 -1.6789135,0 z"
-         style="fill:#5c7aaa;fill-opacity:1;stroke:none;display:inline"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccccccc" />
+         style="fill:#5c7aaa;fill-opacity:1;stroke:none;display:inline" />
       <g
          id="g4094-4"
          transform="matrix(0.55964608,0,0,0.55963589,2.6421482,459.89962)">
@@ -286,15 +225,11 @@
         <path
            style="opacity:0.5;fill:url(#linearGradient4877-1);fill-opacity:1;stroke:none;display:inline"
            d="m 3,1044.3622 1,1 0,2 -1,0 z"
-           id="rect4035-1-7-1-5"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
+           id="rect4035-1-7-1-5" />
         <path
            style="opacity:0.5;fill:url(#linearGradient4879-9);fill-opacity:1;stroke:none;display:inline"
            d="m 3,1044.3622 1,1 2,0 0,-1 z"
-           id="rect4035-1-7-4-5-1"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
+           id="rect4035-1-7-4-5-1" />
       </g>
     </g>
     <g
@@ -304,9 +239,7 @@
       <path
          id="rect4035-17-2-6"
          d="m 2.6421734,1042.6833 0,5.0367 5.0367406,0 0,-5.0367 z m 1.6789135,1.6912 1.6789135,0 0,1.6913 -1.6789135,0 z"
-         style="fill:#5c7aaa;fill-opacity:1;stroke:none;display:inline"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccccccc" />
+         style="fill:#5c7aaa;fill-opacity:1;stroke:none;display:inline" />
       <g
          id="g4094-4-1"
          transform="matrix(0.55964608,0,0,0.55963589,2.6421482,459.89962)">
@@ -320,37 +253,28 @@
         <path
            style="opacity:0.5;fill:url(#linearGradient4877-1-7);fill-opacity:1;stroke:none;display:inline"
            d="m 3,1044.3622 1,1 0,2 -1,0 z"
-           id="rect4035-1-7-1-5-2"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
+           id="rect4035-1-7-1-5-2" />
         <path
            style="opacity:0.5;fill:url(#linearGradient4879-9-2);fill-opacity:1;stroke:none;display:inline"
            d="m 3,1044.3622 1,1 2,0 0,-1 z"
-           id="rect4035-1-7-4-5-1-3"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
+           id="rect4035-1-7-4-5-1-3" />
       </g>
     </g>
     <path
        style="fill:#5c7aaa;fill-opacity:1;stroke:none;display:inline"
        d="m 3.9999997,1042.3622 1.0000146,0 0,7 -1.0000146,0 z"
-       id="rect4035-1-1-5-2"
-       inkscape:connector-curvature="0" />
+       id="rect4035-1-1-5-2" />
     <path
        style="fill:#5c7aaa;fill-opacity:1;stroke:none;display:inline"
        d="m 3.9999997,1044.3622 3.0000003,0 0,1 -3.0000003,0 z"
-       id="rect4035-1-1-5-2-2"
-       inkscape:connector-curvature="0" />
+       id="rect4035-1-1-5-2-2" />
     <path
        style="fill:#5c7aaa;fill-opacity:1;stroke:none;display:inline"
        d="m 3.9999997,1048.3622 3.0000003,0 0,0.9999 -3.0000003,0 z"
-       id="rect4035-1-1-5-2-2-1"
-       inkscape:connector-curvature="0" />
+       id="rect4035-1-1-5-2-2-1" />
     <path
        style="fill:url(#linearGradient4972);fill-opacity:1;stroke:none;display:inline"
        d="m 7,1040.3622 7,0 0,1 -7,0 z"
-       id="rect4035-1-1-5-2-2-6"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+       id="rect4035-1-1-5-2-2-6" />
   </g>
 </svg>
diff --git a/ui/org.eclipse.pde.ui/icons/elcl16/history_list.svg b/ui/org.eclipse.pde.ui/icons/elcl16/history_list.svg
index 3e0adc5c98a..1047cfdf2b5 100644
--- a/ui/org.eclipse.pde.ui/icons/elcl16/history_list.svg
+++ b/ui/org.eclipse.pde.ui/icons/elcl16/history_list.svg
@@ -2,20 +2,16 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.48.0 r9654"
-   sodipodi:docname="history_list.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
@@ -38,7 +34,6 @@
          style="stop-color:#b3c7e6;stop-opacity:0" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient5105">
       <stop
          style="stop-color:#bfb688;stop-opacity:1;"
@@ -50,7 +45,6 @@
          id="stop5109" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient5255">
       <stop
          style="stop-color:#f9fafc;stop-opacity:1"
@@ -62,8 +56,7 @@
          id="stop5259" />
     </linearGradient>
     <linearGradient
-       id="linearGradient5240-4-8"
-       inkscape:collect="always">
+       id="linearGradient5240-4-8">
       <stop
          id="stop5243-0-2"
          offset="0"
@@ -81,11 +74,9 @@
        gradientTransform="matrix(0.56763377,0,0,1,-41.522907,-6.4192858)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient4284"
-       xlink:href="#linearGradient5240-4-8"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient5240-4-8" />
     <linearGradient
-       id="linearGradient5240-4-8-1"
-       inkscape:collect="always">
+       id="linearGradient5240-4-8-1">
       <stop
          id="stop5243-0-2-7"
          offset="0"
@@ -103,10 +94,8 @@
        gradientTransform="matrix(0.56763377,0,0,1,-41.522907,2.1398256)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient4318"
-       xlink:href="#linearGradient5240-4-8-1"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient5240-4-8-1" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient5255"
        id="linearGradient6320"
        gradientUnits="userSpaceOnUse"
@@ -116,7 +105,6 @@
        x2="22.878796"
        y2="1051.027" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient5105"
        id="linearGradient6322"
        gradientUnits="userSpaceOnUse"
@@ -126,8 +114,7 @@
        y2="1051.6799"
        gradientTransform="translate(21.397741,0)" />
     <linearGradient
-       id="linearGradient5240-4-8-7"
-       inkscape:collect="always">
+       id="linearGradient5240-4-8-7">
       <stop
          id="stop5243-0-2-4"
          offset="0"
@@ -145,8 +132,7 @@
        gradientTransform="matrix(0.56763377,0,0,1,-41.522907,-2.1397226)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient6339"
-       xlink:href="#linearGradient5240-4-8-7"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient5240-4-8-7" />
     <linearGradient
        gradientTransform="translate(21.397742,3.4270058e-6)"
        y2="1049.4576"
@@ -155,34 +141,8 @@
        x1="8.4143457"
        gradientUnits="userSpaceOnUse"
        id="linearGradient15132"
-       xlink:href="#linearGradient15161"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient15161" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="11.313709"
-     inkscape:cx="19.581485"
-     inkscape:cy="10.191586"
-     inkscape:document-units="px"
-     inkscape:current-layer="g8472"
-     showgrid="true"
-     inkscape:window-width="1638"
-     inkscape:window-height="1174"
-     inkscape:window-x="398"
-     inkscape:window-y="172"
-     inkscape:window-maximized="0"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid4233" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -196,8 +156,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
@@ -208,9 +166,7 @@
       <path
          style="fill:url(#linearGradient6320);fill-opacity:1;stroke:url(#linearGradient6322);stroke-width:1.06988704;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;display:inline"
          d="m 18.26491,1035.4556 11.70189,0 0,14.9787 c -0.768981,-0.6018 -3.39912,-1.8166 -5.2157,0 -1.816579,1.8166 -5.583473,1.5045 -6.48619,-1.1368 z"
-         id="rect4172-1"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccczcc" />
+         id="rect4172-1" />
       <g
          transform="translate(15.600543,0)"
          id="g8421" />
@@ -263,8 +219,7 @@
       <g
          transform="matrix(0.31347478,0,0,0.31347478,18.94235,710.97897)"
          style="fill:#7cb87d;fill-opacity:1;stroke:#379860;stroke-width:3.41299248;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-         id="layer1-4"
-         inkscape:label="Layer 1">
+         id="layer1-4">
         <g
            id="g11331-3-1-1"
            style="fill:#7cb87d;fill-opacity:1;stroke:#379860;stroke-width:12.23149967;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
@@ -288,21 +243,15 @@
             <path
                transform="matrix(0.32984735,0,0,0.32984735,-136.12701,882.92787)"
                d="m 398.75,468.23718 c 0,5.86803 -4.75697,10.625 -10.625,10.625 -5.86803,0 -10.625,-4.75697 -10.625,-10.625 0,-5.86802 4.75697,-10.625 10.625,-10.625 5.86803,0 10.625,4.75698 10.625,10.625 z"
-               sodipodi:ry="10.625"
-               sodipodi:rx="10.625"
-               sodipodi:cy="468.23718"
-               sodipodi:cx="388.125"
                id="path10796-2-6-2"
-               style="fill:#7cb87d;fill-opacity:1;stroke:#379860;stroke-width:10.347188;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline"
-               sodipodi:type="arc" />
+               style="fill:#7cb87d;fill-opacity:1;stroke:#379860;stroke-width:10.347188;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline" />
           </g>
         </g>
       </g>
       <g
          transform="matrix(0.31347478,0,0,0.31347478,18.94235,715.25851)"
          style="fill:#7cb87d;fill-opacity:1;stroke:#379860;stroke-width:3.41299248;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-         id="layer1-4-3"
-         inkscape:label="Layer 1">
+         id="layer1-4-3">
         <g
            id="g11331-3-1-1-2"
            style="fill:#7cb87d;fill-opacity:1;stroke:#379860;stroke-width:12.23149967;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
@@ -326,21 +275,15 @@
             <path
                transform="matrix(0.32984735,0,0,0.32984735,-136.12701,882.92787)"
                d="m 398.75,468.23718 c 0,5.86803 -4.75697,10.625 -10.625,10.625 -5.86803,0 -10.625,-4.75697 -10.625,-10.625 0,-5.86802 4.75697,-10.625 10.625,-10.625 5.86803,0 10.625,4.75698 10.625,10.625 z"
-               sodipodi:ry="10.625"
-               sodipodi:rx="10.625"
-               sodipodi:cy="468.23718"
-               sodipodi:cx="388.125"
                id="path10796-2-6-2-2"
-               style="fill:#7cb87d;fill-opacity:1;stroke:#379860;stroke-width:10.347188;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline"
-               sodipodi:type="arc" />
+               style="fill:#7cb87d;fill-opacity:1;stroke:#379860;stroke-width:10.347188;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline" />
           </g>
         </g>
       </g>
       <g
          transform="matrix(0.31347478,0,0,0.31347478,18.94235,719.53805)"
          style="fill:#7cb87d;fill-opacity:1;stroke:#379860;stroke-width:3.41299248;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-         id="layer1-4-3-7"
-         inkscape:label="Layer 1">
+         id="layer1-4-3-7">
         <g
            id="g11331-3-1-1-2-0"
            style="fill:#7cb87d;fill-opacity:1;stroke:#379860;stroke-width:12.23149967;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
@@ -364,22 +307,15 @@
             <path
                transform="matrix(0.32984735,0,0,0.32984735,-136.12701,882.92787)"
                d="m 398.75,468.23718 c 0,5.86803 -4.75697,10.625 -10.625,10.625 -5.86803,0 -10.625,-4.75697 -10.625,-10.625 0,-5.86802 4.75697,-10.625 10.625,-10.625 5.86803,0 10.625,4.75698 10.625,10.625 z"
-               sodipodi:ry="10.625"
-               sodipodi:rx="10.625"
-               sodipodi:cy="468.23718"
-               sodipodi:cx="388.125"
                id="path10796-2-6-2-2-1"
-               style="fill:#7cb87d;fill-opacity:1;stroke:#379860;stroke-width:10.347188;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline"
-               sodipodi:type="arc" />
+               style="fill:#7cb87d;fill-opacity:1;stroke:#379860;stroke-width:10.347188;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline" />
           </g>
         </g>
       </g>
       <path
          style="fill:none;stroke:url(#linearGradient15132);stroke-width:1.06988704;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;display:inline"
          d="m 29.9668,1050.4343 c -0.76898,-0.6018 -3.399119,-1.8166 -5.2157,0 -1.816579,1.8166 -5.583473,1.5045 -6.48619,-1.1368"
-         id="rect4172-1-4"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="czc" />
+         id="rect4172-1-4" />
     </g>
   </g>
 </svg>
diff --git a/ui/org.eclipse.pde.ui/icons/elcl16/maximize.svg b/ui/org.eclipse.pde.ui/icons/elcl16/maximize.svg
index 643c471b4c3..88d856fa25c 100644
--- a/ui/org.eclipse.pde.ui/icons/elcl16/maximize.svg
+++ b/ui/org.eclipse.pde.ui/icons/elcl16/maximize.svg
@@ -2,50 +2,17 @@
 <!-- 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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r"
-   sodipodi:docname="maximize.svg">
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="22.627417"
-     inkscape:cx="13.024367"
-     inkscape:cy="2.106362"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1164"
-     inkscape:window-height="982"
-     inkscape:window-x="182"
-     inkscape:window-y="338"
-     inkscape:window-maximized="0"
-     inkscape:snap-global="true"
-     inkscape:snap-nodes="false"
-     inkscape:snap-others="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3966"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -59,16 +26,13 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
     <g
        transform="translate(0.96203829,0.494756)"
        style="display:inline;fill:#6f7684;fill-opacity:1"
-       id="layer1-6"
-       inkscape:label="Layer 1">
+       id="layer1-6">
       <g
          transform="translate(17.6875,0)"
          id="g4908"
@@ -82,8 +46,6 @@
          id="g4156"
          style="fill:#6f7684;fill-opacity:1">
         <path
-           sodipodi:nodetypes="cccccccccc"
-           inkscape:connector-curvature="0"
            d="m -32.871484,1041.9532 0,9.0273 9.027301,0 0,-9.0273 z m 0.994582,2.0165 7.032719,-0.017 0,6.0273 -7.027301,0 z"
            style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#6f7684;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.25;marker:none;enable-background:accumulate"
            id="path4951-1" />
diff --git a/ui/org.eclipse.pde.ui/icons/elcl16/package_obj.svg b/ui/org.eclipse.pde.ui/icons/elcl16/package_obj.svg
index b70d20b4500..e39554e0ae9 100644
--- a/ui/org.eclipse.pde.ui/icons/elcl16/package_obj.svg
+++ b/ui/org.eclipse.pde.ui/icons/elcl16/package_obj.svg
@@ -2,24 +2,19 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.48.0 r9654"
-   sodipodi:docname="package_obj.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient10573">
       <stop
          style="stop-color:#c18965;stop-opacity:1;"
@@ -106,7 +101,6 @@
          id="stop11152-8-8-6-3-2-5-1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10507"
        id="linearGradient4895"
        gradientUnits="userSpaceOnUse"
@@ -116,7 +110,6 @@
        y2="449.88141"
        gradientTransform="matrix(0,1,-1,0,824.88775,74.875059)" />
     <radialGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient11146-7-5-30-1-1-4"
        id="radialGradient10499"
        gradientUnits="userSpaceOnUse"
@@ -127,7 +120,6 @@
        fy="442.57816"
        r="6.1875" />
     <radialGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient11146-8-7-5-7-5-6-8"
        id="radialGradient10501"
        gradientUnits="userSpaceOnUse"
@@ -138,7 +130,6 @@
        fy="442.57816"
        r="6.1875" />
     <radialGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient11146-8-3-2-6-1-7"
        id="radialGradient10503"
        gradientUnits="userSpaceOnUse"
@@ -149,7 +140,6 @@
        fy="442.57816"
        r="6.1875" />
     <radialGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient11146-4-4-4-6-2"
        id="radialGradient10505"
        gradientUnits="userSpaceOnUse"
@@ -198,10 +188,8 @@
        gradientTransform="matrix(-1,0,0,-1,750.01459,899.76468)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient10544"
-       xlink:href="#linearGradient10507-2"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient10507-2" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10573"
        id="linearGradient10579"
        x1="366.04819"
@@ -210,29 +198,6 @@
        y2="466.01041"
        gradientUnits="userSpaceOnUse" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="30.80334"
-     inkscape:cx="1.2064551"
-     inkscape:cy="10.646745"
-     inkscape:document-units="px"
-     inkscape:current-layer="g13862"
-     showgrid="true"
-     inkscape:window-width="1920"
-     inkscape:window-height="1138"
-     inkscape:window-x="-8"
-     inkscape:window-y="-8"
-     inkscape:window-maximized="1"
-     inkscape:snap-global="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3947" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -246,8 +211,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
@@ -258,8 +221,7 @@
       <g
          transform="matrix(3.5838051,0,0,3.5838051,511.21484,-3419.8264)"
          style="font-size:13.58917427px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;display:inline;font-family:Sans"
-         id="layer1-9"
-         inkscape:label="Layer 1">
+         id="layer1-9">
         <g
            id="g11260-4-2"
            transform="matrix(0.27903303,0,0,0.27903303,-109.29986,933.62804)"
@@ -279,31 +241,22 @@
              x="375.04584"
              y="431.97098" />
           <path
-             sodipodi:nodetypes="ccccc"
-             inkscape:connector-curvature="0"
              id="rect10961-3-9-1"
              d="m 357.08057,449.75837 17.96523,0 0,18.13262 -17.96523,0 z"
              style="fill:url(#radialGradient10499);fill-opacity:1;stroke:#a45d2b;stroke-width:3.58380508;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline" />
           <path
-             sodipodi:nodetypes="ccccc"
-             inkscape:connector-curvature="0"
              id="rect10961-9-6-4-1"
              d="m 375.0458,449.75837 17.96522,0 0,18.13262 -17.96522,0 z"
              style="fill:url(#radialGradient10501);fill-opacity:1;stroke:#a45d2b;stroke-width:3.58380508;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline" />
           <path
              style="font-size:13.58917427px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:none;stroke:url(#linearGradient10579);stroke-width:3.58380508;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline;font-family:Sans"
              d="m 357.27589,432.15148 0,17.71804 0,17.85756 17.71805,0 17.85755,0 0,-17.85756 0,-0.13951 0,-17.57853 -17.85755,0 -17.71805,0 z"
-             id="rect10961-8-3-6"
-             inkscape:connector-curvature="0" />
+             id="rect10961-8-3-6" />
           <path
-             sodipodi:nodetypes="cc"
-             inkscape:connector-curvature="0"
              id="path11108-6-7-5"
              d="m 375.00635,426.58855 0,46.58947"
              style="fill:#915323;fill-opacity:1;stroke:url(#linearGradient4895);stroke-width:3.58380508;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
           <path
-             sodipodi:nodetypes="cc"
-             inkscape:connector-curvature="0"
              id="path11108-6-7-5-6"
              d="m 398.30108,449.88328 -46.58947,0"
              style="font-size:13.58917427px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#915323;fill-opacity:1;stroke:url(#linearGradient10544);stroke-width:3.58380508;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline;font-family:Sans" />
diff --git a/ui/org.eclipse.pde.ui/icons/elcl16/properties.svg b/ui/org.eclipse.pde.ui/icons/elcl16/properties.svg
index c09341eaa33..b0ec988754e 100644
--- a/ui/org.eclipse.pde.ui/icons/elcl16/properties.svg
+++ b/ui/org.eclipse.pde.ui/icons/elcl16/properties.svg
@@ -2,20 +2,16 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="properties.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
@@ -41,7 +37,6 @@
          id="stop7258" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient7254"
        id="linearGradient7260"
        x1="15.000595"
@@ -69,8 +64,7 @@
        x1="15.000595"
        gradientUnits="userSpaceOnUse"
        id="linearGradient7277"
-       xlink:href="#linearGradient7254-6"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient7254-6" />
     <linearGradient
        id="linearGradient7254-62">
       <stop
@@ -90,8 +84,7 @@
        x1="15.000595"
        gradientUnits="userSpaceOnUse"
        id="linearGradient7328"
-       xlink:href="#linearGradient7254-62"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient7254-62" />
     <linearGradient
        id="linearGradient7254-6-4">
       <stop
@@ -111,10 +104,8 @@
        gradientTransform="matrix(0.93721973,0,0,1,1036.3977,-16.624983)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient7362"
-       xlink:href="#linearGradient7254-6-4"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient7254-6-4" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient7491"
        id="linearGradient7497"
        x1="1.9445436"
@@ -124,30 +115,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(0.99637681,0,0,1,0.01998962,1035.7997)" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="5.6568543"
-     inkscape:cx="-14.579407"
-     inkscape:cy="-27.845113"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1171"
-     inkscape:window-height="959"
-     inkscape:window-x="927"
-     inkscape:window-y="397"
-     inkscape:window-maximized="0"
-     showguides="true"
-     inkscape:guide-bbox="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid4046" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -161,8 +128,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
diff --git a/ui/org.eclipse.pde.ui/icons/elcl16/refresh.svg b/ui/org.eclipse.pde.ui/icons/elcl16/refresh.svg
index 807ed613fb0..ce687af08c6 100644
--- a/ui/org.eclipse.pde.ui/icons/elcl16/refresh.svg
+++ b/ui/org.eclipse.pde.ui/icons/elcl16/refresh.svg
@@ -2,27 +2,19 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="nav_refresh.svg"
-   inkscape:export-filename="C:\Users\jmietling\Documents\rect3997-9-1.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient7134">
       <stop
          style="stop-color:#bd8416;stop-opacity:1"
@@ -33,15 +25,6 @@
          offset="1"
          id="stop7138" />
     </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient7584-5-1"
-       id="linearGradient7608-3-3"
-       gradientUnits="userSpaceOnUse"
-       x1="22.519354"
-       y1="1042.0283"
-       x2="22.519354"
-       y2="1040.7345" />
     <linearGradient
        id="linearGradient7584-5-1">
       <stop
@@ -53,15 +36,6 @@
          offset="1"
          id="stop7588-5-8" />
     </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient7592-1-2"
-       id="linearGradient7610-5-8"
-       gradientUnits="userSpaceOnUse"
-       x1="23.551146"
-       y1="1037.3622"
-       x2="23.551146"
-       y2="1045.3622" />
     <linearGradient
        id="linearGradient7592-1-2">
       <stop
@@ -74,7 +48,6 @@
          id="stop7596-9-7" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient7584-9-3-2"
        id="linearGradient7608-9-7-1"
        gradientUnits="userSpaceOnUse"
@@ -94,7 +67,6 @@
          id="stop7588-9-9-0" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient7134"
        id="linearGradient7140"
        x1="25.363291"
@@ -103,7 +75,6 @@
        y2="1037.7311"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient7584-5-1"
        id="linearGradient3788"
        gradientUnits="userSpaceOnUse"
@@ -112,7 +83,6 @@
        x2="22.519354"
        y2="1040.7345" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient7592-1-2"
        id="linearGradient3790"
        gradientUnits="userSpaceOnUse"
@@ -121,35 +91,6 @@
        x2="23.551146"
        y2="1045.3622" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="15.999999"
-     inkscape:cx="2.6093314"
-     inkscape:cy="-0.20876635"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1241"
-     inkscape:window-height="814"
-     inkscape:window-x="1220"
-     inkscape:window-y="704"
-     inkscape:window-maximized="0"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3999"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -163,8 +104,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
@@ -178,16 +117,12 @@
         <path
            style="fill:url(#linearGradient3788);fill-opacity:1;stroke:url(#linearGradient3790);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
            d="m 23.585155,1039.3249 0,-1.591 c 0,0 -0.353553,-0.8397 -1.370019,-0.044 -1.016466,0.7955 -2.209709,2.0772 -2.386486,2.4307 -0.176776,0.3536 -0.928077,0.9723 0.08839,1.9446 1.016466,0.9722 2.121321,1.9887 2.121321,1.9887 0,0 1.546796,1.4584 1.546796,0.088 0,-1.37 0,-1.812 0,-1.812 1.366404,-0.063 1.694788,0.3552 2.039845,0.6884 0.345482,0.3336 0.8125,1.9687 1.21875,2.0937 0.40625,0.125 0.625,-2.1875 0.625,-2.625 0,-0.4375 -0.174793,-1.2439 -0.71875,-1.9687 -0.293544,-0.3911 -1.006571,-0.9555 -1.53125,-1.0998 -0.524679,-0.1444 -1.633595,-0.094 -1.633595,-0.094 z"
-           id="path7582"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccssscscsssszcc" />
+           id="path7582" />
         <path
            style="opacity:0.85714285;fill:#ffffff;fill-opacity:1;stroke:none"
            d="m 23.069359,2.3660973 0,-0.5966213 c 0,0 0.110485,-0.3756505 -0.220971,-0.243068 -0.331456,0.1325826 -0.972272,0.6629126 -1.038563,0.773398 -0.06629,0.1104855 -0.751301,0.5966214 -0.596622,0.8175923 0.15468,0.2209709 1.458408,0.066291 1.458408,0.066291 z"
            id="path7602"
-           inkscape:connector-curvature="0"
-           transform="translate(0,1036.3622)"
-           sodipodi:nodetypes="ccssscc" />
+           transform="translate(0,1036.3622)" />
       </g>
     </g>
     <g
@@ -195,14 +130,10 @@
        id="g7604-6"
        transform="matrix(-1,0,0,-1,29.113291,2089.2183)">
       <path
-         sodipodi:nodetypes="ccssscsscsssszcc"
-         inkscape:connector-curvature="0"
          id="path7582-7"
          d="m 23.585155,1039.3249 0,-1.591 c 0,0 -0.353553,-0.8397 -1.370019,-0.044 -1.016466,0.7955 -2.209709,2.0772 -2.386486,2.4307 -0.176776,0.3536 -0.928077,0.9723 0.08839,1.9446 1.016466,0.9722 2.121321,1.9887 2.121321,1.9887 0,0 0.404271,0.3812 0.799458,0.5707 0.37782,0.1811 0.747338,0.1871 0.747338,-0.4827 0,-1.37 0,-1.812 0,-1.812 1.366404,-0.063 1.727345,0.3446 2.039845,0.6884 0.3125,0.3437 0.8125,1.9687 1.21875,2.0937 0.40625,0.125 0.625,-2.1875 0.625,-2.625 0,-0.4375 -0.09375,-1.3125 -0.71875,-1.9687 -0.625,-0.6563 -1.006571,-0.9555 -1.53125,-1.0998 -0.524679,-0.1444 -1.633595,-0.094 -1.633595,-0.094 z"
          style="fill:url(#linearGradient7608-9-7-1);fill-opacity:1;stroke:url(#linearGradient7140);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
       <path
-         sodipodi:nodetypes="ccssscc"
-         inkscape:connector-curvature="0"
          id="path7602-2"
          d="m 23.069359,1042.9731 0,0.5966 c 0,0 0.110485,0.3757 -0.220971,0.2431 -0.331456,-0.1326 -0.972272,-0.6629 -1.038563,-0.7734 -0.06629,-0.1105 -0.751301,-0.5966 -0.596622,-0.8176 0.15468,-0.221 1.458408,-0.066 1.458408,-0.066 z"
          style="opacity:0.85714285;fill:#ffffff;fill-opacity:1;stroke:none" />
diff --git a/ui/org.eclipse.pde.ui/icons/elcl16/restore.svg b/ui/org.eclipse.pde.ui/icons/elcl16/restore.svg
index acffb7d9389..5175de6e3dd 100644
--- a/ui/org.eclipse.pde.ui/icons/elcl16/restore.svg
+++ b/ui/org.eclipse.pde.ui/icons/elcl16/restore.svg
@@ -2,50 +2,17 @@
 <!-- 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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r"
-   sodipodi:docname="restore.svg">
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="32"
-     inkscape:cx="3.5577523"
-     inkscape:cy="3.443274"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1164"
-     inkscape:window-height="982"
-     inkscape:window-x="182"
-     inkscape:window-y="338"
-     inkscape:window-maximized="0"
-     inkscape:snap-global="true"
-     inkscape:snap-nodes="false"
-     inkscape:snap-others="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3966"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -59,16 +26,13 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
     <g
        transform="translate(-0.0765248,0.494756)"
        style="display:inline;fill:#6f7684;fill-opacity:1"
-       id="layer1-6"
-       inkscape:label="Layer 1">
+       id="layer1-6">
       <g
          transform="translate(17.6875,0)"
          id="g4908"
@@ -86,8 +50,6 @@
                id="path4951-1"
                transform="translate(-35.830158,1037.9584)" />
             <path
-               sodipodi:nodetypes="cccccccccc"
-               inkscape:connector-curvature="0"
                d="m -31.844183,1044.9532 0,6.0312 6,0 0,-6.0312 z m 1,2 4,0 0,3.0312 -4,0 z"
                style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#6f7684;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.25;marker:none;enable-background:accumulate"
                id="path4951" />
diff --git a/ui/org.eclipse.pde.ui/icons/elcl16/synced.svg b/ui/org.eclipse.pde.ui/icons/elcl16/synced.svg
index 37c0b6ae3f3..c6462adae67 100644
--- a/ui/org.eclipse.pde.ui/icons/elcl16/synced.svg
+++ b/ui/org.eclipse.pde.ui/icons/elcl16/synced.svg
@@ -2,27 +2,19 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.48.0 r9654"
-   sodipodi:docname="synced.svg"
-   inkscape:export-filename="C:\Users\jmietling\Documents\rect3997-9-1.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4883">
       <stop
          style="stop-color:#bd8416;stop-opacity:1;"
@@ -34,7 +26,6 @@
          id="stop4887" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient5103">
       <stop
          style="stop-color:#fefdef;stop-opacity:1"
@@ -46,7 +37,6 @@
          id="stop5107" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient5103"
        id="linearGradient5109"
        x1="11.906143"
@@ -56,7 +46,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-1,2.9999502)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4883"
        id="linearGradient4889"
        x1="11"
@@ -65,7 +54,6 @@
        y2="1052.3622"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4883-7"
        id="linearGradient4889-1"
        x1="11"
@@ -75,7 +63,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(-1,0,0,1,15.987978,-7)" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4883-7">
       <stop
          style="stop-color:#bd8416;stop-opacity:1;"
@@ -87,7 +74,6 @@
          id="stop4887-0" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient5103-4">
       <stop
          style="stop-color:#fefdef;stop-opacity:1"
@@ -106,38 +92,8 @@
        gradientTransform="matrix(-1,0,0,1,16.987978,-4)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient4911"
-       xlink:href="#linearGradient5103-4"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient5103-4" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="15.999999"
-     inkscape:cx="16.638127"
-     inkscape:cy="5.0891236"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1241"
-     inkscape:window-height="814"
-     inkscape:window-x="1124"
-     inkscape:window-y="592"
-     inkscape:window-maximized="0"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3999"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -151,34 +107,24 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
     <path
        style="fill:url(#linearGradient5109);fill-opacity:1;stroke:none;display:inline"
        d="m 4,1047.3622 0,1 7,0 0,3 3.999893,-3.5 -3.999893,-3.5 0,3 z"
-       id="path4108-1"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccccc" />
+       id="path4108-1" />
     <path
        style="fill:url(#linearGradient4889);fill-opacity:1;stroke:none;display:inline"
        d="m 10,1043.3622 0,3 -5,0 -1,0 c -0.99185,0.9918 -0.986324,2.0137 0,3 l 1,0 5,0 0,3 c 0,0.6519 0.740915,0.6375 1.5,0 l 4.9375,-4.5 -4.9375,-4.5 c -0.760225,-0.7602 -1.5,-0.5203 -1.5,0 z m 1,1 4,3.5 -4,3.5 0,-3 -6.4375,0 c -0.276214,-0.2099 -0.277444,-0.7282 0,-1 l 6.4375,0 z"
-       id="path4108-1-6"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccccccccccccccccc" />
+       id="path4108-1-6" />
     <path
        style="fill:url(#linearGradient4911);fill-opacity:1;stroke:none;display:inline"
        d="m 11.987978,1040.3622 0,1 -7.0000023,0 0,3 -3.99989299,-3.5 3.99989299,-3.5 0,3 z"
-       id="path4108-1-2"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccccc" />
+       id="path4108-1-2" />
     <path
        style="fill:url(#linearGradient4889-1);fill-opacity:1;stroke:none;display:inline"
        d="m 5.9879757,1036.3622 0,3 5.0000023,0 1,0 c 0.99185,0.9918 0.986324,2.0137 0,3 l -1,0 -5.0000023,0 0,3 c 0,0.6519 -0.740915,0.6375 -1.5,0 l -4.93749974,-4.5 4.93749974,-4.5 c 0.760225,-0.7602 1.5,-0.5203 1.5,0 z m -1,1 -3.99999999,3.5 3.99999999,3.5 0,-3 6.4375023,0 c 0.276214,-0.2099 0.277444,-0.7282 0,-1 l -6.4375023,0 z"
-       id="path4108-1-6-4"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccccccccccccccccc" />
+       id="path4108-1-6-4" />
   </g>
 </svg>
diff --git a/ui/org.eclipse.pde.ui/icons/elcl16/th_horizontal.svg b/ui/org.eclipse.pde.ui/icons/elcl16/th_horizontal.svg
index eb891d2fb23..7aafeee6161 100644
--- a/ui/org.eclipse.pde.ui/icons/elcl16/th_horizontal.svg
+++ b/ui/org.eclipse.pde.ui/icons/elcl16/th_horizontal.svg
@@ -2,25 +2,20 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="th_horizontal.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient4810"
-       inkscape:collect="always">
+       id="linearGradient4810">
       <stop
          id="stop4812"
          offset="0"
@@ -31,7 +26,6 @@
          style="stop-color:#8694ae;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient5057"
        id="linearGradient5065"
        x1="6"
@@ -41,7 +35,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(2,-2.000037)" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient5057">
       <stop
          style="stop-color:#677da9;stop-opacity:1;"
@@ -53,7 +46,6 @@
          id="stop5061" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient5067"
        id="linearGradient5063"
        x1="8"
@@ -63,8 +55,7 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(2,-2.000037)" />
     <linearGradient
-       id="linearGradient5067"
-       inkscape:collect="always">
+       id="linearGradient5067">
       <stop
          id="stop5069"
          offset="0"
@@ -83,10 +74,8 @@
        gradientTransform="matrix(0.43809804,0,0,0.47690359,1.974207,6.5201176)"
        gradientUnits="userSpaceOnUse"
        id="radialGradient5038"
-       xlink:href="#linearGradient4962-2"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4962-2" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4962-2">
       <stop
          style="stop-color:#7cb87d;stop-opacity:1"
@@ -105,10 +94,8 @@
        gradientTransform="translate(18,-4.000037)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient5062"
-       xlink:href="#linearGradient4910-4"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4910-4" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4910-4">
       <stop
          style="stop-color:#ffffff;stop-opacity:0"
@@ -127,11 +114,9 @@
        gradientUnits="userSpaceOnUse"
        id="linearGradient4975-2"
        xlink:href="#linearGradient4994-4"
-       inkscape:collect="always"
        gradientTransform="translate(18,-4.000037)" />
     <linearGradient
-       id="linearGradient4994-4"
-       inkscape:collect="always">
+       id="linearGradient4994-4">
       <stop
          id="stop4996-5"
          offset="0"
@@ -149,10 +134,8 @@
        gradientTransform="translate(0,2.000063)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient4121"
-       xlink:href="#linearGradient4810"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4810" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient5057-7">
       <stop
          style="stop-color:#677da9;stop-opacity:1;"
@@ -172,10 +155,8 @@
        gradientTransform="matrix(0.43809804,0,0,0.47690359,1.974207,6.5201176)"
        gradientUnits="userSpaceOnUse"
        id="radialGradient5038-5"
-       xlink:href="#linearGradient4962-2-2"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4962-2-2" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4962-2-2">
       <stop
          style="stop-color:#7cb87d;stop-opacity:1"
@@ -194,8 +175,7 @@
        gradientTransform="translate(2,-10.0001)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient4190"
-       xlink:href="#linearGradient5057-7"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient5057-7" />
     <linearGradient
        y2="1050.8623"
        x2="11"
@@ -204,10 +184,8 @@
        gradientTransform="translate(2,-6.0000216)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient4058"
-       xlink:href="#linearGradient5057-4"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient5057-4" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient5057-4">
       <stop
          style="stop-color:#677da9;stop-opacity:1;"
@@ -227,10 +205,8 @@
        gradientTransform="matrix(0.43809804,0,0,0.47690359,1.974207,6.5201176)"
        gradientUnits="userSpaceOnUse"
        id="radialGradient5038-5-1"
-       xlink:href="#linearGradient4962-2-2-7"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4962-2-2-7" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4962-2-2-7">
       <stop
          style="stop-color:#7cb87d;stop-opacity:1"
@@ -249,10 +225,8 @@
        gradientTransform="translate(2,-10.000122)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient4190-9"
-       xlink:href="#linearGradient5057-7-4"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient5057-7-4" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient5057-7-4">
       <stop
          style="stop-color:#677da9;stop-opacity:1;"
@@ -271,11 +245,9 @@
        gradientUnits="userSpaceOnUse"
        id="linearGradient4975-2-2"
        xlink:href="#linearGradient4994-4-4"
-       inkscape:collect="always"
        gradientTransform="translate(18,-4.0000216)" />
     <linearGradient
-       id="linearGradient4994-4-4"
-       inkscape:collect="always">
+       id="linearGradient4994-4-4">
       <stop
          id="stop4996-5-5"
          offset="0"
@@ -293,10 +265,8 @@
        gradientTransform="translate(18,-4.0000216)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient5062-1"
-       xlink:href="#linearGradient4910-4-7"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4910-4-7" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4910-4-7">
       <stop
          style="stop-color:#ffffff;stop-opacity:0"
@@ -316,10 +286,8 @@
        gradientTransform="matrix(0.43809804,0,0,0.47690359,1.974207,6.5201176)"
        gradientUnits="userSpaceOnUse"
        id="radialGradient5038-52"
-       xlink:href="#linearGradient4962-2-7"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4962-2-7" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4962-2-7">
       <stop
          style="stop-color:#7cb87d;stop-opacity:1"
@@ -331,7 +299,6 @@
          id="stop4966-1-1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient5057-2"
        id="linearGradient5065-4"
        x1="6"
@@ -341,7 +308,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(2,-2.0000216)" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient5057-2">
       <stop
          style="stop-color:#677da9;stop-opacity:1;"
@@ -353,7 +319,6 @@
          id="stop5061-2" />
     </linearGradient>
     <radialGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4962-1"
        id="radialGradient4968-2"
        cx="3.5134368"
@@ -364,7 +329,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(0.43809804,0,0,0.47690359,1.974207,6.5201176)" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4962-1">
       <stop
          style="stop-color:#7cb87d;stop-opacity:1"
@@ -376,8 +340,7 @@
          id="stop4966-8" />
     </linearGradient>
     <linearGradient
-       id="linearGradient4810-7"
-       inkscape:collect="always">
+       id="linearGradient4810-7">
       <stop
          id="stop4812-6"
          offset="0"
@@ -395,10 +358,8 @@
        gradientTransform="translate(0,2.0000784)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient4132"
-       xlink:href="#linearGradient4810-7"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4810-7" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4828-8">
       <stop
          style="stop-color:#3979bd;stop-opacity:1;"
@@ -417,10 +378,8 @@
        gradientTransform="translate(-2.0043468,4.9932789)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient4148"
-       xlink:href="#linearGradient4818"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4818" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4818">
       <stop
          style="stop-color:#eb9186;stop-opacity:1;"
@@ -439,11 +398,9 @@
        gradientUnits="userSpaceOnUse"
        id="linearGradient4975-2-23"
        xlink:href="#linearGradient4994-4-3"
-       inkscape:collect="always"
        gradientTransform="translate(24.000001,-4.0000211)" />
     <linearGradient
-       id="linearGradient4994-4-3"
-       inkscape:collect="always">
+       id="linearGradient4994-4-3">
       <stop
          id="stop4996-5-4"
          offset="0"
@@ -461,10 +418,8 @@
        gradientTransform="translate(24.000001,-4.0000211)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient5062-13"
-       xlink:href="#linearGradient4910-4-8"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4910-4-8" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4910-4-8">
       <stop
          style="stop-color:#ffffff;stop-opacity:0"
@@ -476,8 +431,7 @@
          id="stop4914-8-4" />
     </linearGradient>
     <linearGradient
-       id="linearGradient4810-77"
-       inkscape:collect="always">
+       id="linearGradient4810-77">
       <stop
          id="stop4812-9"
          offset="0"
@@ -495,10 +449,8 @@
        gradientTransform="translate(-0.99999834,2.0000789)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient5043"
-       xlink:href="#linearGradient4810-77"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4810-77" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4828-8"
        id="linearGradient4257"
        x1="11.468389"
@@ -507,7 +459,6 @@
        y2="1039.3857"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4828-8"
        id="linearGradient4257-3"
        x1="11.468389"
@@ -517,31 +468,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(0.01104854,8.0048742)" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="15.999999"
-     inkscape:cx="-0.29575553"
-     inkscape:cy="8.484465"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1258"
-     inkscape:window-height="636"
-     inkscape:window-x="432"
-     inkscape:window-y="521"
-     inkscape:window-maximized="0"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3999" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -555,8 +481,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
@@ -577,113 +501,68 @@
     <path
        style="fill:url(#linearGradient5065);fill-opacity:1;stroke:none;display:inline"
        d="m 8,1048.3622 0,0.091 0,0.9091 5,0 0,-0.9091 0,-0.091 z"
-       id="rect4816-1-1-4"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccc" />
+       id="rect4816-1-1-4" />
     <path
        style="fill:url(#linearGradient5063);fill-opacity:1;stroke:none;display:inline"
        d="m 10,1044.3622 0,0.091 0,0.9091 3,0 0,-0.9091 0,-0.091 z"
-       id="rect4816-1-1-4-2"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccc" />
+       id="rect4816-1-1-4-2" />
     <path
-       sodipodi:type="arc"
        style="fill:url(#radialGradient5038);fill-opacity:1;stroke:#379860;stroke-width:1.34009874;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
        id="path4959-6"
-       sodipodi:cx="3.5134368"
-       sodipodi:cy="12.464466"
-       sodipodi:rx="1.5026019"
-       sodipodi:ry="1.5026019"
        d="M 5.0160387,12.464466 A 1.5026019,1.5026019 0 0 1 3.5134368,13.967068 1.5026019,1.5026019 0 0 1 2.0108349,12.464466 1.5026019,1.5026019 0 0 1 3.5134368,10.961864 1.5026019,1.5026019 0 0 1 5.0160387,12.464466 Z"
        transform="matrix(0.68773292,0,0,0.68773292,3.0805578,1040.2821)" />
     <path
        style="fill:url(#linearGradient5062);fill-opacity:1;stroke:none;display:inline"
        d="m 4,1039.3622 0,12 -1,0 0,-13 z"
-       id="rect4853-82-7"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+       id="rect4853-82-7" />
     <path
        style="fill:url(#linearGradient4975-2);fill-opacity:1;stroke:none;display:inline"
        d="m 4,1039.3622 10,0 0,-1 -11,0 z"
-       id="rect4853-82-0"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+       id="rect4853-82-0" />
     <path
        style="fill:url(#linearGradient4190);fill-opacity:1;stroke:none;display:inline"
        d="m 8,1040.3622 0,0.091 0,0.9091 5,0 0,-0.9091 0,-0.091 z"
-       id="rect4816-1-1-4-1"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccc" />
+       id="rect4816-1-1-4-1" />
     <path
-       sodipodi:type="arc"
        style="fill:url(#radialGradient5038-5);fill-opacity:1;stroke:#379860;stroke-width:1.34009874;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
        id="path4959-6-4"
-       sodipodi:cx="3.5134368"
-       sodipodi:cy="12.464466"
-       sodipodi:rx="1.5026019"
-       sodipodi:ry="1.5026019"
        d="M 5.0160387,12.464466 A 1.5026019,1.5026019 0 0 1 3.5134368,13.967068 1.5026019,1.5026019 0 0 1 2.0108349,12.464466 1.5026019,1.5026019 0 0 1 3.5134368,10.961864 1.5026019,1.5026019 0 0 1 5.0160387,12.464466 Z"
        transform="matrix(0.68773292,0,0,0.68773292,3.0805578,1032.2821)" />
     <path
-       sodipodi:type="arc"
        style="fill:url(#radialGradient4968-2);fill-opacity:1;stroke:#379860;stroke-width:1.34009874;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
        id="path4959-9"
-       sodipodi:cx="3.5134368"
-       sodipodi:cy="12.464466"
-       sodipodi:rx="1.5026019"
-       sodipodi:ry="1.5026019"
        d="M 5.0160387,12.464466 A 1.5026019,1.5026019 0 0 1 3.5134368,13.967068 1.5026019,1.5026019 0 0 1 2.0108349,12.464466 1.5026019,1.5026019 0 0 1 3.5134368,10.961864 1.5026019,1.5026019 0 0 1 5.0160387,12.464466 Z"
        transform="matrix(0.68773292,0,0,0.68773292,3.0805578,1036.2821)" />
     <path
        style="fill:url(#linearGradient5065-4);fill-opacity:1;stroke:none;display:inline"
        d="m 8,1048.3622 0,0.091 0,0.9091 5,0 0,-0.9091 0,-0.091 z"
-       id="rect4816-1-1-4-27"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccc" />
+       id="rect4816-1-1-4-27" />
     <path
-       sodipodi:type="arc"
        style="fill:url(#radialGradient5038-52);fill-opacity:1;stroke:#379860;stroke-width:1.34009874;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
        id="path4959-6-9"
-       sodipodi:cx="3.5134368"
-       sodipodi:cy="12.464466"
-       sodipodi:rx="1.5026019"
-       sodipodi:ry="1.5026019"
        d="M 5.0160387,12.464466 A 1.5026019,1.5026019 0 0 1 3.5134368,13.967068 1.5026019,1.5026019 0 0 1 2.0108349,12.464466 1.5026019,1.5026019 0 0 1 3.5134368,10.961864 1.5026019,1.5026019 0 0 1 5.0160387,12.464466 Z"
        transform="matrix(0.68773292,0,0,0.68773292,3.0805578,1040.2821)" />
     <path
        style="fill:url(#linearGradient5062-1);fill-opacity:1;stroke:none;display:inline"
        d="m 4,1039.3622 0,12 -1,0 0,-13 z"
-       id="rect4853-82-7-5"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+       id="rect4853-82-7-5" />
     <path
        style="fill:url(#linearGradient4975-2-2);fill-opacity:1;stroke:none;display:inline"
        d="m 4,1039.3622 10,0 0,-1 -11,0 z"
-       id="rect4853-82-0-4"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+       id="rect4853-82-0-4" />
     <path
        style="fill:url(#linearGradient4190-9);fill-opacity:1;stroke:none;display:inline"
        d="m 8,1040.3622 0,0.091 0,0.9091 5,0 0,-0.9091 0,-0.091 z"
-       id="rect4816-1-1-4-1-3"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccc" />
+       id="rect4816-1-1-4-1-3" />
     <path
-       sodipodi:type="arc"
        style="fill:url(#radialGradient5038-5-1);fill-opacity:1;stroke:#379860;stroke-width:1.34009874;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
        id="path4959-6-4-1"
-       sodipodi:cx="3.5134368"
-       sodipodi:cy="12.464466"
-       sodipodi:rx="1.5026019"
-       sodipodi:ry="1.5026019"
        d="M 5.0160387,12.464466 A 1.5026019,1.5026019 0 0 1 3.5134368,13.967068 1.5026019,1.5026019 0 0 1 2.0108349,12.464466 1.5026019,1.5026019 0 0 1 3.5134368,10.961864 1.5026019,1.5026019 0 0 1 5.0160387,12.464466 Z"
        transform="matrix(0.68773292,0,0,0.68773292,3.0805578,1032.2821)" />
     <path
        style="fill:url(#linearGradient4058);fill-opacity:1;stroke:none;display:inline"
        d="m 8,1044.3622 0,0.091 0,0.9091 5,0 0,-0.9091 0,-0.091 z"
-       id="rect4816-1-1-4-4"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccc" />
+       id="rect4816-1-1-4-4" />
     <rect
        style="fill:#f4fcff;fill-opacity:1;stroke:url(#linearGradient5043);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline"
        id="rect3997-9-1"
@@ -694,15 +573,11 @@
     <path
        style="fill:url(#linearGradient5062-13);fill-opacity:1;stroke:none;display:inline"
        d="m 10.000001,1039.3622 0,12 -0.9999993,0 0,-13 z"
-       id="rect4853-82-7-9"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+       id="rect4853-82-7-9" />
     <path
        style="fill:url(#linearGradient4975-2-23);fill-opacity:1;stroke:none;display:inline"
        d="m 10.000001,1039.3622 4,0 0,-1 -4.9999993,0 z"
-       id="rect4853-82-0-8"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+       id="rect4853-82-0-8" />
     <rect
        style="fill:url(#linearGradient4148);fill-opacity:1;stroke:none;display:inline"
        id="rect4816"
@@ -713,12 +588,10 @@
     <path
        style="fill:url(#linearGradient4257);fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1"
        d="m 11.015398,1039.3581 0.994369,0 0.983321,3.0162 -3.0052043,0 z"
-       id="path4249"
-       inkscape:connector-curvature="0" />
+       id="path4249" />
     <path
        style="display:inline;fill:url(#linearGradient4257-3);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
        d="m 11.026447,1047.3629 0.994369,0 0.983321,3.0162 -3.0052048,0 z"
-       id="path4249-2"
-       inkscape:connector-curvature="0" />
+       id="path4249-2" />
   </g>
 </svg>
diff --git a/ui/org.eclipse.pde.ui/icons/elcl16/th_vertical.svg b/ui/org.eclipse.pde.ui/icons/elcl16/th_vertical.svg
index ab24b5a26e3..11df326b778 100644
--- a/ui/org.eclipse.pde.ui/icons/elcl16/th_vertical.svg
+++ b/ui/org.eclipse.pde.ui/icons/elcl16/th_vertical.svg
@@ -2,25 +2,20 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.48.0 r9654"
-   sodipodi:docname="th_vertical.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient4810"
-       inkscape:collect="always">
+       id="linearGradient4810">
       <stop
          id="stop4812"
          offset="0"
@@ -31,7 +26,6 @@
          style="stop-color:#8694ae;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient5057"
        id="linearGradient5065"
        x1="6"
@@ -41,7 +35,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(0.8,0,0,1,3.2,-10.000137)" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient5057">
       <stop
          style="stop-color:#677da9;stop-opacity:1;"
@@ -61,10 +54,8 @@
        gradientTransform="matrix(0.43809804,0,0,0.47690359,1.974207,6.5201176)"
        gradientUnits="userSpaceOnUse"
        id="radialGradient5038"
-       xlink:href="#linearGradient4962-2"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4962-2" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4962-2">
       <stop
          style="stop-color:#7cb87d;stop-opacity:1"
@@ -76,7 +67,6 @@
          id="stop4966-1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4910-4">
       <stop
          style="stop-color:#ffffff;stop-opacity:0"
@@ -88,8 +78,7 @@
          id="stop4914-8" />
     </linearGradient>
     <linearGradient
-       id="linearGradient4994-4"
-       inkscape:collect="always">
+       id="linearGradient4994-4">
       <stop
          id="stop4996-5"
          offset="0"
@@ -100,7 +89,6 @@
          style="stop-color:#ffffff;stop-opacity:0;" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4818">
       <stop
          style="stop-color:#eb9186;stop-opacity:1;"
@@ -119,10 +107,8 @@
        gradientTransform="translate(-8.0043468,8.9932942)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient4148"
-       xlink:href="#linearGradient4818"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4818" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4994-4"
        id="linearGradient4075"
        gradientUnits="userSpaceOnUse"
@@ -132,7 +118,6 @@
        x2="-11"
        y2="1044.3622" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4910-4"
        id="linearGradient4077"
        gradientUnits="userSpaceOnUse"
@@ -142,7 +127,6 @@
        x2="-15"
        y2="1047.3622" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4810"
        id="linearGradient4079"
        gradientUnits="userSpaceOnUse"
@@ -152,7 +136,6 @@
        x2="8.0137892"
        y2="1050.0707" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient5057-4">
       <stop
          style="stop-color:#677da9;stop-opacity:1;"
@@ -171,10 +154,8 @@
        gradientTransform="matrix(0.8,0,0,1,3.2,-2.0002)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient4123"
-       xlink:href="#linearGradient5057-4"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient5057-4" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4910-4-3">
       <stop
          style="stop-color:#ffffff;stop-opacity:0"
@@ -186,7 +167,6 @@
          id="stop4914-8-2" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4994-4-6"
        id="linearGradient4075-1"
        gradientUnits="userSpaceOnUse"
@@ -196,8 +176,7 @@
        x2="-11"
        y2="1044.3622" />
     <linearGradient
-       id="linearGradient4994-4-6"
-       inkscape:collect="always">
+       id="linearGradient4994-4-6">
       <stop
          id="stop4996-5-85"
          offset="0"
@@ -215,34 +194,8 @@
        gradientTransform="translate(18.000045,3)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient4268"
-       xlink:href="#linearGradient4910-4-3"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4910-4-3" />
   </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.708346"
-     inkscape:cy="9.4756409"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1241"
-     inkscape:window-height="814"
-     inkscape:window-x="1124"
-     inkscape:window-y="508"
-     inkscape:window-maximized="0"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3999" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -256,8 +209,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
@@ -271,37 +222,24 @@
     <path
        style="fill:url(#linearGradient4077);fill-opacity:1;stroke:none;display:inline"
        d="m 4.0164621,1039.3622 -0.016462,5 -1,0 0.016462,-6 z"
-       id="rect4853-82-7"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+       id="rect4853-82-7" />
     <path
        style="fill:url(#linearGradient4075);fill-opacity:1;stroke:none;display:inline"
        d="m 4.0164621,1039.3622 9.9835379,0 0,-1 -10.9835379,0 z"
-       id="rect4853-82-0"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+       id="rect4853-82-0" />
     <path
        style="fill:url(#linearGradient5065);fill-opacity:1;stroke:none;display:inline"
        d="m 8,1040.3621 0,1.0001 5,0 0,-1.0001 z"
-       id="rect4816-1-1-4"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+       id="rect4816-1-1-4" />
     <path
-       sodipodi:type="arc"
        style="fill:url(#radialGradient5038);fill-opacity:1;stroke:#379860;stroke-width:1.34009874;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
        id="path4959-6"
-       sodipodi:cx="3.5134368"
-       sodipodi:cy="12.464466"
-       sodipodi:rx="1.5026019"
-       sodipodi:ry="1.5026019"
        d="m 5.0160387,12.464466 c 0,0.829864 -0.6727378,1.502602 -1.5026019,1.502602 -0.8298641,0 -1.5026019,-0.672738 -1.5026019,-1.502602 0,-0.829864 0.6727378,-1.502602 1.5026019,-1.502602 0.8298641,0 1.5026019,0.672738 1.5026019,1.502602 z"
        transform="matrix(0.68773292,0,0,0.68773292,3.080558,1032.282)" />
     <path
        style="fill:url(#linearGradient4123);fill-opacity:1;stroke:none;display:inline"
        d="m 8,1048.3621 0,1.0001 5,0 0,-1.0001 z"
-       id="rect4816-1-1-4-4"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+       id="rect4816-1-1-4-4" />
     <rect
        style="fill:url(#linearGradient4148);fill-opacity:1;stroke:none;display:inline"
        id="rect4816"
@@ -312,20 +250,14 @@
     <path
        style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#a5a699;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
        d="m 3,1044.3622 0,1 11,0 0,-1 z"
-       id="path4246"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+       id="path4246" />
     <path
        style="fill:url(#linearGradient4268);fill-opacity:1;stroke:none;display:inline"
        d="m 4,1046.3622 0,5 -1,0 0,-6 z"
-       id="rect4853-82-7-6"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+       id="rect4853-82-7-6" />
     <path
        style="fill:url(#linearGradient4075-1);fill-opacity:1;stroke:none;display:inline"
        d="m 4,1046.3622 9.983538,0 0,-1 -10.983538,0 z"
-       id="rect4853-82-0-1"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+       id="rect4853-82-0-1" />
   </g>
 </svg>
diff --git a/ui/org.eclipse.pde.ui/icons/elcl16/toggle_expand_state.svg b/ui/org.eclipse.pde.ui/icons/elcl16/toggle_expand_state.svg
index 6d2fb5847c4..cf9157a48c6 100644
--- a/ui/org.eclipse.pde.ui/icons/elcl16/toggle_expand_state.svg
+++ b/ui/org.eclipse.pde.ui/icons/elcl16/toggle_expand_state.svg
@@ -2,46 +2,17 @@
 <!-- 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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r"
-   sodipodi:docname="toggle_expand_state.svg">
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="5.6568539"
-     inkscape:cx="-20.875697"
-     inkscape:cy="16.03343"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1241"
-     inkscape:window-height="814"
-     inkscape:window-x="620"
-     inkscape:window-y="386"
-     inkscape:window-maximized="0"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3999" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -55,8 +26,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
@@ -85,13 +54,11 @@
            id="rect4186-9"
            transform="matrix(0,-1,1,0,0,0)"
            style="display:inline;opacity:1;fill:#1547ae;fill-opacity:1;stroke:none;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="m -1043.3651,0.98782074 1.0072,0 0,3.02588366 -1.0072,0 z m 3.0084,1.05621346 1.0072,0 0,5.9633832 -1.0072,0 z m 2.0166,3.9468134 0,1.0072572 -3.0259,0 0,-1.0072572 z m -1.0312,-3.999973 0,1.0072023 -4.938,0 0,-1.0072023 z"
-           inkscape:connector-curvature="0" />
+           d="m -1043.3651,0.98782074 1.0072,0 0,3.02588366 -1.0072,0 z m 3.0084,1.05621346 1.0072,0 0,5.9633832 -1.0072,0 z m 2.0166,3.9468134 0,1.0072572 -3.0259,0 0,-1.0072572 z m -1.0312,-3.999973 0,1.0072023 -4.938,0 0,-1.0072023 z" />
         <path
            id="rect4186-9-7"
            style="display:inline;opacity:1;fill:#1547ae;fill-opacity:1;stroke:none;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="m 15.03867,1047.2531 0,1.0072 -3.0259,0 0,-1.0072 z m -1.0562,3.0084 0,1.0072 -5.9634005,0 0,-1.0072 z m -3.9468,2.0166 -1.0073005,0 0,-3.0259 1.0073005,0 z m 3.9999,-1.0312 -1.0072,0 0,-4.938 1.0072,0 z"
-           inkscape:connector-curvature="0" />
+           d="m 15.03867,1047.2531 0,1.0072 -3.0259,0 0,-1.0072 z m -1.0562,3.0084 0,1.0072 -5.9634005,0 0,-1.0072 z m -3.9468,2.0166 -1.0073005,0 0,-3.0259 1.0073005,0 z m 3.9999,-1.0312 -1.0072,0 0,-4.938 1.0072,0 z" />
       </g>
     </g>
     <g
diff --git a/ui/org.eclipse.pde.ui/icons/etool16/build_exec.svg b/ui/org.eclipse.pde.ui/icons/etool16/build_exec.svg
index 48c0ee37628..6a64765deb9 100644
--- a/ui/org.eclipse.pde.ui/icons/etool16/build_exec.svg
+++ b/ui/org.eclipse.pde.ui/icons/etool16/build_exec.svg
@@ -2,24 +2,19 @@
 <!-- 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="16"
    height="16"
    id="svg25490"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="build_exec.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs25492">
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient11290"
        id="linearGradient8238"
        gradientUnits="userSpaceOnUse"
@@ -28,7 +23,6 @@
        x2="12.51806"
        y2="1044.4806" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient11290">
       <stop
          style="stop-color:#567ead;stop-opacity:1"
@@ -46,8 +40,7 @@
        x1="12.51806"
        gradientUnits="userSpaceOnUse"
        id="linearGradient25569"
-       xlink:href="#linearGradient11290"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient11290" />
     <linearGradient
        y2="1044.4806"
        x2="12.51806"
@@ -55,11 +48,9 @@
        x1="12.51806"
        gradientUnits="userSpaceOnUse"
        id="linearGradient25571"
-       xlink:href="#linearGradient11290"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient11290" />
     <linearGradient
        gradientTransform="translate(-3.851833,-1.011433)"
-       inkscape:collect="always"
        xlink:href="#linearGradient4994-6"
        id="linearGradient4101"
        gradientUnits="userSpaceOnUse"
@@ -68,8 +59,7 @@
        x2="9.8946028"
        y2="1051.8378" />
     <linearGradient
-       id="linearGradient4994-6"
-       inkscape:collect="always">
+       id="linearGradient4994-6">
       <stop
          id="stop4996-1"
          offset="0"
@@ -80,8 +70,7 @@
          style="stop-color:#dce7f7;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       id="linearGradient4894-6"
-       inkscape:collect="always">
+       id="linearGradient4894-6">
       <stop
          id="stop4896-8"
          offset="0"
@@ -99,11 +88,9 @@
        y1="1042.2307"
        x1="7.9987183"
        id="linearGradient4900-1"
-       xlink:href="#linearGradient4894-6"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4894-6" />
     <linearGradient
-       id="linearGradient4902-3"
-       inkscape:collect="always">
+       id="linearGradient4902-3">
       <stop
          id="stop4904-2"
          offset="0"
@@ -121,10 +108,8 @@
        y1="1038.5779"
        x1="10.544736"
        id="linearGradient4908-2"
-       xlink:href="#linearGradient4902-3"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4902-3" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4877-6">
       <stop
          style="stop-color:#91a5c7;stop-opacity:1;"
@@ -143,11 +128,9 @@
        y1="1043.8571"
        x1="7.0070496"
        id="linearGradient4867-7"
-       xlink:href="#linearGradient4877-6"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4877-6" />
     <linearGradient
-       id="linearGradient4861-1"
-       inkscape:collect="always">
+       id="linearGradient4861-1">
       <stop
          id="stop4863-1"
          offset="0"
@@ -165,36 +148,8 @@
        y1="1045.8571"
        x1="7.0070496"
        id="linearGradient4869-17"
-       xlink:href="#linearGradient4861-1"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4861-1" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="8"
-     inkscape:cx="24.383091"
-     inkscape:cy="-10.446691"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1-95"
-     showgrid="true"
-     inkscape:snap-global="false"
-     inkscape:window-width="1429"
-     inkscape:window-height="852"
-     inkscape:window-x="1129"
-     inkscape:window-y="616"
-     inkscape:window-maximized="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid26727"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
   <metadata
      id="metadata25495">
     <rdf:RDF>
@@ -208,15 +163,12 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      transform="translate(0,-1036.3622)">
     <g
        transform="translate(324.0078,-599.7683)"
        style="stroke:url(#linearGradient8238);stroke-opacity:1;display:inline"
-       id="layer1-2"
-       inkscape:label="Layer 1">
+       id="layer1-2">
       <g
          id="g11331-3-1-1-7"
          style="stroke:url(#linearGradient25569);display:inline"
@@ -240,7 +192,6 @@
           <g
              style="font-size:13.58917427px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#236298;fill-opacity:1;stroke:#236298;stroke-width:0.24860173;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline;font-family:Sans"
              id="layer1-9"
-             inkscape:label="Layer 1"
              transform="matrix(1.2778996,0,0.03747938,1.2778996,-58.56426,-297.79529)">
             <g
                transform="translate(20,0)"
@@ -249,22 +200,16 @@
               <g
                  transform="matrix(0.84893168,0,-0.02489823,0.84893168,-258.1493,627.19515)"
                  style="display:inline"
-                 id="layer1-95"
-                 inkscape:label="Layer 1">
+                 id="layer1-95">
                 <path
-                   sodipodi:nodetypes="cccccc"
-                   inkscape:connector-curvature="0"
                    id="rect4001-3"
                    d="m 1.6454495,1037.8925 7.0096695,0 3.062056,3.0066 0,9.9546 -10.0717255,0 z"
                    style="display:inline;fill:url(#linearGradient4101);fill-opacity:1;stroke:none" />
                 <path
-                   inkscape:connector-curvature="0"
                    id="path4884"
                    d="m 8.4914265,1037.4298 0,3.626 3.6108385,0 z"
                    style="display:inline;fill:url(#linearGradient4900-1);fill-opacity:1;stroke:none" />
                 <path
-                   sodipodi:nodetypes="cccccc"
-                   inkscape:connector-curvature="0"
                    id="rect4001"
                    d="m 1.643146,1037.8902 7.0128758,0 3.0634562,2.9776 0,9.8586 -10.076332,0 z"
                    style="display:inline;fill:none;stroke:url(#linearGradient4908-2);stroke-width:0.99539304;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1" />
@@ -286,12 +231,10 @@
                    id="g4920"
                    transform="matrix(1.0976253,0,0,1.0976253,-1.2719888,-103.09171)">
                   <path
-                     inkscape:connector-curvature="0"
                      id="path4114"
                      d="m 11.652973,1046.0814 -0.85549,0.7332 c 0,0 -0.08148,0.8148 -0.08148,1.1407 0,0.3259 0.366638,1.0999 0.366638,1.0999 l 0.488851,0.4481 c 0,0 0.69254,-0.082 0.651802,-0.2444 -0.04073,-0.163 0.285163,-1.1814 0.285163,-1.1814 0,0 0.08148,-0.774 -0.04073,-1.0184 -0.122212,-0.2445 -0.366638,-0.6926 -0.366638,-0.6926 z"
                      style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:11.05178356px;line-height:125%;font-family:AustralianFlyingCorpsStencil;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;display:inline;fill:#ffffff;fill-opacity:1;stroke:none" />
                   <path
-                     inkscape:connector-curvature="0"
                      id="path4114-5"
                      d="m 5.2571682,1046.0814 -0.85549,0.7332 c 0,0 -0.08148,0.8148 -0.08148,1.1407 0,0.3259 0.366638,1.0999 0.366638,1.0999 l 0.488851,0.4481 c 0,0 0.69254,-0.082 0.651802,-0.2444 -0.04073,-0.163 0.285163,-1.1814 0.285163,-1.1814 0,0 0.08148,-0.774 -0.04073,-1.0184 -0.122212,-0.2445 -0.366638,-0.6926 -0.366638,-0.6926 z"
                      style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:11.05178356px;line-height:125%;font-family:AustralianFlyingCorpsStencil;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;display:inline;fill:#ffffff;fill-opacity:1;stroke:none" />
@@ -302,18 +245,15 @@
                     <path
                        d="m 6.4096109,937.52961 q 0,-0.70054 -0.132603,-0.98577 -0.130101,-0.28772 -0.4403418,-0.28772 -0.3102409,0 -0.4428438,0.28772 -0.132603,0.28523 -0.132603,0.98577 0,0.70805 0.132603,0.99827 0.1326029,0.29023 0.4428438,0.29023 0.3077389,0 0.4403418,-0.29023 0.132603,-0.29022 0.132603,-0.99827 z m 0.9632478,0.007 q 0,0.92823 -0.4003108,1.43362 -0.4003107,0.50289 -1.1358818,0.50289 -0.7380731,0 -1.1383838,-0.50289 -0.4003108,-0.50539 -0.4003108,-1.43362 0,-0.93072 0.4003108,-1.43361 0.4003107,-0.50539 1.1383838,-0.50539 0.7355711,0 1.1358818,0.50539 0.4003108,0.50289 0.4003108,1.43361 z"
                        style="font-weight:bold;fill:#17325d;fill-opacity:1"
-                       id="path4180"
-                       inkscape:connector-curvature="0" />
+                       id="path4180" />
                     <path
                        d="m 8.2160134,938.73555 0.8506604,0 0,-2.41438 -0.8731779,0.18014 0,-0.65551 0.868174,-0.18014 0.915711,0 0,3.06989 0.8506601,0 0,0.66551 -2.6120276,0 0,-0.66551 z"
                        style="font-weight:bold;fill:#17325d;fill-opacity:1"
-                       id="path4182"
-                       inkscape:connector-curvature="0" />
+                       id="path4182" />
                     <path
                        d="m 13.535143,937.52961 q 0,-0.70054 -0.132603,-0.98577 -0.130101,-0.28772 -0.440342,-0.28772 -0.310241,0 -0.442844,0.28772 -0.132603,0.28523 -0.132603,0.98577 0,0.70805 0.132603,0.99827 0.132603,0.29023 0.442844,0.29023 0.307739,0 0.440342,-0.29023 0.132603,-0.29022 0.132603,-0.99827 z m 0.963248,0.007 q 0,0.92823 -0.400311,1.43362 -0.400311,0.50289 -1.135882,0.50289 -0.738073,0 -1.138384,-0.50289 -0.40031,-0.50539 -0.40031,-1.43362 0,-0.93072 0.40031,-1.43361 0.400311,-0.50539 1.138384,-0.50539 0.735571,0 1.135882,0.50539 0.400311,0.50289 0.400311,1.43361 z"
                        style="font-weight:bold;fill:#17325d;fill-opacity:1"
-                       id="path4184"
-                       inkscape:connector-curvature="0" />
+                       id="path4184" />
                   </g>
                 </g>
               </g>
diff --git a/ui/org.eclipse.pde.ui/icons/etool16/eclipse.svg b/ui/org.eclipse.pde.ui/icons/etool16/eclipse.svg
index 19ba07cbe21..7045fafb38f 100644
--- a/ui/org.eclipse.pde.ui/icons/etool16/eclipse.svg
+++ b/ui/org.eclipse.pde.ui/icons/etool16/eclipse.svg
@@ -7,13 +7,6 @@
    viewBox="0 0 1.3617021 1.3617021"
    version="1.1"
    id="SVGRoot"
-   sodipodi:docname="eclipse16.svg"
-   inkscape:export-xdpi="96"
-   inkscape:export-ydpi="96"
-   inkscape:version="1.3 (0e150ed, 2023-07-21)"
-   inkscape:export-filename="eclipse16.png"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
@@ -73,39 +66,6 @@
          id="stop48" />
     </linearGradient>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#828282"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="49.995668"
-     inkscape:cx="8.4407313"
-     inkscape:cy="7.1806221"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1920"
-     inkscape:window-height="1027"
-     inkscape:window-x="0"
-     inkscape:window-y="25"
-     inkscape:window-maximized="1"
-     inkscape:grid-bbox="true"
-     showguides="false"
-     inkscape:pagecheckerboard="0"
-     inkscape:showpageshadow="0"
-     inkscape:deskcolor="#505050">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2674"
-       originx="0"
-       originy="0"
-       spacingy="1"
-       spacingx="1"
-       units="px"
-       visible="true" />
-  </sodipodi:namedview>
   <metadata
      id="metadata1981">
     <rdf:RDF>
@@ -118,63 +78,50 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1">
     <path
        d="m 0.31439266,0.59574465 h -0.0967113 c -0.003538,0.0277386 -0.005949,0.0560544 -0.007043,0.085092 h 0.1149434 0.0576597 0.83227824 0.07597 c -0.00111,-0.0290374 -0.00351,-0.0573534 -0.00708,-0.085092"
        id="path4"
-       inkscape:connector-curvature="0"
        style="fill:#2c2255;stroke-width:0.144573" />
     <path
        d="m 0.21063836,0.7659574 c 0.001095,0.0290569 0.003494,0.0573776 0.007043,0.0851063 h 0.10054431 0.0762098 0.81426083 0.07569 c 0.00356,-0.0277288 0.00599,-0.0560495 0.0071,-0.0851063"
        id="path6"
-       inkscape:connector-curvature="0"
        style="fill:#2c2255;stroke-width:0.144583" />
     <path
-       inkscape:connector-curvature="0"
        style="fill:#2c2255;stroke-width:0.133163"
        d="M 0.41454626,0.89361769 H 0.22814691 c 0.0246807,0.0812411 0.0704785,0.15405391 0.13752861,0.21840611 0.1068924,0.1025848 0.23542602,0.153808 0.38573431,0.153808 0.0300462,0 0.0591574,-0.00215 0.0874334,-0.00624 C 0.95205875,1.2431968 1.0511805,1.1940768 1.136109,1.1120239 1.2035931,1.0476919 1.2497144,0.97485901 1.2745839,0.89361777 H 1.1989402 1.0883294 Z"
        id="path2" />
     <path
-       inkscape:connector-curvature="0"
        style="fill:#2c2255;stroke-width:0.133163"
        d="M 1.2668657,0.54246809 C 1.2420234,0.46099363 1.1959007,0.38783112 1.1283973,0.32302332 1.0437092,0.24173051 0.94488598,0.19295901 0.83206131,0.17654876 c -0.0285368,-0.004154 -0.0579314,-0.006336 -0.0882827,-0.006336 -0.15027704,0 -0.2787951,0.0509506 -0.38565413,0.15281002 -0.0670578,0.0648077 -0.11286932,0.13797029 -0.13753331,0.21944478"
        id="path10" />
     <path
        d="M 0.41865313,0.51063829 H 0.2361419 c -0.005999,0.0277109 -0.009869,0.0561367 -0.0135847,0.0851063 h 0.0940013 0.0800416 0.7131853 0.1010032 0.07219 c -0.00373,-0.0289542 -0.00853,-0.0573799 -0.014511,-0.0851063"
        id="path57"
-       inkscape:connector-curvature="0"
        style="fill:#ffffff;stroke-width:0.148492" />
     <path
        d="m 1.1188859,0.68083664 c -0.00181,-0.0291673 -0.00558,-0.0576132 -0.011189,-0.085092 H 0.39444174 c -0.005617,0.0274644 -0.009387,0.0559101 -0.0112003,0.085092 z"
        id="path37"
-       inkscape:connector-curvature="0"
        style="fill:url(#SVGID_1_);stroke-width:0.144573" />
     <path
        d="M 1.118854,0.7659574 H 0.38324642 c 0.001813,0.0291723 0.005561,0.0576229 0.0111888,0.0851063 H 1.1076762 c 0.00562,-0.0274835 0.00936,-0.055934 0.011178,-0.0851063 z"
        id="path44"
-       inkscape:connector-curvature="0"
        style="fill:url(#SVGID_2_);stroke-width:0.144583" />
     <path
        d="m 0.75182905,1.0995883 c 0.15139629,0 0.28189755,-0.084318 0.34199495,-0.2059713 H 0.40983415 c 0.0600975,0.1216535 0.19059862,0.2059713 0.3419949,0.2059713 z"
        id="path51"
-       inkscape:connector-curvature="0"
        style="fill:url(#SVGID_3_);stroke-width:0.133164" />
     <path
        d="m 0.32109283,0.76595731 h 0.0539474 0.73681757 0.096794 0.073531 c 5.081e-4,-0.0135369 7.953e-4,-0.0271669 7.953e-4,-0.0408902 0,-0.0148423 -3.867e-4,-0.0295603 -9.867e-4,-0.044216 H 1.2086406 1.1118467 0.3750292 0.31727101 0.20311323 c -5.9648e-4,0.0146403 -9.8376e-4,0.0293739 -9.8376e-4,0.044216 0,0.0137233 2.8719e-4,0.0273534 7.9529e-4,0.0408902 z"
        id="path55"
-       inkscape:connector-curvature="0"
        style="fill:#ffffff;stroke-width:0.149916" />
     <path
        d="m 1.2019969,0.85106376 h -0.098427 -0.69498572 -0.0742716 -0.098137 c 0.003524,0.0289542 0.007533,0.0573645 0.0132811,0.0851064 h 0.18059658 0.65204764 0.1070448 0.069715 c 0.00573,-0.0277263 0.010369,-0.0561367 0.013904,-0.0851064 z"
        id="path59"
-       inkscape:connector-curvature="0"
        style="fill:#ffffff;stroke-width:0.146814" />
     <path
        d="m 0.1666079,0.71588183 c 0,-0.29724773 0.21917824,-0.54422903 0.50430771,-0.58766974 -0.007074,-2.6475e-4 -0.0141825,-5.5252e-4 -0.0213245,-5.5252e-4 -0.31996972,0 -0.57937867,0.26336078 -0.57937867,0.58822226 0,0.32487317 0.25939765,0.58822237 0.57937867,0.58822237 0.007165,0 0.0142729,-2.762e-4 0.0213697,-5.409e-4 C 0.38578614,1.2601224 0.1666079,1.0131411 0.1666079,0.71588183 Z"
        id="path12"
-       inkscape:connector-curvature="0"
        style="fill:#f7941e;stroke-width:0.133164" />
     <ellipse
        style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.0362633;stroke-linecap:square;stroke-miterlimit:3;stroke-opacity:0.921569"
diff --git a/ui/org.eclipse.pde.ui/icons/etool16/exp_deployfeat.svg b/ui/org.eclipse.pde.ui/icons/etool16/exp_deployfeat.svg
index 036a2a7f9b9..046672650e8 100644
--- a/ui/org.eclipse.pde.ui/icons/etool16/exp_deployfeat.svg
+++ b/ui/org.eclipse.pde.ui/icons/etool16/exp_deployfeat.svg
@@ -2,25 +2,20 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="exp_deployfeat.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient3973"
-       inkscape:collect="always">
+       id="linearGradient3973">
       <stop
          id="stop3975"
          offset="0"
@@ -31,8 +26,7 @@
          style="stop-color:#f8f0c8;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       id="linearGradient3967"
-       inkscape:collect="always">
+       id="linearGradient3967">
       <stop
          id="stop3969"
          offset="0"
@@ -66,7 +60,6 @@
          style="stop-color:#ba772f;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3949">
       <stop
          style="stop-color:#9e6627;stop-opacity:1"
@@ -78,7 +71,6 @@
          id="stop3953" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient3967"
        id="linearGradient3939"
        gradientUnits="userSpaceOnUse"
@@ -88,7 +80,6 @@
        x2="531.09253"
        y2="371.17883" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient3955"
        id="linearGradient3945"
        gradientUnits="userSpaceOnUse"
@@ -97,18 +88,7 @@
        x2="543.91406"
        y2="373.2294"
        gradientTransform="translate(-60.558598,1.4188)" />
-    <mask
-       maskUnits="userSpaceOnUse"
-       id="mask4917">
-      <path
-         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;display:inline"
-         d="m 462.77563,373.22885 29.11636,0 c 1.45425,0 2.625,1.17075 2.625,2.625 l 0,18.76896 c 0,1.45425 -1.17412,2.52598 -2.625,2.625 l -29.11636,1.98708 c -1.45088,0.099 -2.625,-1.17075 -2.625,-2.625 l 0,-20.75604 c 0,-1.45425 1.17075,-2.625 2.625,-2.625 z"
-         id="path4919"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="sssssssss" />
-    </mask>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient3973"
        id="linearGradient4933"
        gradientUnits="userSpaceOnUse"
@@ -118,7 +98,6 @@
        x2="538.00562"
        y2="374.21222" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient3949"
        id="linearGradient4935"
        gradientUnits="userSpaceOnUse"
@@ -128,7 +107,6 @@
        x2="548.45923"
        y2="373.77069" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4284"
        id="linearGradient10790-8-2"
        gradientUnits="userSpaceOnUse"
@@ -153,7 +131,6 @@
          style="stop-color:#809dcb;stop-opacity:0" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10157-2-5"
        id="linearGradient10790-8"
        gradientUnits="userSpaceOnUse"
@@ -178,7 +155,6 @@
          id="stop10161-5-0" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10149-39-0"
        id="linearGradient10792-6"
        gradientUnits="userSpaceOnUse"
@@ -188,7 +164,6 @@
        x2="322.875"
        y2="504.44818" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient10149-39-0">
       <stop
          style="stop-color:#6084be;stop-opacity:1"
@@ -200,7 +175,6 @@
          id="stop10153-72-3" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10157-2-5"
        id="linearGradient10786-1"
        gradientUnits="userSpaceOnUse"
@@ -210,7 +184,6 @@
        y2="514.75818"
        gradientTransform="matrix(1.0391435,0,0,0.5924666,202.46608,49.82119)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10414-9"
        id="linearGradient10782-3"
        gradientUnits="userSpaceOnUse"
@@ -235,7 +208,6 @@
          id="stop10418-4" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10432-3"
        id="linearGradient10784-2"
        gradientUnits="userSpaceOnUse"
@@ -260,7 +232,6 @@
          style="stop-color:#567ebc;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10448-90"
        id="linearGradient10778-6"
        gradientUnits="userSpaceOnUse"
@@ -293,7 +264,6 @@
          id="stop10452-1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10748-8"
        id="linearGradient10774-5"
        gradientUnits="userSpaceOnUse"
@@ -326,7 +296,6 @@
          style="stop-color:#e5b630;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10448-9-7-0-5"
        id="linearGradient10770-6"
        gradientUnits="userSpaceOnUse"
@@ -350,17 +319,6 @@
          offset="1"
          id="stop10452-22-7-8-4" />
     </linearGradient>
-    <linearGradient
-       id="linearGradient6281-8-0-1-6">
-      <stop
-         id="stop6283-0-2-2-1"
-         offset="0"
-         style="stop-color:#f7f9fb;stop-opacity:1" />
-      <stop
-         id="stop6285-5-0-9-7"
-         offset="1"
-         style="stop-color:#ffd680;stop-opacity:1" />
-    </linearGradient>
     <linearGradient
        y2="1050.3622"
        x2="6.9999828"
@@ -369,11 +327,9 @@
        gradientTransform="matrix(3.5838051,0,0,3.5838051,449.80948,-3368.7064)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient19869"
-       xlink:href="#linearGradient4922-2"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4922-2" />
     <linearGradient
-       id="linearGradient4922-2"
-       inkscape:collect="always">
+       id="linearGradient4922-2">
       <stop
          id="stop4924-3"
          offset="0"
@@ -384,29 +340,6 @@
          style="stop-color:#4077a7;stop-opacity:1" />
     </linearGradient>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="8"
-     inkscape:cx="-6.1825937"
-     inkscape:cy="-5.7082438"
-     inkscape:document-units="px"
-     inkscape:current-layer="g4301"
-     showgrid="true"
-     inkscape:window-width="1088"
-     inkscape:window-height="856"
-     inkscape:window-x="1148"
-     inkscape:window-y="707"
-     inkscape:window-maximized="0"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3947" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -420,8 +353,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
@@ -444,14 +375,11 @@
         <path
            style="fill:url(#linearGradient4933);fill-opacity:1;stroke:url(#linearGradient4935);stroke-width:3.02792978;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
            d="m 463.24874,374.64819 28.07551,0 c 1.45425,0 2.625,1.17075 2.625,2.625 l 0,11.29376 c 0,1.45425 -1.18021,2.45926 -2.625,2.625 l -28.07551,3.22078 c -1.44478,0.16574 -2.625,-1.17075 -2.625,-2.625 l 0,-14.51454 c 0,-1.45425 1.17075,-2.625 2.625,-2.625 z"
-           id="rect13693"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="sssssssss" />
+           id="rect13693" />
         <path
            style="fill:none;stroke:url(#linearGradient3945);stroke-width:3.02792978;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
            d="m 462.26171,374.64819 20.09375,0"
-           id="path13797"
-           inkscape:connector-curvature="0" />
+           id="path13797" />
       </g>
       <g
          id="g4301"
@@ -466,18 +394,14 @@
            id="rect10007-0-74-2-7-6"
            style="display:inline;fill:url(#linearGradient10770-6);fill-opacity:1;stroke:none;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
         <path
-           inkscape:connector-curvature="0"
            id="path4313-8-8"
            d="m 548.23888,354.95116 0,3.5838 12.01134,0 0,-3.5838 -12.01134,0 z"
            style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
         <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
            id="path4313-8-8-7"
            d="m 549.43361,354.93037 0,10.8213 3.63939,0 0,-10.8213 z"
            style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.94926554px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
         <path
-           inkscape:connector-curvature="0"
            id="path4313-5-1-8"
            d="m 560.22222,362.10479 -12.03934,0.1111 0.0351,3.58381 12.03934,-0.1111 -0.0351,-3.58381 z"
            style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#9e7400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
@@ -491,12 +415,10 @@
            id="rect10007-0-74-2-7"
            style="display:inline;fill:url(#linearGradient10774-5);fill-opacity:1;stroke:none;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
         <path
-           inkscape:connector-curvature="0"
            id="path4313-5-1"
            d="m 549.5198,365.72372 -12.03934,0.1111 0.035,3.5838 12.03935,-0.1111 -0.0351,-3.5838 z"
            style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#9e7400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
         <path
-           inkscape:connector-curvature="0"
            id="path4313-8"
            d="m 549.48481,351.36054 -12.03935,0.1111 0.035,3.58381 12.03935,-0.1111 -0.0351,-3.58381 z"
            style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
@@ -510,12 +432,10 @@
            id="rect10007-0-74-2"
            style="display:inline;fill:url(#linearGradient10778-6);fill-opacity:1;stroke:none;stroke-width:1.50161433;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
         <path
-           inkscape:connector-curvature="0"
            id="path4313"
            d="m 542.3172,347.76957 -12.03935,0.1111 0.035,3.5838 12.03935,-0.11109 -0.0351,-3.58381 z"
            style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
         <path
-           inkscape:connector-curvature="0"
            id="path4313-5"
            d="m 542.33819,369.2724 -12.03934,0.1111 0.035,3.58381 12.03935,-0.1111 -0.0351,-3.58381 z"
            style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#9e7400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
@@ -568,8 +488,6 @@
         </g>
       </g>
       <path
-         sodipodi:nodetypes="cccc"
-         inkscape:connector-curvature="0"
          id="path4920"
          d="m 466.83256,388.41931 15.23117,0 0,15.34335 z"
          style="display:inline;fill:url(#linearGradient19869);fill-opacity:1;stroke:none" />
diff --git a/ui/org.eclipse.pde.ui/icons/etool16/exp_deployplug.svg b/ui/org.eclipse.pde.ui/icons/etool16/exp_deployplug.svg
index 67b63be8c7b..840dd92cc85 100644
--- a/ui/org.eclipse.pde.ui/icons/etool16/exp_deployplug.svg
+++ b/ui/org.eclipse.pde.ui/icons/etool16/exp_deployplug.svg
@@ -2,20 +2,16 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="exp_deployplug.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
@@ -48,21 +44,6 @@
          offset="1"
          id="stop10452-22-7-8-4" />
     </linearGradient>
-    <linearGradient
-       id="linearGradient10440-1-0-0-3">
-      <stop
-         style="stop-color:#ae7603;stop-opacity:1;"
-         offset="0"
-         id="stop10442-43-2-0-9" />
-      <stop
-         id="stop10521-1-2-5-3"
-         offset="0.5"
-         style="stop-color:#e8d8a3;stop-opacity:1" />
-      <stop
-         style="stop-color:#bb9221;stop-opacity:1"
-         offset="1"
-         id="stop10444-3-4-0-4" />
-    </linearGradient>
     <linearGradient
        id="linearGradient10748-8">
       <stop
@@ -86,21 +67,6 @@
          offset="1"
          style="stop-color:#e5b630;stop-opacity:1" />
     </linearGradient>
-    <linearGradient
-       id="linearGradient10440-1-3-4">
-      <stop
-         style="stop-color:#ae7603;stop-opacity:1;"
-         offset="0"
-         id="stop10442-43-0-5" />
-      <stop
-         id="stop10521-1-4-7"
-         offset="0.5"
-         style="stop-color:#e8d8a3;stop-opacity:1" />
-      <stop
-         style="stop-color:#bb9221;stop-opacity:1"
-         offset="1"
-         id="stop10444-3-2-0" />
-    </linearGradient>
     <linearGradient
        id="linearGradient10448-90">
       <stop
@@ -124,51 +90,6 @@
          offset="1"
          id="stop10452-1" />
     </linearGradient>
-    <linearGradient
-       id="linearGradient10440-18">
-      <stop
-         style="stop-color:#ae7603;stop-opacity:1;"
-         offset="0"
-         id="stop10442-8" />
-      <stop
-         id="stop10521-7"
-         offset="0.5"
-         style="stop-color:#e8d8a3;stop-opacity:1" />
-      <stop
-         style="stop-color:#bb9221;stop-opacity:1"
-         offset="1"
-         id="stop10444-0" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10414-9">
-      <stop
-         style="stop-color:#5078b9;stop-opacity:1;"
-         offset="0"
-         id="stop10416-3" />
-      <stop
-         id="stop10422-8"
-         offset="0.5"
-         style="stop-color:#6d8cbd;stop-opacity:1" />
-      <stop
-         style="stop-color:#5f88c9;stop-opacity:1"
-         offset="1"
-         id="stop10418-4" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10432-3">
-      <stop
-         id="stop10434-4"
-         offset="0"
-         style="stop-color:#1f4d9a;stop-opacity:1" />
-      <stop
-         style="stop-color:#4e6da1;stop-opacity:1"
-         offset="0.5"
-         id="stop10436-2" />
-      <stop
-         id="stop10438-9"
-         offset="1"
-         style="stop-color:#567ebc;stop-opacity:1" />
-    </linearGradient>
     <linearGradient
        id="linearGradient10157-6">
       <stop
@@ -184,21 +105,6 @@
          offset="1"
          id="stop10161-55" />
     </linearGradient>
-    <linearGradient
-       id="linearGradient10396-5">
-      <stop
-         style="stop-color:#1b3e79;stop-opacity:1;"
-         offset="0"
-         id="stop10398-7" />
-      <stop
-         id="stop10404-9"
-         offset="0.5"
-         style="stop-color:#728fbf;stop-opacity:1" />
-      <stop
-         style="stop-color:#1f4d9a;stop-opacity:1"
-         offset="1"
-         id="stop10400-9" />
-    </linearGradient>
     <linearGradient
        id="linearGradient10157-2-5">
       <stop
@@ -215,7 +121,6 @@
          id="stop10161-5-0" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient10149-39-0">
       <stop
          style="stop-color:#6936ae;stop-opacity:1"
@@ -227,22 +132,6 @@
          id="stop10153-72-3" />
     </linearGradient>
     <linearGradient
-       id="linearGradient10149-6-5-4">
-      <stop
-         style="stop-color:#1f4d9a;stop-opacity:1"
-         offset="0"
-         id="stop10151-5-7-2" />
-      <stop
-         id="stop10394-3"
-         offset="0.5"
-         style="stop-color:#b9c7df;stop-opacity:1" />
-      <stop
-         style="stop-color:#567ebc;stop-opacity:1"
-         offset="1"
-         id="stop10153-8-1-2" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10448-9-7-0-5"
        id="linearGradient4545"
        gradientUnits="userSpaceOnUse"
@@ -252,7 +141,6 @@
        x2="323.98331"
        y2="518.28192" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10748-8"
        id="linearGradient4547"
        gradientUnits="userSpaceOnUse"
@@ -262,7 +150,6 @@
        x2="324.1601"
        y2="515.53949" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10448-90"
        id="linearGradient4549"
        gradientUnits="userSpaceOnUse"
@@ -272,7 +159,6 @@
        x2="324.1601"
        y2="511.66458" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10157-6"
        id="linearGradient4551"
        gradientUnits="userSpaceOnUse"
@@ -282,7 +168,6 @@
        x2="306.05069"
        y2="514.75818" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10157-2-5"
        id="linearGradient4553"
        gradientUnits="userSpaceOnUse"
@@ -292,7 +177,6 @@
        x2="305"
        y2="542.73901" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10149-39-0"
        id="linearGradient4555"
        gradientUnits="userSpaceOnUse"
@@ -302,7 +186,6 @@
        x2="322.875"
        y2="504.44818" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4284"
        id="linearGradient4557"
        gradientUnits="userSpaceOnUse"
@@ -311,36 +194,6 @@
        y1="513.87781"
        x2="305"
        y2="545.35248" />
-    <linearGradient
-       id="linearGradient10157-6-8">
-      <stop
-         style="stop-color:#6588c1;stop-opacity:1"
-         offset="0"
-         id="stop10159-5-1" />
-      <stop
-         id="stop10165-9-1"
-         offset="0.5"
-         style="stop-color:#becce3;stop-opacity:1" />
-      <stop
-         style="stop-color:#809dcb;stop-opacity:1"
-         offset="1"
-         id="stop10161-55-7" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4284-3">
-      <stop
-         id="stop4286-1"
-         offset="0"
-         style="stop-color:#6588c1;stop-opacity:0" />
-      <stop
-         style="stop-color:#becce3;stop-opacity:1"
-         offset="0.49999967"
-         id="stop4288-4" />
-      <stop
-         id="stop4290-4"
-         offset="1"
-         style="stop-color:#809dcb;stop-opacity:0" />
-    </linearGradient>
     <linearGradient
        y2="1050.3622"
        x2="6.9999828"
@@ -349,11 +202,9 @@
        gradientTransform="translate(-4.0023793,0.00326943)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient19869"
-       xlink:href="#linearGradient4922-2"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4922-2" />
     <linearGradient
-       id="linearGradient4922-2"
-       inkscape:collect="always">
+       id="linearGradient4922-2">
       <stop
          id="stop4924-3"
          offset="0"
@@ -410,7 +261,6 @@
          id="stop10452-1-6" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10448-9-7-0-5"
        id="linearGradient4424"
        gradientUnits="userSpaceOnUse"
@@ -420,7 +270,6 @@
        x2="323.98331"
        y2="518.28192" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10748-8-5"
        id="linearGradient4426"
        gradientUnits="userSpaceOnUse"
@@ -430,7 +279,6 @@
        x2="324.1601"
        y2="515.53949" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10448-90-9"
        id="linearGradient4428"
        gradientUnits="userSpaceOnUse"
@@ -440,7 +288,6 @@
        x2="324.1601"
        y2="511.66458" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4322"
        id="linearGradient4328"
        x1="10.003791"
@@ -450,7 +297,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(14.996209,-0.985039)" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4322">
       <stop
          style="stop-color:#a0b5d7;stop-opacity:1"
@@ -474,7 +320,6 @@
          id="stop4326" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4285"
        id="linearGradient4291"
        x1="11.923064"
@@ -484,7 +329,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(14.668084,-11.177808)" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4285">
       <stop
          style="stop-color:#a0b5d7;stop-opacity:1"
@@ -508,7 +352,6 @@
          id="stop4289" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4295"
        id="linearGradient4301"
        x1="13.425666"
@@ -518,7 +361,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(14.668084,-11.177808)" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4295">
       <stop
          style="stop-color:#7da0d5;stop-opacity:1"
@@ -530,29 +372,6 @@
          id="stop4299" />
     </linearGradient>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1.4142136"
-     inkscape:cx="114.99426"
-     inkscape:cy="15.513436"
-     inkscape:document-units="px"
-     inkscape:current-layer="g4228-7"
-     showgrid="true"
-     inkscape:window-width="858"
-     inkscape:window-height="564"
-     inkscape:window-x="1010"
-     inkscape:window-y="845"
-     inkscape:window-maximized="0"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid4210" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -566,8 +385,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
@@ -585,23 +402,17 @@
          id="rect10007-0-74-2-7-6-5"
          style="fill:url(#linearGradient4545);fill-opacity:1;stroke:none;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
       <path
-         inkscape:connector-curvature="0"
          id="path4313-8-8-8"
          d="m 14.940316,1043.3652 0,1 2.886225,0 0,-1 z"
-         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-         sodipodi:nodetypes="ccccc" />
+         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
       <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
          id="path4313-8-8-7-1"
          d="m 15.273687,1043.3594 0,3.0195 1.01551,0 0,-3.0195 z"
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.94926554px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
       <path
-         inkscape:connector-curvature="0"
          id="path4313-5-1-8-1"
          d="m 17.786212,1045.3613 -2.861522,0.031 0.0053,1 2.861522,-0.031 z"
-         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#9e7400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-         sodipodi:nodetypes="ccccc" />
+         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#9e7400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
       <rect
          ry="0"
          rx="0"
@@ -612,12 +423,10 @@
          id="rect10007-0-74-2-7-7"
          style="fill:url(#linearGradient4547);fill-opacity:1;stroke:none;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
       <path
-         inkscape:connector-curvature="0"
          id="path4313-5-1-5"
          d="m 15.297737,1046.3711 -3.359374,0.031 0.0098,1 3.359374,-0.031 -0.0098,-1 z"
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#9e7400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
       <path
-         inkscape:connector-curvature="0"
          id="path4313-8-2"
          d="m 14.283082,1043.3634 -2.354485,0.028 0.0069,0.9091 2.354484,-0.028 -0.0069,-0.909 z"
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
@@ -658,18 +467,14 @@
          id="rect10007-0-74-0"
          style="fill:url(#linearGradient4551);fill-opacity:1;stroke:none;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
       <path
-         inkscape:connector-curvature="0"
          id="path4313-6"
          d="m 13.334711,1043.3647 -3.4061138,0.029 0.00991,0.9204 3.4061128,-0.028 -0.0099,-0.9205 z"
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
       <path
-         inkscape:connector-curvature="0"
          id="path4313-5-2"
          d="m 13.293831,1047.3613 -3.3593745,0.031 0.00977,1 3.3593745,-0.031 -0.0098,-1 z"
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#9e7400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
       <path
-         sodipodi:nodetypes="cssssc"
-         inkscape:connector-curvature="0"
          id="rect10007-6-5"
          d="m 8.7673916,1043.9833 c 1.0259795,0 2.0241514,-0.1891 2.0241514,0.834 l 0,3.5451 c 0,0.8271 -0.665834,1.4929 -1.4929014,1.4929 -0.8270672,0 -1.4929011,-0.6658 -1.4929011,-1.4929 l 0,-3.5537"
          style="fill:url(#linearGradient4553);fill-opacity:1;stroke:url(#linearGradient4555);stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
@@ -681,21 +486,15 @@
          id="rect10007-6-6-0"
          style="display:inline;fill:url(#linearGradient4557);fill-opacity:1;stroke:none;stroke-width:3.58380508;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
       <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
          id="path4313-8-8-7-8-4"
          d="m 13.295507,1043.3647 0,3.01 1.000277,0 0,-3.01 z"
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:0.64640886;fill-rule:evenodd;stroke:none;stroke-width:0.97351193px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
       <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
          id="path4313-8-8-7-5-5"
          d="m 14.284123,1042.3524 0,1.0351 1.01551,0 0,-1.0351 z"
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.94926554px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
     </g>
     <path
-       sodipodi:nodetypes="cccc"
-       inkscape:connector-curvature="0"
        id="path4920"
        d="m 0.99069027,1048.3655 4.00693153,0 0,3.9719 z"
        style="display:inline;fill:url(#linearGradient19869);fill-opacity:1;stroke:none" />
@@ -714,25 +513,19 @@
          ry="0"
          transform="translate(20.125466,13.034661)" />
       <path
-         sodipodi:nodetypes="ccccc"
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ba9726;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
          d="m 10.665872,1046.3536 0,1 3.34593,0 0,-1 z"
          id="path4313-8-8-5"
-         inkscape:connector-curvature="0"
          transform="translate(20.125466,13.034661)" />
       <path
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.94926554px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
          d="m 10.999243,1046.3478 0,3.0195 1.01551,0 0,-3.0195 z"
          id="path4313-8-8-7-4"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc"
          transform="translate(20.125466,13.034661)" />
       <path
-         sodipodi:nodetypes="ccccc"
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ba9726;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
          d="m 14.005886,1048.3497 -3.35564,0.031 0.0098,1 3.355639,-0.031 z"
          id="path4313-5-1-8-9"
-         inkscape:connector-curvature="0"
          transform="translate(20.125466,13.034661)" />
       <rect
          style="display:inline;fill:url(#linearGradient4426);fill-opacity:1;stroke:none;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
@@ -748,13 +541,11 @@
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ba9726;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
          d="m 11.023293,1049.3595 -3.3593746,0.031 0.00977,1 3.3593746,-0.031 -0.0098,-1 z"
          id="path4313-5-1-2"
-         inkscape:connector-curvature="0"
          transform="translate(20.125466,13.034661)" />
       <path
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ba9726;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
          d="m 11.013528,1045.3517 -3.3593752,0.031 0.00977,1 3.3593742,-0.031 -0.0098,-1 z"
          id="path4313-8-0"
-         inkscape:connector-curvature="0"
          transform="translate(20.125466,13.034661)" />
       <rect
          style="display:inline;fill:url(#linearGradient4428);fill-opacity:1;stroke:none;stroke-width:1.50161433;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
@@ -770,38 +561,28 @@
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
          d="m 9.013528,1044.3497 -3.3593752,0.031 0.00977,1 3.3593742,-0.031 -0.0098,-1 z"
          id="path4313-54"
-         inkscape:connector-curvature="0"
          transform="translate(20.125466,13.034661)" />
       <path
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#9e7400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
          d="m 9.019387,1050.3497 -3.3593749,0.031 0.00977,1 3.3593749,-0.031 -0.0098,-1 z"
          id="path4313-5-0"
-         inkscape:connector-curvature="0"
          transform="translate(20.125466,13.034661)" />
       <path
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:0.64640886;fill-rule:evenodd;stroke:none;stroke-width:0.97351193px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
          d="m 9.021063,1046.3531 0,3.01 1.000277,0 0,-3.01 z"
          id="path4313-8-8-7-8-1"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc"
          transform="translate(20.125466,13.034661)" />
       <g
          id="g4294">
         <path
-           sodipodi:nodetypes="cccc"
-           inkscape:connector-curvature="0"
            id="rect4317-3"
            d="m 20.151278,1061.8671 5.39483,0 0,-1.9999 -5.39483,0"
            style="display:inline;opacity:1;fill:#93acd2;fill-opacity:1;stroke:#7698cf;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
         <path
-           sodipodi:nodetypes="cccc"
-           inkscape:connector-curvature="0"
            id="path4303"
            d="m 24,1058.9107 2.53125,0 0,3.9871 -2.532198,0"
            style="fill:url(#linearGradient4328);fill-opacity:1;fill-rule:evenodd;stroke:#698dc5;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
         <path
-           sodipodi:nodetypes="cscssccc"
-           inkscape:connector-curvature="0"
            id="path4274"
            d="m 25.5625,1060.3052 0,-2.1494 c 0,-0.4714 1.0625,-1.2031 1.0625,-1.2031 0,0 0.96875,0.4413 0.96875,0.8906 l 0,5.9219 c 0,0.5045 -1.070312,1.0547 -1.070312,1.0547 0,0 -1.039063,-0.5336 -1.039063,-1.0234 l 0,-2.4808"
            style="fill:url(#linearGradient4291);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4301);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
diff --git a/ui/org.eclipse.pde.ui/icons/etool16/exp_product.svg b/ui/org.eclipse.pde.ui/icons/etool16/exp_product.svg
index 5af403187bd..1d86578cd63 100644
--- a/ui/org.eclipse.pde.ui/icons/etool16/exp_product.svg
+++ b/ui/org.eclipse.pde.ui/icons/etool16/exp_product.svg
@@ -2,43 +2,19 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="exp_product.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient5103-3">
-      <stop
-         style="stop-color:#fefdef;stop-opacity:1"
-         offset="0"
-         id="stop5105-5" />
-      <stop
-         id="stop7550-07"
-         offset="0.26694915"
-         style="stop-color:#fef5d4;stop-opacity:1" />
-      <stop
-         id="stop7548-6"
-         offset="0.51694918"
-         style="stop-color:#fbe08e;stop-opacity:1" />
-      <stop
-         style="stop-color:#fbdd83;stop-opacity:1"
-         offset="1"
-         id="stop5107-7" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        id="linearGradient8287-7-5-4">
       <stop
          style="stop-color:#6eb6e2;stop-opacity:1;"
@@ -50,22 +26,6 @@
          id="stop8291-0-7-3" />
     </linearGradient>
     <linearGradient
-       id="linearGradient4082-3-4-1-2">
-      <stop
-         style="stop-color:#4476aa;stop-opacity:1"
-         offset="0"
-         id="stop4084-8-8-5-1" />
-      <stop
-         id="stop4864-7-8-2-6"
-         offset="0.5"
-         style="stop-color:#5a9ccc;stop-opacity:1" />
-      <stop
-         style="stop-color:#4476aa;stop-opacity:1"
-         offset="1"
-         id="stop4086-2-2-7-8" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient8287-7-5-4"
        id="linearGradient8293"
        x1="-16.963362"
@@ -75,7 +35,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-1.4448902,16.475551)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4994-4-5"
        id="linearGradient8881"
        gradientUnits="userSpaceOnUse"
@@ -85,8 +44,7 @@
        x2="-11"
        y2="1044.3622" />
     <linearGradient
-       id="linearGradient4994-4-5"
-       inkscape:collect="always">
+       id="linearGradient4994-4-5">
       <stop
          id="stop4996-5-9"
          offset="0"
@@ -97,7 +55,6 @@
          style="stop-color:#ffffff;stop-opacity:0;" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4910-4-0"
        id="linearGradient8884"
        gradientUnits="userSpaceOnUse"
@@ -107,7 +64,6 @@
        x2="-15"
        y2="1047.3622" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4910-4-0">
       <stop
          style="stop-color:#ffffff;stop-opacity:0"
@@ -119,7 +75,6 @@
          id="stop4914-8-1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4810-5"
        id="linearGradient8887"
        gradientUnits="userSpaceOnUse"
@@ -129,8 +84,7 @@
        x2="8.0137892"
        y2="1050.0707" />
     <linearGradient
-       id="linearGradient4810-5"
-       inkscape:collect="always">
+       id="linearGradient4810-5">
       <stop
          id="stop4812-0"
          offset="0"
@@ -140,17 +94,6 @@
          offset="1"
          style="stop-color:#615941;stop-opacity:1" />
     </linearGradient>
-    <linearGradient
-       id="linearGradient6281-8-0-1-6">
-      <stop
-         id="stop6283-0-2-2-1"
-         offset="0"
-         style="stop-color:#f7f9fb;stop-opacity:1" />
-      <stop
-         id="stop6285-5-0-9-7"
-         offset="1"
-         style="stop-color:#ffd680;stop-opacity:1" />
-    </linearGradient>
     <linearGradient
        y2="1050.3622"
        x2="6.9999828"
@@ -159,11 +102,9 @@
        gradientTransform="translate(-3.9963672,-0.2839927)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient19869"
-       xlink:href="#linearGradient4922-2"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4922-2" />
     <linearGradient
-       id="linearGradient4922-2"
-       inkscape:collect="always">
+       id="linearGradient4922-2">
       <stop
          id="stop4924-3"
          offset="0"
@@ -174,31 +115,6 @@
          style="stop-color:#4077a7;stop-opacity:1" />
     </linearGradient>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="8"
-     inkscape:cx="14.082224"
-     inkscape:cy="14.869466"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1160"
-     inkscape:window-height="491"
-     inkscape:window-x="1143"
-     inkscape:window-y="932"
-     inkscape:window-maximized="0"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3999" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -212,8 +128,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
@@ -224,52 +138,36 @@
          id="g4305"
          transform="translate(20.999999,-11.874999)">
         <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
            id="rect3997-9"
            d="m -20.021622,1054.4036 10.9970217,0 0,8.7015 -10.9970217,0 z"
            style="display:inline;fill:#f4fcff;fill-opacity:1;stroke:url(#linearGradient8887);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1" />
         <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
            id="rect4853-82-7"
            d="m -18.518293,1057.5796 0,5.0164 -1,0 0,-6.0164 z"
            style="display:inline;fill:url(#linearGradient8884);fill-opacity:1;stroke:none" />
         <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
            id="rect4853-82-0"
            d="m -18.502668,1057.6109 8.9806629,0 0,-1 -9.9806629,0 z"
            style="display:inline;fill:url(#linearGradient8881);fill-opacity:1;stroke:none" />
         <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
            id="rect3997-9-9"
            d="m -20.045975,1054.1029 11.0550208,0 0,1.9946 -11.0550208,0 z"
            style="display:inline;fill:url(#linearGradient8293);fill-opacity:1;stroke:#315b91;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1" />
         <path
-           inkscape:connector-curvature="0"
            id="path4299"
            d="m -16.029488,1056.5996 0,6.0312"
-           style="fill:#a79d79;fill-opacity:1;fill-rule:evenodd;stroke:#a79d79;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-           sodipodi:nodetypes="cc" />
+           style="fill:#a79d79;fill-opacity:1;fill-rule:evenodd;stroke:#a79d79;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
         <path
-           inkscape:connector-curvature="0"
            id="path4301"
            d="m -15.529488,1059.1309 6.0781245,0"
-           style="fill:#a79d79;fill-opacity:1;fill-rule:evenodd;stroke:#a79d79;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-           sodipodi:nodetypes="cc" />
+           style="fill:#a79d79;fill-opacity:1;fill-rule:evenodd;stroke:#a79d79;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
         <path
-           inkscape:connector-curvature="0"
            id="path4303"
            d="m -16.529488,1060.1309 -3.045035,0"
-           style="fill:#a79d79;fill-opacity:1;fill-rule:evenodd;stroke:#a79d79;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-           sodipodi:nodetypes="cc" />
+           style="fill:#a79d79;fill-opacity:1;fill-rule:evenodd;stroke:#a79d79;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
       </g>
     </g>
     <path
-       sodipodi:nodetypes="cccc"
-       inkscape:connector-curvature="0"
        id="path4920"
        d="m 0.7536344,1048.3544 4.2499995,0 0,4.0051 z"
        style="display:inline;fill:url(#linearGradient19869);fill-opacity:1;stroke:none" />
diff --git a/ui/org.eclipse.pde.ui/icons/etool16/export_target.svg b/ui/org.eclipse.pde.ui/icons/etool16/export_target.svg
index 9a4de30f929..3fa0a239a61 100644
--- a/ui/org.eclipse.pde.ui/icons/etool16/export_target.svg
+++ b/ui/org.eclipse.pde.ui/icons/etool16/export_target.svg
@@ -2,24 +2,19 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="export_target.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4464">
       <stop
          style="stop-color:#ffffff;stop-opacity:1"
@@ -31,7 +26,6 @@
          id="stop4468" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4454">
       <stop
          style="stop-color:#af8836;stop-opacity:1"
@@ -43,7 +37,6 @@
          id="stop4458" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4429">
       <stop
          style="stop-color:#b88800;stop-opacity:1"
@@ -54,48 +47,6 @@
          offset="1"
          id="stop4433" />
     </linearGradient>
-    <linearGradient
-       id="linearGradient5103-3">
-      <stop
-         style="stop-color:#fefdef;stop-opacity:1"
-         offset="0"
-         id="stop5105-5" />
-      <stop
-         id="stop7550-07"
-         offset="0.26694915"
-         style="stop-color:#fef5d4;stop-opacity:1" />
-      <stop
-         id="stop7548-6"
-         offset="0.51694918"
-         style="stop-color:#fbe08e;stop-opacity:1" />
-      <stop
-         style="stop-color:#fbdd83;stop-opacity:1"
-         offset="1"
-         id="stop5107-7" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3955-9">
-      <stop
-         style="stop-color:#3870da;stop-opacity:1"
-         offset="0"
-         id="stop3957-3" />
-      <stop
-         id="stop3959-2"
-         offset="0.15381166"
-         style="stop-color:#78b8f0;stop-opacity:1" />
-      <stop
-         id="stop3961-3"
-         offset="0.65650523"
-         style="stop-color:#78b8f0;stop-opacity:1" />
-      <stop
-         style="stop-color:#3068d8;stop-opacity:1"
-         offset="0.92272848"
-         id="stop3963-9" />
-      <stop
-         style="stop-color:#3068d8;stop-opacity:1"
-         offset="1"
-         id="stop3965-8" />
-    </linearGradient>
     <linearGradient
        y2="1051.8378"
        x2="9.8946028"
@@ -104,10 +55,8 @@
        gradientUnits="userSpaceOnUse"
        id="linearGradient4101"
        xlink:href="#linearGradient4994-6"
-       inkscape:collect="always"
        gradientTransform="translate(-1.977903,-1.0442)" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4994-6">
       <stop
          style="stop-color:#f9fafc;stop-opacity:1;"
@@ -119,7 +68,6 @@
          id="stop4998-89" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4894-6"
        id="linearGradient4900-1"
        x1="7.9987183"
@@ -129,7 +77,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1.0078567,0,0,1.0239695,2.0063018,-25.982043)" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4894-6">
       <stop
          style="stop-color:#e0c88f;stop-opacity:1"
@@ -140,127 +87,6 @@
          offset="1"
          id="stop4898-5" />
     </linearGradient>
-    <linearGradient
-       id="linearGradient10448-9-7-0-5">
-      <stop
-         style="stop-color:#cf9307;stop-opacity:1"
-         offset="0"
-         id="stop10450-3-5-6-7" />
-      <stop
-         id="stop10456-4-1-5-3"
-         offset="0.5"
-         style="stop-color:#f7d87b;stop-opacity:1" />
-      <stop
-         style="stop-color:#ebb313;stop-opacity:1"
-         offset="1"
-         id="stop10452-22-7-8-4" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10748-8">
-      <stop
-         id="stop10750-5"
-         offset="0"
-         style="stop-color:#ecac18;stop-opacity:1" />
-      <stop
-         style="stop-color:#f1ce66;stop-opacity:1"
-         offset="0.25"
-         id="stop10752-8" />
-      <stop
-         style="stop-color:#f6e5a6;stop-opacity:1"
-         offset="0.5"
-         id="stop10754-8" />
-      <stop
-         id="stop10756-4"
-         offset="0.75"
-         style="stop-color:#f1cf6c;stop-opacity:1" />
-      <stop
-         id="stop10758-7"
-         offset="1"
-         style="stop-color:#e5b630;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10448-90">
-      <stop
-         style="stop-color:#ecac18;stop-opacity:1"
-         offset="0"
-         id="stop10450-0" />
-      <stop
-         id="stop10458-2"
-         offset="0.25"
-         style="stop-color:#ffe38d;stop-opacity:1" />
-      <stop
-         id="stop10456-96"
-         offset="0.5"
-         style="stop-color:#fdf5d2;stop-opacity:1" />
-      <stop
-         style="stop-color:#ffeba7;stop-opacity:1"
-         offset="0.75"
-         id="stop10460-3" />
-      <stop
-         style="stop-color:#e5b630;stop-opacity:1"
-         offset="1"
-         id="stop10452-1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10414-9">
-      <stop
-         style="stop-color:#5078b9;stop-opacity:1;"
-         offset="0"
-         id="stop10416-3" />
-      <stop
-         id="stop10422-8"
-         offset="0.5"
-         style="stop-color:#6d8cbd;stop-opacity:1" />
-      <stop
-         style="stop-color:#5f88c9;stop-opacity:1"
-         offset="1"
-         id="stop10418-4" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10432-3">
-      <stop
-         id="stop10434-4"
-         offset="0"
-         style="stop-color:#1f4d9a;stop-opacity:1" />
-      <stop
-         style="stop-color:#4e6da1;stop-opacity:1"
-         offset="0.5"
-         id="stop10436-2" />
-      <stop
-         id="stop10438-9"
-         offset="1"
-         style="stop-color:#567ebc;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10157-6">
-      <stop
-         style="stop-color:#6588c1;stop-opacity:1"
-         offset="0"
-         id="stop10159-5" />
-      <stop
-         id="stop10165-9"
-         offset="0.5"
-         style="stop-color:#becce3;stop-opacity:1" />
-      <stop
-         style="stop-color:#809dcb;stop-opacity:1"
-         offset="1"
-         id="stop10161-55" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4284">
-      <stop
-         id="stop4286"
-         offset="0"
-         style="stop-color:#6588c1;stop-opacity:0" />
-      <stop
-         style="stop-color:#becce3;stop-opacity:1"
-         offset="0.49999967"
-         id="stop4288" />
-      <stop
-         id="stop4290"
-         offset="1"
-         style="stop-color:#809dcb;stop-opacity:0" />
-    </linearGradient>
     <linearGradient
        y2="1050.3622"
        x2="6.9999828"
@@ -269,11 +95,9 @@
        gradientTransform="matrix(0.95320617,0,0,0.95354827,-3.5591374,48.679409)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient19869"
-       xlink:href="#linearGradient4922-2"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4922-2" />
     <linearGradient
-       id="linearGradient4922-2"
-       inkscape:collect="always">
+       id="linearGradient4922-2">
       <stop
          id="stop4924-3"
          offset="0"
@@ -284,7 +108,6 @@
          style="stop-color:#4077a7;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4317"
        id="linearGradient4323"
        x1="19.792524"
@@ -293,7 +116,6 @@
        y2="1064.6748"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4317">
       <stop
          style="stop-color:#f8e8a8;stop-opacity:1"
@@ -313,7 +135,6 @@
          id="stop4321" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4311"
        id="linearGradient4307"
        gradientUnits="userSpaceOnUse"
@@ -322,8 +143,7 @@
        x2="18.92688"
        y2="1065.5569" />
     <linearGradient
-       id="linearGradient4311"
-       inkscape:collect="always">
+       id="linearGradient4311">
       <stop
          id="stop4313"
          offset="0"
@@ -334,7 +154,6 @@
          style="stop-color:#a87000;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4429"
        id="linearGradient4309"
        gradientUnits="userSpaceOnUse"
@@ -343,7 +162,6 @@
        x2="17.04467"
        y2="1063.8405" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4250"
        id="linearGradient4256"
        x1="18.92688"
@@ -352,7 +170,6 @@
        y2="1065.5569"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4250">
       <stop
          style="stop-color:#7090c0;stop-opacity:1"
@@ -364,7 +181,6 @@
          id="stop4254" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4258"
        id="linearGradient4264"
        x1="17.04467"
@@ -373,7 +189,6 @@
        y2="1063.8405"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4258">
       <stop
          style="stop-color:#5888c8;stop-opacity:1"
@@ -385,7 +200,6 @@
          id="stop4262" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4454"
        id="linearGradient4460"
        x1="8.7878056"
@@ -394,7 +208,6 @@
        y2="1051.0579"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4464"
        id="linearGradient4470"
        x1="9.375"
@@ -403,7 +216,6 @@
        y2="1037.8778"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4464"
        id="linearGradient4470-8"
        x1="9.375"
@@ -413,31 +225,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(1033.257,-1043.3949)" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1"
-     inkscape:cx="12.577337"
-     inkscape:cy="46.621338"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="1280"
-     inkscape:window-height="900"
-     inkscape:window-x="949"
-     inkscape:window-y="618"
-     inkscape:window-maximized="0"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3999" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -451,8 +238,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
@@ -460,26 +245,20 @@
        transform="matrix(1.2394243,0,0,1.2394243,-21.274665,-254.90388)"
        style="font-style:normal;font-weight:normal;font-size:13.58917427px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;display:inline;fill:#ffffff;fill-opacity:1;stroke:none"
        id="layer1-9"
-       inkscape:label="Layer 1"
        mask="none" />
     <g
        style="display:inline"
        id="g4486"
        transform="translate(1.9431311,0.01451452)">
       <path
-         sodipodi:nodetypes="cccccc"
-         inkscape:connector-curvature="0"
          id="rect4001-3"
          d="m 3.5193795,1037.8597 7.0096695,0 3.062057,3.0066 0,9.9546 -10.0717265,0 z"
          style="display:inline;fill:url(#linearGradient4101);fill-opacity:1;stroke:none" />
       <path
-         inkscape:connector-curvature="0"
          id="path4884"
          d="m 10.045593,1037.3501 0,4.005 4.008729,0 z"
          style="display:inline;fill:url(#linearGradient4900-1);fill-opacity:1;stroke:none" />
       <path
-         sodipodi:nodetypes="cccccc"
-         inkscape:connector-curvature="0"
          id="rect4001"
          d="m 3.5635737,1037.8597 6.9654753,0 3.062057,3.0066 0,9.9546 -10.0275323,0 z"
          style="display:inline;fill:none;stroke:url(#linearGradient4460);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1" />
@@ -497,15 +276,12 @@
            id="path4320"
            style="display:inline;opacity:1;fill:#d8e8e0;fill-opacity:1;stroke:#2068a0;stroke-width:1;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
         <path
-           inkscape:connector-curvature="0"
            id="path4322"
            d="m 8.0531998,1060.9305 0,1.0254 -1.0019532,0 0,1 1.0019532,0 0,0.9785 1,0 0,-0.9785 0.9824222,0 0,-1 -0.9824222,0 0,-1.0254 -1,0 z"
            style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#2068a0;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
       </g>
     </g>
     <path
-       sodipodi:nodetypes="cccc"
-       inkscape:connector-curvature="0"
        id="path4920"
        d="m 0.96859203,1048.3434 4.05112627,0 0,4.0824 z"
        style="display:inline;fill:url(#linearGradient19869);fill-opacity:1;stroke:none" />
@@ -535,8 +311,6 @@
            id="g4266-0"
            style="display:inline">
           <path
-             sodipodi:nodetypes="ssssccs"
-             inkscape:connector-curvature="0"
              id="path4242-9"
              d="m 19.520119,1060.4831 c 0.341806,-0.3409 1.0254,0.4474 1.0254,0.9295 l 0,2.9581 c 0,0.5003 -0.709328,1.5082 -1.063991,1.1545 -1.323187,-1.3197 -1.935031,-2.0399 -1.935031,-2.0399 l 0,-0.9787 c 0,0 0.739057,-0.7922 1.973622,-2.0235 z"
              style="fill:url(#linearGradient4323);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4307);stroke-width:0.89697278;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
@@ -561,9 +335,7 @@
         <path
            style="fill:#a8c0d8;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4256);stroke-width:0.89697278;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
            d="m 19.520119,1060.4831 c 0.341806,-0.3409 1.0254,1.0466 1.0254,1.5287 l 0,2.4522 c 0,0.5003 -0.709328,1.4149 -1.063991,1.0612 -1.323187,-1.3197 -1.935031,-2.0399 -1.935031,-2.0399 l 0,-0.9787 c 0,0 0.739057,-0.7922 1.973622,-2.0235 z"
-           id="path4242"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ssssccs" />
+           id="path4242" />
       </g>
     </g>
   </g>
diff --git a/ui/org.eclipse.pde.ui/icons/etool16/imp_extfeat.svg b/ui/org.eclipse.pde.ui/icons/etool16/imp_extfeat.svg
index 920be956733..ce2ec619c41 100644
--- a/ui/org.eclipse.pde.ui/icons/etool16/imp_extfeat.svg
+++ b/ui/org.eclipse.pde.ui/icons/etool16/imp_extfeat.svg
@@ -2,25 +2,20 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="imp_extfeat.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient3973"
-       inkscape:collect="always">
+       id="linearGradient3973">
       <stop
          id="stop3975"
          offset="0"
@@ -31,8 +26,7 @@
          style="stop-color:#f8f0c8;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       id="linearGradient3967"
-       inkscape:collect="always">
+       id="linearGradient3967">
       <stop
          id="stop3969"
          offset="0"
@@ -66,7 +60,6 @@
          style="stop-color:#ba772f;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3949">
       <stop
          style="stop-color:#9e6627;stop-opacity:1"
@@ -78,7 +71,6 @@
          id="stop3953" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient3967"
        id="linearGradient3939"
        gradientUnits="userSpaceOnUse"
@@ -88,7 +80,6 @@
        x2="531.09253"
        y2="371.17883" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient3955"
        id="linearGradient3945"
        gradientUnits="userSpaceOnUse"
@@ -97,18 +88,7 @@
        x2="543.91406"
        y2="373.2294"
        gradientTransform="translate(-60.592052,3.9947745)" />
-    <mask
-       maskUnits="userSpaceOnUse"
-       id="mask4917">
-      <path
-         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;display:inline"
-         d="m 462.77563,373.22885 29.11636,0 c 1.45425,0 2.625,1.17075 2.625,2.625 l 0,18.76896 c 0,1.45425 -1.17412,2.52598 -2.625,2.625 l -29.11636,1.98708 c -1.45088,0.099 -2.625,-1.17075 -2.625,-2.625 l 0,-20.75604 c 0,-1.45425 1.17075,-2.625 2.625,-2.625 z"
-         id="path4919"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="sssssssss" />
-    </mask>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient3973"
        id="linearGradient4933"
        gradientUnits="userSpaceOnUse"
@@ -118,7 +98,6 @@
        x2="538.00562"
        y2="374.21222" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient3949"
        id="linearGradient4935"
        gradientUnits="userSpaceOnUse"
@@ -248,17 +227,6 @@
          offset="1"
          id="stop10452-22-7-8-4" />
     </linearGradient>
-    <linearGradient
-       id="linearGradient6281-8-0-1-6">
-      <stop
-         id="stop6283-0-2-2-1"
-         offset="0"
-         style="stop-color:#f7f9fb;stop-opacity:1" />
-      <stop
-         id="stop6285-5-0-9-7"
-         offset="1"
-         style="stop-color:#ffd680;stop-opacity:1" />
-    </linearGradient>
     <linearGradient
        y2="1050.3622"
        x2="6.9999828"
@@ -267,11 +235,9 @@
        gradientTransform="matrix(4.2359716,0,0,-4.1942167,483.36143,4800.0046)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient19869"
-       xlink:href="#linearGradient4922-2"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4922-2" />
     <linearGradient
-       id="linearGradient4922-2"
-       inkscape:collect="always">
+       id="linearGradient4922-2">
       <stop
          id="stop4924-3"
          offset="0"
@@ -282,7 +248,6 @@
          style="stop-color:#4077a7;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10448-9-7-0-5"
        id="linearGradient10770-6"
        gradientUnits="userSpaceOnUse"
@@ -292,7 +257,6 @@
        x2="323.98331"
        y2="518.28192" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10748-8"
        id="linearGradient10774-5"
        gradientUnits="userSpaceOnUse"
@@ -302,7 +266,6 @@
        x2="324.1601"
        y2="515.53949" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10448-90"
        id="linearGradient10778-6"
        gradientUnits="userSpaceOnUse"
@@ -312,7 +275,6 @@
        y2="511.66458"
        gradientTransform="matrix(1.0765606,0,0,1.061954,190.65652,-195.98554)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10414-9"
        id="linearGradient10782-3"
        gradientUnits="userSpaceOnUse"
@@ -322,7 +284,6 @@
        y2="519.08923"
        gradientTransform="translate(214.83053,-163.75412)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10432-3"
        id="linearGradient10784-2"
        gradientUnits="userSpaceOnUse"
@@ -332,7 +293,6 @@
        y2="519.36218"
        gradientTransform="translate(214.83053,-163.75412)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10157-2-5"
        id="linearGradient10786-1"
        gradientUnits="userSpaceOnUse"
@@ -342,7 +302,6 @@
        y2="514.75818"
        gradientTransform="matrix(1.0391435,0,0,0.5924666,202.46608,49.82119)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10157-2-5"
        id="linearGradient10790-8"
        gradientUnits="userSpaceOnUse"
@@ -352,7 +311,6 @@
        x2="305"
        y2="542.73901" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10149-39-0"
        id="linearGradient10792-6"
        gradientUnits="userSpaceOnUse"
@@ -362,7 +320,6 @@
        x2="322.875"
        y2="504.44818" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient10149-39-0">
       <stop
          style="stop-color:#6084be;stop-opacity:1"
@@ -374,7 +331,6 @@
          id="stop10153-72-3" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4284"
        id="linearGradient10790-8-2"
        gradientUnits="userSpaceOnUse"
@@ -384,29 +340,6 @@
        x2="305"
        y2="545.35248" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="11.313709"
-     inkscape:cx="10.321161"
-     inkscape:cy="7.236765"
-     inkscape:document-units="px"
-     inkscape:current-layer="g13813"
-     showgrid="true"
-     inkscape:window-width="841"
-     inkscape:window-height="544"
-     inkscape:window-x="1237"
-     inkscape:window-y="983"
-     inkscape:window-maximized="0"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3947" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -420,8 +353,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
@@ -444,18 +375,13 @@
         <path
            style="fill:url(#linearGradient4933);fill-opacity:1;stroke:url(#linearGradient4935);stroke-width:3.02792978;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
            d="m 463.21529,377.22417 28.07551,0 c 1.45425,0 2.625,1.17075 2.625,2.625 l 0,11.29376 c 0,1.45425 -1.18112,2.45158 -2.625,2.625 l -28.07551,3.37198 c -1.44388,0.17342 -2.625,-0.56857 -2.625,-2.02282 l 0,-15.26792 c 0,-1.45425 1.17075,-2.625 2.625,-2.625 z"
-           id="rect13693"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="sssssssss" />
+           id="rect13693" />
         <path
            style="fill:none;stroke:url(#linearGradient3945);stroke-width:3.02792978;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
            d="m 462.22826,377.22417 20.09375,0"
-           id="path13797"
-           inkscape:connector-curvature="0" />
+           id="path13797" />
       </g>
       <path
-         sodipodi:nodetypes="cccc"
-         inkscape:connector-curvature="0"
          id="path4920"
          d="m 503.4823,402.94589 18.00288,0 0,-17.95666 z"
          style="display:inline;fill:url(#linearGradient19869);fill-opacity:1;stroke:none" />
@@ -475,19 +401,15 @@
         <path
            style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
            d="m 548.23888,354.95116 0,3.5838 12.01134,0 0,-3.5838 -12.01134,0 z"
-           id="path4313-8-8"
-           inkscape:connector-curvature="0" />
+           id="path4313-8-8" />
         <path
            style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.94926554px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
            d="m 549.43361,354.93037 0,10.8213 3.63939,0 0,-10.8213 z"
-           id="path4313-8-8-7"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
+           id="path4313-8-8-7" />
         <path
            style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#9e7400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
            d="m 560.22222,362.10479 -12.03934,0.1111 0.0351,3.58381 12.03934,-0.1111 -0.0351,-3.58381 z"
-           id="path4313-5-1-8"
-           inkscape:connector-curvature="0" />
+           id="path4313-5-1-8" />
         <rect
            style="display:inline;fill:url(#linearGradient10774-5);fill-opacity:1;stroke:none;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
            id="rect10007-0-74-2-7"
@@ -500,13 +422,11 @@
         <path
            style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#9e7400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
            d="m 549.5198,365.72372 -12.03934,0.1111 0.035,3.5838 12.03935,-0.1111 -0.0351,-3.5838 z"
-           id="path4313-5-1"
-           inkscape:connector-curvature="0" />
+           id="path4313-5-1" />
         <path
            style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
            d="m 549.48481,351.36054 -12.03935,0.1111 0.035,3.58381 12.03935,-0.1111 -0.0351,-3.58381 z"
-           id="path4313-8"
-           inkscape:connector-curvature="0" />
+           id="path4313-8" />
         <rect
            style="display:inline;fill:url(#linearGradient10778-6);fill-opacity:1;stroke:none;stroke-width:1.50161433;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
            id="rect10007-0-74-2"
@@ -519,13 +439,11 @@
         <path
            style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
            d="m 542.3172,347.76957 -12.03935,0.1111 0.035,3.5838 12.03935,-0.11109 -0.0351,-3.58381 z"
-           id="path4313"
-           inkscape:connector-curvature="0" />
+           id="path4313" />
         <path
            style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#9e7400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
            d="m 542.33819,369.2724 -12.03934,0.1111 0.035,3.58381 12.03935,-0.1111 -0.0351,-3.58381 z"
-           id="path4313-5"
-           inkscape:connector-curvature="0" />
+           id="path4313-5" />
         <g
            transform="translate(3.4844327,0)"
            id="g4240">
diff --git a/ui/org.eclipse.pde.ui/icons/etool16/imp_extplug.svg b/ui/org.eclipse.pde.ui/icons/etool16/imp_extplug.svg
index 3f97e012460..c53fe0bc32c 100644
--- a/ui/org.eclipse.pde.ui/icons/etool16/imp_extplug.svg
+++ b/ui/org.eclipse.pde.ui/icons/etool16/imp_extplug.svg
@@ -2,20 +2,16 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="imp_extplug.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
@@ -48,21 +44,6 @@
          offset="1"
          id="stop10452-22-7-8-4" />
     </linearGradient>
-    <linearGradient
-       id="linearGradient10440-1-0-0-3">
-      <stop
-         style="stop-color:#ae7603;stop-opacity:1;"
-         offset="0"
-         id="stop10442-43-2-0-9" />
-      <stop
-         id="stop10521-1-2-5-3"
-         offset="0.5"
-         style="stop-color:#e8d8a3;stop-opacity:1" />
-      <stop
-         style="stop-color:#bb9221;stop-opacity:1"
-         offset="1"
-         id="stop10444-3-4-0-4" />
-    </linearGradient>
     <linearGradient
        id="linearGradient10748-8">
       <stop
@@ -86,21 +67,6 @@
          offset="1"
          style="stop-color:#e5b630;stop-opacity:1" />
     </linearGradient>
-    <linearGradient
-       id="linearGradient10440-1-3-4">
-      <stop
-         style="stop-color:#ae7603;stop-opacity:1;"
-         offset="0"
-         id="stop10442-43-0-5" />
-      <stop
-         id="stop10521-1-4-7"
-         offset="0.5"
-         style="stop-color:#e8d8a3;stop-opacity:1" />
-      <stop
-         style="stop-color:#bb9221;stop-opacity:1"
-         offset="1"
-         id="stop10444-3-2-0" />
-    </linearGradient>
     <linearGradient
        id="linearGradient10448-90">
       <stop
@@ -124,51 +90,6 @@
          offset="1"
          id="stop10452-1" />
     </linearGradient>
-    <linearGradient
-       id="linearGradient10440-18">
-      <stop
-         style="stop-color:#ae7603;stop-opacity:1;"
-         offset="0"
-         id="stop10442-8" />
-      <stop
-         id="stop10521-7"
-         offset="0.5"
-         style="stop-color:#e8d8a3;stop-opacity:1" />
-      <stop
-         style="stop-color:#bb9221;stop-opacity:1"
-         offset="1"
-         id="stop10444-0" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10414-9">
-      <stop
-         style="stop-color:#5078b9;stop-opacity:1;"
-         offset="0"
-         id="stop10416-3" />
-      <stop
-         id="stop10422-8"
-         offset="0.5"
-         style="stop-color:#6d8cbd;stop-opacity:1" />
-      <stop
-         style="stop-color:#5f88c9;stop-opacity:1"
-         offset="1"
-         id="stop10418-4" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10432-3">
-      <stop
-         id="stop10434-4"
-         offset="0"
-         style="stop-color:#1f4d9a;stop-opacity:1" />
-      <stop
-         style="stop-color:#4e6da1;stop-opacity:1"
-         offset="0.5"
-         id="stop10436-2" />
-      <stop
-         id="stop10438-9"
-         offset="1"
-         style="stop-color:#567ebc;stop-opacity:1" />
-    </linearGradient>
     <linearGradient
        id="linearGradient10157-6">
       <stop
@@ -184,21 +105,6 @@
          offset="1"
          id="stop10161-55" />
     </linearGradient>
-    <linearGradient
-       id="linearGradient10396-5">
-      <stop
-         style="stop-color:#1b3e79;stop-opacity:1;"
-         offset="0"
-         id="stop10398-7" />
-      <stop
-         id="stop10404-9"
-         offset="0.5"
-         style="stop-color:#728fbf;stop-opacity:1" />
-      <stop
-         style="stop-color:#1f4d9a;stop-opacity:1"
-         offset="1"
-         id="stop10400-9" />
-    </linearGradient>
     <linearGradient
        id="linearGradient10157-2-5">
       <stop
@@ -215,7 +121,6 @@
          id="stop10161-5-0" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient10149-39-0">
       <stop
          style="stop-color:#6936ae;stop-opacity:1"
@@ -227,22 +132,6 @@
          id="stop10153-72-3" />
     </linearGradient>
     <linearGradient
-       id="linearGradient10149-6-5-4">
-      <stop
-         style="stop-color:#1f4d9a;stop-opacity:1"
-         offset="0"
-         id="stop10151-5-7-2" />
-      <stop
-         id="stop10394-3"
-         offset="0.5"
-         style="stop-color:#b9c7df;stop-opacity:1" />
-      <stop
-         style="stop-color:#567ebc;stop-opacity:1"
-         offset="1"
-         id="stop10153-8-1-2" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10448-9-7-0-5"
        id="linearGradient4545"
        gradientUnits="userSpaceOnUse"
@@ -252,7 +141,6 @@
        x2="323.98331"
        y2="518.28192" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10748-8"
        id="linearGradient4547"
        gradientUnits="userSpaceOnUse"
@@ -262,7 +150,6 @@
        x2="324.1601"
        y2="515.53949" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10448-90"
        id="linearGradient4549"
        gradientUnits="userSpaceOnUse"
@@ -272,7 +159,6 @@
        x2="324.1601"
        y2="511.66458" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10157-6"
        id="linearGradient4551"
        gradientUnits="userSpaceOnUse"
@@ -282,7 +168,6 @@
        x2="306.05069"
        y2="514.75818" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10157-2-5"
        id="linearGradient4553"
        gradientUnits="userSpaceOnUse"
@@ -292,7 +177,6 @@
        x2="305"
        y2="542.73901" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10149-39-0"
        id="linearGradient4555"
        gradientUnits="userSpaceOnUse"
@@ -302,7 +186,6 @@
        x2="322.875"
        y2="504.44818" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4284"
        id="linearGradient4557"
        gradientUnits="userSpaceOnUse"
@@ -311,36 +194,6 @@
        y1="513.87781"
        x2="305"
        y2="545.35248" />
-    <linearGradient
-       id="linearGradient10157-6-8">
-      <stop
-         style="stop-color:#6588c1;stop-opacity:1"
-         offset="0"
-         id="stop10159-5-1" />
-      <stop
-         id="stop10165-9-1"
-         offset="0.5"
-         style="stop-color:#becce3;stop-opacity:1" />
-      <stop
-         style="stop-color:#809dcb;stop-opacity:1"
-         offset="1"
-         id="stop10161-55-7" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4284-3">
-      <stop
-         id="stop4286-1"
-         offset="0"
-         style="stop-color:#6588c1;stop-opacity:0" />
-      <stop
-         style="stop-color:#becce3;stop-opacity:1"
-         offset="0.49999967"
-         id="stop4288-4" />
-      <stop
-         id="stop4290-4"
-         offset="1"
-         style="stop-color:#809dcb;stop-opacity:0" />
-    </linearGradient>
     <linearGradient
        y2="1050.3622"
        x2="6.9999828"
@@ -349,11 +202,9 @@
        gradientTransform="matrix(1.181976,0,0,-1.170325,5.3622158,2279.3062)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient19869"
-       xlink:href="#linearGradient4922-2"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4922-2" />
     <linearGradient
-       id="linearGradient4922-2"
-       inkscape:collect="always">
+       id="linearGradient4922-2">
       <stop
          id="stop4924-3"
          offset="0"
@@ -364,7 +215,6 @@
          style="stop-color:#4077a7;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10448-9-7-0-5"
        id="linearGradient4424"
        gradientUnits="userSpaceOnUse"
@@ -374,7 +224,6 @@
        x2="323.98331"
        y2="518.28192" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10748-8-5"
        id="linearGradient4426"
        gradientUnits="userSpaceOnUse"
@@ -407,7 +256,6 @@
          style="stop-color:#e5b630;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10448-90-9"
        id="linearGradient4428"
        gradientUnits="userSpaceOnUse"
@@ -440,7 +288,6 @@
          id="stop10452-1-6" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4322"
        id="linearGradient4328"
        x1="10.003791"
@@ -450,7 +297,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(14.996209,-0.985039)" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4322">
       <stop
          style="stop-color:#a0b5d7;stop-opacity:1"
@@ -474,7 +320,6 @@
          id="stop4326" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4285"
        id="linearGradient4291"
        x1="11.923064"
@@ -484,7 +329,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(14.668084,-11.177808)" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4285">
       <stop
          style="stop-color:#a0b5d7;stop-opacity:1"
@@ -508,7 +352,6 @@
          id="stop4289" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4295"
        id="linearGradient4301"
        x1="13.425666"
@@ -518,7 +361,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(14.668084,-11.177808)" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4295">
       <stop
          style="stop-color:#7da0d5;stop-opacity:1"
@@ -530,29 +372,6 @@
          id="stop4299" />
     </linearGradient>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1"
-     inkscape:cx="13.593793"
-     inkscape:cy="-5.5037466"
-     inkscape:document-units="px"
-     inkscape:current-layer="g4228-7"
-     showgrid="false"
-     inkscape:window-width="1062"
-     inkscape:window-height="832"
-     inkscape:window-x="1327"
-     inkscape:window-y="629"
-     inkscape:window-maximized="0"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid4210" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -566,8 +385,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
@@ -585,23 +402,17 @@
          id="rect10007-0-74-2-7-6-5"
          style="fill:url(#linearGradient4545);fill-opacity:1;stroke:none;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
       <path
-         inkscape:connector-curvature="0"
          id="path4313-8-8-8"
          d="m 14.940316,1043.3652 0,1 2.886225,0 0,-1 z"
-         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-         sodipodi:nodetypes="ccccc" />
+         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
       <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
          id="path4313-8-8-7-1"
          d="m 15.273687,1043.3594 0,3.0195 1.01551,0 0,-3.0195 z"
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.94926554px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
       <path
-         inkscape:connector-curvature="0"
          id="path4313-5-1-8-1"
          d="m 17.786212,1045.3613 -2.861522,0.031 0.0053,1 2.861522,-0.031 z"
-         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#9e7400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-         sodipodi:nodetypes="ccccc" />
+         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#9e7400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
       <rect
          ry="0"
          rx="0"
@@ -612,12 +423,10 @@
          id="rect10007-0-74-2-7-7"
          style="fill:url(#linearGradient4547);fill-opacity:1;stroke:none;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
       <path
-         inkscape:connector-curvature="0"
          id="path4313-5-1-5"
          d="m 15.297737,1046.3711 -3.359374,0.031 0.0098,1 3.359374,-0.031 -0.0098,-1 z"
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#9e7400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
       <path
-         inkscape:connector-curvature="0"
          id="path4313-8-2"
          d="m 14.283082,1043.3634 -2.354485,0.028 0.0069,0.9091 2.354484,-0.028 -0.0069,-0.909 z"
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
@@ -658,18 +467,14 @@
          id="rect10007-0-74-0"
          style="fill:url(#linearGradient4551);fill-opacity:1;stroke:none;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
       <path
-         inkscape:connector-curvature="0"
          id="path4313-6"
          d="m 13.334711,1043.3647 -3.4061138,0.029 0.00991,0.9204 3.4061128,-0.028 -0.0099,-0.9205 z"
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
       <path
-         inkscape:connector-curvature="0"
          id="path4313-5-2"
          d="m 13.293831,1047.3613 -3.3593745,0.031 0.00977,1 3.3593745,-0.031 -0.0098,-1 z"
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#9e7400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
       <path
-         sodipodi:nodetypes="cssssc"
-         inkscape:connector-curvature="0"
          id="rect10007-6-5"
          d="m 8.7673916,1043.9833 c 1.0259795,0 1.7523214,-0.1891 1.7523214,0.834 l 0,3.5451 c 0,0.8271 -0.394004,1.4929 -1.2210714,1.4929 -0.8270672,0 -1.178692,-0.6658 -1.178692,-1.4929 l 0,-3.5537"
          style="fill:url(#linearGradient4553);fill-opacity:1;stroke:url(#linearGradient4555);stroke-width:1.18290496;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
@@ -681,21 +486,15 @@
          id="rect10007-6-6-0"
          style="display:inline;fill:url(#linearGradient4557);fill-opacity:1;stroke:none;stroke-width:3.58380508;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
       <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
          id="path4313-8-8-7-8-4"
          d="m 13.295507,1043.3647 0,3.01 1.000277,0 0,-3.01 z"
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:0.64640886;fill-rule:evenodd;stroke:none;stroke-width:0.97351193px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
       <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
          id="path4313-8-8-7-5-5"
          d="m 14.284123,1042.3524 0,1.0351 1.01551,0 0,-1.0351 z"
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.94926554px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
     </g>
     <path
-       sodipodi:nodetypes="cccc"
-       inkscape:connector-curvature="0"
        id="path4920"
        d="m 10.976602,1052.3816 5.023398,0 0,-5.0105 z"
        style="display:inline;fill:url(#linearGradient19869);fill-opacity:1;stroke:none" />
@@ -714,25 +513,19 @@
          ry="0"
          transform="translate(20.125466,13.034661)" />
       <path
-         sodipodi:nodetypes="ccccc"
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ba9726;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
          d="m 10.665872,1046.3536 0,1 3.34593,0 0,-1 z"
          id="path4313-8-8-5"
-         inkscape:connector-curvature="0"
          transform="translate(20.125466,13.034661)" />
       <path
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.94926554px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
          d="m 10.999243,1046.3478 0,3.0195 1.01551,0 0,-3.0195 z"
          id="path4313-8-8-7-4"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc"
          transform="translate(20.125466,13.034661)" />
       <path
-         sodipodi:nodetypes="ccccc"
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ba9726;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
          d="m 14.005886,1048.3497 -3.35564,0.031 0.0098,1 3.355639,-0.031 z"
          id="path4313-5-1-8-9"
-         inkscape:connector-curvature="0"
          transform="translate(20.125466,13.034661)" />
       <rect
          style="display:inline;fill:url(#linearGradient4426);fill-opacity:1;stroke:none;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
@@ -748,13 +541,11 @@
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ba9726;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
          d="m 11.023293,1049.3595 -3.3593746,0.031 0.00977,1 3.3593746,-0.031 -0.0098,-1 z"
          id="path4313-5-1-2"
-         inkscape:connector-curvature="0"
          transform="translate(20.125466,13.034661)" />
       <path
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ba9726;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
          d="m 11.013528,1045.3517 -3.3593752,0.031 0.00977,1 3.3593742,-0.031 -0.0098,-1 z"
          id="path4313-8-0"
-         inkscape:connector-curvature="0"
          transform="translate(20.125466,13.034661)" />
       <rect
          style="display:inline;fill:url(#linearGradient4428);fill-opacity:1;stroke:none;stroke-width:1.50161433;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
@@ -770,38 +561,28 @@
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
          d="m 9.013528,1044.3497 -3.3593752,0.031 0.00977,1 3.3593742,-0.031 -0.0098,-1 z"
          id="path4313-54"
-         inkscape:connector-curvature="0"
          transform="translate(20.125466,13.034661)" />
       <path
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#9e7400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
          d="m 9.019387,1050.3497 -3.3593749,0.031 0.00977,1 3.3593749,-0.031 -0.0098,-1 z"
          id="path4313-5-0"
-         inkscape:connector-curvature="0"
          transform="translate(20.125466,13.034661)" />
       <path
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:0.64640886;fill-rule:evenodd;stroke:none;stroke-width:0.97351193px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
          d="m 9.021063,1046.3531 0,3.01 1.000277,0 0,-3.01 z"
          id="path4313-8-8-7-8-1"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc"
          transform="translate(20.125466,13.034661)" />
       <g
          id="g4294">
         <path
-           sodipodi:nodetypes="cccc"
-           inkscape:connector-curvature="0"
            id="rect4317-3"
            d="m 20.151278,1061.8671 5.39483,0 0,-1.9999 -5.39483,0"
            style="display:inline;opacity:1;fill:#93acd2;fill-opacity:1;stroke:#7698cf;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
         <path
-           sodipodi:nodetypes="cccc"
-           inkscape:connector-curvature="0"
            id="path4303"
            d="m 24,1058.9107 2.53125,0 0,3.9871 -2.532198,0"
            style="fill:url(#linearGradient4328);fill-opacity:1;fill-rule:evenodd;stroke:#698dc5;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
         <path
-           sodipodi:nodetypes="cscssccc"
-           inkscape:connector-curvature="0"
            id="path4274"
            d="m 25.5625,1060.3052 0,-2.1494 c 0,-0.4714 1.0625,-1.2031 1.0625,-1.2031 0,0 0.96875,0.4413 0.96875,0.8906 l 0,5.9219 c 0,0.5045 -1.070312,1.0547 -1.070312,1.0547 0,0 -1.039063,-0.5336 -1.039063,-1.0234 l 0,-2.4808"
            style="fill:url(#linearGradient4291);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4301);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
diff --git a/ui/org.eclipse.pde.ui/icons/etool16/jarToPlugin.svg b/ui/org.eclipse.pde.ui/icons/etool16/jarToPlugin.svg
index 1e03e37c911..e271507ed47 100644
--- a/ui/org.eclipse.pde.ui/icons/etool16/jarToPlugin.svg
+++ b/ui/org.eclipse.pde.ui/icons/etool16/jarToPlugin.svg
@@ -2,24 +2,19 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="jarToPlugin.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4398">
       <stop
          style="stop-color:#6888d1;stop-opacity:1"
@@ -88,7 +83,6 @@
          id="stop4851" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4825">
       <stop
          style="stop-color:#c7a229;stop-opacity:1"
@@ -100,7 +94,6 @@
          id="stop4829" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4817">
       <stop
          style="stop-color:#fefdef;stop-opacity:1;"
@@ -112,7 +105,6 @@
          id="stop4821" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4817"
        id="linearGradient4823"
        x1="25.082857"
@@ -122,7 +114,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-20,0)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4825"
        id="linearGradient4831"
        x1="27.425272"
@@ -132,7 +123,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-20,0)" />
     <radialGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4847"
        id="radialGradient4853"
        cx="28.538633"
@@ -150,350 +140,8 @@
        gradientUnits="userSpaceOnUse"
        id="linearGradient4882"
        xlink:href="#linearGradient4968"
-       inkscape:collect="always"
        gradientTransform="translate(-20,0)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4738"
-       id="linearGradient4744"
-       x1="-13.936629"
-       y1="1049.9579"
-       x2="-13.936629"
-       y2="1040.053"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(20,0)" />
-    <linearGradient
-       id="linearGradient4738">
-      <stop
-         style="stop-color:#8cc861;stop-opacity:1"
-         offset="0"
-         id="stop4740" />
-      <stop
-         id="stop4746"
-         offset="0.43753415"
-         style="stop-color:#4aa766;stop-opacity:1" />
-      <stop
-         style="stop-color:#c2dd97;stop-opacity:1"
-         offset="1"
-         id="stop4742" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4741"
-       id="linearGradient4747"
-       x1="11.0625"
-       y1="1038.5497"
-       x2="11.0625"
-       y2="1049.912"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-1.314993,0)" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient4741">
-      <stop
-         style="stop-color:#30825a;stop-opacity:1"
-         offset="0"
-         id="stop4743" />
-      <stop
-         style="stop-color:#106643;stop-opacity:1"
-         offset="1"
-         id="stop4745" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4738"
-       id="linearGradient6032"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(15.825436,0)"
-       x1="-13.936629"
-       y1="1049.9579"
-       x2="-13.936629"
-       y2="1040.053" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4741"
-       id="linearGradient6034"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-5.4895565,0)"
-       x1="11.0625"
-       y1="1038.5497"
-       x2="11.0625"
-       y2="1049.912" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4939-8-1"
-       id="linearGradient4178"
-       gradientUnits="userSpaceOnUse"
-       x1="1.4333301"
-       y1="6.4610124"
-       x2="3.0734024"
-       y2="8.1045008" />
-    <linearGradient
-       id="linearGradient4939-8-1"
-       inkscape:collect="always">
-      <stop
-         id="stop4941-8-7"
-         offset="0"
-         style="stop-color:#d5f3ff;stop-opacity:1;" />
-      <stop
-         id="stop4943-2-4"
-         offset="1"
-         style="stop-color:#fcffff;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4907-9">
-      <stop
-         style="stop-color:#c1723f;stop-opacity:1"
-         offset="0"
-         id="stop4909-5" />
-      <stop
-         style="stop-color:#b04814;stop-opacity:1"
-         offset="1"
-         id="stop4911-0" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3955">
-      <stop
-         style="stop-color:#c38536;stop-opacity:1"
-         offset="0"
-         id="stop3957" />
-      <stop
-         id="stop3959"
-         offset="0.15381166"
-         style="stop-color:#f2dc91;stop-opacity:1" />
-      <stop
-         id="stop3961"
-         offset="0.5"
-         style="stop-color:#fbdc8b;stop-opacity:1" />
-      <stop
-         style="stop-color:#e6bd7a;stop-opacity:1"
-         offset="0.75"
-         id="stop3963" />
-      <stop
-         style="stop-color:#ba772f;stop-opacity:1"
-         offset="1"
-         id="stop3965" />
-    </linearGradient>
-    <mask
-       id="mask4917"
-       maskUnits="userSpaceOnUse">
-      <path
-         sodipodi:nodetypes="sssssssss"
-         inkscape:connector-curvature="0"
-         id="path4919"
-         d="m 462.77563,373.22885 29.11636,0 c 1.45425,0 2.625,1.17075 2.625,2.625 l 0,18.76896 c 0,1.45425 -1.17412,2.52598 -2.625,2.625 l -29.11636,1.98708 c -1.45088,0.099 -2.625,-1.17075 -2.625,-2.625 l 0,-20.75604 c 0,-1.45425 1.17075,-2.625 2.625,-2.625 z"
-         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;display:inline" />
-    </mask>
-    <linearGradient
-       id="linearGradient4284">
-      <stop
-         style="stop-color:#6588c1;stop-opacity:0"
-         offset="0"
-         id="stop4286" />
-      <stop
-         id="stop4288"
-         offset="0.49999967"
-         style="stop-color:#becce3;stop-opacity:1" />
-      <stop
-         style="stop-color:#809dcb;stop-opacity:0"
-         offset="1"
-         id="stop4290" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10157-2-5">
-      <stop
-         id="stop10159-8-3"
-         offset="0"
-         style="stop-color:#6588c1;stop-opacity:1" />
-      <stop
-         style="stop-color:#becce3;stop-opacity:1"
-         offset="0.5"
-         id="stop10165-3-9" />
-      <stop
-         id="stop10161-5-0"
-         offset="1"
-         style="stop-color:#809dcb;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10414-9">
-      <stop
-         id="stop10416-3"
-         offset="0"
-         style="stop-color:#5078b9;stop-opacity:1;" />
-      <stop
-         style="stop-color:#6d8cbd;stop-opacity:1"
-         offset="0.5"
-         id="stop10422-8" />
-      <stop
-         id="stop10418-4"
-         offset="1"
-         style="stop-color:#5f88c9;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10432-3">
-      <stop
-         style="stop-color:#1f4d9a;stop-opacity:1"
-         offset="0"
-         id="stop10434-4" />
-      <stop
-         id="stop10436-2"
-         offset="0.5"
-         style="stop-color:#4e6da1;stop-opacity:1" />
-      <stop
-         style="stop-color:#567ebc;stop-opacity:1"
-         offset="1"
-         id="stop10438-9" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10448-90">
-      <stop
-         id="stop10450-0"
-         offset="0"
-         style="stop-color:#ecac18;stop-opacity:1" />
-      <stop
-         style="stop-color:#ffe38d;stop-opacity:1"
-         offset="0.25"
-         id="stop10458-2" />
-      <stop
-         style="stop-color:#fdf5d2;stop-opacity:1"
-         offset="0.5"
-         id="stop10456-96" />
-      <stop
-         id="stop10460-3"
-         offset="0.75"
-         style="stop-color:#ffeba7;stop-opacity:1" />
-      <stop
-         id="stop10452-1"
-         offset="1"
-         style="stop-color:#e5b630;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10748-8">
-      <stop
-         style="stop-color:#ecac18;stop-opacity:1"
-         offset="0"
-         id="stop10750-5" />
-      <stop
-         id="stop10752-8"
-         offset="0.25"
-         style="stop-color:#f1ce66;stop-opacity:1" />
-      <stop
-         id="stop10754-8"
-         offset="0.5"
-         style="stop-color:#f6e5a6;stop-opacity:1" />
-      <stop
-         style="stop-color:#f1cf6c;stop-opacity:1"
-         offset="0.75"
-         id="stop10756-4" />
-      <stop
-         style="stop-color:#e5b630;stop-opacity:1"
-         offset="1"
-         id="stop10758-7" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10448-9-7-0-5">
-      <stop
-         id="stop10450-3-5-6-7"
-         offset="0"
-         style="stop-color:#cf9307;stop-opacity:1" />
-      <stop
-         style="stop-color:#f7d87b;stop-opacity:1"
-         offset="0.5"
-         id="stop10456-4-1-5-3" />
-      <stop
-         id="stop10452-22-7-8-4"
-         offset="1"
-         style="stop-color:#ebb313;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       xlink:href="#linearGradient4158"
-       id="linearGradient4212"
-       x1="8.3145638"
-       y1="1040.4003"
-       x2="8.3145638"
-       y2="1039.3397"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(3.5838051,0,0,3.5838051,446.6247,-3372.1684)" />
-    <linearGradient
-       id="linearGradient4158">
-      <stop
-         style="stop-color:#fdae35;stop-opacity:1;"
-         offset="0"
-         id="stop4160" />
-      <stop
-         style="stop-color:#fef0db;stop-opacity:1"
-         offset="1"
-         id="stop4162" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10440-1-0-0-3">
-      <stop
-         style="stop-color:#ae7603;stop-opacity:1;"
-         offset="0"
-         id="stop10442-43-2-0-9" />
-      <stop
-         id="stop10521-1-2-5-3"
-         offset="0.5"
-         style="stop-color:#e8d8a3;stop-opacity:1" />
-      <stop
-         style="stop-color:#bb9221;stop-opacity:1"
-         offset="1"
-         id="stop10444-3-4-0-4" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10396-5">
-      <stop
-         style="stop-color:#1b3e79;stop-opacity:1;"
-         offset="0"
-         id="stop10398-7" />
-      <stop
-         id="stop10404-9"
-         offset="0.5"
-         style="stop-color:#728fbf;stop-opacity:1" />
-      <stop
-         style="stop-color:#1f4d9a;stop-opacity:1"
-         offset="1"
-         id="stop10400-9" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10149-6-5-4">
-      <stop
-         style="stop-color:#1f4d9a;stop-opacity:1"
-         offset="0"
-         id="stop10151-5-7-2" />
-      <stop
-         id="stop10394-3"
-         offset="0.5"
-         style="stop-color:#b9c7df;stop-opacity:1" />
-      <stop
-         style="stop-color:#567ebc;stop-opacity:1"
-         offset="1"
-         id="stop10153-8-1-2" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4528-9-5-7-9-7">
-      <stop
-         id="stop4530-0-5-0-5-8"
-         offset="0"
-         style="stop-color:#e0c576;stop-opacity:1;" />
-      <stop
-         id="stop4532-7-9-3-3-6"
-         offset="1"
-         style="stop-color:#9e7916;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient6281-8-0-1-6-6-4-2-8">
-      <stop
-         style="stop-color:#f7f9fb;stop-opacity:1"
-         offset="0"
-         id="stop6283-0-2-2-1-2-0-1-6" />
-      <stop
-         style="stop-color:#ffd680;stop-opacity:1"
-         offset="1"
-         id="stop6285-5-0-9-7-6-9-9-1" />
-    </linearGradient>
     <radialGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4960"
        id="radialGradient4958"
        cx="28.552979"
@@ -504,31 +152,6 @@
        gradientTransform="matrix(0.88536081,0.01253637,-0.02077996,1.1371413,4.947957,-143.07582)"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       id="linearGradient3837"
-       inkscape:collect="always">
-      <stop
-         id="stop3839"
-         offset="0"
-         style="stop-color:#6f8db9;stop-opacity:1;" />
-      <stop
-         id="stop3841"
-         offset="1"
-         style="stop-color:#1b639e;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3829"
-       inkscape:collect="always">
-      <stop
-         id="stop3831"
-         offset="0"
-         style="stop-color:#8297bc;stop-opacity:1" />
-      <stop
-         id="stop3833"
-         offset="1"
-         style="stop-color:#6c81ad;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        id="linearGradient3047">
       <stop
          style="stop-color:#146d39;stop-opacity:1"
@@ -539,31 +162,6 @@
          offset="1"
          id="stop3051" />
     </linearGradient>
-    <linearGradient
-       id="linearGradient23102">
-      <stop
-         id="stop23104"
-         offset="0"
-         style="stop-color:#c9473e;stop-opacity:1" />
-      <stop
-         style="stop-color:#f35863;stop-opacity:1"
-         offset="0.25388375"
-         id="stop23118" />
-      <stop
-         id="stop23106"
-         offset="1"
-         style="stop-color:#f6928e;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       y2="1048.0511"
-       x2="12.339488"
-       y1="1043.0511"
-       x1="12.339488"
-       gradientTransform="translate(19.911612,-20)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient9563"
-       xlink:href="#linearGradient5103-3-7"
-       inkscape:collect="always" />
     <linearGradient
        id="linearGradient5103-3-7">
       <stop
@@ -583,117 +181,6 @@
          offset="1"
          style="stop-color:#abca52;stop-opacity:1" />
     </linearGradient>
-    <linearGradient
-       y2="1067.0511"
-       x2="11.339488"
-       y1="1064.0511"
-       x1="11.339488"
-       gradientTransform="translate(19.911612,-40)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient9565"
-       xlink:href="#linearGradient8562"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient8562"
-       inkscape:collect="always">
-      <stop
-         id="stop8564"
-         offset="0"
-         style="stop-color:#6994ad;stop-opacity:1" />
-      <stop
-         id="stop8566"
-         offset="1"
-         style="stop-color:#005596;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3047"
-       id="linearGradient6482"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(19.911612,-40)"
-       x1="11.339488"
-       y1="1064.0511"
-       x2="11.339488"
-       y2="1067.0511" />
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       y2="-1019.7672"
-       x2="56.177807"
-       y1="-1019.7672"
-       x1="52.177807"
-       id="linearGradient3835"
-       xlink:href="#linearGradient3829"
-       inkscape:collect="always" />
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       y2="-1017.2672"
-       x2="53.177807"
-       y1="-1022.2672"
-       x1="53.177807"
-       id="linearGradient3843"
-       xlink:href="#linearGradient3837"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="1067.0511"
-       x2="11.339488"
-       y1="1064.0511"
-       x1="11.339488"
-       gradientTransform="matrix(1,0,0,-1,-6.266193,2108.6294)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3861"
-       xlink:href="#linearGradient3047"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="1048.0511"
-       x2="12.339488"
-       y1="1043.0511"
-       x1="12.339488"
-       gradientTransform="matrix(1,0,0,-1,-6.266193,2088.6294)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3864"
-       xlink:href="#linearGradient5103-3-7"
-       inkscape:collect="always" />
-    <mask
-       id="mask3991"
-       maskUnits="userSpaceOnUse">
-      <g
-         style="fill:#ffffff"
-         id="g3993"
-         transform="matrix(1,0,0,-1,-46.177805,2068.6294)">
-        <rect
-           transform="scale(1,-1)"
-           y="-1022.2672"
-           x="48.177807"
-           height="5"
-           width="10"
-           id="rect3995"
-           style="fill:#ffffff;fill-opacity:1;stroke:none" />
-        <rect
-           transform="scale(1,-1)"
-           y="-1021.2672"
-           x="49.177807"
-           height="3"
-           width="8"
-           id="rect3997"
-           style="fill:#ffffff;fill-opacity:1;stroke:none" />
-        <rect
-           transform="scale(1,-1)"
-           y="-1020.2672"
-           x="50.177807"
-           height="1"
-           width="1"
-           id="rect3999"
-           style="fill:#ffffff;fill-opacity:1;stroke:none" />
-        <rect
-           transform="scale(1,-1)"
-           y="-1020.2672"
-           x="52.177807"
-           height="1"
-           width="4"
-           id="rect4001"
-           style="fill:#ffffff;fill-opacity:1;stroke:none" />
-      </g>
-    </mask>
     <linearGradient
        y2="1067.0511"
        x2="11.339488"
@@ -702,8 +189,7 @@
        gradientTransform="matrix(1,0,0,-1,-2.266193,2109.6406)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient3081"
-       xlink:href="#linearGradient3047"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient3047" />
     <linearGradient
        y2="1048.0511"
        x2="12.339488"
@@ -712,10 +198,8 @@
        gradientTransform="matrix(1,0,0,-1,-2.266193,2089.6406)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient3083"
-       xlink:href="#linearGradient5103-3-7"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient5103-3-7" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4317"
        id="linearGradient4323"
        x1="19.792524"
@@ -724,7 +208,6 @@
        y2="1064.6748"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4317">
       <stop
          style="stop-color:#f8e8a8;stop-opacity:1"
@@ -744,7 +227,6 @@
          id="stop4321" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4311"
        id="linearGradient4307"
        gradientUnits="userSpaceOnUse"
@@ -753,8 +235,7 @@
        x2="18.92688"
        y2="1065.5569" />
     <linearGradient
-       id="linearGradient4311"
-       inkscape:collect="always">
+       id="linearGradient4311">
       <stop
          id="stop4313"
          offset="0"
@@ -765,7 +246,6 @@
          style="stop-color:#a87000;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4311"
        id="linearGradient4309"
        gradientUnits="userSpaceOnUse"
@@ -774,7 +254,6 @@
        x2="17.04467"
        y2="1063.8405" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4258"
        id="linearGradient4264"
        x1="17.04467"
@@ -783,7 +262,6 @@
        y2="1063.8405"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4258">
       <stop
          style="stop-color:#5888c8;stop-opacity:1"
@@ -795,7 +273,6 @@
          id="stop4262" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4250"
        id="linearGradient4256"
        x1="18.92688"
@@ -804,7 +281,6 @@
        y2="1065.5569"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4250">
       <stop
          style="stop-color:#597fca;stop-opacity:1"
@@ -816,7 +292,6 @@
          id="stop4254" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4398"
        id="linearGradient4404"
        x1="19.653019"
@@ -825,31 +300,6 @@
        y2="1061.0938"
        gradientUnits="userSpaceOnUse" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="4"
-     inkscape:cx="36.636453"
-     inkscape:cy="-17.351872"
-     inkscape:document-units="px"
-     inkscape:current-layer="g4463"
-     showgrid="true"
-     inkscape:window-width="1236"
-     inkscape:window-height="929"
-     inkscape:window-x="818"
-     inkscape:window-y="608"
-     inkscape:window-maximized="0"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid4042" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -863,8 +313,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
@@ -872,14 +320,10 @@
        id="g4463"
        transform="translate(-1.9375001,2.0000001)">
       <path
-         sodipodi:nodetypes="ccssssssc"
-         inkscape:connector-curvature="0"
          id="rect4044"
          d="m 6.253476,1039.2695 2.1328049,0 c 0.453044,1.6907 2.7621361,2.5911 2.7621361,5.1157 l 0,1.5065 c 0,1.5302 -1.2319121,2.7621 -2.7621361,2.7621 l -2.1328049,0 c -1.530224,0 -2.762136,-1.2319 -2.762136,-2.7621 l 0,-1.5065 c 0,-2.5909 2.334749,-3.5207 2.762136,-5.1157 z"
          style="fill:url(#radialGradient4853);fill-opacity:1;stroke:none" />
       <path
-         sodipodi:nodetypes="ccssssssc"
-         inkscape:connector-curvature="0"
          id="rect4044-1"
          d="m 6.253476,1039.2695 2.3984299,0 c 0.453044,1.6907 2.7621361,1.5746 2.7621361,4.0992 l 0,3.2667 c 0,1.5302 -1.231912,2.2097 -2.7621361,2.2097 l -2.3984299,0 c -1.530224,0 -2.762136,-0.6353 -2.762136,-2.1655 l 0,-3.3109 c 0,-2.5909 2.334749,-2.5042 2.762136,-4.0992 z"
          style="display:inline;fill:none;stroke:url(#linearGradient4882);stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
@@ -893,15 +337,12 @@
          id="rect4815"
          style="fill:url(#linearGradient4823);fill-opacity:1;stroke:url(#linearGradient4831);stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
       <path
-         sodipodi:nodetypes="ccssssssc"
-         inkscape:connector-curvature="0"
          id="rect4044-7"
          d="m 6.253476,1040.3633 2.411834,0 c 0.453044,1.4882 2.762136,2.2808 2.762136,4.5031 l 0,1.106 c 0,1.347 -1.231912,2.4314 -2.762136,2.4314 l -2.411834,0 c -1.530224,0 -2.762136,-1.0844 -2.762136,-2.4314 l 0,-1.106 c 0,-2.2807 2.334749,-3.0991 2.762136,-4.5031 z"
          style="display:inline;fill:url(#radialGradient4958);fill-opacity:1;stroke:none" />
     </g>
     <g
        id="layer1-2"
-       inkscape:label="Layer 1"
        transform="translate(41.267903,17.94952)">
       <g
          id="g3866"
@@ -909,15 +350,11 @@
         <path
            style="display:inline;fill:url(#linearGradient3083);fill-opacity:1;stroke:none"
            d="m 5.519236,1047.6671 -0.816057,-1.9944 0.88243,-2.3985 3.398198,0.051 0,-1.5313 3.781143,2.432 -3.781143,3.0027 0,-1.5156 -2.544844,0 z"
-           id="path4108-1"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccccccccc" />
+           id="path4108-1" />
         <path
            style="display:inline;fill:url(#linearGradient3081);fill-opacity:1;stroke:none"
            d="m 7.983807,1046.8309 0,-1.5156 -0.07965,0 c -1.711191,0 -1.9036885,1.2987 -1.9036885,2.075 l -1,0 c -1.937334,-3.08 -0.6777005,-5.0631 1.8476505,-5.0884 l 1.135685,0.023 0,-1.5313 c 0,-0.6519 0.740915,-0.6375 1.5,0 l 3.923255,3.0122 -3.923255,3.0247 c -0.760225,0.7602 -1.5,0.5203 -1.5,0 z m 1,-1 2.985755,-2.0247 -2.985755,-2.0122 0,1.5313 -2.12809,0.07 c -1.65655,0 -2.276462,1.3386 -1.391431,2.4245 0.477391,-0.9138 0.93524,-1.5048 2.407536,-1.5048 l 1.111985,0 z"
-           id="path4108-1-6"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccccccccccccccccccccc" />
+           id="path4108-1-6" />
       </g>
     </g>
     <g
@@ -936,9 +373,7 @@
             <path
                style="fill:url(#linearGradient4323);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4307);stroke-width:0.89697278;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
                d="m 19.520119,1060.4831 c 0.341806,-0.3409 1.0254,0.4474 1.0254,0.9295 l 0,1.9439 c 0,0.5003 -0.709328,1.5082 -1.063991,1.1545 -1.088616,-1.1026 -0.73007,-0.7839 -1.935031,-2.0044 0,0 0.739057,-0.7922 1.973622,-2.0235 z"
-               id="path4242-9"
-               inkscape:connector-curvature="0"
-               sodipodi:nodetypes="sssccs" />
+               id="path4242-9" />
             <rect
                style="opacity:1;fill:url(#linearGradient4309);fill-opacity:1;stroke:none;stroke-width:0.84714097;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
                id="rect4244-5"
@@ -959,8 +394,6 @@
              id="rect4244"
              style="opacity:1;fill:url(#linearGradient4264);fill-opacity:1;stroke:none;stroke-width:0.84714097;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
           <path
-             sodipodi:nodetypes="sssccs"
-             inkscape:connector-curvature="0"
              id="path4242"
              d="m 19.520119,1060.4831 c 0.341806,-0.3409 1.0254,1.0466 1.0254,1.5287 l 0,1.0114 c 0,0.5003 -0.709328,1.8729 -1.063991,1.5192 -1.167505,-1.1826 -0.874481,-0.9615 -1.935031,-2.0358 0,0 0.739057,-0.7922 1.973622,-2.0235 z"
              style="fill:url(#linearGradient4404);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4256);stroke-width:0.89697278;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
diff --git a/ui/org.eclipse.pde.ui/icons/etool16/new_target_wiz.svg b/ui/org.eclipse.pde.ui/icons/etool16/new_target_wiz.svg
index 2a81b1c048a..001f5714d55 100644
--- a/ui/org.eclipse.pde.ui/icons/etool16/new_target_wiz.svg
+++ b/ui/org.eclipse.pde.ui/icons/etool16/new_target_wiz.svg
@@ -2,64 +2,18 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="new_target_wiz.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
-    <linearGradient
-       id="linearGradient5103-3">
-      <stop
-         style="stop-color:#fefdef;stop-opacity:1"
-         offset="0"
-         id="stop5105-5" />
-      <stop
-         id="stop7550-07"
-         offset="0.26694915"
-         style="stop-color:#fef5d4;stop-opacity:1" />
-      <stop
-         id="stop7548-6"
-         offset="0.51694918"
-         style="stop-color:#fbe08e;stop-opacity:1" />
-      <stop
-         style="stop-color:#fbdd83;stop-opacity:1"
-         offset="1"
-         id="stop5107-7" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3955-9">
-      <stop
-         style="stop-color:#3870da;stop-opacity:1"
-         offset="0"
-         id="stop3957-3" />
-      <stop
-         id="stop3959-2"
-         offset="0.15381166"
-         style="stop-color:#78b8f0;stop-opacity:1" />
-      <stop
-         id="stop3961-3"
-         offset="0.65650523"
-         style="stop-color:#78b8f0;stop-opacity:1" />
-      <stop
-         style="stop-color:#3068d8;stop-opacity:1"
-         offset="0.92272848"
-         id="stop3963-9" />
-      <stop
-         style="stop-color:#3068d8;stop-opacity:1"
-         offset="1"
-         id="stop3965-8" />
-    </linearGradient>
     <linearGradient
        y2="1051.8378"
        x2="9.8946028"
@@ -68,10 +22,8 @@
        gradientUnits="userSpaceOnUse"
        id="linearGradient4101"
        xlink:href="#linearGradient4994-6"
-       inkscape:collect="always"
        gradientTransform="translate(-1.977903,-1.0442)" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4994-6">
       <stop
          style="stop-color:#f9fafc;stop-opacity:1;"
@@ -83,7 +35,6 @@
          id="stop4998-89" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4894-6"
        id="linearGradient4900-1"
        x1="7.9987183"
@@ -93,7 +44,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(2.022097,-1.0442)" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4894-6">
       <stop
          style="stop-color:#e0c88f;stop-opacity:1"
@@ -105,128 +55,6 @@
          id="stop4898-5" />
     </linearGradient>
     <linearGradient
-       id="linearGradient10448-9-7-0-5">
-      <stop
-         style="stop-color:#cf9307;stop-opacity:1"
-         offset="0"
-         id="stop10450-3-5-6-7" />
-      <stop
-         id="stop10456-4-1-5-3"
-         offset="0.5"
-         style="stop-color:#f7d87b;stop-opacity:1" />
-      <stop
-         style="stop-color:#ebb313;stop-opacity:1"
-         offset="1"
-         id="stop10452-22-7-8-4" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10748-8">
-      <stop
-         id="stop10750-5"
-         offset="0"
-         style="stop-color:#ecac18;stop-opacity:1" />
-      <stop
-         style="stop-color:#f1ce66;stop-opacity:1"
-         offset="0.25"
-         id="stop10752-8" />
-      <stop
-         style="stop-color:#f6e5a6;stop-opacity:1"
-         offset="0.5"
-         id="stop10754-8" />
-      <stop
-         id="stop10756-4"
-         offset="0.75"
-         style="stop-color:#f1cf6c;stop-opacity:1" />
-      <stop
-         id="stop10758-7"
-         offset="1"
-         style="stop-color:#e5b630;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10448-90">
-      <stop
-         style="stop-color:#ecac18;stop-opacity:1"
-         offset="0"
-         id="stop10450-0" />
-      <stop
-         id="stop10458-2"
-         offset="0.25"
-         style="stop-color:#ffe38d;stop-opacity:1" />
-      <stop
-         id="stop10456-96"
-         offset="0.5"
-         style="stop-color:#fdf5d2;stop-opacity:1" />
-      <stop
-         style="stop-color:#ffeba7;stop-opacity:1"
-         offset="0.75"
-         id="stop10460-3" />
-      <stop
-         style="stop-color:#e5b630;stop-opacity:1"
-         offset="1"
-         id="stop10452-1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10414-9">
-      <stop
-         style="stop-color:#5078b9;stop-opacity:1;"
-         offset="0"
-         id="stop10416-3" />
-      <stop
-         id="stop10422-8"
-         offset="0.5"
-         style="stop-color:#6d8cbd;stop-opacity:1" />
-      <stop
-         style="stop-color:#5f88c9;stop-opacity:1"
-         offset="1"
-         id="stop10418-4" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10432-3">
-      <stop
-         id="stop10434-4"
-         offset="0"
-         style="stop-color:#1f4d9a;stop-opacity:1" />
-      <stop
-         style="stop-color:#4e6da1;stop-opacity:1"
-         offset="0.5"
-         id="stop10436-2" />
-      <stop
-         id="stop10438-9"
-         offset="1"
-         style="stop-color:#567ebc;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10157-6">
-      <stop
-         style="stop-color:#6588c1;stop-opacity:1"
-         offset="0"
-         id="stop10159-5" />
-      <stop
-         id="stop10165-9"
-         offset="0.5"
-         style="stop-color:#becce3;stop-opacity:1" />
-      <stop
-         style="stop-color:#809dcb;stop-opacity:1"
-         offset="1"
-         id="stop10161-55" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4284">
-      <stop
-         id="stop4286"
-         offset="0"
-         style="stop-color:#6588c1;stop-opacity:0" />
-      <stop
-         style="stop-color:#becce3;stop-opacity:1"
-         offset="0.49999967"
-         id="stop4288" />
-      <stop
-         id="stop4290"
-         offset="1"
-         style="stop-color:#809dcb;stop-opacity:0" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient6281-8-0-1-6"
        id="linearGradient3093-5-2-7-0-9"
        gradientUnits="userSpaceOnUse"
@@ -247,7 +75,6 @@
          style="stop-color:#ffd680;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4317"
        id="linearGradient4323"
        x1="19.792524"
@@ -256,7 +83,6 @@
        y2="1064.6748"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4317">
       <stop
          style="stop-color:#f8e8a8;stop-opacity:1"
@@ -276,7 +102,6 @@
          id="stop4321" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4311"
        id="linearGradient4307"
        gradientUnits="userSpaceOnUse"
@@ -285,8 +110,7 @@
        x2="18.92688"
        y2="1065.5569" />
     <linearGradient
-       id="linearGradient4311"
-       inkscape:collect="always">
+       id="linearGradient4311">
       <stop
          id="stop4313"
          offset="0"
@@ -297,7 +121,6 @@
          style="stop-color:#a87000;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4311"
        id="linearGradient4309"
        gradientUnits="userSpaceOnUse"
@@ -306,7 +129,6 @@
        x2="17.04467"
        y2="1063.8405" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4258"
        id="linearGradient4264"
        x1="17.04467"
@@ -315,7 +137,6 @@
        y2="1063.8405"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4258">
       <stop
          style="stop-color:#5888c8;stop-opacity:1"
@@ -327,7 +148,6 @@
          id="stop4262" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4250"
        id="linearGradient4256"
        x1="18.92688"
@@ -336,7 +156,6 @@
        y2="1065.5569"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4250">
       <stop
          style="stop-color:#7090c0;stop-opacity:1"
@@ -348,7 +167,6 @@
          id="stop4254" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4464"
        id="linearGradient4470-8"
        x1="9.375"
@@ -358,7 +176,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(1033.257,-1043.4262)" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4464">
       <stop
          style="stop-color:#ffffff;stop-opacity:1"
@@ -371,7 +188,6 @@
     </linearGradient>
     <linearGradient
        gradientTransform="translate(0,-1.5330059e-6)"
-       inkscape:collect="always"
        xlink:href="#linearGradient4464"
        id="linearGradient4470"
        x1="9.375"
@@ -380,7 +196,6 @@
        y2="1037.8778"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4464"
        id="linearGradient4470-8-6"
        x1="9.375"
@@ -390,31 +205,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(0.74650889,0,0,1,1.5883978,-0.1286417)" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="22.627416"
-     inkscape:cx="-1.990972"
-     inkscape:cy="8.3322471"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="900"
-     inkscape:window-x="498"
-     inkscape:window-y="561"
-     inkscape:window-maximized="0"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3999" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -428,8 +218,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
@@ -437,7 +225,6 @@
        transform="matrix(1.2394243,0,0,1.2394243,-21.274665,-254.90388)"
        style="font-style:normal;font-weight:normal;font-size:13.58917427px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;display:inline;fill:#ffffff;fill-opacity:1;stroke:none"
        id="layer1-9"
-       inkscape:label="Layer 1"
        mask="none" />
     <rect
        style="display:inline;opacity:1;fill:url(#linearGradient4470);fill-opacity:1;stroke:none;stroke-width:0.85000002;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
@@ -451,19 +238,14 @@
        id="g4486"
        transform="translate(1.9873253,-0.11048548)">
       <path
-         sodipodi:nodetypes="cccccc"
-         inkscape:connector-curvature="0"
          id="rect4001-3"
          d="m 3.5193795,1037.8597 7.0096695,0 3.062057,3.0066 0,9.9546 -10.0717265,0 z"
          style="display:inline;fill:url(#linearGradient4101);fill-opacity:1;stroke:none" />
       <path
-         inkscape:connector-curvature="0"
          id="path4884"
          d="m 9.998718,1037.397 0,3.9112 3.977479,0 z"
          style="display:inline;fill:url(#linearGradient4900-1);fill-opacity:1;stroke:none" />
       <path
-         sodipodi:nodetypes="cccccc"
-         inkscape:connector-curvature="0"
          id="rect4001"
          d="m 3.5635737,1037.8597 6.9654753,0 3.062057,3.0066 0,9.9546 -10.0275323,0 z"
          style="display:inline;fill:none;stroke:#a1813a;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1" />
@@ -488,7 +270,6 @@
            id="path4320"
            style="display:inline;opacity:1;fill:#d8e8e0;fill-opacity:1;stroke:#2068a0;stroke-width:1;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
         <path
-           inkscape:connector-curvature="0"
            id="path4322"
            d="m 8.0064212,1060.9149 0,1.0254 -1.0019532,0 0,1 1.0019532,0 0,0.9785 1,0 0,-0.9785 0.9824218,0 0,-1 -0.9824218,0 0,-1.0254 -1,0 z"
            style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#2068a0;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
@@ -513,8 +294,6 @@
            id="g4266-0"
            style="display:inline">
           <path
-             sodipodi:nodetypes="ssssccs"
-             inkscape:connector-curvature="0"
              id="path4242-9"
              d="m 19.520119,1060.4831 c 0.341806,-0.3409 1.0254,0.4474 1.0254,0.9295 l 0,2.9581 c 0,0.5003 -0.709328,1.5082 -1.063991,1.1545 -1.323187,-1.3197 -1.935031,-2.0399 -1.935031,-2.0399 l 0,-0.9787 c 0,0 0.739057,-0.7922 1.973622,-2.0235 z"
              style="fill:url(#linearGradient4323);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4307);stroke-width:0.89697278;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
@@ -539,9 +318,7 @@
         <path
            style="fill:#a8c0d8;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4256);stroke-width:0.89697278;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
            d="m 19.520119,1060.4831 c 0.341806,-0.3409 1.0254,1.0466 1.0254,1.5287 l 0,2.4522 c 0,0.5003 -0.709328,1.4149 -1.063991,1.0612 -1.323187,-1.3197 -1.935031,-2.0399 -1.935031,-2.0399 l 0,-0.9787 c 0,0 0.739057,-0.7922 1.973622,-2.0235 z"
-           id="path4242"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ssssccs" />
+           id="path4242" />
       </g>
     </g>
     <g
@@ -559,9 +336,7 @@
       <path
          style="display:inline;fill:url(#linearGradient3093-5-2-7-0-9);fill-opacity:1;stroke:none"
          d="m 12.471186,1054.309 1.001133,0 0,1.946 1.986639,0 0,1.0167 -1.986639,0 0,2.043 -1.001133,0 0,-2.043 -1.98664,0 0,-1.0167 1.98664,0 z"
-         id="path5581-5-5"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccccccccccc" />
+         id="path5581-5-5" />
     </g>
   </g>
 </svg>
diff --git a/ui/org.eclipse.pde.ui/icons/etool16/newcatdef_wiz.svg b/ui/org.eclipse.pde.ui/icons/etool16/newcatdef_wiz.svg
index 8e53e8de65e..6d7803ab9c0 100644
--- a/ui/org.eclipse.pde.ui/icons/etool16/newcatdef_wiz.svg
+++ b/ui/org.eclipse.pde.ui/icons/etool16/newcatdef_wiz.svg
@@ -2,25 +2,20 @@
 <!-- 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="16"
    height="16"
    viewBox="0 0 16 16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r"
-   sodipodi:docname="newcatdef_wiz.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4154">
       <stop
          style="stop-color:#2c71af;stop-opacity:1"
@@ -32,7 +27,6 @@
          id="stop4158" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4146">
       <stop
          style="stop-color:#fef5da;stop-opacity:1;"
@@ -44,7 +38,6 @@
          id="stop4150" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4138">
       <stop
          style="stop-color:#e6e9a0;stop-opacity:1;"
@@ -56,7 +49,6 @@
          id="stop4142" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4138"
        id="linearGradient4144"
        x1="-2.8482134"
@@ -65,7 +57,6 @@
        y2="1040.7104"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4146"
        id="linearGradient4152"
        x1="-3.1607134"
@@ -74,7 +65,6 @@
        y2="1045.3979"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4154"
        id="linearGradient4160"
        x1="-3.0267849"
@@ -83,7 +73,6 @@
        y2="1049.3712"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient6281-8-0-1-6"
        id="linearGradient3093-5-2-7-0-9"
        gradientUnits="userSpaceOnUse"
@@ -104,31 +93,6 @@
          style="stop-color:#ffd680;stop-opacity:1" />
     </linearGradient>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7.919596"
-     inkscape:cx="11.810495"
-     inkscape:cy="10.868306"
-     inkscape:document-units="px"
-     inkscape:current-layer="g4218"
-     showgrid="true"
-     units="px"
-     inkscape:snap-others="false"
-     inkscape:snap-grids="false"
-     inkscape:window-width="797"
-     inkscape:window-height="427"
-     inkscape:window-x="992"
-     inkscape:window-y="1093"
-     inkscape:window-maximized="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3336" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -142,8 +106,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      transform="translate(0,-1036.3622)">
     <g
@@ -191,9 +153,7 @@
         <path
            style="display:inline;fill:url(#linearGradient3093-5-2-7-0-9);fill-opacity:1;stroke:none"
            d="m 12.471186,1054.309 1.001133,0 0,1.946 1.986639,0 0,1.0167 -1.986639,0 0,2.043 -1.001133,0 0,-2.043 -1.98664,0 0,-1.0167 1.98664,0 z"
-           id="path5581-5-5"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccccccccccc" />
+           id="path5581-5-5" />
       </g>
     </g>
   </g>
diff --git a/ui/org.eclipse.pde.ui/icons/etool16/newefix_wiz.svg b/ui/org.eclipse.pde.ui/icons/etool16/newefix_wiz.svg
index d0551d1984c..40034520715 100644
--- a/ui/org.eclipse.pde.ui/icons/etool16/newefix_wiz.svg
+++ b/ui/org.eclipse.pde.ui/icons/etool16/newefix_wiz.svg
@@ -2,25 +2,20 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="newefix_wiz.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient3973"
-       inkscape:collect="always">
+       id="linearGradient3973">
       <stop
          id="stop3975"
          offset="0"
@@ -31,8 +26,7 @@
          style="stop-color:#f8f0c8;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       id="linearGradient3967"
-       inkscape:collect="always">
+       id="linearGradient3967">
       <stop
          id="stop3969"
          offset="0"
@@ -66,7 +60,6 @@
          style="stop-color:#ba772f;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3949">
       <stop
          style="stop-color:#9e6627;stop-opacity:1"
@@ -78,7 +71,6 @@
          id="stop3953" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient3967"
        id="linearGradient3939"
        gradientUnits="userSpaceOnUse"
@@ -88,7 +80,6 @@
        x2="531.09253"
        y2="371.17883" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient3955"
        id="linearGradient3945"
        gradientUnits="userSpaceOnUse"
@@ -97,18 +88,7 @@
        x2="543.91406"
        y2="373.2294"
        gradientTransform="translate(-60.558598,1.4188)" />
-    <mask
-       maskUnits="userSpaceOnUse"
-       id="mask4917">
-      <path
-         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;display:inline"
-         d="m 462.77563,373.22885 29.11636,0 c 1.45425,0 2.625,1.17075 2.625,2.625 l 0,18.76896 c 0,1.45425 -1.17412,2.52598 -2.625,2.625 l -29.11636,1.98708 c -1.45088,0.099 -2.625,-1.17075 -2.625,-2.625 l 0,-20.75604 c 0,-1.45425 1.17075,-2.625 2.625,-2.625 z"
-         id="path4919"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="sssssssss" />
-    </mask>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient3973"
        id="linearGradient4933"
        gradientUnits="userSpaceOnUse"
@@ -118,7 +98,6 @@
        x2="538.00562"
        y2="374.21222" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient3949"
        id="linearGradient4935"
        gradientUnits="userSpaceOnUse"
@@ -128,7 +107,6 @@
        x2="548.45923"
        y2="373.77069" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4284"
        id="linearGradient10790-8-2"
        gradientUnits="userSpaceOnUse"
@@ -153,7 +131,6 @@
          style="stop-color:#809dcb;stop-opacity:0" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10157-2-5"
        id="linearGradient10790-8"
        gradientUnits="userSpaceOnUse"
@@ -178,7 +155,6 @@
          id="stop10161-5-0" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10149-39-0"
        id="linearGradient10792-6"
        gradientUnits="userSpaceOnUse"
@@ -188,7 +164,6 @@
        x2="322.875"
        y2="504.44818" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient10149-39-0">
       <stop
          style="stop-color:#1d4d9d;stop-opacity:1"
@@ -200,7 +175,6 @@
          id="stop10153-72-3" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10157-2-5"
        id="linearGradient10786-1"
        gradientUnits="userSpaceOnUse"
@@ -210,7 +184,6 @@
        y2="514.75818"
        gradientTransform="matrix(1.0391435,0,0,0.5924666,202.46608,49.82119)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10414-9"
        id="linearGradient10782-3"
        gradientUnits="userSpaceOnUse"
@@ -235,7 +208,6 @@
          id="stop10418-4" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10432-3"
        id="linearGradient10784-2"
        gradientUnits="userSpaceOnUse"
@@ -260,7 +232,6 @@
          style="stop-color:#567ebc;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10448-90"
        id="linearGradient10778-6"
        gradientUnits="userSpaceOnUse"
@@ -293,7 +264,6 @@
          id="stop10452-1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10748-8"
        id="linearGradient10774-5"
        gradientUnits="userSpaceOnUse"
@@ -326,7 +296,6 @@
          style="stop-color:#e5b630;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10448-9-7-0-5"
        id="linearGradient10770-6"
        gradientUnits="userSpaceOnUse"
@@ -362,7 +331,6 @@
          style="stop-color:#ffd680;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient6281-8-0-1-6"
        id="linearGradient3093-5-2-7-0-9"
        gradientUnits="userSpaceOnUse"
@@ -372,29 +340,6 @@
        x2="0.9375"
        y2="7.549418" />
   </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="7.1713708"
-     inkscape:cy="1.7474546"
-     inkscape:document-units="px"
-     inkscape:current-layer="g4293"
-     showgrid="true"
-     inkscape:window-width="968"
-     inkscape:window-height="796"
-     inkscape:window-x="1081"
-     inkscape:window-y="759"
-     inkscape:window-maximized="0"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3947" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -408,8 +353,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
@@ -432,14 +375,11 @@
         <path
            style="fill:url(#linearGradient4933);fill-opacity:1;stroke:url(#linearGradient4935);stroke-width:3.02792978;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
            d="m 463.24874,374.64819 28.07551,0 c 1.45425,0 2.625,1.17075 2.625,2.625 l 0,11.29376 c 0,1.45425 -1.22088,2.24642 -2.625,2.625 l -28.07551,7.56983 c -1.40411,0.37858 -2.625,-1.17075 -2.625,-2.625 l 0,-18.86359 c 0,-1.45425 1.17075,-2.625 2.625,-2.625 z"
-           id="rect13693"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="sssssssss" />
+           id="rect13693" />
         <path
            style="fill:none;stroke:url(#linearGradient3945);stroke-width:3.02792978;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
            d="m 462.26171,374.64819 20.09375,0"
-           id="path13797"
-           inkscape:connector-curvature="0" />
+           id="path13797" />
       </g>
       <g
          id="g4301"
@@ -454,18 +394,14 @@
            id="rect10007-0-74-2-7-6"
            style="display:inline;fill:url(#linearGradient10770-6);fill-opacity:1;stroke:none;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
         <path
-           inkscape:connector-curvature="0"
            id="path4313-8-8"
            d="m 548.23888,354.95116 0,3.5838 12.01134,0 0,-3.5838 -12.01134,0 z"
            style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
         <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
            id="path4313-8-8-7"
            d="m 549.43361,354.93037 0,10.8213 3.63939,0 0,-10.8213 z"
            style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.94926554px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
         <path
-           inkscape:connector-curvature="0"
            id="path4313-5-1-8"
            d="m 560.22222,362.10479 -12.03934,0.1111 0.0351,3.58381 12.03934,-0.1111 -0.0351,-3.58381 z"
            style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#9e7400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
@@ -479,12 +415,10 @@
            id="rect10007-0-74-2-7"
            style="display:inline;fill:url(#linearGradient10774-5);fill-opacity:1;stroke:none;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
         <path
-           inkscape:connector-curvature="0"
            id="path4313-5-1"
            d="m 549.5198,365.72372 -12.03934,0.1111 0.035,3.5838 12.03935,-0.1111 -0.0351,-3.5838 z"
            style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#9e7400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
         <path
-           inkscape:connector-curvature="0"
            id="path4313-8"
            d="m 549.48481,351.36054 -12.03935,0.1111 0.035,3.58381 12.03935,-0.1111 -0.0351,-3.58381 z"
            style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
@@ -525,12 +459,10 @@
            id="rect10007-0-74"
            style="display:inline;fill:url(#linearGradient10786-1);fill-opacity:1;stroke:none;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
         <path
-           inkscape:connector-curvature="0"
            id="path4313"
            d="m 542.3172,347.76957 -12.03935,0.1111 0.035,3.5838 12.03935,-0.11109 -0.0351,-3.58381 z"
            style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
         <path
-           inkscape:connector-curvature="0"
            id="path4313-5"
            d="m 542.33819,369.2724 -12.03934,0.1111 0.035,3.58381 12.03935,-0.1111 -0.0351,-3.58381 z"
            style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#9e7400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
@@ -550,8 +482,6 @@
            id="rect10007-6-6"
            style="display:inline;fill:url(#linearGradient10790-8-2);fill-opacity:1;stroke:none;stroke-width:3.58380508;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
         <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
            id="path4313-8-8-7-8"
            d="m 542.3442,354.94937 0,10.78725 3.5848,0 0,-10.78725 z"
            style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:0.64640886;fill-rule:evenodd;stroke:none;stroke-width:0.97351193px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
@@ -575,9 +505,7 @@
           <path
              style="display:inline;fill:url(#linearGradient3093-5-2-7-0-9);fill-opacity:1;stroke:none"
              d="m 12.471186,1054.309 1.001133,0 0,2.0068 1.986639,0 0,1.0001 -1.986639,0 0,1.9988 -1.001133,0 0,-1.9988 -1.98664,0 0,-1.0001 1.98664,0 z"
-             id="path5581-5-5"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccccccccccc" />
+             id="path5581-5-5" />
         </g>
       </g>
       <g
@@ -596,9 +524,7 @@
            id="rect4262"
            transform="matrix(3.5838051,0,0,3.5838051,464.1443,345.53547)"
            d="m 13.435547,9.9824219 0,2.5213121 -2.34375,0 0,1.123219 2.34375,0 0,2.109375 1.097656,0 0,-2.109375 2.3125,0 0,-1.123219 -2.3125,0 0,-2.5213121 z"
-           style="opacity:1;fill:#f13f53;fill-opacity:1;stroke:#f13f53;stroke-width:0.90158916;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccccccccccc" />
+           style="opacity:1;fill:#f13f53;fill-opacity:1;stroke:#f13f53;stroke-width:0.90158916;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
       </g>
     </g>
   </g>
diff --git a/ui/org.eclipse.pde.ui/icons/etool16/newex_wiz.svg b/ui/org.eclipse.pde.ui/icons/etool16/newex_wiz.svg
index 559c6e8dbf2..64d88c0bacc 100644
--- a/ui/org.eclipse.pde.ui/icons/etool16/newex_wiz.svg
+++ b/ui/org.eclipse.pde.ui/icons/etool16/newex_wiz.svg
@@ -2,20 +2,16 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r"
-   sodipodi:docname="newex_wiz.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
@@ -80,7 +76,6 @@
          id="stop10452-1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10448-9-7-0-5"
        id="linearGradient10770-6"
        gradientUnits="userSpaceOnUse"
@@ -90,7 +85,6 @@
        x2="323.98331"
        y2="518.28192" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10748-8"
        id="linearGradient10774-5"
        gradientUnits="userSpaceOnUse"
@@ -100,7 +94,6 @@
        x2="324.1601"
        y2="515.53949" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10448-90"
        id="linearGradient10778-6"
        gradientUnits="userSpaceOnUse"
@@ -110,7 +103,6 @@
        y2="511.66458"
        gradientTransform="matrix(0.30039597,0,0,0.29632024,-93.823234,870.37106)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient6281-8-0-1-6"
        id="linearGradient3093-5-2-7-0-9"
        gradientUnits="userSpaceOnUse"
@@ -131,31 +123,6 @@
          style="stop-color:#ffd680;stop-opacity:1" />
     </linearGradient>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="15.999999"
-     inkscape:cx="1.6581998"
-     inkscape:cy="1.9975375"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="784"
-     inkscape:window-height="634"
-     inkscape:window-x="1607"
-     inkscape:window-y="915"
-     inkscape:window-maximized="0"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3999" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -169,8 +136,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
@@ -183,18 +148,14 @@
          style="display:inline"
          id="g4386">
         <path
-           sodipodi:nodetypes="ccccc"
            style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#9e7400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
            d="m 2.3385061,1041.3342 -3.4062511,0.031 0.0098,1 3.4062501,-0.031 z"
-           id="path4313-5-1-8-6"
-           inkscape:connector-curvature="0" />
+           id="path4313-5-1-8-6" />
       </g>
       <path
-         inkscape:connector-curvature="0"
          id="path4313-5-1-8-6-0"
          d="m 20.608712,1042.3225 3.421876,0.031 -0.0098,1 -3.421875,-0.031 z"
-         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#9e7400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-         sodipodi:nodetypes="ccccc" />
+         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#9e7400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
       <g
          style="display:inline"
          id="g4239"
@@ -209,23 +170,17 @@
            id="rect10007-0-74-2-7-6"
            style="display:inline;fill:url(#linearGradient10770-6);fill-opacity:1;stroke:none;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
         <path
-           inkscape:connector-curvature="0"
            id="path4313-8-8"
            d="m 5.9540546,1024.1006 0,1 8.2734374,0 0,-1 z"
-           style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-           sodipodi:nodetypes="ccccc" />
+           style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
         <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
            id="path4313-8-8-7"
            d="m 6.2874256,1024.0948 0,3.0195 1.01551,0 0,-3.0195 z"
            style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.94926554px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
         <path
-           inkscape:connector-curvature="0"
            id="path4313-5-1-8"
            d="m 14.275248,1026.0967 -8.0937514,0.031 0.0098,1 8.0937504,-0.031 z"
-           style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#9e7400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-           sodipodi:nodetypes="ccccc" />
+           style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#9e7400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
         <rect
            ry="0"
            rx="0"
@@ -236,12 +191,10 @@
            id="rect10007-0-74-2-7"
            style="display:inline;fill:url(#linearGradient10774-5);fill-opacity:1;stroke:none;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
         <path
-           inkscape:connector-curvature="0"
            id="path4313-5-1"
            d="m 6.3114756,1027.1065 -3.3593746,0.031 0.00977,1 3.3593746,-0.031 -0.0098,-1 z"
            style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#9e7400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
         <path
-           inkscape:connector-curvature="0"
            id="path4313-8"
            d="m 6.3017106,1023.0987 -3.3593752,0.031 0.00977,1 3.3593742,-0.031 -0.0098,-1 z"
            style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
@@ -255,26 +208,18 @@
            id="rect10007-0-74-2"
            style="display:inline;fill:url(#linearGradient10778-6);fill-opacity:1;stroke:none;stroke-width:1.50161433;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
         <path
-           inkscape:connector-curvature="0"
            id="path4313"
            d="m 4.3017106,1022.0967 -2.0335499,0.031 0.00977,1 2.0335489,-0.031 -0.0098,-1 z"
-           style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-           sodipodi:nodetypes="cccccc" />
+           style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
         <path
-           inkscape:connector-curvature="0"
            id="path4313-5"
            d="m 4.3075696,1028.0967 -1.9999998,0.031 0.00977,1 1.9999998,-0.031 -0.0098,-1 z"
-           style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#9e7400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-           sodipodi:nodetypes="cccccc" />
+           style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#9e7400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
         <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
            id="path4313-8-8-7-8"
            d="m 4.3092456,1024.1001 0,3.01 1.000277,0 0,-3.01 z"
            style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:0.64640886;fill-rule:evenodd;stroke:none;stroke-width:0.97351193px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
         <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
            id="path4313-8-8-7-8-8"
            d="m 1.3092454,1023.0922 0,5.0101 1.000277,0 0,-5.0101 z"
            style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.97351193px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
@@ -299,9 +244,7 @@
         <path
            style="display:inline;fill:url(#linearGradient3093-5-2-7-0-9);fill-opacity:1;stroke:none"
            d="m 12.471186,1054.309 1.001133,0 0,1.946 1.986639,0 0,1.0167 -1.986639,0 0,2.043 -1.001133,0 0,-2.043 -1.98664,0 0,-1.0167 1.98664,0 z"
-           id="path5581-5-5"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccccccccccc" />
+           id="path5581-5-5" />
       </g>
     </g>
   </g>
diff --git a/ui/org.eclipse.pde.ui/icons/etool16/newexp_wiz.svg b/ui/org.eclipse.pde.ui/icons/etool16/newexp_wiz.svg
index 125b23f824d..6213f75fd79 100644
--- a/ui/org.eclipse.pde.ui/icons/etool16/newexp_wiz.svg
+++ b/ui/org.eclipse.pde.ui/icons/etool16/newexp_wiz.svg
@@ -2,20 +2,16 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="newexp_wiz.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
@@ -34,113 +30,6 @@
          style="stop-color:#809dcb;stop-opacity:0" />
     </linearGradient>
     <linearGradient
-       id="linearGradient10448-9-7-0-5">
-      <stop
-         style="stop-color:#cf9307;stop-opacity:1"
-         offset="0"
-         id="stop10450-3-5-6-7" />
-      <stop
-         id="stop10456-4-1-5-3"
-         offset="0.5"
-         style="stop-color:#f7d87b;stop-opacity:1" />
-      <stop
-         style="stop-color:#ebb313;stop-opacity:1"
-         offset="1"
-         id="stop10452-22-7-8-4" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10440-1-0-0-3">
-      <stop
-         style="stop-color:#ae7603;stop-opacity:1;"
-         offset="0"
-         id="stop10442-43-2-0-9" />
-      <stop
-         id="stop10521-1-2-5-3"
-         offset="0.5"
-         style="stop-color:#e8d8a3;stop-opacity:1" />
-      <stop
-         style="stop-color:#bb9221;stop-opacity:1"
-         offset="1"
-         id="stop10444-3-4-0-4" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10748-8">
-      <stop
-         id="stop10750-5"
-         offset="0"
-         style="stop-color:#ecac18;stop-opacity:1" />
-      <stop
-         style="stop-color:#f1ce66;stop-opacity:1"
-         offset="0.25"
-         id="stop10752-8" />
-      <stop
-         style="stop-color:#f6e5a6;stop-opacity:1"
-         offset="0.5"
-         id="stop10754-8" />
-      <stop
-         id="stop10756-4"
-         offset="0.75"
-         style="stop-color:#f1cf6c;stop-opacity:1" />
-      <stop
-         id="stop10758-7"
-         offset="1"
-         style="stop-color:#e5b630;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10440-1-3-4">
-      <stop
-         style="stop-color:#ae7603;stop-opacity:1;"
-         offset="0"
-         id="stop10442-43-0-5" />
-      <stop
-         id="stop10521-1-4-7"
-         offset="0.5"
-         style="stop-color:#e8d8a3;stop-opacity:1" />
-      <stop
-         style="stop-color:#bb9221;stop-opacity:1"
-         offset="1"
-         id="stop10444-3-2-0" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10448-90">
-      <stop
-         style="stop-color:#ecac18;stop-opacity:1"
-         offset="0"
-         id="stop10450-0" />
-      <stop
-         id="stop10458-2"
-         offset="0.25"
-         style="stop-color:#ffe38d;stop-opacity:1" />
-      <stop
-         id="stop10456-96"
-         offset="0.5"
-         style="stop-color:#fdf5d2;stop-opacity:1" />
-      <stop
-         style="stop-color:#ffeba7;stop-opacity:1"
-         offset="0.75"
-         id="stop10460-3" />
-      <stop
-         style="stop-color:#e5b630;stop-opacity:1"
-         offset="1"
-         id="stop10452-1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10440-18">
-      <stop
-         style="stop-color:#ae7603;stop-opacity:1;"
-         offset="0"
-         id="stop10442-8" />
-      <stop
-         id="stop10521-7"
-         offset="0.5"
-         style="stop-color:#e8d8a3;stop-opacity:1" />
-      <stop
-         style="stop-color:#bb9221;stop-opacity:1"
-         offset="1"
-         id="stop10444-0" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10414-9"
        id="linearGradient10782-3"
        gradientUnits="userSpaceOnUse"
@@ -165,7 +54,6 @@
          id="stop10418-4" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10432-3"
        id="linearGradient10784-2"
        gradientUnits="userSpaceOnUse"
@@ -190,7 +78,6 @@
          style="stop-color:#567ebc;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10157-6"
        id="linearGradient10786-1"
        gradientUnits="userSpaceOnUse"
@@ -215,22 +102,6 @@
          id="stop10161-55" />
     </linearGradient>
     <linearGradient
-       id="linearGradient10396-5">
-      <stop
-         style="stop-color:#1b3e79;stop-opacity:1;"
-         offset="0"
-         id="stop10398-7" />
-      <stop
-         id="stop10404-9"
-         offset="0.5"
-         style="stop-color:#728fbf;stop-opacity:1" />
-      <stop
-         style="stop-color:#1f4d9a;stop-opacity:1"
-         offset="1"
-         id="stop10400-9" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10157-2-5"
        id="linearGradient10790-8"
        gradientUnits="userSpaceOnUse"
@@ -255,7 +126,6 @@
          id="stop10161-5-0" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10149-39-0"
        id="linearGradient10792-6"
        gradientUnits="userSpaceOnUse"
@@ -265,7 +135,6 @@
        x2="322.875"
        y2="504.44818" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient10149-39-0">
       <stop
          style="stop-color:#1d4d9d;stop-opacity:1"
@@ -277,22 +146,6 @@
          id="stop10153-72-3" />
     </linearGradient>
     <linearGradient
-       id="linearGradient10149-6-5-4">
-      <stop
-         style="stop-color:#1f4d9a;stop-opacity:1"
-         offset="0"
-         id="stop10151-5-7-2" />
-      <stop
-         id="stop10394-3"
-         offset="0.5"
-         style="stop-color:#b9c7df;stop-opacity:1" />
-      <stop
-         style="stop-color:#567ebc;stop-opacity:1"
-         offset="1"
-         id="stop10153-8-1-2" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4284"
        id="linearGradient10790-8-2"
        gradientUnits="userSpaceOnUse"
@@ -302,7 +155,6 @@
        x2="305"
        y2="545.35248" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient6281-8-0-1-6"
        id="linearGradient3093-5-2-7-0-9"
        gradientUnits="userSpaceOnUse"
@@ -323,29 +175,6 @@
          style="stop-color:#ffd680;stop-opacity:1" />
     </linearGradient>
   </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="5.9867114"
-     inkscape:cy="3.3746791"
-     inkscape:document-units="px"
-     inkscape:current-layer="g4215"
-     showgrid="true"
-     inkscape:window-width="756"
-     inkscape:window-height="567"
-     inkscape:window-x="1373"
-     inkscape:window-y="949"
-     inkscape:window-maximized="0"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid4210" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -359,8 +188,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
@@ -425,9 +252,7 @@
       <path
          style="display:inline;fill:url(#linearGradient3093-5-2-7-0-9);fill-opacity:1;stroke:none"
          d="m 12.471186,1054.309 1.001133,0 0,1.946 1.986639,0 0,1.0167 -1.986639,0 0,2.043 -1.001133,0 0,-2.043 -1.98664,0 0,-1.0167 1.98664,0 z"
-         id="path5581-5-5"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccccccccccc" />
+         id="path5581-5-5" />
     </g>
   </g>
 </svg>
diff --git a/ui/org.eclipse.pde.ui/icons/etool16/newexpfile_wiz.svg b/ui/org.eclipse.pde.ui/icons/etool16/newexpfile_wiz.svg
index 2dbab2d7f56..fade6a85763 100644
--- a/ui/org.eclipse.pde.ui/icons/etool16/newexpfile_wiz.svg
+++ b/ui/org.eclipse.pde.ui/icons/etool16/newexpfile_wiz.svg
@@ -2,24 +2,19 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="newexpfile_wiz.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4902-3"
        id="linearGradient4908-2"
        x1="10.544736"
@@ -29,7 +24,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-2.009153,-2.0294106)" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4902-3">
       <stop
          style="stop-color:#b28a30;stop-opacity:1"
@@ -41,7 +35,6 @@
          id="stop4906-2" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4894-6"
        id="linearGradient4900-1"
        x1="7.9987183"
@@ -51,7 +44,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(1.990847,-2.0016824)" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4894-6">
       <stop
          style="stop-color:#e0c88f;stop-opacity:1"
@@ -63,7 +55,6 @@
          id="stop4898-5" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4994-6">
       <stop
          style="stop-color:#f9fafc;stop-opacity:1;"
@@ -82,27 +73,7 @@
        gradientUnits="userSpaceOnUse"
        id="linearGradient4101"
        xlink:href="#linearGradient4994-6"
-       inkscape:collect="always"
        gradientTransform="matrix(1,0,0,0.92284666,-2.009153,78.625371)" />
-    <linearGradient
-       id="linearGradient5103-3">
-      <stop
-         style="stop-color:#fefdef;stop-opacity:1"
-         offset="0"
-         id="stop5105-5" />
-      <stop
-         id="stop7550-07"
-         offset="0.26694915"
-         style="stop-color:#fef5d4;stop-opacity:1" />
-      <stop
-         id="stop7548-6"
-         offset="0.51694918"
-         style="stop-color:#fbe08e;stop-opacity:1" />
-      <stop
-         style="stop-color:#fbdd83;stop-opacity:1"
-         offset="1"
-         id="stop5107-7" />
-    </linearGradient>
     <linearGradient
        id="linearGradient4284">
       <stop
@@ -118,82 +89,6 @@
          offset="1"
          id="stop4290" />
     </linearGradient>
-    <linearGradient
-       id="linearGradient10448-9-7-0-5">
-      <stop
-         id="stop10450-3-5-6-7"
-         offset="0"
-         style="stop-color:#cf9307;stop-opacity:1" />
-      <stop
-         style="stop-color:#f7d87b;stop-opacity:1"
-         offset="0.5"
-         id="stop10456-4-1-5-3" />
-      <stop
-         id="stop10452-22-7-8-4"
-         offset="1"
-         style="stop-color:#ebb313;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10440-1-0-0-3">
-      <stop
-         id="stop10442-43-2-0-9"
-         offset="0"
-         style="stop-color:#ae7603;stop-opacity:1;" />
-      <stop
-         style="stop-color:#e8d8a3;stop-opacity:1"
-         offset="0.5"
-         id="stop10521-1-2-5-3" />
-      <stop
-         id="stop10444-3-4-0-4"
-         offset="1"
-         style="stop-color:#bb9221;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10748-8">
-      <stop
-         style="stop-color:#ecac18;stop-opacity:1"
-         offset="0"
-         id="stop10750-5" />
-      <stop
-         id="stop10752-8"
-         offset="0.25"
-         style="stop-color:#f1ce66;stop-opacity:1" />
-      <stop
-         id="stop10754-8"
-         offset="0.5"
-         style="stop-color:#f6e5a6;stop-opacity:1" />
-      <stop
-         style="stop-color:#f1cf6c;stop-opacity:1"
-         offset="0.75"
-         id="stop10756-4" />
-      <stop
-         style="stop-color:#e5b630;stop-opacity:1"
-         offset="1"
-         id="stop10758-7" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10448-90">
-      <stop
-         id="stop10450-0"
-         offset="0"
-         style="stop-color:#ecac18;stop-opacity:1" />
-      <stop
-         style="stop-color:#ffe38d;stop-opacity:1"
-         offset="0.25"
-         id="stop10458-2" />
-      <stop
-         style="stop-color:#fdf5d2;stop-opacity:1"
-         offset="0.5"
-         id="stop10456-96" />
-      <stop
-         id="stop10460-3"
-         offset="0.75"
-         style="stop-color:#ffeba7;stop-opacity:1" />
-      <stop
-         id="stop10452-1"
-         offset="1"
-         style="stop-color:#e5b630;stop-opacity:1" />
-    </linearGradient>
     <linearGradient
        gradientTransform="matrix(0.27903303,0,0,0.27903303,-74.403648,898.67348)"
        y2="519.08923"
@@ -202,8 +97,7 @@
        x1="298.34253"
        gradientUnits="userSpaceOnUse"
        id="linearGradient10782-3"
-       xlink:href="#linearGradient10414-9"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient10414-9" />
     <linearGradient
        id="linearGradient10414-9">
       <stop
@@ -227,8 +121,7 @@
        x1="289.8125"
        gradientUnits="userSpaceOnUse"
        id="linearGradient10784-2"
-       xlink:href="#linearGradient10432-3"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient10432-3" />
     <linearGradient
        id="linearGradient10432-3">
       <stop
@@ -252,8 +145,7 @@
        x1="306.05069"
        gradientUnits="userSpaceOnUse"
        id="linearGradient10786-1"
-       xlink:href="#linearGradient10157-6"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient10157-6" />
     <linearGradient
        id="linearGradient10157-6">
       <stop
@@ -269,21 +161,6 @@
          offset="1"
          style="stop-color:#809dcb;stop-opacity:1" />
     </linearGradient>
-    <linearGradient
-       id="linearGradient10396-5">
-      <stop
-         id="stop10398-7"
-         offset="0"
-         style="stop-color:#1b3e79;stop-opacity:1;" />
-      <stop
-         style="stop-color:#728fbf;stop-opacity:1"
-         offset="0.5"
-         id="stop10404-9" />
-      <stop
-         id="stop10400-9"
-         offset="1"
-         style="stop-color:#1f4d9a;stop-opacity:1" />
-    </linearGradient>
     <linearGradient
        y2="542.73901"
        x2="305"
@@ -292,8 +169,7 @@
        gradientTransform="matrix(0.27929794,0,0,0.27455303,-74.486897,901.10877)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient10790-8"
-       xlink:href="#linearGradient10157-6"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient10157-6" />
     <linearGradient
        y2="504.44818"
        x2="322.875"
@@ -302,11 +178,9 @@
        gradientTransform="matrix(0.27929794,0,0,0.27455303,-74.486897,901.10877)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient10792-6"
-       xlink:href="#linearGradient10149-39-0"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient10149-39-0" />
     <linearGradient
-       id="linearGradient10149-39-0"
-       inkscape:collect="always">
+       id="linearGradient10149-39-0">
       <stop
          id="stop10151-3-0"
          offset="0"
@@ -316,21 +190,6 @@
          offset="1"
          style="stop-color:#638ac8;stop-opacity:1" />
     </linearGradient>
-    <linearGradient
-       id="linearGradient10149-6-5-4">
-      <stop
-         id="stop10151-5-7-2"
-         offset="0"
-         style="stop-color:#1f4d9a;stop-opacity:1" />
-      <stop
-         style="stop-color:#b9c7df;stop-opacity:1"
-         offset="0.5"
-         id="stop10394-3" />
-      <stop
-         id="stop10153-8-1-2"
-         offset="1"
-         style="stop-color:#567ebc;stop-opacity:1" />
-    </linearGradient>
     <linearGradient
        y2="545.35248"
        x2="305"
@@ -339,8 +198,7 @@
        gradientTransform="matrix(0.09367554,0,0,0.16487513,-17.843873,957.45703)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient10790-8-2"
-       xlink:href="#linearGradient4284"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4284" />
     <linearGradient
        id="linearGradient6281-8-0-1-6">
       <stop
@@ -353,7 +211,6 @@
          id="stop6285-5-0-9-7" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient6281-8-0-1-6"
        id="linearGradient3093-5-2-7-0-9"
        gradientUnits="userSpaceOnUse"
@@ -363,31 +220,6 @@
        x2="0.9375"
        y2="7.549418" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="11.313709"
-     inkscape:cx="15.741755"
-     inkscape:cy="2.0877945"
-     inkscape:document-units="px"
-     inkscape:current-layer="g4215"
-     showgrid="true"
-     inkscape:window-width="849"
-     inkscape:window-height="643"
-     inkscape:window-x="945"
-     inkscape:window-y="753"
-     inkscape:window-maximized="0"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3999" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -401,32 +233,24 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
     <path
        style="display:inline;fill:url(#linearGradient4101);fill-opacity:1;stroke:none"
        d="m 3.4881295,1037.3727 7.0096695,0 3.062057,2.7746 0,9.1866 -10.0717265,0 z"
-       id="rect4001-3"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccc" />
+       id="rect4001-3" />
     <path
        style="display:inline;fill:url(#linearGradient4900-1);fill-opacity:1;stroke:none"
        d="m 9.967468,1036.4377 0,3.9112 3.977478,0 z"
-       id="path4884"
-       inkscape:connector-curvature="0" />
+       id="path4884" />
     <path
        style="display:inline;fill:none;stroke:url(#linearGradient4908-2);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1"
        d="m 3.4881295,1036.8727 6.9471695,0 3.062057,3.0066 0,9.9546 -10.0092265,0 z"
-       id="rect4001"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccc" />
+       id="rect4001" />
     <g
        style="display:inline"
        id="layer1-4"
-       inkscape:label="Layer 1"
        transform="translate(-1.9930853,-1.0598527)">
       <g
          transform="translate(-3.0052038,2.0329321)"
@@ -489,9 +313,7 @@
           <path
              style="display:inline;fill:url(#linearGradient3093-5-2-7-0-9);fill-opacity:1;stroke:none"
              d="m 12.471186,1054.309 1.001133,0 0,2.0007 1.986639,0 0,0.9933 -1.986639,0 0,2.0117 -1.001133,0 0,-2.0117 -1.98664,0 0,-0.9933 1.98664,0 z"
-             id="path5581-5-5"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccccccccccc" />
+             id="path5581-5-5" />
         </g>
       </g>
     </g>
diff --git a/ui/org.eclipse.pde.ui/icons/etool16/newexprj_wiz.svg b/ui/org.eclipse.pde.ui/icons/etool16/newexprj_wiz.svg
index d4f1264fda0..b15034225cd 100644
--- a/ui/org.eclipse.pde.ui/icons/etool16/newexprj_wiz.svg
+++ b/ui/org.eclipse.pde.ui/icons/etool16/newexprj_wiz.svg
@@ -2,24 +2,19 @@
 <!-- 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="16"
    height="16"
    id="svg25490"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="newexprj_wiz.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs25492">
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient11290"
        id="linearGradient8238"
        gradientUnits="userSpaceOnUse"
@@ -28,7 +23,6 @@
        x2="12.51806"
        y2="1044.4806" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient11290">
       <stop
          style="stop-color:#567ead;stop-opacity:1"
@@ -46,8 +40,7 @@
        x1="12.51806"
        gradientUnits="userSpaceOnUse"
        id="linearGradient25569"
-       xlink:href="#linearGradient11290"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient11290" />
     <linearGradient
        y2="1044.4806"
        x2="12.51806"
@@ -55,11 +48,9 @@
        x1="12.51806"
        gradientUnits="userSpaceOnUse"
        id="linearGradient25571"
-       xlink:href="#linearGradient11290"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient11290" />
     <linearGradient
        gradientTransform="translate(-3.8518331,-1.9404214)"
-       inkscape:collect="always"
        xlink:href="#linearGradient4994-6"
        id="linearGradient4101"
        gradientUnits="userSpaceOnUse"
@@ -68,8 +59,7 @@
        x2="9.8946028"
        y2="1051.8378" />
     <linearGradient
-       id="linearGradient4994-6"
-       inkscape:collect="always">
+       id="linearGradient4994-6">
       <stop
          id="stop4996-1"
          offset="0"
@@ -80,8 +70,7 @@
          style="stop-color:#dce7f7;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       id="linearGradient4894-6"
-       inkscape:collect="always">
+       id="linearGradient4894-6">
       <stop
          id="stop4896-8"
          offset="0"
@@ -99,11 +88,9 @@
        y1="1042.2307"
        x1="7.9987183"
        id="linearGradient4900-1"
-       xlink:href="#linearGradient4894-6"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4894-6" />
     <linearGradient
-       id="linearGradient4902-3"
-       inkscape:collect="always">
+       id="linearGradient4902-3">
       <stop
          id="stop4904-2"
          offset="0"
@@ -121,10 +108,8 @@
        y1="1045.1774"
        x1="15.025873"
        id="linearGradient4908-2"
-       xlink:href="#linearGradient4902-3"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4902-3" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient6281-8-0-1-6"
        id="linearGradient3093-5-2-7-0-9"
        gradientUnits="userSpaceOnUse"
@@ -160,113 +145,6 @@
          style="stop-color:#ebb313;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       id="linearGradient10748-8">
-      <stop
-         style="stop-color:#ecac18;stop-opacity:1"
-         offset="0"
-         id="stop10750-5" />
-      <stop
-         id="stop10752-8"
-         offset="0.25"
-         style="stop-color:#f1ce66;stop-opacity:1" />
-      <stop
-         id="stop10754-8"
-         offset="0.5"
-         style="stop-color:#f6e5a6;stop-opacity:1" />
-      <stop
-         style="stop-color:#f1cf6c;stop-opacity:1"
-         offset="0.75"
-         id="stop10756-4" />
-      <stop
-         style="stop-color:#e5b630;stop-opacity:1"
-         offset="1"
-         id="stop10758-7" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10448-90">
-      <stop
-         id="stop10450-0"
-         offset="0"
-         style="stop-color:#ecac18;stop-opacity:1" />
-      <stop
-         style="stop-color:#ffe38d;stop-opacity:1"
-         offset="0.25"
-         id="stop10458-2" />
-      <stop
-         style="stop-color:#fdf5d2;stop-opacity:1"
-         offset="0.5"
-         id="stop10456-96" />
-      <stop
-         id="stop10460-3"
-         offset="0.75"
-         style="stop-color:#ffeba7;stop-opacity:1" />
-      <stop
-         id="stop10452-1"
-         offset="1"
-         style="stop-color:#e5b630;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10414-9">
-      <stop
-         id="stop10416-3"
-         offset="0"
-         style="stop-color:#5078b9;stop-opacity:1;" />
-      <stop
-         style="stop-color:#6d8cbd;stop-opacity:1"
-         offset="0.5"
-         id="stop10422-8" />
-      <stop
-         id="stop10418-4"
-         offset="1"
-         style="stop-color:#5f88c9;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10432-3">
-      <stop
-         style="stop-color:#1f4d9a;stop-opacity:1"
-         offset="0"
-         id="stop10434-4" />
-      <stop
-         id="stop10436-2"
-         offset="0.5"
-         style="stop-color:#4e6da1;stop-opacity:1" />
-      <stop
-         style="stop-color:#567ebc;stop-opacity:1"
-         offset="1"
-         id="stop10438-9" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10157-6">
-      <stop
-         id="stop10159-5"
-         offset="0"
-         style="stop-color:#6588c1;stop-opacity:1" />
-      <stop
-         style="stop-color:#becce3;stop-opacity:1"
-         offset="0.5"
-         id="stop10165-9" />
-      <stop
-         id="stop10161-55"
-         offset="1"
-         style="stop-color:#809dcb;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4284">
-      <stop
-         style="stop-color:#6588c1;stop-opacity:0"
-         offset="0"
-         id="stop4286" />
-      <stop
-         id="stop4288"
-         offset="0.49999967"
-         style="stop-color:#becce3;stop-opacity:1" />
-      <stop
-         style="stop-color:#809dcb;stop-opacity:0"
-         offset="1"
-         id="stop4290" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10448-9-7-0-5"
        id="linearGradient4424"
        gradientUnits="userSpaceOnUse"
@@ -276,7 +154,6 @@
        x2="323.98331"
        y2="518.28192" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10748-8-5"
        id="linearGradient4426"
        gradientUnits="userSpaceOnUse"
@@ -309,7 +186,6 @@
          style="stop-color:#e5b630;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10448-90-9"
        id="linearGradient4428"
        gradientUnits="userSpaceOnUse"
@@ -342,7 +218,6 @@
          id="stop10452-1-6" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4322"
        id="linearGradient4328"
        x1="10.003791"
@@ -352,7 +227,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(14.996209,-0.985039)" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4322">
       <stop
          style="stop-color:#a0b5d7;stop-opacity:1"
@@ -376,7 +250,6 @@
          id="stop4326" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4285"
        id="linearGradient4291"
        x1="11.923064"
@@ -386,7 +259,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(14.668084,-11.177808)" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4285">
       <stop
          style="stop-color:#a0b5d7;stop-opacity:1"
@@ -410,7 +282,6 @@
          id="stop4289" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4295"
        id="linearGradient4301"
        x1="13.425666"
@@ -420,7 +291,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(14.668084,-11.177808)" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4295">
       <stop
          style="stop-color:#7da0d5;stop-opacity:1"
@@ -432,33 +302,6 @@
          id="stop4299" />
     </linearGradient>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="2"
-     inkscape:cx="8.6028716"
-     inkscape:cy="7.5725979"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:snap-global="false"
-     inkscape:window-width="1199"
-     inkscape:window-height="704"
-     inkscape:window-x="889"
-     inkscape:window-y="832"
-     inkscape:window-maximized="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid26727"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
   <metadata
      id="metadata25495">
     <rdf:RDF>
@@ -472,15 +315,12 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      transform="translate(0,-1036.3622)">
     <g
        transform="translate(324.0078,-599.7683)"
        style="stroke:url(#linearGradient8238);stroke-opacity:1;display:inline"
-       id="layer1-2"
-       inkscape:label="Layer 1">
+       id="layer1-2">
       <g
          id="g11331-3-1-1-7"
          style="stroke:url(#linearGradient25569);display:inline"
@@ -504,7 +344,6 @@
           <g
              style="font-size:13.58917427px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#236298;fill-opacity:1;stroke:#236298;stroke-width:0.24860173;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline;font-family:Sans"
              id="layer1-9"
-             inkscape:label="Layer 1"
              transform="matrix(1.2778996,0,0.03747938,1.2778996,-58.56426,-297.79529)">
             <g
                transform="translate(20,0)"
@@ -513,28 +352,22 @@
               <g
                  transform="matrix(0.84893168,0,-0.02489823,0.84893168,-258.1493,627.19515)"
                  style="display:inline"
-                 id="layer1-95"
-                 inkscape:label="Layer 1">
+                 id="layer1-95">
                 <g
                    id="g4186"
                    transform="matrix(0,1,-1,0,1050.4513,1039.1256)">
                   <path
                      style="display:inline;fill:url(#linearGradient4101);fill-opacity:1;stroke:none"
                      d="m 2.3787264,1036.9635 6.2763925,0 3.0620571,3.0066 0,8.7325 -9.3384496,0 z"
-                     id="rect4001-3"
-                     inkscape:connector-curvature="0"
-                     sodipodi:nodetypes="cccccc" />
+                     id="rect4001-3" />
                   <path
                      style="display:inline;fill:#feec43;stroke:url(#linearGradient4908-2);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;fill-opacity:1"
                      d="m 2.3787264,1036.9635 6.2763925,0 3.0620571,3.0066 0,8.8139 -9.3384496,0 z"
-                     id="rect4001"
-                     inkscape:connector-curvature="0"
-                     sodipodi:nodetypes="cccccc" />
+                     id="rect4001" />
                   <path
                      style="display:inline;fill:url(#linearGradient4900-1);fill-opacity:1;stroke:none"
                      d="m 8.6543768,1036.2564 0,3.626 3.6108392,0 z"
-                     id="path4884"
-                     inkscape:connector-curvature="0" />
+                     id="path4884" />
                 </g>
                 <g
                    id="g4920"
@@ -560,25 +393,19 @@
          ry="0"
          transform="translate(20.125466,13.034661)" />
       <path
-         sodipodi:nodetypes="ccccc"
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ba9726;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
          d="m 10.665872,1046.3536 0,1 3.34593,0 0,-1 z"
          id="path4313-8-8-5"
-         inkscape:connector-curvature="0"
          transform="translate(20.125466,13.034661)" />
       <path
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.94926554px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
          d="m 10.999243,1046.3478 0,3.0195 1.01551,0 0,-3.0195 z"
          id="path4313-8-8-7-4"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc"
          transform="translate(20.125466,13.034661)" />
       <path
-         sodipodi:nodetypes="ccccc"
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ba9726;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
          d="m 14.005886,1048.3497 -3.35564,0.031 0.0098,1 3.355639,-0.031 z"
          id="path4313-5-1-8-9"
-         inkscape:connector-curvature="0"
          transform="translate(20.125466,13.034661)" />
       <rect
          style="display:inline;fill:url(#linearGradient4426);fill-opacity:1;stroke:none;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
@@ -594,13 +421,11 @@
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ba9726;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
          d="m 11.023293,1049.3595 -3.3593746,0.031 0.00977,1 3.3593746,-0.031 -0.0098,-1 z"
          id="path4313-5-1-2"
-         inkscape:connector-curvature="0"
          transform="translate(20.125466,13.034661)" />
       <path
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ba9726;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
          d="m 11.013528,1045.3517 -3.3593752,0.031 0.00977,1 3.3593742,-0.031 -0.0098,-1 z"
          id="path4313-8-0"
-         inkscape:connector-curvature="0"
          transform="translate(20.125466,13.034661)" />
       <rect
          style="display:inline;fill:url(#linearGradient4428);fill-opacity:1;stroke:none;stroke-width:1.50161433;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
@@ -616,38 +441,28 @@
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
          d="m 9.013528,1044.3497 -3.3593752,0.031 0.00977,1 3.3593742,-0.031 -0.0098,-1 z"
          id="path4313-54"
-         inkscape:connector-curvature="0"
          transform="translate(20.125466,13.034661)" />
       <path
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#9e7400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
          d="m 9.019387,1050.3497 -3.3593749,0.031 0.00977,1 3.3593749,-0.031 -0.0098,-1 z"
          id="path4313-5-0"
-         inkscape:connector-curvature="0"
          transform="translate(20.125466,13.034661)" />
       <path
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:0.64640886;fill-rule:evenodd;stroke:none;stroke-width:0.97351193px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
          d="m 9.021063,1046.3531 0,3.01 1.000277,0 0,-3.01 z"
          id="path4313-8-8-7-8-1"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc"
          transform="translate(20.125466,13.034661)" />
       <g
          id="g4294">
         <path
-           sodipodi:nodetypes="cccc"
-           inkscape:connector-curvature="0"
            id="rect4317-3"
            d="m 20.151278,1061.8671 5.39483,0 0,-1.9999 -5.39483,0"
            style="display:inline;opacity:1;fill:#93acd2;fill-opacity:1;stroke:#7698cf;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
         <path
-           sodipodi:nodetypes="cccc"
-           inkscape:connector-curvature="0"
            id="path4303"
            d="m 24,1058.9107 2.53125,0 0,3.9871 -2.532198,0"
            style="fill:url(#linearGradient4328);fill-opacity:1;fill-rule:evenodd;stroke:#698dc5;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
         <path
-           sodipodi:nodetypes="cscssccc"
-           inkscape:connector-curvature="0"
            id="path4274"
            d="m 25.5625,1060.3052 0,-2.1494 c 0,-0.4714 1.0625,-1.2031 1.0625,-1.2031 0,0 0.96875,0.4413 0.96875,0.8906 l 0,5.9219 c 0,0.5045 -1.070312,1.0547 -1.070312,1.0547 0,0 -1.039063,-0.5336 -1.039063,-1.0234 l 0,-2.4808"
            style="fill:url(#linearGradient4291);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4301);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
@@ -668,9 +483,7 @@
       <path
          style="display:inline;fill:url(#linearGradient3093-5-2-7-0-9);fill-opacity:1;stroke:none"
          d="m 12.471186,1054.309 1.001133,0 0,1.9791 1.986639,0 0,0.9836 -1.986639,0 0,2.043 -1.001133,0 0,-2.043 -1.98664,0 0,-0.9836 1.98664,0 z"
-         id="path5581-5-5"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccccccccccc" />
+         id="path5581-5-5" />
     </g>
   </g>
 </svg>
diff --git a/ui/org.eclipse.pde.ui/icons/etool16/newfprj_wiz.svg b/ui/org.eclipse.pde.ui/icons/etool16/newfprj_wiz.svg
index fb6132ea57c..efa8d67d3c9 100644
--- a/ui/org.eclipse.pde.ui/icons/etool16/newfprj_wiz.svg
+++ b/ui/org.eclipse.pde.ui/icons/etool16/newfprj_wiz.svg
@@ -2,20 +2,16 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r"
-   sodipodi:docname="newfprj_wiz.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
@@ -34,7 +30,6 @@
          style="stop-color:#763db7;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10448-9-7-0-5"
        id="linearGradient10770-6"
        gradientUnits="userSpaceOnUse"
@@ -59,22 +54,6 @@
          id="stop10452-22-7-8-4" />
     </linearGradient>
     <linearGradient
-       id="linearGradient10440-1-0-0-3">
-      <stop
-         style="stop-color:#ae7603;stop-opacity:1;"
-         offset="0"
-         id="stop10442-43-2-0-9" />
-      <stop
-         id="stop10521-1-2-5-3"
-         offset="0.5"
-         style="stop-color:#e8d8a3;stop-opacity:1" />
-      <stop
-         style="stop-color:#bb9221;stop-opacity:1"
-         offset="1"
-         id="stop10444-3-4-0-4" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10748-8"
        id="linearGradient10774-5"
        gradientUnits="userSpaceOnUse"
@@ -107,22 +86,6 @@
          style="stop-color:#e5b630;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       id="linearGradient10440-1-3-4">
-      <stop
-         style="stop-color:#ae7603;stop-opacity:1;"
-         offset="0"
-         id="stop10442-43-0-5" />
-      <stop
-         id="stop10521-1-4-7"
-         offset="0.5"
-         style="stop-color:#e8d8a3;stop-opacity:1" />
-      <stop
-         style="stop-color:#bb9221;stop-opacity:1"
-         offset="1"
-         id="stop10444-3-2-0" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10448-90"
        id="linearGradient10778-6"
        gradientUnits="userSpaceOnUse"
@@ -155,52 +118,6 @@
          id="stop10452-1" />
     </linearGradient>
     <linearGradient
-       id="linearGradient10440-18">
-      <stop
-         style="stop-color:#ae7603;stop-opacity:1;"
-         offset="0"
-         id="stop10442-8" />
-      <stop
-         id="stop10521-7"
-         offset="0.5"
-         style="stop-color:#e8d8a3;stop-opacity:1" />
-      <stop
-         style="stop-color:#bb9221;stop-opacity:1"
-         offset="1"
-         id="stop10444-0" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10414-9">
-      <stop
-         style="stop-color:#5078b9;stop-opacity:1;"
-         offset="0"
-         id="stop10416-3" />
-      <stop
-         id="stop10422-8"
-         offset="0.5"
-         style="stop-color:#6d8cbd;stop-opacity:1" />
-      <stop
-         style="stop-color:#5f88c9;stop-opacity:1"
-         offset="1"
-         id="stop10418-4" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10432-3">
-      <stop
-         id="stop10434-4"
-         offset="0"
-         style="stop-color:#1f4d9a;stop-opacity:1" />
-      <stop
-         style="stop-color:#4e6da1;stop-opacity:1"
-         offset="0.5"
-         id="stop10436-2" />
-      <stop
-         id="stop10438-9"
-         offset="1"
-         style="stop-color:#567ebc;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10157-6"
        id="linearGradient10786-1"
        gradientUnits="userSpaceOnUse"
@@ -225,22 +142,6 @@
          id="stop10161-55" />
     </linearGradient>
     <linearGradient
-       id="linearGradient10396-5">
-      <stop
-         style="stop-color:#1b3e79;stop-opacity:1;"
-         offset="0"
-         id="stop10398-7" />
-      <stop
-         id="stop10404-9"
-         offset="0.5"
-         style="stop-color:#728fbf;stop-opacity:1" />
-      <stop
-         style="stop-color:#1f4d9a;stop-opacity:1"
-         offset="1"
-         id="stop10400-9" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10157-2-5"
        id="linearGradient10790-8"
        gradientUnits="userSpaceOnUse"
@@ -265,7 +166,6 @@
          id="stop10161-5-0" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10149-39-0"
        id="linearGradient10792-6"
        gradientUnits="userSpaceOnUse"
@@ -275,7 +175,6 @@
        x2="322.875"
        y2="504.44818" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient10149-39-0">
       <stop
          style="stop-color:#6936ae;stop-opacity:1"
@@ -287,22 +186,6 @@
          id="stop10153-72-3" />
     </linearGradient>
     <linearGradient
-       id="linearGradient10149-6-5-4">
-      <stop
-         style="stop-color:#1f4d9a;stop-opacity:1"
-         offset="0"
-         id="stop10151-5-7-2" />
-      <stop
-         id="stop10394-3"
-         offset="0.5"
-         style="stop-color:#b9c7df;stop-opacity:1" />
-      <stop
-         style="stop-color:#567ebc;stop-opacity:1"
-         offset="1"
-         id="stop10153-8-1-2" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4284"
        id="linearGradient10790-8-2"
        gradientUnits="userSpaceOnUse"
@@ -312,7 +195,6 @@
        x2="305"
        y2="545.35248" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient6281-8-0-1-6"
        id="linearGradient3093-5-2-7-0-9"
        gradientUnits="userSpaceOnUse"
@@ -333,29 +215,6 @@
          style="stop-color:#ffd680;stop-opacity:1" />
     </linearGradient>
   </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="9.4465354"
-     inkscape:cy="5.7573355"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="795"
-     inkscape:window-height="445"
-     inkscape:window-x="1582"
-     inkscape:window-y="1081"
-     inkscape:window-maximized="0"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid4210" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -369,8 +228,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
@@ -387,18 +244,14 @@
          id="rect10007-0-74-2-7-6"
          style="fill:url(#linearGradient10770-6);fill-opacity:1;stroke:none;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
       <path
-         inkscape:connector-curvature="0"
          id="path4313-8-8"
          d="m 12.648438,1043.3652 0,1 3.351562,0 0,-1 -3.351562,0 z"
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
       <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
          id="path4313-8-8-7"
          d="m 12.981809,1043.3594 0,3.0195 1.01551,0 0,-3.0195 z"
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.94926554px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
       <path
-         inkscape:connector-curvature="0"
          id="path4313-5-1-8"
          d="m 15.992188,1045.3613 -3.359376,0.031 0.0098,1 3.359375,-0.031 -0.0098,-1 z"
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#9e7400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
@@ -412,12 +265,10 @@
          id="rect10007-0-74-2-7"
          style="fill:url(#linearGradient10774-5);fill-opacity:1;stroke:none;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
       <path
-         inkscape:connector-curvature="0"
          id="path4313-5-1"
          d="m 13.005859,1046.3711 -3.3593746,0.031 0.00977,1 3.3593746,-0.031 -0.0098,-1 z"
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#9e7400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
       <path
-         inkscape:connector-curvature="0"
          id="path4313-8"
          d="m 11.991204,1043.3634 -2.3544852,0.028 0.00685,0.9091 2.3544842,-0.028 -0.0069,-0.909 z"
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
@@ -458,18 +309,14 @@
          id="rect10007-0-74"
          style="fill:url(#linearGradient10786-1);fill-opacity:1;stroke:none;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
       <path
-         inkscape:connector-curvature="0"
          id="path4313"
          d="m 11.042833,1043.3647 -3.4061142,0.029 0.00991,0.9204 3.4061132,-0.028 -0.0099,-0.9205 z"
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
       <path
-         inkscape:connector-curvature="0"
          id="path4313-5"
          d="m 11.001953,1047.3613 -3.3593749,0.031 0.00977,1 3.3593749,-0.031 -0.0098,-1 z"
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#9e7400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
       <path
-         sodipodi:nodetypes="cssssc"
-         inkscape:connector-curvature="0"
          id="rect10007-6"
          d="m 6.4755132,1043.9833 c 1.0259795,0 2.0241511,-0.1891 2.0241511,0.834 l 0,3.5451 c 0,0.8271 -0.6658339,1.4929 -1.4929011,1.4929 -0.8270672,0 -1.4929011,-0.6658 -1.4929011,-1.4929 l 0,-3.5537"
          style="fill:url(#linearGradient10790-8);fill-opacity:1;stroke:url(#linearGradient10792-6);stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
@@ -481,14 +328,10 @@
          id="rect10007-6-6"
          style="display:inline;fill:url(#linearGradient10790-8-2);fill-opacity:1;stroke:none;stroke-width:3.58380508;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
       <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
          id="path4313-8-8-7-8"
          d="m 11.003629,1043.3647 0,3.01 1.000277,0 0,-3.01 z"
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:0.64640886;fill-rule:evenodd;stroke:none;stroke-width:0.97351193px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
       <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
          id="path4313-8-8-7-5"
          d="m 11.992245,1042.3524 0,1.0351 1.01551,0 0,-1.0351 z"
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.94926554px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
@@ -512,9 +355,7 @@
         <path
            style="display:inline;fill:url(#linearGradient3093-5-2-7-0-9);fill-opacity:1;stroke:none"
            d="m 12.471186,1054.309 1.001133,0 0,1.946 1.986639,0 0,1.0167 -1.986639,0 0,2.043 -1.001133,0 0,-2.043 -1.98664,0 0,-1.0167 1.98664,0 z"
-           id="path5581-5-5"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccccccccccc" />
+           id="path5581-5-5" />
       </g>
     </g>
   </g>
diff --git a/ui/org.eclipse.pde.ui/icons/etool16/newftrprj_wiz.svg b/ui/org.eclipse.pde.ui/icons/etool16/newftrprj_wiz.svg
index 9e1da36a764..3852d1261dc 100644
--- a/ui/org.eclipse.pde.ui/icons/etool16/newftrprj_wiz.svg
+++ b/ui/org.eclipse.pde.ui/icons/etool16/newftrprj_wiz.svg
@@ -2,25 +2,20 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="newftrprj_wiz.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient3973"
-       inkscape:collect="always">
+       id="linearGradient3973">
       <stop
          id="stop3975"
          offset="0"
@@ -31,8 +26,7 @@
          style="stop-color:#f8f0c8;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       id="linearGradient3967"
-       inkscape:collect="always">
+       id="linearGradient3967">
       <stop
          id="stop3969"
          offset="0"
@@ -66,7 +60,6 @@
          style="stop-color:#ba772f;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3949">
       <stop
          style="stop-color:#9e6627;stop-opacity:1"
@@ -78,7 +71,6 @@
          id="stop3953" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient3967"
        id="linearGradient3939"
        gradientUnits="userSpaceOnUse"
@@ -88,7 +80,6 @@
        x2="531.09253"
        y2="371.17883" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient3955"
        id="linearGradient3945"
        gradientUnits="userSpaceOnUse"
@@ -97,18 +88,7 @@
        x2="543.91406"
        y2="373.2294"
        gradientTransform="translate(-60.558598,1.4188)" />
-    <mask
-       maskUnits="userSpaceOnUse"
-       id="mask4917">
-      <path
-         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;display:inline"
-         d="m 462.77563,373.22885 29.11636,0 c 1.45425,0 2.625,1.17075 2.625,2.625 l 0,18.76896 c 0,1.45425 -1.17412,2.52598 -2.625,2.625 l -29.11636,1.98708 c -1.45088,0.099 -2.625,-1.17075 -2.625,-2.625 l 0,-20.75604 c 0,-1.45425 1.17075,-2.625 2.625,-2.625 z"
-         id="path4919"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="sssssssss" />
-    </mask>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient3973"
        id="linearGradient4933"
        gradientUnits="userSpaceOnUse"
@@ -118,7 +98,6 @@
        x2="538.00562"
        y2="374.21222" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient3949"
        id="linearGradient4935"
        gradientUnits="userSpaceOnUse"
@@ -128,7 +107,6 @@
        x2="548.45923"
        y2="373.77069" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4284"
        id="linearGradient10790-8-2"
        gradientUnits="userSpaceOnUse"
@@ -153,7 +131,6 @@
          style="stop-color:#809dcb;stop-opacity:0" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10157-2-5"
        id="linearGradient10790-8"
        gradientUnits="userSpaceOnUse"
@@ -178,7 +155,6 @@
          id="stop10161-5-0" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10149-39-0"
        id="linearGradient10792-6"
        gradientUnits="userSpaceOnUse"
@@ -188,7 +164,6 @@
        x2="322.875"
        y2="504.44818" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient10149-39-0">
       <stop
          style="stop-color:#1d4d9d;stop-opacity:1"
@@ -200,7 +175,6 @@
          id="stop10153-72-3" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10157-2-5"
        id="linearGradient10786-1"
        gradientUnits="userSpaceOnUse"
@@ -210,7 +184,6 @@
        y2="514.75818"
        gradientTransform="matrix(1.0391435,0,0,0.5924666,202.46608,49.82119)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10414-9"
        id="linearGradient10782-3"
        gradientUnits="userSpaceOnUse"
@@ -235,7 +208,6 @@
          id="stop10418-4" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10432-3"
        id="linearGradient10784-2"
        gradientUnits="userSpaceOnUse"
@@ -260,7 +232,6 @@
          style="stop-color:#567ebc;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10448-90"
        id="linearGradient10778-6"
        gradientUnits="userSpaceOnUse"
@@ -293,7 +264,6 @@
          id="stop10452-1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10748-8"
        id="linearGradient10774-5"
        gradientUnits="userSpaceOnUse"
@@ -326,7 +296,6 @@
          style="stop-color:#e5b630;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10448-9-7-0-5"
        id="linearGradient10770-6"
        gradientUnits="userSpaceOnUse"
@@ -351,7 +320,6 @@
          id="stop10452-22-7-8-4" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient6281-8-0-1-6"
        id="linearGradient3093-5-2-7-0-9"
        gradientUnits="userSpaceOnUse"
@@ -372,29 +340,6 @@
          style="stop-color:#ffd680;stop-opacity:1" />
     </linearGradient>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="11.313709"
-     inkscape:cx="5.1528137"
-     inkscape:cy="7.6970246"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="845"
-     inkscape:window-height="546"
-     inkscape:window-x="1416"
-     inkscape:window-y="980"
-     inkscape:window-maximized="0"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3947" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -408,8 +353,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
@@ -432,14 +375,11 @@
         <path
            style="fill:url(#linearGradient4933);fill-opacity:1;stroke:url(#linearGradient4935);stroke-width:3.02792978;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
            d="m 463.24874,374.64819 28.07551,0 c 1.45425,0 2.625,1.17075 2.625,2.625 l 0,11.29376 c 0,1.45425 -1.22088,2.24642 -2.625,2.625 l -28.07551,7.56983 c -1.40411,0.37858 -2.625,-1.17075 -2.625,-2.625 l 0,-18.86359 c 0,-1.45425 1.17075,-2.625 2.625,-2.625 z"
-           id="rect13693"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="sssssssss" />
+           id="rect13693" />
         <path
            style="fill:none;stroke:url(#linearGradient3945);stroke-width:3.02792978;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
            d="m 462.26171,374.64819 20.09375,0"
-           id="path13797"
-           inkscape:connector-curvature="0" />
+           id="path13797" />
       </g>
       <g
          id="g4301"
@@ -454,18 +394,14 @@
            id="rect10007-0-74-2-7-6"
            style="display:inline;fill:url(#linearGradient10770-6);fill-opacity:1;stroke:none;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
         <path
-           inkscape:connector-curvature="0"
            id="path4313-8-8"
            d="m 548.23888,354.95116 0,3.5838 12.01134,0 0,-3.5838 -12.01134,0 z"
            style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
         <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
            id="path4313-8-8-7"
            d="m 549.43361,354.93037 0,10.8213 3.63939,0 0,-10.8213 z"
            style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.94926554px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
         <path
-           inkscape:connector-curvature="0"
            id="path4313-5-1-8"
            d="m 560.22222,362.10479 -12.03934,0.1111 0.0351,3.58381 12.03934,-0.1111 -0.0351,-3.58381 z"
            style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#9e7400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
@@ -479,12 +415,10 @@
            id="rect10007-0-74-2-7"
            style="display:inline;fill:url(#linearGradient10774-5);fill-opacity:1;stroke:none;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
         <path
-           inkscape:connector-curvature="0"
            id="path4313-5-1"
            d="m 549.5198,365.72372 -12.03934,0.1111 0.035,3.5838 12.03935,-0.1111 -0.0351,-3.5838 z"
            style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#9e7400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
         <path
-           inkscape:connector-curvature="0"
            id="path4313-8"
            d="m 549.48481,351.36054 -12.03935,0.1111 0.035,3.58381 12.03935,-0.1111 -0.0351,-3.58381 z"
            style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
@@ -525,12 +459,10 @@
            id="rect10007-0-74"
            style="display:inline;fill:url(#linearGradient10786-1);fill-opacity:1;stroke:none;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
         <path
-           inkscape:connector-curvature="0"
            id="path4313"
            d="m 542.3172,347.76957 -12.03935,0.1111 0.035,3.5838 12.03935,-0.11109 -0.0351,-3.58381 z"
            style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
         <path
-           inkscape:connector-curvature="0"
            id="path4313-5"
            d="m 542.33819,369.2724 -12.03934,0.1111 0.035,3.58381 12.03935,-0.1111 -0.0351,-3.58381 z"
            style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#9e7400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
@@ -551,8 +483,6 @@
            id="rect10007-6-6"
            style="display:inline;fill:url(#linearGradient10790-8-2);fill-opacity:1;stroke:none;stroke-width:3.58380508;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
         <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
            id="path4313-8-8-7-8"
            d="m 542.3442,354.94937 0,10.78725 3.5848,0 0,-10.78725 z"
            style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:0.64640886;fill-rule:evenodd;stroke:none;stroke-width:0.97351193px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
@@ -572,9 +502,7 @@
         <path
            style="display:inline;fill:url(#linearGradient3093-5-2-7-0-9);fill-opacity:1;stroke:none"
            d="m 12.471186,1054.309 1.001133,0 0,2.0007 1.986639,0 0,0.962 -1.986639,0 0,2.043 -1.001133,0 0,-2.043 -1.98664,0 0,-0.962 1.98664,0 z"
-           id="path5581-5-5"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccccccccccc" />
+           id="path5581-5-5" />
       </g>
     </g>
   </g>
diff --git a/ui/org.eclipse.pde.ui/icons/etool16/newpprj_wiz.svg b/ui/org.eclipse.pde.ui/icons/etool16/newpprj_wiz.svg
index ca85564a463..07dc70af51a 100644
--- a/ui/org.eclipse.pde.ui/icons/etool16/newpprj_wiz.svg
+++ b/ui/org.eclipse.pde.ui/icons/etool16/newpprj_wiz.svg
@@ -2,24 +2,19 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="newpprj_wiz.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4394">
       <stop
          style="stop-color:#ffffff;stop-opacity:1;"
@@ -30,21 +25,6 @@
          offset="1"
          id="stop4398" />
     </linearGradient>
-    <linearGradient
-       id="linearGradient4284">
-      <stop
-         id="stop4286"
-         offset="0"
-         style="stop-color:#6588c1;stop-opacity:0" />
-      <stop
-         style="stop-color:#becce3;stop-opacity:1"
-         offset="0.49999967"
-         id="stop4288" />
-      <stop
-         id="stop4290"
-         offset="1"
-         style="stop-color:#809dcb;stop-opacity:0" />
-    </linearGradient>
     <linearGradient
        id="linearGradient10448-9-7-0-5">
       <stop
@@ -61,208 +41,6 @@
          id="stop10452-22-7-8-4" />
     </linearGradient>
     <linearGradient
-       id="linearGradient10440-1-0-0-3">
-      <stop
-         style="stop-color:#ae7603;stop-opacity:1;"
-         offset="0"
-         id="stop10442-43-2-0-9" />
-      <stop
-         id="stop10521-1-2-5-3"
-         offset="0.5"
-         style="stop-color:#e8d8a3;stop-opacity:1" />
-      <stop
-         style="stop-color:#bb9221;stop-opacity:1"
-         offset="1"
-         id="stop10444-3-4-0-4" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10748-8">
-      <stop
-         id="stop10750-5"
-         offset="0"
-         style="stop-color:#ecac18;stop-opacity:1" />
-      <stop
-         style="stop-color:#f1ce66;stop-opacity:1"
-         offset="0.25"
-         id="stop10752-8" />
-      <stop
-         style="stop-color:#f6e5a6;stop-opacity:1"
-         offset="0.5"
-         id="stop10754-8" />
-      <stop
-         id="stop10756-4"
-         offset="0.75"
-         style="stop-color:#f1cf6c;stop-opacity:1" />
-      <stop
-         id="stop10758-7"
-         offset="1"
-         style="stop-color:#e5b630;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10440-1-3-4">
-      <stop
-         style="stop-color:#ae7603;stop-opacity:1;"
-         offset="0"
-         id="stop10442-43-0-5" />
-      <stop
-         id="stop10521-1-4-7"
-         offset="0.5"
-         style="stop-color:#e8d8a3;stop-opacity:1" />
-      <stop
-         style="stop-color:#bb9221;stop-opacity:1"
-         offset="1"
-         id="stop10444-3-2-0" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10448-90">
-      <stop
-         style="stop-color:#ecac18;stop-opacity:1"
-         offset="0"
-         id="stop10450-0" />
-      <stop
-         id="stop10458-2"
-         offset="0.25"
-         style="stop-color:#ffe38d;stop-opacity:1" />
-      <stop
-         id="stop10456-96"
-         offset="0.5"
-         style="stop-color:#fdf5d2;stop-opacity:1" />
-      <stop
-         style="stop-color:#ffeba7;stop-opacity:1"
-         offset="0.75"
-         id="stop10460-3" />
-      <stop
-         style="stop-color:#e5b630;stop-opacity:1"
-         offset="1"
-         id="stop10452-1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10440-18">
-      <stop
-         style="stop-color:#ae7603;stop-opacity:1;"
-         offset="0"
-         id="stop10442-8" />
-      <stop
-         id="stop10521-7"
-         offset="0.5"
-         style="stop-color:#e8d8a3;stop-opacity:1" />
-      <stop
-         style="stop-color:#bb9221;stop-opacity:1"
-         offset="1"
-         id="stop10444-0" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10414-9">
-      <stop
-         style="stop-color:#5078b9;stop-opacity:1;"
-         offset="0"
-         id="stop10416-3" />
-      <stop
-         id="stop10422-8"
-         offset="0.5"
-         style="stop-color:#6d8cbd;stop-opacity:1" />
-      <stop
-         style="stop-color:#5f88c9;stop-opacity:1"
-         offset="1"
-         id="stop10418-4" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10432-3">
-      <stop
-         id="stop10434-4"
-         offset="0"
-         style="stop-color:#1f4d9a;stop-opacity:1" />
-      <stop
-         style="stop-color:#4e6da1;stop-opacity:1"
-         offset="0.5"
-         id="stop10436-2" />
-      <stop
-         id="stop10438-9"
-         offset="1"
-         style="stop-color:#567ebc;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10157-6">
-      <stop
-         style="stop-color:#6588c1;stop-opacity:1"
-         offset="0"
-         id="stop10159-5" />
-      <stop
-         id="stop10165-9"
-         offset="0.5"
-         style="stop-color:#becce3;stop-opacity:1" />
-      <stop
-         style="stop-color:#809dcb;stop-opacity:1"
-         offset="1"
-         id="stop10161-55" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10396-5">
-      <stop
-         style="stop-color:#1b3e79;stop-opacity:1;"
-         offset="0"
-         id="stop10398-7" />
-      <stop
-         id="stop10404-9"
-         offset="0.5"
-         style="stop-color:#728fbf;stop-opacity:1" />
-      <stop
-         style="stop-color:#1f4d9a;stop-opacity:1"
-         offset="1"
-         id="stop10400-9" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10157-2-5">
-      <stop
-         style="stop-color:#6588c1;stop-opacity:1"
-         offset="0"
-         id="stop10159-8-3" />
-      <stop
-         id="stop10165-3-9"
-         offset="0.5"
-         style="stop-color:#becce3;stop-opacity:1" />
-      <stop
-         style="stop-color:#809dcb;stop-opacity:1"
-         offset="1"
-         id="stop10161-5-0" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10149-6-5-4">
-      <stop
-         style="stop-color:#1f4d9a;stop-opacity:1"
-         offset="0"
-         id="stop10151-5-7-2" />
-      <stop
-         id="stop10394-3"
-         offset="0.5"
-         style="stop-color:#b9c7df;stop-opacity:1" />
-      <stop
-         style="stop-color:#567ebc;stop-opacity:1"
-         offset="1"
-         id="stop10153-8-1-2" />
-    </linearGradient>
-    <linearGradient
-       gradientTransform="translate(-4.8923401,-0.9816688)"
-       gradientUnits="userSpaceOnUse"
-       y2="1039.3397"
-       x2="8.3145638"
-       y1="1040.4003"
-       x1="8.3145638"
-       id="linearGradient4212"
-       xlink:href="#linearGradient4158" />
-    <linearGradient
-       id="linearGradient4158">
-      <stop
-         id="stop4160"
-         offset="0"
-         style="stop-color:#fdae35;stop-opacity:1;" />
-      <stop
-         id="stop4162"
-         offset="1"
-         style="stop-color:#fef0db;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient6281-8-0-1-6"
        id="linearGradient3093-5-2-7-0-9"
        gradientUnits="userSpaceOnUse"
@@ -283,8 +61,7 @@
          id="stop6285-5-0-9-7" />
     </linearGradient>
     <linearGradient
-       id="linearGradient4772"
-       inkscape:collect="always">
+       id="linearGradient4772">
       <stop
          id="stop4774"
          offset="0"
@@ -310,8 +87,7 @@
          style="stop-color:#8591c8;stop-opacity:0" />
     </linearGradient>
     <linearGradient
-       id="linearGradient4762"
-       inkscape:collect="always">
+       id="linearGradient4762">
       <stop
          id="stop4764"
          offset="0"
@@ -322,7 +98,6 @@
          style="stop-color:#b0dffc;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3967">
       <stop
          style="stop-color:#84909f;stop-opacity:1"
@@ -364,14 +139,11 @@
        gradientTransform="translate(-58.381352,-1.4843182)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient3939"
-       xlink:href="#linearGradient3967"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient3967" />
     <mask
        id="mask4917"
        maskUnits="userSpaceOnUse">
       <path
-         sodipodi:nodetypes="sssssssss"
-         inkscape:connector-curvature="0"
          id="path4919"
          d="m 462.77563,373.22885 29.11636,0 c 1.45425,0 2.625,1.17075 2.625,2.625 l 0,18.76896 c 0,1.45425 -1.17412,2.52598 -2.625,2.625 l -29.11636,1.98708 c -1.45088,0.099 -2.625,-1.17075 -2.625,-2.625 l 0,-20.75604 c 0,-1.45425 1.17075,-2.625 2.625,-2.625 z"
          style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;display:inline" />
@@ -384,8 +156,7 @@
        y1="356.2869"
        x1="392.46814"
        id="linearGradient4779"
-       xlink:href="#linearGradient4772"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4772" />
     <linearGradient
        y2="373.77069"
        x2="548.45923"
@@ -394,8 +165,7 @@
        gradientTransform="matrix(1.0790773,0,0,0.99598149,-101.72166,1.5483971)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient5950"
-       xlink:href="#linearGradient4830"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4830" />
     <linearGradient
        y2="373.2294"
        x2="543.91406"
@@ -404,8 +174,7 @@
        gradientTransform="matrix(1.0790773,0,0,0.99598149,-101.72167,1.54839)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient5952"
-       xlink:href="#linearGradient3955"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient3955" />
     <linearGradient
        y2="374.21222"
        x2="538.00562"
@@ -414,10 +183,8 @@
        gradientTransform="matrix(1.0790773,0,0,0.99598149,-101.72167,1.54839)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient5954"
-       xlink:href="#linearGradient4762"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4762" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10448-9-7-0-5"
        id="linearGradient4424"
        gradientUnits="userSpaceOnUse"
@@ -427,7 +194,6 @@
        x2="323.98331"
        y2="518.28192" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10748-8-5"
        id="linearGradient4426"
        gradientUnits="userSpaceOnUse"
@@ -460,7 +226,6 @@
          style="stop-color:#e5b630;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10448-90-9"
        id="linearGradient4428"
        gradientUnits="userSpaceOnUse"
@@ -493,7 +258,6 @@
          id="stop10452-1-6" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4322"
        id="linearGradient4328"
        x1="10.003791"
@@ -503,7 +267,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(0.95839666,0,0,1.0032135,15.489075,-4.3974502)" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4322">
       <stop
          style="stop-color:#a0b5d7;stop-opacity:1"
@@ -527,7 +290,6 @@
          id="stop4326" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4285"
        id="linearGradient4291"
        x1="11.923064"
@@ -537,7 +299,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(14.668084,-11.177808)" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4285">
       <stop
          style="stop-color:#a0b5d7;stop-opacity:1"
@@ -561,7 +322,6 @@
          id="stop4289" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4295"
        id="linearGradient4301"
        x1="13.425666"
@@ -571,7 +331,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(14.668084,-11.177808)" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4295">
       <stop
          style="stop-color:#7da0d5;stop-opacity:1"
@@ -583,7 +342,6 @@
          id="stop4299" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4394"
        id="linearGradient4400"
        x1="458.7642"
@@ -593,29 +351,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(0,1.1354737)" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="8"
-     inkscape:cx="9.9805674"
-     inkscape:cy="11.346689"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="1071"
-     inkscape:window-height="705"
-     inkscape:window-x="1092"
-     inkscape:window-y="702"
-     inkscape:window-maximized="0"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid4210" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -629,15 +364,12 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
     <g
        style="display:inline"
        id="layer1-7"
-       inkscape:label="Layer 1"
        transform="translate(1.0196132,1.9946217)">
       <g
          id="g13862"
@@ -663,14 +395,10 @@
              id="rect13693-3"
              style="display:inline;fill:#fdf7eb;fill-opacity:1;stroke:url(#linearGradient3939);stroke-width:3.02792978;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
           <path
-             sodipodi:nodetypes="sssssssss"
-             inkscape:connector-curvature="0"
              id="rect13693"
              d="m 463.57404,371.54479 30.26361,0 c 1.56924,0 2.83257,1.16604 2.83257,2.61445 l 0,18.9046 c 0,1.44841 -1.26341,2.63029 -2.83257,2.61445 l -30.26361,-0.30559 c -1.56917,-0.0159 -2.83258,-1.16605 -2.83258,-2.61446 l 0,-18.599 c 0,-1.44841 1.26333,-2.61445 2.83258,-2.61445 z"
              style="fill:url(#linearGradient5954);fill-opacity:1;stroke:#757c8a;stroke-width:3.13904619;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
           <path
-             sodipodi:nodetypes="cc"
-             inkscape:connector-curvature="0"
              id="path13797"
              d="m 463.01947,371.54533 21.10512,0"
              style="fill:none;stroke:url(#linearGradient5952);stroke-width:3.13904619;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
@@ -678,16 +406,13 @@
              mask="url(#mask4917)"
              id="g4914" />
           <path
-             sodipodi:nodetypes="cssssssssc"
-             inkscape:connector-curvature="0"
              id="rect13693-8"
              d="m 463.57404,371.54479 30.26361,0 c 1.56925,0 2.83257,1.16604 2.83257,2.61445 l 0,18.69324 c 0,1.44841 -1.26332,2.61934 -2.83257,2.61446 l -30.26361,-0.0942 c -1.56925,-0.005 -2.83258,-1.16605 -2.83258,-2.61446 l 0,-18.599 c 0,-1.44841 1.26333,-2.61445 2.83258,-2.61445 z"
              style="display:inline;fill:none;stroke:url(#linearGradient5950);stroke-width:3.13904619;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
           <path
              style="opacity:0.61600001;fill:url(#linearGradient4400);fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:3.02792978px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
              d="m 460.51871,388.1964 6.05586,0 0,-2.4602 3.01435,-0.80769 1.90604,-2.97722 3.78491,-2.83868 3.21718,1.70321 2.64944,1.51396 3.21717,0.56774 0.18925,1.32472 5.86661,0.94623 0.73503,2.74315 3.42838,0 0,5.96214 -34.25346,0 z"
-             id="path4388"
-             inkscape:connector-curvature="0" />
+             id="path4388" />
         </g>
       </g>
     </g>
@@ -706,9 +431,7 @@
       <path
          style="display:inline;fill:url(#linearGradient3093-5-2-7-0-9);fill-opacity:1;stroke:none"
          d="m 12.471186,1054.309 1.001133,0 0,1.9736 1.986639,0 0,0.9891 -1.986639,0 0,2.0157 -1.001133,0 0,-2.0157 -1.98664,0 0,-0.9891 1.98664,0 z"
-         id="path5581-5-5"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccccccccccc" />
+         id="path5581-5-5" />
     </g>
     <g
        transform="translate(-19.159806,-13.022553)"
@@ -725,25 +448,19 @@
          ry="0"
          transform="translate(20.125466,13.034661)" />
       <path
-         sodipodi:nodetypes="ccccc"
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ba9726;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
          d="m 10.665872,1046.3536 0,1 4.376395,0 0,-1 z"
          id="path4313-8-8-5"
-         inkscape:connector-curvature="0"
          transform="translate(20.125466,13.034661)" />
       <path
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.94926554px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
          d="m 10.999243,1046.3478 0,3.0195 1.01551,0 0,-3.0195 z"
          id="path4313-8-8-7-4"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc"
          transform="translate(20.125466,13.034661)" />
       <path
-         sodipodi:nodetypes="ccccc"
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ba9726;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
          d="m 15.029879,1048.3497 -4.379633,0.031 0.0098,1 4.379632,-0.031 z"
          id="path4313-5-1-8-9"
-         inkscape:connector-curvature="0"
          transform="translate(20.125466,13.034661)" />
       <rect
          style="display:inline;fill:url(#linearGradient4426);fill-opacity:1;stroke:none;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
@@ -759,13 +476,11 @@
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ba9726;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
          d="m 11.023293,1049.3595 -3.3593746,0.031 0.00977,1 3.3593746,-0.031 -0.0098,-1 z"
          id="path4313-5-1-2"
-         inkscape:connector-curvature="0"
          transform="translate(20.125466,13.034661)" />
       <path
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ba9726;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
          d="m 11.013528,1045.3517 -3.3593752,0.031 0.00977,1 3.3593742,-0.031 -0.0098,-1 z"
          id="path4313-8-0"
-         inkscape:connector-curvature="0"
          transform="translate(20.125466,13.034661)" />
       <rect
          style="display:inline;fill:url(#linearGradient4428);fill-opacity:1;stroke:none;stroke-width:1.50161433;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
@@ -781,39 +496,29 @@
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
          d="m 9.013528,1044.3497 -3.3593752,0.031 0.00977,1 3.3593742,-0.031 -0.0098,-1 z"
          id="path4313-54"
-         inkscape:connector-curvature="0"
          transform="translate(20.125466,13.034661)" />
       <path
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#9e7400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
          d="m 9.019387,1050.3497 -3.3593749,0.031 0.00977,1 3.3593749,-0.031 -0.0098,-1 z"
          id="path4313-5-0"
-         inkscape:connector-curvature="0"
          transform="translate(20.125466,13.034661)" />
       <path
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:0.64640886;fill-rule:evenodd;stroke:none;stroke-width:0.97351193px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
          d="m 9.021063,1046.3531 0,3.01 1.000277,0 0,-3.01 z"
          id="path4313-8-8-7-8-1"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc"
          transform="translate(20.125466,13.034661)" />
       <g
          id="g4294"
          transform="translate(-0.04419418,0)">
         <path
-           sodipodi:nodetypes="cccc"
-           inkscape:connector-curvature="0"
            id="rect4317-3"
            d="m 20.151278,1061.8671 5.39483,0 0,-1.9999 -5.39483,0"
            style="display:inline;opacity:1;fill:#93acd2;fill-opacity:1;stroke:#7698cf;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
         <path
-           sodipodi:nodetypes="cccc"
-           inkscape:connector-curvature="0"
            id="path4303"
            d="m 24.118278,1058.9043 2.425942,0 0,3.9999 -2.42685,0"
            style="fill:url(#linearGradient4328);fill-opacity:1;fill-rule:evenodd;stroke:#698dc5;stroke-width:0.9805491px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
         <path
-           sodipodi:nodetypes="cscssccc"
-           inkscape:connector-curvature="0"
            id="path4274"
            d="m 25.5625,1060.3052 0,-2.1494 c 0,-0.4714 1.0625,-1.2031 1.0625,-1.2031 0,0 0.96875,0.4413 0.96875,0.8906 l 0,5.9219 c 0,0.5045 -1.070312,1.0547 -1.070312,1.0547 0,0 -1.039063,-0.5336 -1.039063,-1.0234 l 0,-2.4808"
            style="fill:url(#linearGradient4291);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4301);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
diff --git a/ui/org.eclipse.pde.ui/icons/etool16/newsiteprj_wiz.svg b/ui/org.eclipse.pde.ui/icons/etool16/newsiteprj_wiz.svg
index 14de6c4e5b2..9e8511465f5 100644
--- a/ui/org.eclipse.pde.ui/icons/etool16/newsiteprj_wiz.svg
+++ b/ui/org.eclipse.pde.ui/icons/etool16/newsiteprj_wiz.svg
@@ -2,178 +2,19 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r"
-   sodipodi:docname="newsiteprj_wiz.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient3955">
-      <stop
-         id="stop3957"
-         offset="0"
-         style="stop-color:#c38536;stop-opacity:1" />
-      <stop
-         style="stop-color:#f2dc91;stop-opacity:1"
-         offset="0.15381166"
-         id="stop3959" />
-      <stop
-         style="stop-color:#fbdc8b;stop-opacity:1"
-         offset="0.5"
-         id="stop3961" />
-      <stop
-         id="stop3963"
-         offset="0.75"
-         style="stop-color:#e6bd7a;stop-opacity:1" />
-      <stop
-         id="stop3965"
-         offset="1"
-         style="stop-color:#ba772f;stop-opacity:1" />
-    </linearGradient>
-    <mask
-       maskUnits="userSpaceOnUse"
-       id="mask4917">
-      <path
-         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;display:inline"
-         d="m 462.77563,373.22885 29.11636,0 c 1.45425,0 2.625,1.17075 2.625,2.625 l 0,18.76896 c 0,1.45425 -1.17412,2.52598 -2.625,2.625 l -29.11636,1.98708 c -1.45088,0.099 -2.625,-1.17075 -2.625,-2.625 l 0,-20.75604 c 0,-1.45425 1.17075,-2.625 2.625,-2.625 z"
-         id="path4919"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="sssssssss" />
-    </mask>
-    <linearGradient
-       id="linearGradient4284">
-      <stop
-         id="stop4286"
-         offset="0"
-         style="stop-color:#6588c1;stop-opacity:0" />
-      <stop
-         style="stop-color:#becce3;stop-opacity:1"
-         offset="0.49999967"
-         id="stop4288" />
-      <stop
-         id="stop4290"
-         offset="1"
-         style="stop-color:#809dcb;stop-opacity:0" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10157-2-5">
-      <stop
-         style="stop-color:#6588c1;stop-opacity:1"
-         offset="0"
-         id="stop10159-8-3" />
-      <stop
-         id="stop10165-3-9"
-         offset="0.5"
-         style="stop-color:#becce3;stop-opacity:1" />
-      <stop
-         style="stop-color:#809dcb;stop-opacity:1"
-         offset="1"
-         id="stop10161-5-0" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10414-9">
-      <stop
-         style="stop-color:#5078b9;stop-opacity:1;"
-         offset="0"
-         id="stop10416-3" />
-      <stop
-         id="stop10422-8"
-         offset="0.5"
-         style="stop-color:#6d8cbd;stop-opacity:1" />
-      <stop
-         style="stop-color:#5f88c9;stop-opacity:1"
-         offset="1"
-         id="stop10418-4" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10432-3">
-      <stop
-         id="stop10434-4"
-         offset="0"
-         style="stop-color:#1f4d9a;stop-opacity:1" />
-      <stop
-         style="stop-color:#4e6da1;stop-opacity:1"
-         offset="0.5"
-         id="stop10436-2" />
-      <stop
-         id="stop10438-9"
-         offset="1"
-         style="stop-color:#567ebc;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10448-90">
-      <stop
-         style="stop-color:#ecac18;stop-opacity:1"
-         offset="0"
-         id="stop10450-0" />
-      <stop
-         id="stop10458-2"
-         offset="0.25"
-         style="stop-color:#ffe38d;stop-opacity:1" />
-      <stop
-         id="stop10456-96"
-         offset="0.5"
-         style="stop-color:#fdf5d2;stop-opacity:1" />
-      <stop
-         style="stop-color:#ffeba7;stop-opacity:1"
-         offset="0.75"
-         id="stop10460-3" />
-      <stop
-         style="stop-color:#e5b630;stop-opacity:1"
-         offset="1"
-         id="stop10452-1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10748-8">
-      <stop
-         id="stop10750-5"
-         offset="0"
-         style="stop-color:#ecac18;stop-opacity:1" />
-      <stop
-         style="stop-color:#f1ce66;stop-opacity:1"
-         offset="0.25"
-         id="stop10752-8" />
-      <stop
-         style="stop-color:#f6e5a6;stop-opacity:1"
-         offset="0.5"
-         id="stop10754-8" />
-      <stop
-         id="stop10756-4"
-         offset="0.75"
-         style="stop-color:#f1cf6c;stop-opacity:1" />
-      <stop
-         id="stop10758-7"
-         offset="1"
-         style="stop-color:#e5b630;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10448-9-7-0-5">
-      <stop
-         style="stop-color:#cf9307;stop-opacity:1"
-         offset="0"
-         id="stop10450-3-5-6-7" />
-      <stop
-         id="stop10456-4-1-5-3"
-         offset="0.5"
-         style="stop-color:#f7d87b;stop-opacity:1" />
-      <stop
-         style="stop-color:#ebb313;stop-opacity:1"
-         offset="1"
-         id="stop10452-22-7-8-4" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient6281-8-0-1-6"
        id="linearGradient3093-5-2-7-0-9"
        gradientUnits="userSpaceOnUse"
@@ -194,7 +35,6 @@
          style="stop-color:#ffd680;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4204"
        id="linearGradient4210"
        x1="-708.08484"
@@ -204,7 +44,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(0.26814319,16.7129)" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4204">
       <stop
          style="stop-color:#8e6aae;stop-opacity:1"
@@ -216,7 +55,6 @@
          id="stop4208" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4229"
        id="linearGradient4235"
        x1="44.955429"
@@ -225,7 +63,6 @@
        y2="1042.4124"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4229">
       <stop
          style="stop-color:#713e9d;stop-opacity:1;"
@@ -237,7 +74,6 @@
          id="stop4233" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4276"
        id="linearGradient4235-4"
        x1="44.955429"
@@ -247,8 +83,7 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(-1,0,0,1,83.988875,0)" />
     <linearGradient
-       id="linearGradient4276"
-       inkscape:collect="always">
+       id="linearGradient4276">
       <stop
          id="stop4278"
          offset="0"
@@ -267,29 +102,6 @@
          style="stop-color:#ffffff;stop-opacity:1" />
     </linearGradient>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="11.313709"
-     inkscape:cx="3.0533215"
-     inkscape:cy="7.4251432"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="846"
-     inkscape:window-height="452"
-     inkscape:window-x="1016"
-     inkscape:window-y="1060"
-     inkscape:window-maximized="0"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3947" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -303,8 +115,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
@@ -327,9 +137,7 @@
         <path
            style="display:inline;fill:url(#linearGradient3093-5-2-7-0-9);fill-opacity:1;stroke:none"
            d="m 12.471186,1054.309 1.001133,0 0,1.946 1.986639,0 0,1.0167 -1.986639,0 0,2.043 -1.001133,0 0,-2.043 -1.98664,0 0,-1.0167 1.98664,0 z"
-           id="path5581-5-5"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccccccccccc" />
+           id="path5581-5-5" />
       </g>
     </g>
     <g
@@ -347,26 +155,18 @@
          id="rect3394"
          style="opacity:1;fill:#f2aaf1;fill-opacity:1;stroke:url(#linearGradient4210);stroke-width:1;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
       <path
-         sodipodi:nodetypes="cccc"
-         inkscape:connector-curvature="0"
          id="path4212"
          d="m 46.545386,1043.3647 -4.540397,4.6029 -0.0095,-4.5977 z"
          style="fill:#8861aa;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
       <path
-         sodipodi:nodetypes="cccc"
-         inkscape:connector-curvature="0"
          id="path4212-4"
          d="m 46.545386,1043.3659 -4.540397,-4.6029 -0.0095,4.5977 z"
          style="display:inline;fill:url(#linearGradient4235);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
       <path
-         sodipodi:nodetypes="cccc"
-         inkscape:connector-curvature="0"
          id="path4212-9"
          d="m 37.44617,1043.3647 4.540397,4.6029 0.0095,-4.5977 z"
          style="display:inline;fill:#ad86cf;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
       <path
-         sodipodi:nodetypes="cccc"
-         inkscape:connector-curvature="0"
          id="path4212-4-2"
          d="m 37.443489,1043.3659 4.540397,-4.6029 0.0095,4.5977 z"
          style="display:inline;fill:url(#linearGradient4235-4);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
diff --git a/ui/org.eclipse.pde.ui/icons/etool16/prd_config_wiz.svg b/ui/org.eclipse.pde.ui/icons/etool16/prd_config_wiz.svg
index c1d4747f5a8..3ef1cf9fc2f 100644
--- a/ui/org.eclipse.pde.ui/icons/etool16/prd_config_wiz.svg
+++ b/ui/org.eclipse.pde.ui/icons/etool16/prd_config_wiz.svg
@@ -2,24 +2,19 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="prd_config_wiz.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4902-3"
        id="linearGradient4908-2"
        x1="10.544736"
@@ -29,7 +24,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(0.99084683,-1.0294106)" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4902-3">
       <stop
          style="stop-color:#b28a30;stop-opacity:1"
@@ -41,7 +35,6 @@
          id="stop4906-2" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4894-6"
        id="linearGradient4900-1"
        x1="7.9987183"
@@ -51,7 +44,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(4.1783469,-1.0606606)" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4894-6">
       <stop
          style="stop-color:#e0c88f;stop-opacity:1"
@@ -63,7 +55,6 @@
          id="stop4898-5" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4994-6">
       <stop
          style="stop-color:#f9fafc;stop-opacity:1;"
@@ -82,29 +73,8 @@
        gradientUnits="userSpaceOnUse"
        id="linearGradient4101"
        xlink:href="#linearGradient4994-6"
-       inkscape:collect="always"
        gradientTransform="translate(0.83459682,-1.0294106)" />
     <linearGradient
-       id="linearGradient5103-3">
-      <stop
-         style="stop-color:#fefdef;stop-opacity:1"
-         offset="0"
-         id="stop5105-5" />
-      <stop
-         id="stop7550-07"
-         offset="0.26694915"
-         style="stop-color:#fef5d4;stop-opacity:1" />
-      <stop
-         id="stop7548-6"
-         offset="0.51694918"
-         style="stop-color:#fbe08e;stop-opacity:1" />
-      <stop
-         style="stop-color:#fbdd83;stop-opacity:1"
-         offset="1"
-         id="stop5107-7" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        id="linearGradient8287-7-5-4">
       <stop
          style="stop-color:#6eb6e2;stop-opacity:1;"
@@ -116,22 +86,6 @@
          id="stop8291-0-7-3" />
     </linearGradient>
     <linearGradient
-       id="linearGradient4082-3-4-1-2">
-      <stop
-         style="stop-color:#4476aa;stop-opacity:1"
-         offset="0"
-         id="stop4084-8-8-5-1" />
-      <stop
-         id="stop4864-7-8-2-6"
-         offset="0.5"
-         style="stop-color:#5a9ccc;stop-opacity:1" />
-      <stop
-         style="stop-color:#4476aa;stop-opacity:1"
-         offset="1"
-         id="stop4086-2-2-7-8" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient8287-7-5-4"
        id="linearGradient8293"
        x1="-16.963362"
@@ -141,7 +95,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-1.4448902,16.475551)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4994-4-5"
        id="linearGradient8881"
        gradientUnits="userSpaceOnUse"
@@ -151,8 +104,7 @@
        x2="-11"
        y2="1044.3622" />
     <linearGradient
-       id="linearGradient4994-4-5"
-       inkscape:collect="always">
+       id="linearGradient4994-4-5">
       <stop
          id="stop4996-5-9"
          offset="0"
@@ -163,7 +115,6 @@
          style="stop-color:#ffffff;stop-opacity:0;" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4910-4-0"
        id="linearGradient8884"
        gradientUnits="userSpaceOnUse"
@@ -173,7 +124,6 @@
        x2="-15"
        y2="1047.3622" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4910-4-0">
       <stop
          style="stop-color:#ffffff;stop-opacity:0"
@@ -185,7 +135,6 @@
          id="stop4914-8-1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4810-5"
        id="linearGradient8887"
        gradientUnits="userSpaceOnUse"
@@ -195,8 +144,7 @@
        x2="8.0137892"
        y2="1050.0707" />
     <linearGradient
-       id="linearGradient4810-5"
-       inkscape:collect="always">
+       id="linearGradient4810-5">
       <stop
          id="stop4812-0"
          offset="0"
@@ -207,7 +155,6 @@
          style="stop-color:#615941;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient6281-8-0-1-6"
        id="linearGradient3093-5-2-7-0-9"
        gradientUnits="userSpaceOnUse"
@@ -228,31 +175,6 @@
          style="stop-color:#ffd680;stop-opacity:1" />
     </linearGradient>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="8"
-     inkscape:cx="-10.954627"
-     inkscape:cy="12.34853"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1058"
-     inkscape:window-height="551"
-     inkscape:window-x="839"
-     inkscape:window-y="907"
-     inkscape:window-maximized="0"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3999" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -266,28 +188,21 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
     <path
        style="display:inline;fill:url(#linearGradient4101);fill-opacity:1;stroke:none"
        d="m 6.3318793,1037.8727 7.0096697,0 2.374557,3.0066 0,9.9546 -9.3842267,0 z"
-       id="rect4001-3"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccc" />
+       id="rect4001-3" />
     <path
        style="display:inline;fill:url(#linearGradient4900-1);fill-opacity:1;stroke:none"
        d="m 12.154968,1037.3788 0,3.9112 3.977478,0 z"
-       id="path4884"
-       inkscape:connector-curvature="0" />
+       id="path4884" />
     <path
        style="display:inline;fill:none;stroke:url(#linearGradient4908-2);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1"
        d="m 6.4881293,1037.8727 6.0632867,0 3.062057,3.0066 0,9.9546 -9.1253437,0 z"
-       id="rect4001"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccc" />
+       id="rect4001" />
     <g
        id="g4291"
        transform="translate(0.48973663,-0.33746842)">
@@ -295,42 +210,30 @@
          id="g4305"
          transform="translate(20.999999,-11.874999)">
         <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
            id="rect3997-9"
            d="m -19.005997,1054.4036 9.9813967,0 0,8.7015 -9.9813967,0 z"
            style="display:inline;fill:#f4fcff;fill-opacity:1;stroke:url(#linearGradient8887);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1" />
         <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
            id="rect4853-82-7"
            d="m -17.499146,1057.5796 0,5.0164 -1,0 0,-6.0164 z"
            style="display:inline;fill:url(#linearGradient8884);fill-opacity:1;stroke:none" />
         <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
            id="rect4853-82-0"
            d="m -17.530396,1057.6734 7.986294,0 0,-1 -8.986294,0 z"
            style="display:inline;fill:url(#linearGradient8881);fill-opacity:1;stroke:none" />
         <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
            id="rect3997-9-9"
            d="m -18.979953,1054.1029 9.9889988,0 0,1.9946 -9.9889988,0 z"
            style="display:inline;fill:url(#linearGradient8293);fill-opacity:1;stroke:#315b91;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1" />
         <path
-           inkscape:connector-curvature="0"
            id="path4299"
            d="m -14.982613,1056.6621 0,5.9687"
-           style="fill:#a79d79;fill-opacity:1;fill-rule:evenodd;stroke:#a79d79;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-           sodipodi:nodetypes="cc" />
+           style="fill:#a79d79;fill-opacity:1;fill-rule:evenodd;stroke:#a79d79;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
         <path
-           inkscape:connector-curvature="0"
            id="path4301"
            d="m -14.982613,1059.1309 5.5312495,0"
            style="fill:#a79d79;fill-opacity:1;fill-rule:evenodd;stroke:#a79d79;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
         <path
-           inkscape:connector-curvature="0"
            id="path4303"
            d="m -14.982613,1060.1309 -3.53125,0"
            style="fill:#a79d79;fill-opacity:1;fill-rule:evenodd;stroke:#a79d79;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
@@ -351,9 +254,7 @@
       <path
          style="display:inline;fill:url(#linearGradient3093-5-2-7-0-9);fill-opacity:1;stroke:none"
          d="m 12.471186,1054.309 1.001133,0 0,1.9902 1.986639,0 0,0.9959 -1.986639,0 0,2.0196 -1.001133,0 0,-2.0196 -1.98664,0 0,-0.9959 1.98664,0 z"
-         id="path5581-5-5"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccccccccccc" />
+         id="path5581-5-5" />
     </g>
   </g>
 </svg>
diff --git a/ui/org.eclipse.pde.ui/icons/etool16/script_wiz.svg b/ui/org.eclipse.pde.ui/icons/etool16/script_wiz.svg
index 9ecceafd643..d4dab6062e3 100644
--- a/ui/org.eclipse.pde.ui/icons/etool16/script_wiz.svg
+++ b/ui/org.eclipse.pde.ui/icons/etool16/script_wiz.svg
@@ -2,24 +2,19 @@
 <!-- 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="16"
    height="16"
    id="svg25490"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="script_wiz.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs25492">
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient6281-8-0-1-6"
        id="linearGradient3093-5-2-7-0-9"
        gradientUnits="userSpaceOnUse"
@@ -40,128 +35,6 @@
          id="stop6285-5-0-9-7" />
     </linearGradient>
     <linearGradient
-       id="linearGradient10448-9-7-0-5">
-      <stop
-         id="stop10450-3-5-6-7"
-         offset="0"
-         style="stop-color:#cf9307;stop-opacity:1" />
-      <stop
-         style="stop-color:#f7d87b;stop-opacity:1"
-         offset="0.5"
-         id="stop10456-4-1-5-3" />
-      <stop
-         id="stop10452-22-7-8-4"
-         offset="1"
-         style="stop-color:#ebb313;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10748-8">
-      <stop
-         style="stop-color:#ecac18;stop-opacity:1"
-         offset="0"
-         id="stop10750-5" />
-      <stop
-         id="stop10752-8"
-         offset="0.25"
-         style="stop-color:#f1ce66;stop-opacity:1" />
-      <stop
-         id="stop10754-8"
-         offset="0.5"
-         style="stop-color:#f6e5a6;stop-opacity:1" />
-      <stop
-         style="stop-color:#f1cf6c;stop-opacity:1"
-         offset="0.75"
-         id="stop10756-4" />
-      <stop
-         style="stop-color:#e5b630;stop-opacity:1"
-         offset="1"
-         id="stop10758-7" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10448-90">
-      <stop
-         id="stop10450-0"
-         offset="0"
-         style="stop-color:#ecac18;stop-opacity:1" />
-      <stop
-         style="stop-color:#ffe38d;stop-opacity:1"
-         offset="0.25"
-         id="stop10458-2" />
-      <stop
-         style="stop-color:#fdf5d2;stop-opacity:1"
-         offset="0.5"
-         id="stop10456-96" />
-      <stop
-         id="stop10460-3"
-         offset="0.75"
-         style="stop-color:#ffeba7;stop-opacity:1" />
-      <stop
-         id="stop10452-1"
-         offset="1"
-         style="stop-color:#e5b630;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10414-9">
-      <stop
-         id="stop10416-3"
-         offset="0"
-         style="stop-color:#5078b9;stop-opacity:1;" />
-      <stop
-         style="stop-color:#6d8cbd;stop-opacity:1"
-         offset="0.5"
-         id="stop10422-8" />
-      <stop
-         id="stop10418-4"
-         offset="1"
-         style="stop-color:#5f88c9;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10432-3">
-      <stop
-         style="stop-color:#1f4d9a;stop-opacity:1"
-         offset="0"
-         id="stop10434-4" />
-      <stop
-         id="stop10436-2"
-         offset="0.5"
-         style="stop-color:#4e6da1;stop-opacity:1" />
-      <stop
-         style="stop-color:#567ebc;stop-opacity:1"
-         offset="1"
-         id="stop10438-9" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10157-6">
-      <stop
-         id="stop10159-5"
-         offset="0"
-         style="stop-color:#6588c1;stop-opacity:1" />
-      <stop
-         style="stop-color:#becce3;stop-opacity:1"
-         offset="0.5"
-         id="stop10165-9" />
-      <stop
-         id="stop10161-55"
-         offset="1"
-         style="stop-color:#809dcb;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4284">
-      <stop
-         style="stop-color:#6588c1;stop-opacity:0"
-         offset="0"
-         id="stop4286" />
-      <stop
-         id="stop4288"
-         offset="0.49999967"
-         style="stop-color:#becce3;stop-opacity:1" />
-      <stop
-         style="stop-color:#809dcb;stop-opacity:0"
-         offset="1"
-         id="stop4290" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4185"
        id="linearGradient4191"
        x1="9.7633457"
@@ -170,7 +43,6 @@
        y2="1044.8577"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4185">
       <stop
          style="stop-color:#f0e55f;stop-opacity:1"
@@ -182,7 +54,6 @@
          id="stop4189" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4177"
        id="linearGradient4183"
        x1="4.9019866"
@@ -191,7 +62,6 @@
        y2="1054.0059"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4177">
       <stop
          style="stop-color:#91854e;stop-opacity:1"
@@ -203,33 +73,6 @@
          id="stop4181" />
     </linearGradient>
   </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.3380535"
-     inkscape:cy="15.86561"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:snap-global="false"
-     inkscape:window-width="1155"
-     inkscape:window-height="896"
-     inkscape:window-x="1120"
-     inkscape:window-y="654"
-     inkscape:window-maximized="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid26727"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
   <metadata
      id="metadata25495">
     <rdf:RDF>
@@ -243,25 +86,19 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      transform="translate(0,-1036.3622)">
     <g
        id="g4249"
        transform="matrix(0.94376518,0,0,1.0019455,-0.26934827,-4.4268357)">
       <path
-         inkscape:connector-curvature="0"
          id="path4245"
          d="m 1.9375,1046.1747 c 0.3465585,1.8098 4,4.125 4,4.125 l 0.8175922,0.9931 c 0,0 -1.5171578,-0.3875 -1.8175922,-0.2427 -0.4809297,0.2311 -0.8233768,0.7465 -1,1.25 -0.096544,0.2752 -0.111616,0.6055 0,0.875 0.1803987,0.4355 0.564479,0.8196 1,1 0.3272073,0.1355 0.7352927,0.1355 1.0625,0 0.4627411,-0.1917 1.4823446,-1.3056 1.4823446,-1.3056 l 1.5508568,-1.6613 2.0605486,-2.1268 c 0.456671,-0.4714 0.451406,-1.5174 0,-1.9688 -1.088538,-1.0885 -3.265625,-3.2656 -3.265625,-3.2656 0,0 -6.2876927,0.2541 -5.890625,2.3277 z"
-         style="fill:url(#linearGradient4191);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4183);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         sodipodi:nodetypes="sccsssssccsscs" />
+         style="fill:url(#linearGradient4191);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4183);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
       <path
-         inkscape:connector-curvature="0"
          id="path4247"
          d="m 5.0921796,1047.5908 c 0,0 0.1035025,-0.9178 -0.1546796,-1.5411 -0.1522123,-0.3675 -1.0457828,-0.9062 -1.59375,-0.9062 -0.6979167,0 -1.4723615,0.5507 -1.2013641,0.2797 2.1108671,-2.1109 2.6445064,-3.0042 4.8107391,-5.1704 0.2614822,-0.2615 0.8056988,-0.1753 1.109375,0 0.3863767,0.2231 0.8984375,0.8616 0.8984375,1.4178 l 0,1.5666 -3.1054688,3.0117 c 0,0 -0.5638582,0.3957 -0.7632891,1.3419 z"
-         style="fill:#f0efbe;fill-opacity:1;fill-rule:evenodd;stroke:#91854e;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         sodipodi:nodetypes="cssssssccc" />
+         style="fill:#f0efbe;fill-opacity:1;fill-rule:evenodd;stroke:#91854e;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
     </g>
     <g
        transform="translate(-0.47160917,-15.943503)"
@@ -278,9 +115,7 @@
       <path
          style="display:inline;fill:url(#linearGradient3093-5-2-7-0-9);fill-opacity:1;stroke:none"
          d="m 12.471186,1054.309 1.001133,0 0,2.0068 1.986639,0 0,0.9911 -1.986639,0 0,2.0078 -1.001133,0 0,-2.0078 -1.98664,0 0,-0.9911 1.98664,0 z"
-         id="path5581-5-5"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccccccccccc" />
+         id="path5581-5-5" />
     </g>
   </g>
 </svg>
diff --git a/ui/org.eclipse.pde.ui/icons/etool16/validate.svg b/ui/org.eclipse.pde.ui/icons/etool16/validate.svg
index 7e629f18e19..547fbfd3253 100644
--- a/ui/org.eclipse.pde.ui/icons/etool16/validate.svg
+++ b/ui/org.eclipse.pde.ui/icons/etool16/validate.svg
@@ -2,37 +2,18 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r"
-   sodipodi:docname="validate.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
-    <linearGradient
-       id="linearGradient4784">
-      <stop
-         style="stop-color:#b68e69;stop-opacity:1"
-         offset="0"
-         id="stop4786" />
-      <stop
-         id="stop4792"
-         offset="0.94238818"
-         style="stop-color:#d5ae7d;stop-opacity:1" />
-      <stop
-         style="stop-color:#c69863;stop-opacity:1"
-         offset="1"
-         id="stop4788" />
-    </linearGradient>
     <linearGradient
        gradientTransform="translate(-1.977903,-3.044194)"
        gradientUnits="userSpaceOnUse"
@@ -41,10 +22,8 @@
        y1="1051.8571"
        x1="7.0070496"
        id="linearGradient4873-1"
-       xlink:href="#linearGradient5135-7"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient5135-7" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient5135-7">
       <stop
          style="stop-color:#91a5c7;stop-opacity:1;"
@@ -63,8 +42,7 @@
        y1="1049.8571"
        x1="7.0070496"
        id="linearGradient4875-9"
-       xlink:href="#linearGradient5135-7"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient5135-7" />
     <linearGradient
        gradientTransform="translate(-1.977903,-3.044194)"
        gradientUnits="userSpaceOnUse"
@@ -73,8 +51,7 @@
        y1="1047.8571"
        x1="7.0070496"
        id="linearGradient4871-2"
-       xlink:href="#linearGradient5135-7"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient5135-7" />
     <linearGradient
        gradientTransform="translate(-1.977903,-3.044194)"
        gradientUnits="userSpaceOnUse"
@@ -83,8 +60,7 @@
        y1="1045.8571"
        x1="7.0070496"
        id="linearGradient4869-17"
-       xlink:href="#linearGradient5135-7"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient5135-7" />
     <linearGradient
        gradientTransform="translate(-1.977903,-3.044194)"
        gradientUnits="userSpaceOnUse"
@@ -93,10 +69,8 @@
        y1="1043.8571"
        x1="7.0070496"
        id="linearGradient4867-7"
-       xlink:href="#linearGradient4877-6"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4877-6" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4877-6">
       <stop
          style="stop-color:#91a5c7;stop-opacity:1;"
@@ -115,11 +89,9 @@
        y1="1038.5779"
        x1="10.544736"
        id="linearGradient4908-2"
-       xlink:href="#linearGradient4902-3"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4902-3" />
     <linearGradient
-       id="linearGradient4902-3"
-       inkscape:collect="always">
+       id="linearGradient4902-3">
       <stop
          id="stop4904-2"
          offset="0"
@@ -137,11 +109,9 @@
        y1="1042.2307"
        x1="7.9987183"
        id="linearGradient4900-1"
-       xlink:href="#linearGradient4894-6"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4894-6" />
     <linearGradient
-       id="linearGradient4894-6"
-       inkscape:collect="always">
+       id="linearGradient4894-6">
       <stop
          id="stop4896-8"
          offset="0"
@@ -152,8 +122,7 @@
          style="stop-color:#d5b269;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       id="linearGradient4994-6"
-       inkscape:collect="always">
+       id="linearGradient4994-6">
       <stop
          id="stop4996-1"
          offset="0"
@@ -165,7 +134,6 @@
     </linearGradient>
     <linearGradient
        gradientTransform="translate(-1.977903,-1.044194)"
-       inkscape:collect="always"
        xlink:href="#linearGradient4994-6"
        id="linearGradient4101"
        gradientUnits="userSpaceOnUse"
@@ -174,43 +142,16 @@
        x2="9.8946028"
        y2="1051.8378" />
     <filter
-       inkscape:collect="always"
        id="filter11154"
-       x="-0.10200531"
-       width="1.2040106"
-       y="-0.15007681"
-       height="1.3001536">
+       x="-0.18204814"
+       width="1.3631471"
+       y="-0.26778204"
+       height="1.6519907">
       <feGaussianBlur
-         inkscape:collect="always"
          stdDeviation="0.34001774"
          id="feGaussianBlur11156" />
     </filter>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7.9999998"
-     inkscape:cx="19.135899"
-     inkscape:cy="11.192484"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="745"
-     inkscape:window-height="557"
-     inkscape:window-x="1485"
-     inkscape:window-y="1011"
-     inkscape:window-maximized="0"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3999" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -224,30 +165,22 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
     <g
        style="display:inline"
        id="layer1-1"
-       inkscape:label="Layer 1"
        transform="translate(-0.03027408,1.0408691)">
       <path
-         sodipodi:nodetypes="cccccc"
-         inkscape:connector-curvature="0"
          id="rect4001-3"
          d="m 3.5193795,1037.8597 7.0096695,0 3.062057,3.0066 0,9.9546 -10.0717265,0 z"
          style="display:inline;fill:url(#linearGradient4101);fill-opacity:1;stroke:none" />
       <path
-         inkscape:connector-curvature="0"
          id="path4884"
          d="m 9.998718,1037.397 0,3.9112 3.977478,0 z"
          style="display:inline;fill:url(#linearGradient4900-1);fill-opacity:1;stroke:none" />
       <path
-         sodipodi:nodetypes="cccccc"
-         inkscape:connector-curvature="0"
          id="rect4001"
          d="m 3.5193795,1037.8597 7.0096695,0 3.062057,3.0066 0,9.9546 -10.0717265,0 z"
          style="display:inline;fill:none;stroke:url(#linearGradient4908-2);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1" />
@@ -294,13 +227,11 @@
       <path
          style="display:inline;fill:none;stroke:#ffffff;stroke-width:1.79999995;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter11154)"
          d="m 1.7812498,1045.1747 2.4999999,2.5313 5.5000013,-5.4375"
-         id="path4065-9"
-         inkscape:connector-curvature="0" />
+         id="path4065-9" />
       <path
          style="display:inline;fill:none;stroke:#0073ff;stroke-width:1.79999995;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
          d="m 0.49999987,1045.4246 2.49999993,2.5313 5.500001,-5.4375"
-         id="path4065"
-         inkscape:connector-curvature="0" />
+         id="path4065" />
     </g>
   </g>
 </svg>
diff --git a/ui/org.eclipse.pde.ui/icons/eview16/osgiconsole.svg b/ui/org.eclipse.pde.ui/icons/eview16/osgiconsole.svg
index 1b7937fdbc8..219a8df8534 100644
--- a/ui/org.eclipse.pde.ui/icons/eview16/osgiconsole.svg
+++ b/ui/org.eclipse.pde.ui/icons/eview16/osgiconsole.svg
@@ -2,23 +2,16 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r"
-   sodipodi:docname="osgiconsole.svg"
-   inkscape:export-filename="C:\Users\jmietling\Documents\rect3997-9-1.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
@@ -55,273 +48,6 @@
          id="stop3896" />
     </linearGradient>
     <linearGradient
-       id="linearGradient3884">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop3886" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop3888" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient11290">
-      <stop
-         style="stop-color:#567ead;stop-opacity:1"
-         offset="0"
-         id="stop11292" />
-      <stop
-         style="stop-color:#35679d;stop-opacity:1"
-         offset="1"
-         id="stop11294" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4082">
-      <stop
-         id="stop4084"
-         offset="0"
-         style="stop-color:#4476aa;stop-opacity:1" />
-      <stop
-         style="stop-color:#5a9ccc;stop-opacity:1"
-         offset="0.5"
-         id="stop4864" />
-      <stop
-         id="stop4086"
-         offset="1"
-         style="stop-color:#4476aa;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       y2="1067.9872"
-       x2="14.526336"
-       y1="1067.9872"
-       x1="4.7236701"
-       id="linearGradient5838"
-       xlink:href="#linearGradient5832"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient5832">
-      <stop
-         id="stop5834"
-         offset="0"
-         style="stop-color:#7d6fba;stop-opacity:1;" />
-      <stop
-         style="stop-color:#4b3e81;stop-opacity:1;"
-         offset="0.5"
-         id="stop5840" />
-      <stop
-         id="stop5836"
-         offset="1"
-         style="stop-color:#9d93cb;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5844">
-      <stop
-         style="stop-color:#739cc6;stop-opacity:1"
-         offset="0"
-         id="stop5846" />
-      <stop
-         id="stop5848"
-         offset="0.47270355"
-         style="stop-color:#4b82b6;stop-opacity:1" />
-      <stop
-         style="stop-color:#aac2dc;stop-opacity:1"
-         offset="1"
-         id="stop5850" />
-    </linearGradient>
-    <mask
-       maskUnits="userSpaceOnUse"
-       id="mask10494">
-      <path
-         inkscape:connector-curvature="0"
-         style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-         d="m 21,1037.3622 0,0.5 0,2 0,0.5 0,8.5313 0,0.5 0.5,0 13.03125,0 0.5,0 0,-0.5 0,-11.0313 0,-0.5 -0.5,0 -13.03125,0 -0.5,0 z"
-         id="path10496" />
-    </mask>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11290"
-       id="linearGradient11296"
-       x1="12.51806"
-       y1="1037.6146"
-       x2="12.51806"
-       y2="1044.4806"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       y2="1067.9872"
-       x2="14.526336"
-       y1="1067.9872"
-       x1="4.72367"
-       id="linearGradient5838-7"
-       xlink:href="#linearGradient5832-2"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient5832-2">
-      <stop
-         id="stop5834-8"
-         offset="0"
-         style="stop-color:#7d6fba;stop-opacity:1;" />
-      <stop
-         style="stop-color:#4b3e81;stop-opacity:1;"
-         offset="0.5"
-         id="stop5840-7" />
-      <stop
-         id="stop5836-9"
-         offset="1"
-         style="stop-color:#9d93cb;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5844-9">
-      <stop
-         style="stop-color:#739cc6;stop-opacity:1"
-         offset="0"
-         id="stop5846-2" />
-      <stop
-         id="stop5848-9"
-         offset="0.47270355"
-         style="stop-color:#4b82b6;stop-opacity:1" />
-      <stop
-         style="stop-color:#aac2dc;stop-opacity:1"
-         offset="1"
-         id="stop5850-1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient11290-2">
-      <stop
-         style="stop-color:#567ead;stop-opacity:1"
-         offset="0"
-         id="stop11292-4" />
-      <stop
-         style="stop-color:#35679d;stop-opacity:1"
-         offset="1"
-         id="stop11294-75" />
-    </linearGradient>
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       y2="1067.9872"
-       x2="14.526336"
-       y1="1067.9872"
-       x1="4.72367"
-       id="linearGradient5838-0"
-       xlink:href="#linearGradient5832-7"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient5832-7">
-      <stop
-         id="stop5834-1"
-         offset="0"
-         style="stop-color:#7d6fba;stop-opacity:1;" />
-      <stop
-         style="stop-color:#4b3e81;stop-opacity:1;"
-         offset="0.5"
-         id="stop5840-6" />
-      <stop
-         id="stop5836-93"
-         offset="1"
-         style="stop-color:#9d93cb;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5844-7">
-      <stop
-         style="stop-color:#739cc6;stop-opacity:1"
-         offset="0"
-         id="stop5846-3" />
-      <stop
-         id="stop5848-0"
-         offset="0.47270355"
-         style="stop-color:#4b82b6;stop-opacity:1" />
-      <stop
-         style="stop-color:#aac2dc;stop-opacity:1"
-         offset="1"
-         id="stop5850-4" />
-    </linearGradient>
-    <linearGradient
-       y2="1044.4806"
-       x2="12.51806"
-       y1="1037.6146"
-       x1="12.51806"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient11407"
-       xlink:href="#linearGradient11290-2"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="1044.4806"
-       x2="12.51806"
-       y1="1037.6146"
-       x1="12.51806"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient11409"
-       xlink:href="#linearGradient11290-2"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="1044.4806"
-       x2="12.51806"
-       y1="1037.6146"
-       x1="12.51806"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient11413"
-       xlink:href="#linearGradient11290-2"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="1044.4806"
-       x2="12.51806"
-       y1="1037.6146"
-       x1="12.51806"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient11415"
-       xlink:href="#linearGradient11290-2"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="1044.4806"
-       x2="12.51806"
-       y1="1037.6146"
-       x1="12.51806"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient11417"
-       xlink:href="#linearGradient11290-2"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11290"
-       id="linearGradient11623"
-       gradientUnits="userSpaceOnUse"
-       x1="12.51806"
-       y1="1037.6146"
-       x2="12.51806"
-       y2="1044.4806" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11290"
-       id="linearGradient11625"
-       gradientUnits="userSpaceOnUse"
-       x1="12.51806"
-       y1="1037.6146"
-       x2="12.51806"
-       y2="1044.4806" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11290"
-       id="linearGradient11629"
-       gradientUnits="userSpaceOnUse"
-       x1="12.51806"
-       y1="1037.6146"
-       x2="12.51806"
-       y2="1044.4806" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11290"
-       id="linearGradient11631"
-       gradientUnits="userSpaceOnUse"
-       x1="12.51806"
-       y1="1037.6146"
-       x2="12.51806"
-       y2="1044.4806" />
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient3892"
        id="linearGradient3898"
        x1="22.420315"
@@ -330,7 +56,6 @@
        y2="1037.9327"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient3906"
        id="linearGradient3912"
        x1="22.994839"
@@ -339,7 +64,6 @@
        y2="1048.3184"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4008"
        id="linearGradient4014"
        x1="25.096403"
@@ -348,15 +72,6 @@
        y2="1041.8778"
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-1.0281848,0)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4008-8"
-       id="linearGradient4014-5"
-       x1="25.096403"
-       y1="1041.8778"
-       x2="19.998154"
-       y2="1041.8778"
-       gradientUnits="userSpaceOnUse" />
     <linearGradient
        id="linearGradient4008-8">
       <stop
@@ -376,7 +91,6 @@
        gradientUnits="userSpaceOnUse"
        id="linearGradient4048"
        xlink:href="#linearGradient4008-8"
-       inkscape:collect="always"
        gradientTransform="matrix(1.20625,0,0,1,-5.1479113,2.03125)" />
     <linearGradient
        id="linearGradient4198">
@@ -420,17 +134,6 @@
          offset="1"
          style="stop-color:#5f392d;stop-opacity:1" />
     </linearGradient>
-    <linearGradient
-       id="linearGradient11146-7-5-30-1-1-4">
-      <stop
-         style="stop-color:#faefba;stop-opacity:1"
-         offset="0"
-         id="stop11150-9-6-9-5-6-9" />
-      <stop
-         id="stop11152-6-7-6-3-3-3"
-         offset="1"
-         style="stop-color:#9e6542;stop-opacity:1" />
-    </linearGradient>
     <linearGradient
        gradientTransform="matrix(0,1,-1,0,824.88775,74.875059)"
        y2="449.88141"
@@ -439,8 +142,7 @@
        x1="355.2973"
        gradientUnits="userSpaceOnUse"
        id="linearGradient4895"
-       xlink:href="#linearGradient10507"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient10507" />
     <radialGradient
        r="6.1875"
        fy="441.55878"
@@ -450,10 +152,8 @@
        gradientTransform="matrix(1.8729839,-2.3108417e-6,5.5328279e-6,4.4844688,-345.69517,-1544.188)"
        gradientUnits="userSpaceOnUse"
        id="radialGradient10503"
-       xlink:href="#linearGradient4198"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4198" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10507"
        id="linearGradient10544"
        gradientUnits="userSpaceOnUse"
@@ -471,8 +171,7 @@
        gradientTransform="matrix(-1.1985191,-1.1985241,-3.8050612,3.8050452,2516.1875,-780.55682)"
        gradientUnits="userSpaceOnUse"
        id="radialGradient10503-3"
-       xlink:href="#linearGradient4198"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4198" />
     <radialGradient
        r="6.1875"
        fy="447.11966"
@@ -482,8 +181,7 @@
        gradientTransform="matrix(-1.6388515,-0.9461912,-1.0961485,1.8985849,1499.8266,-31.358796)"
        gradientUnits="userSpaceOnUse"
        id="radialGradient10503-5"
-       xlink:href="#linearGradient4198"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4198" />
     <radialGradient
        r="6.1875"
        fy="446.32083"
@@ -493,38 +191,8 @@
        gradientTransform="matrix(-0.61826712,-2.3074084,3.2755855,-0.87768889,-856.61082,1748.2073)"
        gradientUnits="userSpaceOnUse"
        id="radialGradient10503-3-2"
-       xlink:href="#linearGradient4198"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4198" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="4"
-     inkscape:cx="7.8629929"
-     inkscape:cy="-1.058385"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="684"
-     inkscape:window-height="428"
-     inkscape:window-x="18"
-     inkscape:window-y="1111"
-     inkscape:window-maximized="0"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3999"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -538,8 +206,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
@@ -642,14 +308,12 @@
     <g
        style="display:inline"
        id="layer1-4"
-       inkscape:label="Layer 1"
        transform="matrix(0.70083946,0,0,0.70083946,5.5382602,316.25916)">
       <g
          id="g13862"
          style="display:inline"
          transform="matrix(0.27903303,0,0,0.27903303,-129.51159,939.94639)">
         <g
-           inkscape:label="Layer 1"
            id="layer1-9"
            style="font-style:normal;font-weight:normal;font-size:13.58917427px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;display:inline;fill:#ffffff;fill-opacity:1;stroke:none"
            transform="matrix(3.5838051,0,0,3.5838051,511.44753,-3423.3167)">
@@ -658,14 +322,10 @@
              transform="matrix(0.27903303,0,0,0.27903303,-109.29986,933.62804)"
              id="g11260-4-2">
             <path
-               sodipodi:nodetypes="ccccc"
-               inkscape:connector-curvature="0"
                id="rect10961-9-0-4-7"
                d="m 375.04584,467.87065 12.70006,-4.27794 5.26516,-13.68728 -17.96522,0 z"
                style="font-style:normal;font-weight:normal;font-size:13.58917427px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;display:inline;fill:url(#radialGradient10503-5);fill-opacity:1;stroke:none;stroke-width:3.58380508;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
             <path
-               sodipodi:nodetypes="ccccc"
-               inkscape:connector-curvature="0"
                id="rect10961-9-0-4-6-0"
                d="m 374.583,467.87065 -12.70006,-4.27794 -5.26516,-13.68728 17.96522,0 z"
                style="font-style:normal;font-weight:normal;font-size:13.58917427px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;display:inline;fill:url(#radialGradient10503-3-2);fill-opacity:1;stroke:none;stroke-width:3.58380508;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
@@ -676,29 +336,21 @@
                id="path4196-7"
                style="font-style:normal;font-weight:normal;font-size:13.58917427px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;display:inline;opacity:1;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:5.11358929;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
             <path
-               sodipodi:nodetypes="ccccc"
-               inkscape:connector-curvature="0"
                id="rect10961-9-0-4"
                d="m 375.04584,431.97098 12.70006,4.27794 5.26516,13.68728 -17.96522,0 z"
                style="display:inline;fill:url(#radialGradient10503);fill-opacity:1;stroke:none;stroke-width:3.58380508;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
             <path
-               sodipodi:nodetypes="ccccc"
-               inkscape:connector-curvature="0"
                id="rect10961-9-0-4-6"
                d="m 374.583,431.97098 -12.70006,4.27794 -5.26516,13.68728 17.96522,0 z"
                style="font-style:normal;font-weight:normal;font-size:13.58917427px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;display:inline;fill:url(#radialGradient10503-3);fill-opacity:1;stroke:none;stroke-width:3.58380508;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
             <path
                style="display:inline;fill:#915323;fill-opacity:1;stroke:url(#linearGradient4895);stroke-width:5.11358929;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
                d="m 375.00635,426.58855 0,46.58947"
-               id="path11108-6-7-5"
-               inkscape:connector-curvature="0"
-               sodipodi:nodetypes="cc" />
+               id="path11108-6-7-5" />
             <path
                style="font-style:normal;font-weight:normal;font-size:13.58917427px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;display:inline;fill:#915323;fill-opacity:1;stroke:url(#linearGradient10544);stroke-width:5.11358929;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
                d="m 398.30108,449.88328 -46.58947,0"
-               id="path11108-6-7-5-6"
-               inkscape:connector-curvature="0"
-               sodipodi:nodetypes="cc" />
+               id="path11108-6-7-5-6" />
             <circle
                r="18.101562"
                cy="450.11887"
diff --git a/ui/org.eclipse.pde.ui/icons/eview16/plugin_depend.svg b/ui/org.eclipse.pde.ui/icons/eview16/plugin_depend.svg
index 625837c375c..bad1df32e07 100644
--- a/ui/org.eclipse.pde.ui/icons/eview16/plugin_depend.svg
+++ b/ui/org.eclipse.pde.ui/icons/eview16/plugin_depend.svg
@@ -2,24 +2,19 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="plugin_depend.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4368">
       <stop
          style="stop-color:#fbdf89;stop-opacity:1"
@@ -39,7 +34,6 @@
          id="stop4372" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4344">
       <stop
          style="stop-color:#7e9cca;stop-opacity:1"
@@ -63,7 +57,6 @@
          id="stop4348" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4336">
       <stop
          style="stop-color:#3461ab;stop-opacity:1"
@@ -75,248 +68,6 @@
          id="stop4340" />
     </linearGradient>
     <linearGradient
-       id="linearGradient3955">
-      <stop
-         id="stop3957"
-         offset="0"
-         style="stop-color:#c38536;stop-opacity:1" />
-      <stop
-         style="stop-color:#f2dc91;stop-opacity:1"
-         offset="0.15381166"
-         id="stop3959" />
-      <stop
-         style="stop-color:#fbdc8b;stop-opacity:1"
-         offset="0.5"
-         id="stop3961" />
-      <stop
-         id="stop3963"
-         offset="0.75"
-         style="stop-color:#e6bd7a;stop-opacity:1" />
-      <stop
-         id="stop3965"
-         offset="1"
-         style="stop-color:#ba772f;stop-opacity:1" />
-    </linearGradient>
-    <mask
-       maskUnits="userSpaceOnUse"
-       id="mask4917">
-      <path
-         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;display:inline"
-         d="m 462.77563,373.22885 29.11636,0 c 1.45425,0 2.625,1.17075 2.625,2.625 l 0,18.76896 c 0,1.45425 -1.17412,2.52598 -2.625,2.625 l -29.11636,1.98708 c -1.45088,0.099 -2.625,-1.17075 -2.625,-2.625 l 0,-20.75604 c 0,-1.45425 1.17075,-2.625 2.625,-2.625 z"
-         id="path4919"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="sssssssss" />
-    </mask>
-    <linearGradient
-       id="linearGradient4284">
-      <stop
-         id="stop4286"
-         offset="0"
-         style="stop-color:#6588c1;stop-opacity:0" />
-      <stop
-         style="stop-color:#becce3;stop-opacity:1"
-         offset="0.49999967"
-         id="stop4288" />
-      <stop
-         id="stop4290"
-         offset="1"
-         style="stop-color:#809dcb;stop-opacity:0" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10157-2-5">
-      <stop
-         style="stop-color:#6588c1;stop-opacity:1"
-         offset="0"
-         id="stop10159-8-3" />
-      <stop
-         id="stop10165-3-9"
-         offset="0.5"
-         style="stop-color:#becce3;stop-opacity:1" />
-      <stop
-         style="stop-color:#809dcb;stop-opacity:1"
-         offset="1"
-         id="stop10161-5-0" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10414-9">
-      <stop
-         style="stop-color:#5078b9;stop-opacity:1;"
-         offset="0"
-         id="stop10416-3" />
-      <stop
-         id="stop10422-8"
-         offset="0.5"
-         style="stop-color:#6d8cbd;stop-opacity:1" />
-      <stop
-         style="stop-color:#5f88c9;stop-opacity:1"
-         offset="1"
-         id="stop10418-4" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10432-3">
-      <stop
-         id="stop10434-4"
-         offset="0"
-         style="stop-color:#1f4d9a;stop-opacity:1" />
-      <stop
-         style="stop-color:#4e6da1;stop-opacity:1"
-         offset="0.5"
-         id="stop10436-2" />
-      <stop
-         id="stop10438-9"
-         offset="1"
-         style="stop-color:#567ebc;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10448-90">
-      <stop
-         style="stop-color:#ecac18;stop-opacity:1"
-         offset="0"
-         id="stop10450-0" />
-      <stop
-         id="stop10458-2"
-         offset="0.25"
-         style="stop-color:#ffe38d;stop-opacity:1" />
-      <stop
-         id="stop10456-96"
-         offset="0.5"
-         style="stop-color:#fdf5d2;stop-opacity:1" />
-      <stop
-         style="stop-color:#ffeba7;stop-opacity:1"
-         offset="0.75"
-         id="stop10460-3" />
-      <stop
-         style="stop-color:#e5b630;stop-opacity:1"
-         offset="1"
-         id="stop10452-1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10748-8">
-      <stop
-         id="stop10750-5"
-         offset="0"
-         style="stop-color:#ecac18;stop-opacity:1" />
-      <stop
-         style="stop-color:#f1ce66;stop-opacity:1"
-         offset="0.25"
-         id="stop10752-8" />
-      <stop
-         style="stop-color:#f6e5a6;stop-opacity:1"
-         offset="0.5"
-         id="stop10754-8" />
-      <stop
-         id="stop10756-4"
-         offset="0.75"
-         style="stop-color:#f1cf6c;stop-opacity:1" />
-      <stop
-         id="stop10758-7"
-         offset="1"
-         style="stop-color:#e5b630;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10448-9-7-0-5">
-      <stop
-         style="stop-color:#cf9307;stop-opacity:1"
-         offset="0"
-         id="stop10450-3-5-6-7" />
-      <stop
-         id="stop10456-4-1-5-3"
-         offset="0.5"
-         style="stop-color:#f7d87b;stop-opacity:1" />
-      <stop
-         style="stop-color:#ebb313;stop-opacity:1"
-         offset="1"
-         id="stop10452-22-7-8-4" />
-    </linearGradient>
-    <linearGradient
-       gradientTransform="matrix(3.5838051,0,0,3.5838051,446.6247,-3372.1684)"
-       gradientUnits="userSpaceOnUse"
-       y2="1039.3397"
-       x2="8.3145638"
-       y1="1040.4003"
-       x1="8.3145638"
-       id="linearGradient4212"
-       xlink:href="#linearGradient4158" />
-    <linearGradient
-       id="linearGradient4158">
-      <stop
-         id="stop4160"
-         offset="0"
-         style="stop-color:#fdae35;stop-opacity:1;" />
-      <stop
-         id="stop4162"
-         offset="1"
-         style="stop-color:#fef0db;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10440-1-0-0-3">
-      <stop
-         id="stop10442-43-2-0-9"
-         offset="0"
-         style="stop-color:#ae7603;stop-opacity:1;" />
-      <stop
-         style="stop-color:#e8d8a3;stop-opacity:1"
-         offset="0.5"
-         id="stop10521-1-2-5-3" />
-      <stop
-         id="stop10444-3-4-0-4"
-         offset="1"
-         style="stop-color:#bb9221;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10396-5">
-      <stop
-         id="stop10398-7"
-         offset="0"
-         style="stop-color:#1b3e79;stop-opacity:1;" />
-      <stop
-         style="stop-color:#728fbf;stop-opacity:1"
-         offset="0.5"
-         id="stop10404-9" />
-      <stop
-         id="stop10400-9"
-         offset="1"
-         style="stop-color:#1f4d9a;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10149-6-5-4">
-      <stop
-         id="stop10151-5-7-2"
-         offset="0"
-         style="stop-color:#1f4d9a;stop-opacity:1" />
-      <stop
-         style="stop-color:#b9c7df;stop-opacity:1"
-         offset="0.5"
-         id="stop10394-3" />
-      <stop
-         id="stop10153-8-1-2"
-         offset="1"
-         style="stop-color:#567ebc;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4528-9-5-7-9-7">
-      <stop
-         style="stop-color:#e0c576;stop-opacity:1;"
-         offset="0"
-         id="stop4530-0-5-0-5-8" />
-      <stop
-         style="stop-color:#9e7916;stop-opacity:1"
-         offset="1"
-         id="stop4532-7-9-3-3-6" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient6281-8-0-1-6-6-4-2-8">
-      <stop
-         id="stop6283-0-2-2-1-2-0-1-6"
-         offset="0"
-         style="stop-color:#f7f9fb;stop-opacity:1" />
-      <stop
-         id="stop6285-5-0-9-7-6-9-9-1"
-         offset="1"
-         style="stop-color:#ffd680;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4336"
        id="linearGradient4342"
        x1="509.96674"
@@ -326,7 +77,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1.0106162,0,0,0.96711322,-26.641878,12.017452)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4344"
        id="linearGradient4350"
        x1="505.37363"
@@ -336,7 +86,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1.0106162,0,0,0.96711322,-26.641878,12.017452)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4368"
        id="linearGradient4374"
        x1="494.33554"
@@ -345,7 +94,6 @@
        y2="358.83438"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4344"
        id="linearGradient4455"
        gradientUnits="userSpaceOnUse"
@@ -355,7 +103,6 @@
        x2="505.37363"
        y2="349.91144" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4336"
        id="linearGradient4457"
        gradientUnits="userSpaceOnUse"
@@ -365,7 +112,6 @@
        x2="509.96674"
        y2="350.06982" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4368"
        id="linearGradient4301"
        gradientUnits="userSpaceOnUse"
@@ -374,29 +120,6 @@
        x2="494.33554"
        y2="358.83438" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="4"
-     inkscape:cx="26.593415"
-     inkscape:cy="-6.0189443"
-     inkscape:document-units="px"
-     inkscape:current-layer="g4247-6"
-     showgrid="true"
-     inkscape:window-width="1086"
-     inkscape:window-height="934"
-     inkscape:window-x="503"
-     inkscape:window-y="589"
-     inkscape:window-maximized="0"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3947" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -410,8 +133,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
@@ -430,9 +151,7 @@
           <path
              style="fill:url(#linearGradient4374);fill-opacity:1;fill-rule:evenodd;stroke:#b08b21;stroke-width:3.58380508px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
              d="m 494.79147,354.51004 3.60322,3.57383 3.60322,0 3.42504,2.69707 0,5.48733 -3.85069,2.56276 -3.69232,0 -3.34089,3.62088 -3.46959,0 -0.002,-17.95827 z"
-             id="path4366"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccccccccc" />
+             id="path4366" />
           <rect
              style="opacity:1;fill:#b08b21;fill-opacity:1;stroke:none;stroke-width:1.79190254;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
              id="rect4380"
@@ -446,9 +165,7 @@
           <path
              style="fill:url(#linearGradient4350);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4342);stroke-width:3.54304099px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
              d="m 487.40807,351.09688 c 1.22716,-1.17433 3.68149,1.86226 3.68149,3.52302 0,5.94129 0,12.02914 0,17.4619 0,2.60379 -2.50768,4.79948 -3.76152,3.5996 -4.2413,-4.05871 -10.72434,-10.26269 -10.72434,-10.26269 l 0,-3.5996 c 0,0 6.01931,-6.14314 10.80437,-10.72223 z"
-             id="path4326"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ssssccs" />
+             id="path4326" />
           <rect
              style="opacity:1;fill:#547fc4;fill-opacity:1;stroke:none;stroke-width:1.79190254;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
              id="rect4358"
@@ -469,9 +186,7 @@
           <path
              style="fill:url(#linearGradient4301);fill-opacity:1;fill-rule:evenodd;stroke:#b08b21;stroke-width:3.58380508px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
              d="m 494.79147,354.51004 3.60322,3.57383 3.60322,0 3.42504,2.69707 0,5.48733 -3.85069,2.56276 -3.69232,0 -3.34089,3.62088 -3.46959,0 -0.002,-17.95827 z"
-             id="path4366-2"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccccccccc" />
+             id="path4366-2" />
           <rect
              style="opacity:1;fill:#b08b21;fill-opacity:1;stroke:none;stroke-width:1.79190254;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
              id="rect4380-9"
@@ -485,9 +200,7 @@
           <path
              style="fill:url(#linearGradient4455);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4457);stroke-width:3.54304099px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
              d="m 487.40807,351.09688 c 1.22716,-1.17433 3.68149,1.86226 3.68149,3.52302 0,5.94129 0,12.02914 0,17.4619 0,2.60379 -2.50768,4.79948 -3.76152,3.5996 -4.2413,-4.05871 -10.72434,-10.26269 -10.72434,-10.26269 l 0,-3.5996 c 0,0 6.01931,-6.14314 10.80437,-10.72223 z"
-             id="path4326-2"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ssssccs" />
+             id="path4326-2" />
           <rect
              style="opacity:1;fill:#547fc4;fill-opacity:1;stroke:none;stroke-width:1.79190254;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
              id="rect4358-7"
diff --git a/ui/org.eclipse.pde.ui/icons/eview16/plugins.svg b/ui/org.eclipse.pde.ui/icons/eview16/plugins.svg
index 6741d827a52..9e20febec4f 100644
--- a/ui/org.eclipse.pde.ui/icons/eview16/plugins.svg
+++ b/ui/org.eclipse.pde.ui/icons/eview16/plugins.svg
@@ -2,20 +2,16 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="plugins.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
@@ -34,7 +30,6 @@
          style="stop-color:#809dcb;stop-opacity:0" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10448-9-7-0-5"
        id="linearGradient10770-6"
        gradientUnits="userSpaceOnUse"
@@ -59,22 +54,6 @@
          id="stop10452-22-7-8-4" />
     </linearGradient>
     <linearGradient
-       id="linearGradient10440-1-0-0-3">
-      <stop
-         style="stop-color:#ae7603;stop-opacity:1;"
-         offset="0"
-         id="stop10442-43-2-0-9" />
-      <stop
-         id="stop10521-1-2-5-3"
-         offset="0.5"
-         style="stop-color:#e8d8a3;stop-opacity:1" />
-      <stop
-         style="stop-color:#bb9221;stop-opacity:1"
-         offset="1"
-         id="stop10444-3-4-0-4" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10748-8"
        id="linearGradient10774-5"
        gradientUnits="userSpaceOnUse"
@@ -107,22 +86,6 @@
          style="stop-color:#e5b630;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       id="linearGradient10440-1-3-4">
-      <stop
-         style="stop-color:#ae7603;stop-opacity:1;"
-         offset="0"
-         id="stop10442-43-0-5" />
-      <stop
-         id="stop10521-1-4-7"
-         offset="0.5"
-         style="stop-color:#e8d8a3;stop-opacity:1" />
-      <stop
-         style="stop-color:#bb9221;stop-opacity:1"
-         offset="1"
-         id="stop10444-3-2-0" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10448-90"
        id="linearGradient10778-6"
        gradientUnits="userSpaceOnUse"
@@ -155,22 +118,6 @@
          id="stop10452-1" />
     </linearGradient>
     <linearGradient
-       id="linearGradient10440-18">
-      <stop
-         style="stop-color:#ae7603;stop-opacity:1;"
-         offset="0"
-         id="stop10442-8" />
-      <stop
-         id="stop10521-7"
-         offset="0.5"
-         style="stop-color:#e8d8a3;stop-opacity:1" />
-      <stop
-         style="stop-color:#bb9221;stop-opacity:1"
-         offset="1"
-         id="stop10444-0" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10414-9"
        id="linearGradient10782-3"
        gradientUnits="userSpaceOnUse"
@@ -195,7 +142,6 @@
          id="stop10418-4" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10432-3"
        id="linearGradient10784-2"
        gradientUnits="userSpaceOnUse"
@@ -220,7 +166,6 @@
          style="stop-color:#567ebc;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10157-6"
        id="linearGradient10786-1"
        gradientUnits="userSpaceOnUse"
@@ -245,22 +190,6 @@
          id="stop10161-55" />
     </linearGradient>
     <linearGradient
-       id="linearGradient10396-5">
-      <stop
-         style="stop-color:#1b3e79;stop-opacity:1;"
-         offset="0"
-         id="stop10398-7" />
-      <stop
-         id="stop10404-9"
-         offset="0.5"
-         style="stop-color:#728fbf;stop-opacity:1" />
-      <stop
-         style="stop-color:#1f4d9a;stop-opacity:1"
-         offset="1"
-         id="stop10400-9" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10157-2-5"
        id="linearGradient10790-8"
        gradientUnits="userSpaceOnUse"
@@ -285,7 +214,6 @@
          id="stop10161-5-0" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10149-39-0"
        id="linearGradient10792-6"
        gradientUnits="userSpaceOnUse"
@@ -295,7 +223,6 @@
        x2="322.875"
        y2="504.44818" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient10149-39-0">
       <stop
          style="stop-color:#1d4d9d;stop-opacity:1"
@@ -307,22 +234,6 @@
          id="stop10153-72-3" />
     </linearGradient>
     <linearGradient
-       id="linearGradient10149-6-5-4">
-      <stop
-         style="stop-color:#1f4d9a;stop-opacity:1"
-         offset="0"
-         id="stop10151-5-7-2" />
-      <stop
-         id="stop10394-3"
-         offset="0.5"
-         style="stop-color:#b9c7df;stop-opacity:1" />
-      <stop
-         style="stop-color:#567ebc;stop-opacity:1"
-         offset="1"
-         id="stop10153-8-1-2" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4284"
        id="linearGradient10790-8-2"
        gradientUnits="userSpaceOnUse"
@@ -332,29 +243,6 @@
        x2="305"
        y2="545.35248" />
   </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="47.607658"
-     inkscape:cy="-9.9169213"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1609"
-     inkscape:window-height="978"
-     inkscape:window-x="719"
-     inkscape:window-y="519"
-     inkscape:window-maximized="0"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid4210" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -368,8 +256,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
@@ -385,19 +271,15 @@
     <path
        style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
        d="m 12.648438,1043.3652 0,1 3.351562,0 0,-1 -3.351562,0 z"
-       id="path4313-8-8"
-       inkscape:connector-curvature="0" />
+       id="path4313-8-8" />
     <path
        style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.94926554px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
        d="m 12.981809,1043.3594 0,3.0195 1.01551,0 0,-3.0195 z"
-       id="path4313-8-8-7"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+       id="path4313-8-8-7" />
     <path
        style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#9e7400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
        d="m 15.992188,1045.3613 -3.359376,0.031 0.0098,1 3.359375,-0.031 -0.0098,-1 z"
-       id="path4313-5-1-8"
-       inkscape:connector-curvature="0" />
+       id="path4313-5-1-8" />
     <rect
        style="fill:url(#linearGradient10774-5);fill-opacity:1;stroke:none;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        id="rect10007-0-74-2-7"
@@ -410,13 +292,11 @@
     <path
        style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#9e7400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
        d="m 13.005859,1046.3711 -3.3593746,0.031 0.00977,1 3.359375,-0.031 -0.0098,-1 z"
-       id="path4313-5-1"
-       inkscape:connector-curvature="0" />
+       id="path4313-5-1" />
     <path
        style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
        d="m 12.996094,1042.3633 -3.3593752,0.031 0.00977,1 3.3593746,-0.031 -0.0098,-1 z"
-       id="path4313-8"
-       inkscape:connector-curvature="0" />
+       id="path4313-8" />
     <rect
        style="fill:url(#linearGradient10778-6);fill-opacity:1;stroke:none;stroke-width:1.50161433;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        id="rect10007-0-74-2"
@@ -456,13 +336,11 @@
     <path
        style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
        d="m 10.996094,1041.3613 -3.3593752,0.031 0.00977,1 3.3593746,-0.031 -0.0098,-1 z"
-       id="path4313"
-       inkscape:connector-curvature="0" />
+       id="path4313" />
     <path
        style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#9e7400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
        d="m 11.001953,1047.3613 -3.3593749,0.031 0.00977,1 3.3593752,-0.031 -0.0098,-1 z"
-       id="path4313-5"
-       inkscape:connector-curvature="0" />
+       id="path4313-5" />
     <rect
        ry="1.0288811"
        style="fill:url(#linearGradient10790-8);fill-opacity:1;stroke:url(#linearGradient10792-6);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
@@ -482,8 +360,6 @@
     <path
        style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:0.64640886;fill-rule:evenodd;stroke:none;stroke-width:0.97351193px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
        d="m 11.003629,1043.3647 0,3.01 1.000277,0 0,-3.01 z"
-       id="path4313-8-8-7-8"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+       id="path4313-8-8-7-8" />
   </g>
 </svg>
diff --git a/ui/org.eclipse.pde.ui/icons/obj16/alert_obj.svg b/ui/org.eclipse.pde.ui/icons/obj16/alert_obj.svg
index 48d2af0bd47..a9e9e2fbbac 100644
--- a/ui/org.eclipse.pde.ui/icons/obj16/alert_obj.svg
+++ b/ui/org.eclipse.pde.ui/icons/obj16/alert_obj.svg
@@ -2,24 +2,19 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="alert_obj.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4225">
       <stop
          style="stop-color:#ffcd69;stop-opacity:1"
@@ -39,7 +34,6 @@
          id="stop4229" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4225"
        id="linearGradient4231"
        x1="-724.10876"
@@ -48,31 +42,6 @@
        y2="748.81"
        gradientUnits="userSpaceOnUse" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="45.254834"
-     inkscape:cx="6.9942277"
-     inkscape:cy="13.412522"
-     inkscape:document-units="px"
-     inkscape:current-layer="g4274"
-     showgrid="false"
-     inkscape:window-width="1440"
-     inkscape:window-height="900"
-     inkscape:window-x="1118"
-     inkscape:window-y="601"
-     inkscape:window-maximized="0"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3999" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -86,8 +55,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
diff --git a/ui/org.eclipse.pde.ui/icons/obj16/all_sc_obj.svg b/ui/org.eclipse.pde.ui/icons/obj16/all_sc_obj.svg
index beab647e548..b6654af09b0 100644
--- a/ui/org.eclipse.pde.ui/icons/obj16/all_sc_obj.svg
+++ b/ui/org.eclipse.pde.ui/icons/obj16/all_sc_obj.svg
@@ -2,24 +2,19 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="all_sc_obj.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4190"
        id="linearGradient4196"
        x1="18.493853"
@@ -29,7 +24,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(1.6718751,-3.0429689)" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4190">
       <stop
          style="stop-color:#346692;stop-opacity:1"
@@ -41,7 +35,6 @@
          id="stop4194" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4190"
        id="linearGradient4196-4"
        x1="18.493853"
@@ -51,7 +44,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(1.6874986,2.9687089)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4190"
        id="linearGradient4196-1"
        x1="18.493853"
@@ -61,33 +53,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-3.332033,-0.04301006)" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="22.627416"
-     inkscape:cx="4.9054386"
-     inkscape:cy="10.488539"
-     inkscape:document-units="px"
-     inkscape:current-layer="g3353"
-     showgrid="true"
-     inkscape:window-width="1100"
-     inkscape:window-height="900"
-     inkscape:window-x="1111"
-     inkscape:window-y="527"
-     inkscape:window-maximized="0"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2985"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -101,8 +66,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      transform="translate(0,-1036.3622)">
     <g
diff --git a/ui/org.eclipse.pde.ui/icons/obj16/att_URI_obj.svg b/ui/org.eclipse.pde.ui/icons/obj16/att_URI_obj.svg
index d5e40104097..a01d24929fb 100644
--- a/ui/org.eclipse.pde.ui/icons/obj16/att_URI_obj.svg
+++ b/ui/org.eclipse.pde.ui/icons/obj16/att_URI_obj.svg
@@ -2,74 +2,17 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="att_URI_obj.svg">
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
-     id="defs4">
-    <linearGradient
-       y2="462.11539"
-       x2="388.63736"
-       y1="478.18777"
-       x1="388.63736"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3929-5"
-       xlink:href="#linearGradient10798-1-9-3-7-6-8-9-0-9-1"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient10798-1-9-3-7-6-8-9-0-9-1">
-      <stop
-         style="stop-color:#7564b1;stop-opacity:1"
-         offset="0"
-         id="stop10800-5-2-1-8-20-6-4-9-8-2" />
-      <stop
-         id="stop10806-6-8-5-3-9-24-8-4-3-2"
-         offset="0.5"
-         style="stop-color:#5d4aa1;stop-opacity:1" />
-      <stop
-         style="stop-color:#9283c3;stop-opacity:1"
-         offset="1"
-         id="stop10802-1-5-3-0-4-8-4-2-9-2" />
-    </linearGradient>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="22.627416"
-     inkscape:cx="4.962"
-     inkscape:cy="9.1530062"
-     inkscape:document-units="px"
-     inkscape:current-layer="g3353"
-     showgrid="true"
-     inkscape:window-width="1164"
-     inkscape:window-height="853"
-     inkscape:window-x="866"
-     inkscape:window-y="713"
-     inkscape:window-maximized="0"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2985"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
+     id="defs4" />
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -83,8 +26,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      transform="translate(0,-1036.3622)">
     <g
@@ -104,24 +45,14 @@
              id="path10796-2-6-2"
              transform="matrix(1.0012483,0,0,0.88600469,0.97175283,73.294583)" />
           <path
-             sodipodi:open="true"
              d="m 24.43155,1046.9864 a 4.4886336,4.4886336 0 0 1 -1.642954,1.6429"
-             sodipodi:end="1.0471976"
-             sodipodi:start="0.52359878"
-             sodipodi:ry="4.4886336"
-             sodipodi:rx="4.4886336"
-             sodipodi:cy="1044.7421"
-             sodipodi:cx="20.544279"
-             sodipodi:type="arc"
              style="font-style:normal;font-weight:normal;font-size:13.58917427px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;display:inline;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
              id="path10796-2-6-2-2"
              transform="matrix(1.0012483,0,0,0.88600469,0.97175283,73.294583)" />
           <path
              d="m 22.620507,999.74158 0,-0.98021 -1.040788,0 c -0.401091,0 -0.699714,0.0857 -0.895868,0.25704 -0.196155,0.17135 -0.294232,0.43419 -0.294232,0.78852 0,0.32237 0.09954,0.57797 0.298623,0.76677 0.199082,0.1887 0.468428,0.2831 0.808038,0.2831 0.336682,0 0.607492,-0.1031 0.812429,-0.3093 0.207865,-0.2062 0.311798,-0.4748 0.311798,-0.80592 z m 0.808037,-1.43764 -0.01946,1.97066 1.6957,1.5699 -0.444853,0.3635 -1.601857,-1.6986 -0.459711,0.2744 c -0.244962,0.1855 -0.362864,0.285 -0.597079,0.3867 -0.234214,0.1017 -0.507951,0.1525 -0.821211,0.1525 -0.518199,0 -0.929537,-0.1365 -1.234015,-0.4095 -0.304478,-0.2731 -0.456717,-0.6419 -0.456717,-1.10657 0,-0.47921 0.174196,-0.85097 0.522589,-1.11526 0.348394,-0.26429 0.840243,-0.39644 1.475548,-0.39644 l 1.13301,0 0,-0.31802 c 0,-0.35143 -0.108324,-0.62298 -0.324973,-0.81467 -0.213719,-0.19459 -0.51527,-0.29188 -0.904651,-0.29188 -0.322044,0 -0.578215,0.0726 -0.768514,0.21782 -0.190299,0.14521 -0.308869,0.36013 -0.355712,0.64476 l -0.417193,0 0,-0.93664 c 0.281057,-0.11908 0.55333,-0.20766 0.816821,-0.26575 0.266418,-0.061 0.525517,-0.0915 0.777297,-0.0915 0.647015,0 1.138864,0.15974 1.475547,0.47921 0.33961,0.31657 0.509415,0.77836 0.509415,1.38537 z"
              style="fill:#266923;fill-opacity:1;stroke:#266923;stroke-width:0.27716896;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-             id="path4156"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="scscscscsccccccsscssscscssccccscsc" />
+             id="path4156" />
         </g>
       </g>
     </g>
diff --git a/ui/org.eclipse.pde.ui/icons/obj16/att_boolean_obj.svg b/ui/org.eclipse.pde.ui/icons/obj16/att_boolean_obj.svg
index 001617804d9..265b19ba245 100644
--- a/ui/org.eclipse.pde.ui/icons/obj16/att_boolean_obj.svg
+++ b/ui/org.eclipse.pde.ui/icons/obj16/att_boolean_obj.svg
@@ -2,74 +2,17 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="att_boolean_obj.svg">
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
-     id="defs4">
-    <linearGradient
-       y2="462.11539"
-       x2="388.63736"
-       y1="478.18777"
-       x1="388.63736"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3929-5"
-       xlink:href="#linearGradient10798-1-9-3-7-6-8-9-0-9-1"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient10798-1-9-3-7-6-8-9-0-9-1">
-      <stop
-         style="stop-color:#7564b1;stop-opacity:1"
-         offset="0"
-         id="stop10800-5-2-1-8-20-6-4-9-8-2" />
-      <stop
-         id="stop10806-6-8-5-3-9-24-8-4-3-2"
-         offset="0.5"
-         style="stop-color:#5d4aa1;stop-opacity:1" />
-      <stop
-         style="stop-color:#9283c3;stop-opacity:1"
-         offset="1"
-         id="stop10802-1-5-3-0-4-8-4-2-9-2" />
-    </linearGradient>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="16"
-     inkscape:cx="16.87436"
-     inkscape:cy="4.3148346"
-     inkscape:document-units="px"
-     inkscape:current-layer="text3773"
-     showgrid="false"
-     inkscape:window-width="990"
-     inkscape:window-height="968"
-     inkscape:window-x="1194"
-     inkscape:window-y="750"
-     inkscape:window-maximized="0"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2985"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
+     id="defs4" />
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -83,8 +26,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      transform="translate(0,-1036.3622)">
     <g
@@ -112,24 +53,14 @@
                      id="path10796-2-6-2"
                      transform="matrix(1.0012483,0,0,0.88600469,0.97175283,73.294583)" />
                   <path
-                     sodipodi:open="true"
                      d="m 24.43155,1046.9864 a 4.4886336,4.4886336 0 0 1 -1.642954,1.6429"
-                     sodipodi:end="1.0471976"
-                     sodipodi:start="0.52359878"
-                     sodipodi:ry="4.4886336"
-                     sodipodi:rx="4.4886336"
-                     sodipodi:cy="1044.7421"
-                     sodipodi:cx="20.544279"
-                     sodipodi:type="arc"
                      style="font-style:normal;font-weight:normal;font-size:13.58917427px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;display:inline;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
                      id="path10796-2-6-2-2"
                      transform="matrix(1.0012483,0,0,0.88600469,0.97175283,73.294583)" />
                   <path
                      d="m 22.620507,999.74158 0,-0.98021 -1.040788,0 c -0.401091,0 -0.699714,0.0857 -0.895868,0.25704 -0.196155,0.17135 -0.294232,0.43419 -0.294232,0.78852 0,0.32237 0.09954,0.57797 0.298623,0.76677 0.199082,0.1887 0.468428,0.2831 0.808038,0.2831 0.336682,0 0.607492,-0.1031 0.812429,-0.3093 0.207865,-0.2062 0.311798,-0.4748 0.311798,-0.80592 z m 0.808037,-1.43764 -0.01946,1.97066 1.6957,1.5699 -0.444853,0.3635 -1.601857,-1.6986 -0.459711,0.2744 c -0.244962,0.1855 -0.362864,0.285 -0.597079,0.3867 -0.234214,0.1017 -0.507951,0.1525 -0.821211,0.1525 -0.518199,0 -0.929537,-0.1365 -1.234015,-0.4095 -0.304478,-0.2731 -0.456717,-0.6419 -0.456717,-1.10657 0,-0.47921 0.174196,-0.85097 0.522589,-1.11526 0.348394,-0.26429 0.840243,-0.39644 1.475548,-0.39644 l 1.13301,0 0,-0.31802 c 0,-0.35143 -0.108324,-0.62298 -0.324973,-0.81467 -0.213719,-0.19459 -0.51527,-0.29188 -0.904651,-0.29188 -0.322044,0 -0.578215,0.0726 -0.768514,0.21782 -0.190299,0.14521 -0.308869,0.36013 -0.355712,0.64476 l -0.417193,0 0,-0.93664 c 0.281057,-0.11908 0.55333,-0.20766 0.816821,-0.26575 0.266418,-0.061 0.525517,-0.0915 0.777297,-0.0915 0.647015,0 1.138864,0.15974 1.475547,0.47921 0.33961,0.31657 0.509415,0.77836 0.509415,1.38537 z"
                      style="fill:#266923;fill-opacity:1;stroke:#266923;stroke-width:0.27716896;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-                     id="path4156"
-                     inkscape:connector-curvature="0"
-                     sodipodi:nodetypes="scscscscsccccccsscssscscssccccscsc" />
+                     id="path4156" />
                 </g>
               </g>
             </g>
@@ -138,8 +69,6 @@
         <g
            id="g4277">
           <path
-             sodipodi:nodetypes="cc"
-             inkscape:connector-curvature="0"
              id="path4162-4"
              d="m 14.791139,1037.0666 4.775192,5.7421"
              style="fill:none;fill-rule:evenodd;stroke:#315079;stroke-width:1.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
@@ -148,14 +77,11 @@
             <path
                style="fill:none;fill-rule:evenodd;stroke:#315079;stroke-width:1.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
                d="m 10.688393,1037.1181 2.326151,2.2325 4.496757,-4.4968"
-               id="path4160"
-               inkscape:connector-curvature="0"
-               sodipodi:nodetypes="ccc" />
+               id="path4160" />
             <path
                style="fill:none;fill-rule:evenodd;stroke:#315079;stroke-width:1.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
                d="m 19.566331,1036.7541 -4.993942,6.0546"
-               id="path4162"
-               inkscape:connector-curvature="0" />
+               id="path4162" />
           </g>
         </g>
       </g>
diff --git a/ui/org.eclipse.pde.ui/icons/obj16/att_class_obj.svg b/ui/org.eclipse.pde.ui/icons/obj16/att_class_obj.svg
index 36e92babc68..dcff06a63dc 100644
--- a/ui/org.eclipse.pde.ui/icons/obj16/att_class_obj.svg
+++ b/ui/org.eclipse.pde.ui/icons/obj16/att_class_obj.svg
@@ -2,63 +2,19 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="att_class_obj.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       y2="462.11539"
-       x2="388.63736"
-       y1="478.18777"
-       x1="388.63736"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3929-5"
-       xlink:href="#linearGradient10798-1-9-3-7-6-8-9-0-9-1"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient10798-1-9-3-7-6-8-9-0-9-1">
-      <stop
-         style="stop-color:#7564b1;stop-opacity:1"
-         offset="0"
-         id="stop10800-5-2-1-8-20-6-4-9-8-2" />
-      <stop
-         id="stop10806-6-8-5-3-9-24-8-4-3-2"
-         offset="0.5"
-         style="stop-color:#5d4aa1;stop-opacity:1" />
-      <stop
-         style="stop-color:#9283c3;stop-opacity:1"
-         offset="1"
-         id="stop10802-1-5-3-0-4-8-4-2-9-2" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3827">
-      <stop
-         id="stop3829"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0.60149658"
-         id="stop3835" />
-      <stop
-         id="stop3831"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10798-1-9-3-7-6-8-9-0-9-1-0"
        id="linearGradient3929-5-7"
        gradientUnits="userSpaceOnUse"
@@ -82,33 +38,6 @@
          style="stop-color:#91c168;stop-opacity:1;" />
     </linearGradient>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="15.999999"
-     inkscape:cx="2.5633073"
-     inkscape:cy="8.0527309"
-     inkscape:document-units="px"
-     inkscape:current-layer="g3353"
-     showgrid="true"
-     inkscape:window-width="1100"
-     inkscape:window-height="900"
-     inkscape:window-x="630"
-     inkscape:window-y="749"
-     inkscape:window-maximized="0"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2985"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -122,8 +51,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      transform="translate(0,-1036.3622)">
     <g
@@ -134,8 +61,7 @@
         <g
            transform="matrix(0.83447477,0,0,0.82677585,8.9128593,176.40614)"
            style="display:inline"
-           id="layer1-0"
-           inkscape:label="Layer 1">
+           id="layer1-0">
           <g
              id="g11331-3-1-1"
              style="display:inline"
@@ -174,9 +100,7 @@
             <path
                d="m 9.9582435,1043.873 c -0.068736,-0.4207 -0.2258257,-0.7375 -0.4712765,-0.9505 -0.2405524,-0.2129 -0.5547364,-0.3192 -0.9425527,-0.3192 -0.5154625,0 -0.927829,0.185 -1.2371006,0.5551 -0.3043689,0.3648 -0.4565517,0.6031 -0.4565489,1.4648 -2.8e-6,0.958 0.1546346,1.3845 0.4639127,1.7799 0.3141807,0.3954 0.7339108,0.593 1.2591915,0.593 0.3927255,0 0.7142731,-0.114 0.9646439,-0.3422 0.2503599,-0.2332 0.4270885,-0.6309 0.5301861,-1.1937 l 2.032379,-0.017 c -0.211101,0.9629 -0.616102,2.0653 -1.215009,2.557 -0.598921,0.4917 -1.401562,0.7374 -2.407928,0.7374 -1.1438303,0 -2.0569271,-0.3724 -2.7392935,-1.1176 -0.6774613,-0.7449 -1.0161905,-1.5264 -1.0161905,-2.8443 0,-1.333 0.3411837,-1.9946 1.0235539,-2.7344 0.6823664,-0.7452 1.6052818,-1.1177 2.7687486,-1.1177 0.9523657,0 1.7083715,0.2129 2.2680175,0.6387 0.564543,0.4205 1.032045,1.4081 1.277509,2.2745 z"
                style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:15.56941891px;line-height:125%;font-family:Arial;letter-spacing:0px;word-spacing:0px;display:inline;fill:#ffffff;fill-opacity:1;stroke:none"
-               id="path3817"
-               inkscape:connector-curvature="0"
-               sodipodi:nodetypes="ccscscscccsscscsccc" />
+               id="path3817" />
           </g>
         </g>
         <g
@@ -191,24 +115,14 @@
              id="path10796-2-6-2"
              transform="matrix(1.0012483,0,0,0.88600469,0.97175283,73.294583)" />
           <path
-             sodipodi:open="true"
              d="m 24.43155,1046.9864 a 4.4886336,4.4886336 0 0 1 -1.642954,1.6429"
-             sodipodi:end="1.0471976"
-             sodipodi:start="0.52359878"
-             sodipodi:ry="4.4886336"
-             sodipodi:rx="4.4886336"
-             sodipodi:cy="1044.7421"
-             sodipodi:cx="20.544279"
-             sodipodi:type="arc"
              style="font-style:normal;font-weight:normal;font-size:13.58917427px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;display:inline;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
              id="path10796-2-6-2-2"
              transform="matrix(1.0012483,0,0,0.88600469,0.97175283,73.294583)" />
           <path
              d="m 22.620507,999.74158 0,-0.98021 -1.040788,0 c -0.401091,0 -0.699714,0.0857 -0.895868,0.25704 -0.196155,0.17135 -0.294232,0.43419 -0.294232,0.78852 0,0.32237 0.09954,0.57797 0.298623,0.76677 0.199082,0.1887 0.468428,0.2831 0.808038,0.2831 0.336682,0 0.607492,-0.1031 0.812429,-0.3093 0.207865,-0.2062 0.311798,-0.4748 0.311798,-0.80592 z m 0.808037,-1.43764 -0.01946,1.97066 1.6957,1.5699 -0.444853,0.3635 -1.601857,-1.6986 -0.459711,0.2744 c -0.244962,0.1855 -0.362864,0.285 -0.597079,0.3867 -0.234214,0.1017 -0.507951,0.1525 -0.821211,0.1525 -0.518199,0 -0.929537,-0.1365 -1.234015,-0.4095 -0.304478,-0.2731 -0.456717,-0.6419 -0.456717,-1.10657 0,-0.47921 0.174196,-0.85097 0.522589,-1.11526 0.348394,-0.26429 0.840243,-0.39644 1.475548,-0.39644 l 1.13301,0 0,-0.31802 c 0,-0.35143 -0.108324,-0.62298 -0.324973,-0.81467 -0.213719,-0.19459 -0.51527,-0.29188 -0.904651,-0.29188 -0.322044,0 -0.578215,0.0726 -0.768514,0.21782 -0.190299,0.14521 -0.308869,0.36013 -0.355712,0.64476 l -0.417193,0 0,-0.93664 c 0.281057,-0.11908 0.55333,-0.20766 0.816821,-0.26575 0.266418,-0.061 0.525517,-0.0915 0.777297,-0.0915 0.647015,0 1.138864,0.15974 1.475547,0.47921 0.33961,0.31657 0.509415,0.77836 0.509415,1.38537 z"
              style="fill:#266923;fill-opacity:1;stroke:#266923;stroke-width:0.27716896;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-             id="path4156"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="scscscscsccccccsscssscscssccccscsc" />
+             id="path4156" />
         </g>
       </g>
     </g>
diff --git a/ui/org.eclipse.pde.ui/icons/obj16/att_file_obj.svg b/ui/org.eclipse.pde.ui/icons/obj16/att_file_obj.svg
index a82b405ab9a..e6cbb74acf8 100644
--- a/ui/org.eclipse.pde.ui/icons/obj16/att_file_obj.svg
+++ b/ui/org.eclipse.pde.ui/icons/obj16/att_file_obj.svg
@@ -2,46 +2,18 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="att_file_obj.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
-    <linearGradient
-       y2="462.11539"
-       x2="388.63736"
-       y1="478.18777"
-       x1="388.63736"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3929-5"
-       xlink:href="#linearGradient10798-1-9-3-7-6-8-9-0-9-1"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient10798-1-9-3-7-6-8-9-0-9-1">
-      <stop
-         style="stop-color:#7564b1;stop-opacity:1"
-         offset="0"
-         id="stop10800-5-2-1-8-20-6-4-9-8-2" />
-      <stop
-         id="stop10806-6-8-5-3-9-24-8-4-3-2"
-         offset="0.5"
-         style="stop-color:#5d4aa1;stop-opacity:1" />
-      <stop
-         style="stop-color:#9283c3;stop-opacity:1"
-         offset="1"
-         id="stop10802-1-5-3-0-4-8-4-2-9-2" />
-    </linearGradient>
     <linearGradient
        gradientTransform="matrix(1.0848495,0,0,1.0848495,4.1318641,-91.791648)"
        gradientUnits="userSpaceOnUse"
@@ -50,11 +22,9 @@
        y1="1038.5779"
        x1="10.544736"
        id="linearGradient4908-2"
-       xlink:href="#linearGradient4902-3"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4902-3" />
     <linearGradient
-       id="linearGradient4902-3"
-       inkscape:collect="always">
+       id="linearGradient4902-3">
       <stop
          id="stop4904-2"
          offset="0"
@@ -72,11 +42,9 @@
        y1="1042.2307"
        x1="7.9987183"
        id="linearGradient4900-1"
-       xlink:href="#linearGradient4894-6"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4894-6" />
     <linearGradient
-       id="linearGradient4894-6"
-       inkscape:collect="always">
+       id="linearGradient4894-6">
       <stop
          id="stop4896-8"
          offset="0"
@@ -88,7 +56,6 @@
     </linearGradient>
     <linearGradient
        gradientTransform="matrix(1.0848495,0,0,1.0848495,4.1318641,-91.791648)"
-       inkscape:collect="always"
        xlink:href="#linearGradient4994-6"
        id="linearGradient4101"
        gradientUnits="userSpaceOnUse"
@@ -97,8 +64,7 @@
        x2="9.8946028"
        y2="1051.8378" />
     <linearGradient
-       id="linearGradient4994-6"
-       inkscape:collect="always">
+       id="linearGradient4994-6">
       <stop
          id="stop4996-1"
          offset="0"
@@ -109,33 +75,6 @@
          style="stop-color:#dce7f7;stop-opacity:1" />
     </linearGradient>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="15.999999"
-     inkscape:cx="-0.73627572"
-     inkscape:cy="13.519436"
-     inkscape:document-units="px"
-     inkscape:current-layer="g3353"
-     showgrid="true"
-     inkscape:window-width="1100"
-     inkscape:window-height="900"
-     inkscape:window-x="946"
-     inkscape:window-y="653"
-     inkscape:window-maximized="0"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2985"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -149,8 +88,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      transform="translate(0,-1036.3622)">
     <g
@@ -159,19 +96,14 @@
          transform="translate(-9.5563496,1.6205583)"
          id="g3353">
         <path
-           sodipodi:nodetypes="cccccc"
-           inkscape:connector-curvature="0"
            id="rect4001-3"
            d="m 10.095588,1035.2628 5.291937,-0.062 3.321871,3.2617 0,7.7367 -8.613808,0.062 z"
            style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:11.05178356px;line-height:125%;font-family:AustralianFlyingCorpsStencil;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;display:inline;fill:url(#linearGradient4101);fill-opacity:1;stroke:none;stroke-width:0.24860173;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
         <path
-           inkscape:connector-curvature="0"
            id="path4884"
            d="m 14.584943,1034.7608 0,3.9337 3.917218,0 z"
            style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:11.05178356px;line-height:125%;font-family:AustralianFlyingCorpsStencil;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;display:inline;fill:url(#linearGradient4900-1);fill-opacity:1;stroke:none;stroke-width:0.24860173;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
         <path
-           sodipodi:nodetypes="cccccc"
-           inkscape:connector-curvature="0"
            id="rect4001"
            d="m 10.095588,1035.2628 4.791937,0 3.321871,3.2617 0,7.7367 -8.113808,0 z"
            style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:11.05178356px;line-height:125%;font-family:AustralianFlyingCorpsStencil;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;display:inline;fill:none;fill-opacity:1;stroke:url(#linearGradient4908-2);stroke-width:1.08484948;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
@@ -187,24 +119,14 @@
              id="path10796-2-6-2"
              transform="matrix(1.0012483,0,0,0.88600469,0.97175283,73.294583)" />
           <path
-             sodipodi:open="true"
              d="m 24.43155,1046.9864 a 4.4886336,4.4886336 0 0 1 -1.642954,1.6429"
-             sodipodi:end="1.0471976"
-             sodipodi:start="0.52359878"
-             sodipodi:ry="4.4886336"
-             sodipodi:rx="4.4886336"
-             sodipodi:cy="1044.7421"
-             sodipodi:cx="20.544279"
-             sodipodi:type="arc"
              style="font-style:normal;font-weight:normal;font-size:13.58917427px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;display:inline;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
              id="path10796-2-6-2-2"
              transform="matrix(1.0012483,0,0,0.88600469,0.97175283,73.294583)" />
           <path
              d="m 22.620507,999.74158 0,-0.98021 -1.040788,0 c -0.401091,0 -0.699714,0.0857 -0.895868,0.25704 -0.196155,0.17135 -0.294232,0.43419 -0.294232,0.78852 0,0.32237 0.09954,0.57797 0.298623,0.76677 0.199082,0.1887 0.468428,0.2831 0.808038,0.2831 0.336682,0 0.607492,-0.1031 0.812429,-0.3093 0.207865,-0.2062 0.311798,-0.4748 0.311798,-0.80592 z m 0.808037,-1.43764 -0.01946,1.97066 1.6957,1.5699 -0.444853,0.3635 -1.601857,-1.6986 -0.459711,0.2744 c -0.244962,0.1855 -0.362864,0.285 -0.597079,0.3867 -0.234214,0.1017 -0.507951,0.1525 -0.821211,0.1525 -0.518199,0 -0.929537,-0.1365 -1.234015,-0.4095 -0.304478,-0.2731 -0.456717,-0.6419 -0.456717,-1.10657 0,-0.47921 0.174196,-0.85097 0.522589,-1.11526 0.348394,-0.26429 0.840243,-0.39644 1.475548,-0.39644 l 1.13301,0 0,-0.31802 c 0,-0.35143 -0.108324,-0.62298 -0.324973,-0.81467 -0.213719,-0.19459 -0.51527,-0.29188 -0.904651,-0.29188 -0.322044,0 -0.578215,0.0726 -0.768514,0.21782 -0.190299,0.14521 -0.308869,0.36013 -0.355712,0.64476 l -0.417193,0 0,-0.93664 c 0.281057,-0.11908 0.55333,-0.20766 0.816821,-0.26575 0.266418,-0.061 0.525517,-0.0915 0.777297,-0.0915 0.647015,0 1.138864,0.15974 1.475547,0.47921 0.33961,0.31657 0.509415,0.77836 0.509415,1.38537 z"
              style="fill:#266923;fill-opacity:1;stroke:#266923;stroke-width:0.27716896;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-             id="path4156"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="scscscscsccccccsscssscscssccccscsc" />
+             id="path4156" />
         </g>
       </g>
     </g>
diff --git a/ui/org.eclipse.pde.ui/icons/obj16/att_id_obj.svg b/ui/org.eclipse.pde.ui/icons/obj16/att_id_obj.svg
index aa75cd95721..cc9c6dd02e6 100644
--- a/ui/org.eclipse.pde.ui/icons/obj16/att_id_obj.svg
+++ b/ui/org.eclipse.pde.ui/icons/obj16/att_id_obj.svg
@@ -2,46 +2,18 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="att_id_obj.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
-    <linearGradient
-       y2="462.11539"
-       x2="388.63736"
-       y1="478.18777"
-       x1="388.63736"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3929-5"
-       xlink:href="#linearGradient10798-1-9-3-7-6-8-9-0-9-1"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient10798-1-9-3-7-6-8-9-0-9-1">
-      <stop
-         style="stop-color:#7564b1;stop-opacity:1"
-         offset="0"
-         id="stop10800-5-2-1-8-20-6-4-9-8-2" />
-      <stop
-         id="stop10806-6-8-5-3-9-24-8-4-3-2"
-         offset="0.5"
-         style="stop-color:#5d4aa1;stop-opacity:1" />
-      <stop
-         style="stop-color:#9283c3;stop-opacity:1"
-         offset="1"
-         id="stop10802-1-5-3-0-4-8-4-2-9-2" />
-    </linearGradient>
     <linearGradient
        id="linearGradient28456">
       <stop
@@ -54,7 +26,6 @@
          id="stop28460" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient28456"
        id="linearGradient28462"
        x1="27.221357"
@@ -64,33 +35,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-25.192192,1037.8916)" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1"
-     inkscape:cx="-34.479441"
-     inkscape:cy="-16.015995"
-     inkscape:document-units="px"
-     inkscape:current-layer="g4176"
-     showgrid="false"
-     inkscape:window-width="1100"
-     inkscape:window-height="900"
-     inkscape:window-x="1252"
-     inkscape:window-y="605"
-     inkscape:window-maximized="0"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2985"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -104,8 +48,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      transform="translate(0,-1036.3622)">
     <g
@@ -125,24 +67,14 @@
              id="path10796-2-6-2"
              transform="matrix(1.0012483,0,0,0.88600469,0.97175283,73.294583)" />
           <path
-             sodipodi:open="true"
              d="m 24.43155,1046.9864 a 4.4886336,4.4886336 0 0 1 -1.642954,1.6429"
-             sodipodi:end="1.0471976"
-             sodipodi:start="0.52359878"
-             sodipodi:ry="4.4886336"
-             sodipodi:rx="4.4886336"
-             sodipodi:cy="1044.7421"
-             sodipodi:cx="20.544279"
-             sodipodi:type="arc"
              style="font-style:normal;font-weight:normal;font-size:13.58917427px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;display:inline;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
              id="path10796-2-6-2-2"
              transform="matrix(1.0012483,0,0,0.88600469,0.97175283,73.294583)" />
           <path
              d="m 22.620507,999.74158 0,-0.98021 -1.040788,0 c -0.401091,0 -0.699714,0.0857 -0.895868,0.25704 -0.196155,0.17135 -0.294232,0.43419 -0.294232,0.78852 0,0.32237 0.09954,0.57797 0.298623,0.76677 0.199082,0.1887 0.468428,0.2831 0.808038,0.2831 0.336682,0 0.607492,-0.1031 0.812429,-0.3093 0.207865,-0.2062 0.311798,-0.4748 0.311798,-0.80592 z m 0.808037,-1.43764 -0.01946,1.97066 1.6957,1.5699 -0.444853,0.3635 -1.601857,-1.6986 -0.459711,0.2744 c -0.244962,0.1855 -0.362864,0.285 -0.597079,0.3867 -0.234214,0.1017 -0.507951,0.1525 -0.821211,0.1525 -0.518199,0 -0.929537,-0.1365 -1.234015,-0.4095 -0.304478,-0.2731 -0.456717,-0.6419 -0.456717,-1.10657 0,-0.47921 0.174196,-0.85097 0.522589,-1.11526 0.348394,-0.26429 0.840243,-0.39644 1.475548,-0.39644 l 1.13301,0 0,-0.31802 c 0,-0.35143 -0.108324,-0.62298 -0.324973,-0.81467 -0.213719,-0.19459 -0.51527,-0.29188 -0.904651,-0.29188 -0.322044,0 -0.578215,0.0726 -0.768514,0.21782 -0.190299,0.14521 -0.308869,0.36013 -0.355712,0.64476 l -0.417193,0 0,-0.93664 c 0.281057,-0.11908 0.55333,-0.20766 0.816821,-0.26575 0.266418,-0.061 0.525517,-0.0915 0.777297,-0.0915 0.647015,0 1.138864,0.15974 1.475547,0.47921 0.33961,0.31657 0.509415,0.77836 0.509415,1.38537 z"
              style="fill:#266923;fill-opacity:1;stroke:#266923;stroke-width:0.27716896;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-             id="path4156"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="scscscscsccccccsscssscscssccccscsc" />
+             id="path4156" />
         </g>
         <g
            id="g4176"
@@ -155,8 +87,6 @@
              id="rect28446"
              style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;stroke:url(#linearGradient28462);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
           <path
-             sodipodi:nodetypes="cccccccc"
-             inkscape:connector-curvature="0"
              id="path3986"
              d="m 6.5786243,1053.01 -0.4968363,0.4621 -3.1499817,-3.3122 -1.3597109,1.2925 0.010561,-2.996 2.9917897,0.013 -1.2272009,1.3098 z"
              style="display:inline;fill:#17325d;fill-opacity:1;stroke:none" />
diff --git a/ui/org.eclipse.pde.ui/icons/obj16/att_impl_obj.svg b/ui/org.eclipse.pde.ui/icons/obj16/att_impl_obj.svg
index d27a1def423..08a644884e0 100644
--- a/ui/org.eclipse.pde.ui/icons/obj16/att_impl_obj.svg
+++ b/ui/org.eclipse.pde.ui/icons/obj16/att_impl_obj.svg
@@ -2,46 +2,18 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="att_impl_obj.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
-    <linearGradient
-       y2="462.11539"
-       x2="388.63736"
-       y1="478.18777"
-       x1="388.63736"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3929-5"
-       xlink:href="#linearGradient10798-1-9-3-7-6-8-9-0-9-1"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient10798-1-9-3-7-6-8-9-0-9-1">
-      <stop
-         style="stop-color:#7564b1;stop-opacity:1"
-         offset="0"
-         id="stop10800-5-2-1-8-20-6-4-9-8-2" />
-      <stop
-         id="stop10806-6-8-5-3-9-24-8-4-3-2"
-         offset="0.5"
-         style="stop-color:#5d4aa1;stop-opacity:1" />
-      <stop
-         style="stop-color:#9283c3;stop-opacity:1"
-         offset="1"
-         id="stop10802-1-5-3-0-4-8-4-2-9-2" />
-    </linearGradient>
     <linearGradient
        gradientTransform="translate(9.5876528,1023.7417)"
        y2="13.5"
@@ -50,10 +22,8 @@
        x1="0"
        gradientUnits="userSpaceOnUse"
        id="linearGradient4901"
-       xlink:href="#linearGradient4878-7"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4878-7" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4878-7">
       <stop
          style="stop-color:#4d607b;stop-opacity:1"
@@ -65,33 +35,6 @@
          id="stop4882-0" />
     </linearGradient>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="22.627416"
-     inkscape:cx="12.930331"
-     inkscape:cy="7.8190913"
-     inkscape:document-units="px"
-     inkscape:current-layer="g3353"
-     showgrid="true"
-     inkscape:window-width="1100"
-     inkscape:window-height="897"
-     inkscape:window-x="1113"
-     inkscape:window-y="729"
-     inkscape:window-maximized="0"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2985"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -105,8 +48,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      transform="translate(0,-1036.3622)">
     <g
@@ -130,32 +71,20 @@
                id="path10796-2-6-2"
                transform="matrix(1.0012483,0,0,0.88600469,0.97175283,73.294583)" />
             <path
-               sodipodi:open="true"
                d="m 24.43155,1046.9864 a 4.4886336,4.4886336 0 0 1 -1.642954,1.6429"
-               sodipodi:end="1.0471976"
-               sodipodi:start="0.52359878"
-               sodipodi:ry="4.4886336"
-               sodipodi:rx="4.4886336"
-               sodipodi:cy="1044.7421"
-               sodipodi:cx="20.544279"
-               sodipodi:type="arc"
                style="font-style:normal;font-weight:normal;font-size:13.58917427px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;display:inline;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
                id="path10796-2-6-2-2"
                transform="matrix(1.0012483,0,0,0.88600469,0.97175283,73.294583)" />
             <path
                d="m 22.620507,999.74158 0,-0.98021 -1.040788,0 c -0.401091,0 -0.699714,0.0857 -0.895868,0.25704 -0.196155,0.17135 -0.294232,0.43419 -0.294232,0.78852 0,0.32237 0.09954,0.57797 0.298623,0.76677 0.199082,0.1887 0.468428,0.2831 0.808038,0.2831 0.336682,0 0.607492,-0.1031 0.812429,-0.3093 0.207865,-0.2062 0.311798,-0.4748 0.311798,-0.80592 z m 0.808037,-1.43764 -0.01946,1.97066 1.6957,1.5699 -0.444853,0.3635 -1.601857,-1.6986 -0.459711,0.2744 c -0.244962,0.1855 -0.362864,0.285 -0.597079,0.3867 -0.234214,0.1017 -0.507951,0.1525 -0.821211,0.1525 -0.518199,0 -0.929537,-0.1365 -1.234015,-0.4095 -0.304478,-0.2731 -0.456717,-0.6419 -0.456717,-1.10657 0,-0.47921 0.174196,-0.85097 0.522589,-1.11526 0.348394,-0.26429 0.840243,-0.39644 1.475548,-0.39644 l 1.13301,0 0,-0.31802 c 0,-0.35143 -0.108324,-0.62298 -0.324973,-0.81467 -0.213719,-0.19459 -0.51527,-0.29188 -0.904651,-0.29188 -0.322044,0 -0.578215,0.0726 -0.768514,0.21782 -0.190299,0.14521 -0.308869,0.36013 -0.355712,0.64476 l -0.417193,0 0,-0.93664 c 0.281057,-0.11908 0.55333,-0.20766 0.816821,-0.26575 0.266418,-0.061 0.525517,-0.0915 0.777297,-0.0915 0.647015,0 1.138864,0.15974 1.475547,0.47921 0.33961,0.31657 0.509415,0.77836 0.509415,1.38537 z"
                style="fill:#266923;fill-opacity:1;stroke:#266923;stroke-width:0.27716896;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-               id="path4156"
-               inkscape:connector-curvature="0"
-               sodipodi:nodetypes="scscscscsccccccsscssscscssccccscsc" />
+               id="path4156" />
           </g>
         </g>
         <path
            style="display:inline;fill:url(#linearGradient4901);fill-opacity:1;stroke:none"
            d="m 9.5876528,1036.7417 0,1 5.0000012,0 0,2 2.999893,-2.5 -2.999893,-2.5 0,2 z"
-           id="path4108-9"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccccccc" />
+           id="path4108-9" />
       </g>
     </g>
   </g>
diff --git a/ui/org.eclipse.pde.ui/icons/obj16/att_req_obj.svg b/ui/org.eclipse.pde.ui/icons/obj16/att_req_obj.svg
index 96f91cdb845..701f546cf12 100644
--- a/ui/org.eclipse.pde.ui/icons/obj16/att_req_obj.svg
+++ b/ui/org.eclipse.pde.ui/icons/obj16/att_req_obj.svg
@@ -1,39 +1,15 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <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"
    version="1.1"
    id="svg2"
    height="16"
    width="16"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="att_req_obj.svg">
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1289"
-     inkscape:window-height="835"
-     id="namedview16"
-     showgrid="false"
-     inkscape:zoom="20.85965"
-     inkscape:cx="7.2258713"
-     inkscape:cy="5.1617109"
-     inkscape:window-x="1050"
-     inkscape:window-y="728"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="g3353" />
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
@@ -89,24 +65,14 @@
              id="path10796-2-6-2"
              transform="matrix(1.0012483,0,0,0.88600469,0.97175283,73.294583)" />
           <path
-             sodipodi:open="true"
              d="m 24.43155,1046.9864 a 4.4886336,4.4886336 0 0 1 -1.642954,1.6429"
-             sodipodi:end="1.0471976"
-             sodipodi:start="0.52359878"
-             sodipodi:ry="4.4886336"
-             sodipodi:rx="4.4886336"
-             sodipodi:cy="1044.7421"
-             sodipodi:cx="20.544279"
-             sodipodi:type="arc"
              style="font-style:normal;font-weight:normal;font-size:13.58917427px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;display:inline;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
              id="path10796-2-6-2-2"
              transform="matrix(1.0012483,0,0,0.88600469,0.97175283,73.294583)" />
           <path
              d="m 22.620507,999.74158 0,-0.98021 -1.040788,0 c -0.401091,0 -0.699714,0.0857 -0.895868,0.25704 -0.196155,0.17135 -0.294232,0.43419 -0.294232,0.78852 0,0.32237 0.09954,0.57797 0.298623,0.76677 0.199082,0.1887 0.468428,0.2831 0.808038,0.2831 0.336682,0 0.607492,-0.1031 0.812429,-0.3093 0.207865,-0.2062 0.311798,-0.4748 0.311798,-0.80592 z m 0.808037,-1.43764 -0.01946,1.97066 1.6957,1.5699 -0.444853,0.3635 -1.601857,-1.6986 -0.459711,0.2744 c -0.244962,0.1855 -0.362864,0.285 -0.597079,0.3867 -0.234214,0.1017 -0.507951,0.1525 -0.821211,0.1525 -0.518199,0 -0.929537,-0.1365 -1.234015,-0.4095 -0.304478,-0.2731 -0.456717,-0.6419 -0.456717,-1.10657 0,-0.47921 0.174196,-0.85097 0.522589,-1.11526 0.348394,-0.26429 0.840243,-0.39644 1.475548,-0.39644 l 1.13301,0 0,-0.31802 c 0,-0.35143 -0.108324,-0.62298 -0.324973,-0.81467 -0.213719,-0.19459 -0.51527,-0.29188 -0.904651,-0.29188 -0.322044,0 -0.578215,0.0726 -0.768514,0.21782 -0.190299,0.14521 -0.308869,0.36013 -0.355712,0.64476 l -0.417193,0 0,-0.93664 c 0.281057,-0.11908 0.55333,-0.20766 0.816821,-0.26575 0.266418,-0.061 0.525517,-0.0915 0.777297,-0.0915 0.647015,0 1.138864,0.15974 1.475547,0.47921 0.33961,0.31657 0.509415,0.77836 0.509415,1.38537 z"
              style="fill:#266923;fill-opacity:1;stroke:#266923;stroke-width:0.27716896;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-             id="path4156"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="scscscscsccccccsscssscscssccccscsc" />
+             id="path4156" />
         </g>
       </g>
       <rect
diff --git a/ui/org.eclipse.pde.ui/icons/obj16/att_string_obj.svg b/ui/org.eclipse.pde.ui/icons/obj16/att_string_obj.svg
index f2d407b3485..cc79cc08b28 100644
--- a/ui/org.eclipse.pde.ui/icons/obj16/att_string_obj.svg
+++ b/ui/org.eclipse.pde.ui/icons/obj16/att_string_obj.svg
@@ -2,46 +2,18 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="att_string_obj.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
-    <linearGradient
-       y2="462.11539"
-       x2="388.63736"
-       y1="478.18777"
-       x1="388.63736"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3929-5"
-       xlink:href="#linearGradient10798-1-9-3-7-6-8-9-0-9-1"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient10798-1-9-3-7-6-8-9-0-9-1">
-      <stop
-         style="stop-color:#7564b1;stop-opacity:1"
-         offset="0"
-         id="stop10800-5-2-1-8-20-6-4-9-8-2" />
-      <stop
-         id="stop10806-6-8-5-3-9-24-8-4-3-2"
-         offset="0.5"
-         style="stop-color:#5d4aa1;stop-opacity:1" />
-      <stop
-         style="stop-color:#9283c3;stop-opacity:1"
-         offset="1"
-         id="stop10802-1-5-3-0-4-8-4-2-9-2" />
-    </linearGradient>
     <linearGradient
        gradientTransform="matrix(1.4832993,0,0,0.99737035,-6.3494562,-0.23785593)"
        gradientUnits="userSpaceOnUse"
@@ -50,10 +22,8 @@
        y1="1043.8571"
        x1="7.0070496"
        id="linearGradient4867-7"
-       xlink:href="#linearGradient4877-6"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4877-6" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4877-6">
       <stop
          style="stop-color:#91a5c7;stop-opacity:1;"
@@ -66,7 +36,6 @@
     </linearGradient>
     <linearGradient
        gradientTransform="matrix(1.0848495,0,0,1.0848495,-10.926878,-91.847701)"
-       inkscape:collect="always"
        xlink:href="#linearGradient4994-6"
        id="linearGradient4101"
        gradientUnits="userSpaceOnUse"
@@ -75,8 +44,7 @@
        x2="9.8946028"
        y2="1042.3459" />
     <linearGradient
-       id="linearGradient4994-6"
-       inkscape:collect="always">
+       id="linearGradient4994-6">
       <stop
          id="stop4996-1"
          offset="0"
@@ -94,11 +62,9 @@
        y1="1038.5779"
        x1="10.544736"
        id="linearGradient4908-2"
-       xlink:href="#linearGradient4902-3"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4902-3" />
     <linearGradient
-       id="linearGradient4902-3"
-       inkscape:collect="always">
+       id="linearGradient4902-3">
       <stop
          id="stop4904-2"
          offset="0"
@@ -109,33 +75,6 @@
          style="stop-color:#8392b0;stop-opacity:1" />
     </linearGradient>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="22.627416"
-     inkscape:cx="1.4073056"
-     inkscape:cy="6.2129041"
-     inkscape:document-units="px"
-     inkscape:current-layer="g3353"
-     showgrid="true"
-     inkscape:window-width="1348"
-     inkscape:window-height="984"
-     inkscape:window-x="1093"
-     inkscape:window-y="899"
-     inkscape:window-maximized="0"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2985"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -149,8 +88,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      transform="translate(0,-1036.3622)">
     <g
@@ -170,24 +107,14 @@
              id="path10796-2-6-2"
              transform="matrix(1.0012483,0,0,0.88600469,0.97175283,73.294583)" />
           <path
-             sodipodi:open="true"
              d="m 24.43155,1046.9864 a 4.4886336,4.4886336 0 0 1 -1.642954,1.6429"
-             sodipodi:end="1.0471976"
-             sodipodi:start="0.52359878"
-             sodipodi:ry="4.4886336"
-             sodipodi:rx="4.4886336"
-             sodipodi:cy="1044.7421"
-             sodipodi:cx="20.544279"
-             sodipodi:type="arc"
              style="font-style:normal;font-weight:normal;font-size:13.58917427px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;display:inline;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
              id="path10796-2-6-2-2"
              transform="matrix(1.0012483,0,0,0.88600469,0.97175283,73.294583)" />
           <path
              d="m 22.620507,999.74158 0,-0.98021 -1.040788,0 c -0.401091,0 -0.699714,0.0857 -0.895868,0.25704 -0.196155,0.17135 -0.294232,0.43419 -0.294232,0.78852 0,0.32237 0.09954,0.57797 0.298623,0.76677 0.199082,0.1887 0.468428,0.2831 0.808038,0.2831 0.336682,0 0.607492,-0.1031 0.812429,-0.3093 0.207865,-0.2062 0.311798,-0.4748 0.311798,-0.80592 z m 0.808037,-1.43764 -0.01946,1.97066 1.6957,1.5699 -0.444853,0.3635 -1.601857,-1.6986 -0.459711,0.2744 c -0.244962,0.1855 -0.362864,0.285 -0.597079,0.3867 -0.234214,0.1017 -0.507951,0.1525 -0.821211,0.1525 -0.518199,0 -0.929537,-0.1365 -1.234015,-0.4095 -0.304478,-0.2731 -0.456717,-0.6419 -0.456717,-1.10657 0,-0.47921 0.174196,-0.85097 0.522589,-1.11526 0.348394,-0.26429 0.840243,-0.39644 1.475548,-0.39644 l 1.13301,0 0,-0.31802 c 0,-0.35143 -0.108324,-0.62298 -0.324973,-0.81467 -0.213719,-0.19459 -0.51527,-0.29188 -0.904651,-0.29188 -0.322044,0 -0.578215,0.0726 -0.768514,0.21782 -0.190299,0.14521 -0.308869,0.36013 -0.355712,0.64476 l -0.417193,0 0,-0.93664 c 0.281057,-0.11908 0.55333,-0.20766 0.816821,-0.26575 0.266418,-0.061 0.525517,-0.0915 0.777297,-0.0915 0.647015,0 1.138864,0.15974 1.475547,0.47921 0.33961,0.31657 0.509415,0.77836 0.509415,1.38537 z"
              style="fill:#266923;fill-opacity:1;stroke:#266923;stroke-width:0.27716896;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-             id="path4156"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="scscscscsccccccsscssscscssccccscsc" />
+             id="path4156" />
         </g>
       </g>
       <g
@@ -196,15 +123,11 @@
         <path
            style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:11.05178356px;line-height:125%;font-family:AustralianFlyingCorpsStencil;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;display:inline;fill:url(#linearGradient4101);fill-opacity:1;stroke:none;stroke-width:0.24860173;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
            d="m -4.9631536,1035.2067 c 0,0 8.5285363,-0.9593 10.8748056,0 1.4364002,0.5873 0.051502,3.2617 0.051502,3.2617 l 0,0.6788 -10.9263073,0 z"
-           id="rect4001-3"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cscccc" />
+           id="rect4001-3" />
         <path
            style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:11.05178356px;line-height:125%;font-family:AustralianFlyingCorpsStencil;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;display:inline;fill:none;fill-opacity:1;stroke:url(#linearGradient4908-2);stroke-width:1.08484948;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
            d="m -4.9631536,1035.2067 10.9189997,0 c 0.012962,4.687 0.00731,-0.7023 0.00731,3.9847 l -10.9263073,0 z"
-           id="rect4001"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
+           id="rect4001" />
       </g>
       <rect
          y="1040.3701"
diff --git a/ui/org.eclipse.pde.ui/icons/obj16/attribute_obj.svg b/ui/org.eclipse.pde.ui/icons/obj16/attribute_obj.svg
index 0ca1755dfb1..184d5958540 100644
--- a/ui/org.eclipse.pde.ui/icons/obj16/attribute_obj.svg
+++ b/ui/org.eclipse.pde.ui/icons/obj16/attribute_obj.svg
@@ -2,74 +2,17 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="attribute_obj.svg">
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
-     id="defs4">
-    <linearGradient
-       y2="462.11539"
-       x2="388.63736"
-       y1="478.18777"
-       x1="388.63736"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3929-5"
-       xlink:href="#linearGradient10798-1-9-3-7-6-8-9-0-9-1"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient10798-1-9-3-7-6-8-9-0-9-1">
-      <stop
-         style="stop-color:#7564b1;stop-opacity:1"
-         offset="0"
-         id="stop10800-5-2-1-8-20-6-4-9-8-2" />
-      <stop
-         id="stop10806-6-8-5-3-9-24-8-4-3-2"
-         offset="0.5"
-         style="stop-color:#5d4aa1;stop-opacity:1" />
-      <stop
-         style="stop-color:#9283c3;stop-opacity:1"
-         offset="1"
-         id="stop10802-1-5-3-0-4-8-4-2-9-2" />
-    </linearGradient>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="22.627416"
-     inkscape:cx="-2.6155138"
-     inkscape:cy="12.037537"
-     inkscape:document-units="px"
-     inkscape:current-layer="g3353"
-     showgrid="true"
-     inkscape:window-width="1104"
-     inkscape:window-height="956"
-     inkscape:window-x="1151"
-     inkscape:window-y="564"
-     inkscape:window-maximized="0"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2985"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
+     id="defs4" />
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -83,8 +26,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      transform="translate(0,-1036.3622)">
     <g
@@ -105,8 +46,7 @@
           <path
              d="m 22.556023,999.80708 0,-0.98786 -1.040543,0 q -0.601495,0 -0.895657,0.25904 -0.294162,0.25904 -0.294162,0.79468 0,0.48736 0.298552,0.77276 0.298553,0.2853 0.807848,0.2853 0.504904,0 0.812238,-0.3117 0.311724,-0.3117 0.311724,-0.81222 z m 0.807847,-1.44886 0,2.44988 0.720038,0 0,0.4654 -1.527885,0 0,-0.5049 q -0.267819,0.3249 -0.619058,0.4786 -0.351238,0.1536 -0.821018,0.1536 -0.777115,0 -1.233724,-0.4127 -0.456609,-0.4127 -0.456609,-1.11516 0,-0.72443 0.522466,-1.12396 0.522467,-0.39954 1.4752,-0.39954 l 1.132743,0 0,-0.3205 q 0,-0.53125 -0.324896,-0.82102 -0.320504,-0.29416 -0.904438,-0.29416 -0.482952,0 -0.768333,0.21952 -0.285381,0.21952 -0.355628,0.64979 l -0.417095,0 0,-0.94395 q 0.421485,-0.18001 0.816628,-0.26782 0.399533,-0.0922 0.777114,-0.0922 0.970295,0 1.4752,0.48295 0.509295,0.47856 0.509295,1.39617 z"
              style="stroke-width:0.42076299;stroke:#266923;stroke-opacity:1;fill:#266923;fill-opacity:1"
-             id="path4156"
-             inkscape:connector-curvature="0" />
+             id="path4156" />
         </g>
       </g>
     </g>
diff --git a/ui/org.eclipse.pde.ui/icons/obj16/build_exec.svg b/ui/org.eclipse.pde.ui/icons/obj16/build_exec.svg
index 8451e5b3738..6736b9814ed 100644
--- a/ui/org.eclipse.pde.ui/icons/obj16/build_exec.svg
+++ b/ui/org.eclipse.pde.ui/icons/obj16/build_exec.svg
@@ -6,10 +6,6 @@
    height="16"
    id="svg25490"
    version="1.1"
-   inkscape:version="1.3.2 (091e20e, 2023-11-25, custom)"
-   sodipodi:docname="build_exec.svg"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:svg="http://www.w3.org/2000/svg"
@@ -19,7 +15,6 @@
   <defs
      id="defs25492">
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient11290"
        id="linearGradient8238"
        gradientUnits="userSpaceOnUse"
@@ -28,7 +23,6 @@
        x2="12.51806"
        y2="1044.4806" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient11290">
       <stop
          style="stop-color:#567ead;stop-opacity:1"
@@ -46,8 +40,7 @@
        x1="12.51806"
        gradientUnits="userSpaceOnUse"
        id="linearGradient25569"
-       xlink:href="#linearGradient11290"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient11290" />
     <linearGradient
        y2="1044.4806"
        x2="12.51806"
@@ -55,11 +48,9 @@
        x1="12.51806"
        gradientUnits="userSpaceOnUse"
        id="linearGradient25571"
-       xlink:href="#linearGradient11290"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient11290" />
     <linearGradient
        gradientTransform="translate(-3.8518331,-1.044194)"
-       inkscape:collect="always"
        xlink:href="#linearGradient4994-6"
        id="linearGradient4101"
        gradientUnits="userSpaceOnUse"
@@ -68,8 +59,7 @@
        x2="9.8946028"
        y2="1051.8378" />
     <linearGradient
-       id="linearGradient4994-6"
-       inkscape:collect="always">
+       id="linearGradient4994-6">
       <stop
          id="stop4996-1"
          offset="0"
@@ -80,8 +70,7 @@
          style="stop-color:#dce7f7;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       id="linearGradient4894-6"
-       inkscape:collect="always">
+       id="linearGradient4894-6">
       <stop
          id="stop4896-8"
          offset="0"
@@ -99,11 +88,9 @@
        y1="1042.2307"
        x1="7.9987183"
        id="linearGradient4900-1"
-       xlink:href="#linearGradient4894-6"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4894-6" />
     <linearGradient
-       id="linearGradient4902-3"
-       inkscape:collect="always">
+       id="linearGradient4902-3">
       <stop
          id="stop4904-2"
          offset="0"
@@ -121,10 +108,8 @@
        y1="1038.5779"
        x1="10.544736"
        id="linearGradient4908-2"
-       xlink:href="#linearGradient4902-3"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4902-3" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4877-6">
       <stop
          style="stop-color:#91a5c7;stop-opacity:1;"
@@ -143,11 +128,9 @@
        y1="1043.8571"
        x1="7.0070496"
        id="linearGradient4867-7"
-       xlink:href="#linearGradient4877-6"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4877-6" />
     <linearGradient
-       id="linearGradient4861-1"
-       inkscape:collect="always">
+       id="linearGradient4861-1">
       <stop
          id="stop4863-1"
          offset="0"
@@ -165,44 +148,8 @@
        y1="1045.8571"
        x1="7.0070496"
        id="linearGradient4869-17"
-       xlink:href="#linearGradient4861-1"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4861-1" />
   </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="12.705825"
-     inkscape:cy="2.7621359"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1-95"
-     showgrid="true"
-     inkscape:snap-global="false"
-     inkscape:window-width="1920"
-     inkscape:window-height="991"
-     inkscape:window-x="-9"
-     inkscape:window-y="-9"
-     inkscape:window-maximized="1"
-     inkscape:showpageshadow="2"
-     inkscape:pagecheckerboard="0"
-     inkscape:deskcolor="#d1d1d1">
-    <inkscape:grid
-       type="xygrid"
-       id="grid26727"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       originx="0"
-       originy="0"
-       spacingy="1"
-       spacingx="1"
-       units="px" />
-  </sodipodi:namedview>
   <metadata
      id="metadata25495">
     <rdf:RDF>
@@ -216,15 +163,12 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      transform="translate(0,-1036.3622)">
     <g
        transform="translate(324.0078,-599.7683)"
        style="stroke:url(#linearGradient8238);stroke-opacity:1;display:inline"
-       id="layer1-2"
-       inkscape:label="Layer 1">
+       id="layer1-2">
       <g
          id="g11331-3-1-1-7"
          style="stroke:url(#linearGradient25569);display:inline"
@@ -248,7 +192,6 @@
           <g
              style="font-size:13.58917427px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#236298;fill-opacity:1;stroke:#236298;stroke-width:0.24860173;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline;font-family:Sans"
              id="layer1-9"
-             inkscape:label="Layer 1"
              transform="matrix(1.2778996,0,0.03747938,1.2778996,-58.56426,-297.79529)">
             <g
                transform="translate(20,0)"
@@ -257,22 +200,16 @@
               <g
                  transform="matrix(0.84893168,0,-0.02489823,0.84893168,-258.1493,627.19515)"
                  style="display:inline"
-                 id="layer1-95"
-                 inkscape:label="Layer 1">
+                 id="layer1-95">
                 <path
-                   sodipodi:nodetypes="cccccc"
-                   inkscape:connector-curvature="0"
                    id="rect4001-3"
                    d="m 1.6454494,1037.8597 7.0096695,0 3.0620571,3.0066 0,9.9546 -10.0717266,0 z"
                    style="fill:url(#linearGradient4101);fill-opacity:1;stroke:none;display:inline" />
                 <path
-                   inkscape:connector-curvature="0"
                    id="path4884"
                    d="m 8.1247879,1037.397 0,3.9112 3.9774781,0 z"
                    style="fill:url(#linearGradient4900-1);fill-opacity:1;stroke:none;display:inline" />
                 <path
-                   sodipodi:nodetypes="cccccc"
-                   inkscape:connector-curvature="0"
                    id="rect4001"
                    d="m 1.6454494,1037.8597 7.0096695,0 3.0620571,3.0066 0,9.9546 -10.0717266,0 z"
                    style="fill:none;stroke:url(#linearGradient4908-2);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;display:inline" />
@@ -294,12 +231,10 @@
                    id="g4920"
                    transform="matrix(1.0976253,0,0,1.0976253,-1.2719888,-102.19548)">
                   <path
-                     inkscape:connector-curvature="0"
                      id="path4114"
                      d="m 11.652973,1045.2351 -0.85549,0.7332 c 0,0 -0.08148,0.8148 -0.08148,1.1407 0,0.3259 0.366638,1.0999 0.366638,1.0999 l 0.488851,0.4481 c 0,0 0.69254,-0.082 0.651802,-0.2444 -0.04073,-0.163 0.285163,-1.1814 0.285163,-1.1814 0,0 0.08148,-0.774 -0.04073,-1.0184 -0.122212,-0.2445 -0.366638,-0.6926 -0.366638,-0.6926 z"
                      style="font-size:11.05178356px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;display:inline;font-family:AustralianFlyingCorpsStencil;-inkscape-font-specification:AustralianFlyingCorpsStencil" />
                   <path
-                     inkscape:connector-curvature="0"
                      id="path4114-5"
                      d="m 5.2571683,1045.2351 -0.85549,0.7332 c 0,0 -0.08148,0.8148 -0.08148,1.1407 0,0.3259 0.366638,1.0999 0.366638,1.0999 l 0.488851,0.4481 c 0,0 0.69254,-0.082 0.651802,-0.2444 -0.04073,-0.163 0.285163,-1.1814 0.285163,-1.1814 0,0 0.08148,-0.774 -0.04073,-1.0184 -0.122212,-0.2445 -0.366638,-0.6926 -0.366638,-0.6926 z"
                      style="font-size:11.05178356px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;display:inline;font-family:AustralianFlyingCorpsStencil;-inkscape-font-specification:AustralianFlyingCorpsStencil" />
diff --git a/ui/org.eclipse.pde.ui/icons/obj16/build_var_obj.svg b/ui/org.eclipse.pde.ui/icons/obj16/build_var_obj.svg
index 36d56e3de4d..d3193546b9c 100644
--- a/ui/org.eclipse.pde.ui/icons/obj16/build_var_obj.svg
+++ b/ui/org.eclipse.pde.ui/icons/obj16/build_var_obj.svg
@@ -2,24 +2,19 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="build_var_obj.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4161">
       <stop
          style="stop-color:#13436c;stop-opacity:1"
@@ -31,7 +26,6 @@
          id="stop4165" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4156">
       <stop
          style="stop-color:#7fa8cb;stop-opacity:1"
@@ -55,22 +49,6 @@
          id="stop4160" />
     </linearGradient>
     <linearGradient
-       id="linearGradient10798-1-9-3-7-6-8-9-0-9-1">
-      <stop
-         style="stop-color:#75ba7a;stop-opacity:1;"
-         offset="0"
-         id="stop10800-5-2-1-8-20-6-4-9-8-2" />
-      <stop
-         id="stop10806-6-8-5-3-9-24-8-4-3-2"
-         offset="0.5"
-         style="stop-color:#418a4d;stop-opacity:1" />
-      <stop
-         style="stop-color:#a4c589;stop-opacity:1"
-         offset="1"
-         id="stop10802-1-5-3-0-4-8-4-2-9-2" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4156"
        id="linearGradient4162"
        x1="-8.0854702"
@@ -80,7 +58,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1.0299985,0,0,1.0100745,0.29691166,-10.48482)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4161"
        id="linearGradient4167"
        x1="-9.3671017"
@@ -90,31 +67,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1.0299985,0,0,1.0100745,0.29691166,-10.48482)" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="32"
-     inkscape:cx="7.7461006"
-     inkscape:cy="9.7026067"
-     inkscape:document-units="px"
-     inkscape:current-layer="g6438"
-     showgrid="false"
-     inkscape:window-width="795"
-     inkscape:window-height="643"
-     inkscape:window-x="1266"
-     inkscape:window-y="539"
-     inkscape:window-maximized="0"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3949" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -128,8 +80,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
diff --git a/ui/org.eclipse.pde.ui/icons/obj16/bundle_obj.svg b/ui/org.eclipse.pde.ui/icons/obj16/bundle_obj.svg
index 9d73abb463d..d073a24c6d9 100644
--- a/ui/org.eclipse.pde.ui/icons/obj16/bundle_obj.svg
+++ b/ui/org.eclipse.pde.ui/icons/obj16/bundle_obj.svg
@@ -2,20 +2,16 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="bundle_obj.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
@@ -94,29 +90,6 @@
          id="stop11152-8-4-35-5-4-6" />
     </linearGradient>
     <linearGradient
-       id="linearGradient11146-7-5-30-1-1-4">
-      <stop
-         id="stop11150-9-6-9-5-6-9"
-         offset="0"
-         style="stop-color:#faefba;stop-opacity:1" />
-      <stop
-         style="stop-color:#9e6542;stop-opacity:1"
-         offset="1"
-         id="stop11152-6-7-6-3-3-3" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient11146-8-7-5-7-5-6-8">
-      <stop
-         id="stop11150-7-8-3-8-7-0-6"
-         offset="0"
-         style="stop-color:#faefba;stop-opacity:1" />
-      <stop
-         style="stop-color:#9e6542;stop-opacity:1"
-         offset="1"
-         id="stop11152-8-8-6-3-2-5-1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10507"
        id="linearGradient4895"
        gradientUnits="userSpaceOnUse"
@@ -126,7 +99,6 @@
        y2="449.88141"
        gradientTransform="matrix(0,1,-1,0,824.88775,74.875059)" />
     <radialGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient11146-8-3-2-6-1-7"
        id="radialGradient10503"
        gradientUnits="userSpaceOnUse"
@@ -175,10 +147,8 @@
        gradientTransform="matrix(-1,0,0,-1,750.01459,899.76468)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient10544"
-       xlink:href="#linearGradient10507-2"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient10507-2" />
     <radialGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4192"
        id="radialGradient10503-3"
        gradientUnits="userSpaceOnUse"
@@ -189,7 +159,6 @@
        fy="442.99802"
        r="6.1875" />
     <radialGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient11146-4-4-4-6-2"
        id="radialGradient10503-5"
        gradientUnits="userSpaceOnUse"
@@ -200,7 +169,6 @@
        fy="447.11966"
        r="6.1875" />
     <radialGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4198"
        id="radialGradient10503-3-2"
        gradientUnits="userSpaceOnUse"
@@ -211,29 +179,6 @@
        fy="446.32083"
        r="6.1875" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="15.401671"
-     inkscape:cx="6.5349806"
-     inkscape:cy="3.7646412"
-     inkscape:document-units="px"
-     inkscape:current-layer="g11260-4-2"
-     showgrid="true"
-     inkscape:window-width="1438"
-     inkscape:window-height="1019"
-     inkscape:window-x="857"
-     inkscape:window-y="464"
-     inkscape:window-maximized="0"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3947" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -247,8 +192,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
@@ -259,8 +202,7 @@
       <g
          transform="matrix(3.5838051,0,0,3.5838051,511.44753,-3423.3167)"
          style="font-style:normal;font-weight:normal;font-size:13.58917427px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;display:inline;fill:#ffffff;fill-opacity:1;stroke:none"
-         id="layer1-9"
-         inkscape:label="Layer 1">
+         id="layer1-9">
         <g
            id="g11260-4-2"
            transform="matrix(0.27903303,0,0,0.27903303,-109.29986,933.62804)"
@@ -268,15 +210,11 @@
           <path
              style="font-style:normal;font-weight:normal;font-size:13.58917427px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;display:inline;fill:url(#radialGradient10503-5);fill-opacity:1;stroke:none;stroke-width:3.58380508;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
              d="m 375.04584,467.87065 12.70006,-4.27794 5.26516,-13.68728 -17.96522,0 z"
-             id="rect10961-9-0-4-7"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccc" />
+             id="rect10961-9-0-4-7" />
           <path
              style="font-style:normal;font-weight:normal;font-size:13.58917427px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;display:inline;fill:url(#radialGradient10503-3-2);fill-opacity:1;stroke:none;stroke-width:3.58380508;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
              d="m 374.583,467.87065 -12.70006,-4.27794 -5.26516,-13.68728 17.96522,0 z"
-             id="rect10961-9-0-4-6-0"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccc" />
+             id="rect10961-9-0-4-6-0" />
           <circle
              style="font-style:normal;font-weight:normal;font-size:13.58917427px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;display:inline;opacity:1;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.58380513;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
              id="path4196-7"
@@ -286,24 +224,16 @@
           <path
              style="display:inline;fill:url(#radialGradient10503);fill-opacity:1;stroke:none;stroke-width:3.58380508;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
              d="m 375.04584,431.97098 12.70006,4.27794 5.26516,13.68728 -17.96522,0 z"
-             id="rect10961-9-0-4"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccc" />
+             id="rect10961-9-0-4" />
           <path
              style="font-style:normal;font-weight:normal;font-size:13.58917427px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;display:inline;fill:url(#radialGradient10503-3);fill-opacity:1;stroke:none;stroke-width:3.58380508;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
              d="m 374.583,431.97098 -12.70006,4.27794 -5.26516,13.68728 17.96522,0 z"
-             id="rect10961-9-0-4-6"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccc" />
+             id="rect10961-9-0-4-6" />
           <path
-             sodipodi:nodetypes="cc"
-             inkscape:connector-curvature="0"
              id="path11108-6-7-5"
              d="m 375.00635,426.58855 0,46.58947"
              style="display:inline;fill:#915323;fill-opacity:1;stroke:url(#linearGradient4895);stroke-width:3.58380508;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
           <path
-             sodipodi:nodetypes="cc"
-             inkscape:connector-curvature="0"
              id="path11108-6-7-5-6"
              d="m 398.30108,449.88328 -46.58947,0"
              style="font-style:normal;font-weight:normal;font-size:13.58917427px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;display:inline;fill:#915323;fill-opacity:1;stroke:url(#linearGradient10544);stroke-width:3.58380508;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
diff --git a/ui/org.eclipse.pde.ui/icons/obj16/category_obj.svg b/ui/org.eclipse.pde.ui/icons/obj16/category_obj.svg
index 84175662c1c..145a4bbc09f 100644
--- a/ui/org.eclipse.pde.ui/icons/obj16/category_obj.svg
+++ b/ui/org.eclipse.pde.ui/icons/obj16/category_obj.svg
@@ -2,25 +2,20 @@
 <!-- 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="16"
    height="16"
    viewBox="0 0 16 16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="category_obj.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4177">
       <stop
          style="stop-color:#5d7bae;stop-opacity:1"
@@ -32,7 +27,6 @@
          id="stop4181" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4169">
       <stop
          style="stop-color:#a77e1c;stop-opacity:1"
@@ -44,7 +38,6 @@
          id="stop4173" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4161">
       <stop
          style="stop-color:#679989;stop-opacity:1"
@@ -56,7 +49,6 @@
          id="stop4165" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4154">
       <stop
          style="stop-color:#2c71af;stop-opacity:1"
@@ -68,7 +60,6 @@
          id="stop4158" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4146">
       <stop
          style="stop-color:#fef5da;stop-opacity:1;"
@@ -80,7 +71,6 @@
          id="stop4150" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4138">
       <stop
          style="stop-color:#e6e9a0;stop-opacity:1;"
@@ -92,7 +82,6 @@
          id="stop4142" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4138"
        id="linearGradient4144"
        x1="-2.8482134"
@@ -101,7 +90,6 @@
        y2="1039.5676"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4146"
        id="linearGradient4152"
        x1="-3.1607134"
@@ -111,7 +99,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(0.99919524,0,0,1.0138636,-0.00235319,-14.454477)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4154"
        id="linearGradient4160"
        x1="-3.0267849"
@@ -121,7 +108,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(0.99892818,0,0,1.0184881,-0.00313413,-19.368468)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4161"
        id="linearGradient4167"
        x1="-5.0651731"
@@ -130,7 +116,6 @@
        y2="1037.4772"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4169"
        id="linearGradient4175"
        x1="-4.697381"
@@ -140,7 +125,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(0.99919524,0,0,1.0138636,-0.00235319,-14.454477)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4177"
        id="linearGradient4183"
        x1="-4.9499192"
@@ -150,32 +134,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(0.99892818,0,0,1.0184881,-0.00313413,-19.368468)" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="32"
-     inkscape:cx="7.48751"
-     inkscape:cy="2.8401925"
-     inkscape:document-units="px"
-     inkscape:current-layer="g4218"
-     showgrid="false"
-     units="px"
-     inkscape:snap-others="false"
-     inkscape:snap-grids="false"
-     inkscape:window-width="1071"
-     inkscape:window-height="833"
-     inkscape:window-x="1195"
-     inkscape:window-y="730"
-     inkscape:window-maximized="0"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3336" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -189,8 +147,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      transform="translate(0,-1036.3622)">
     <g
diff --git a/ui/org.eclipse.pde.ui/icons/obj16/cheatsheet_composite_obj.svg b/ui/org.eclipse.pde.ui/icons/obj16/cheatsheet_composite_obj.svg
index bd1c14fdce4..5b748b3e745 100644
--- a/ui/org.eclipse.pde.ui/icons/obj16/cheatsheet_composite_obj.svg
+++ b/ui/org.eclipse.pde.ui/icons/obj16/cheatsheet_composite_obj.svg
@@ -2,25 +2,20 @@
 <!-- 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="16"
    height="16"
    viewBox="0 0 16 16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r"
-   sodipodi:docname="cheetsheet_composite_obj.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4309">
       <stop
          style="stop-color:#b7d2e4;stop-opacity:0"
@@ -40,7 +35,6 @@
          id="stop4313" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4200">
       <stop
          style="stop-color:#3e72a7;stop-opacity:1"
@@ -52,7 +46,6 @@
          id="stop4204" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4190">
       <stop
          style="stop-color:#2846b3;stop-opacity:1"
@@ -64,7 +57,6 @@
          id="stop4194" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4178">
       <stop
          style="stop-color:#2846b3;stop-opacity:1"
@@ -76,7 +68,6 @@
          id="stop4182" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4170">
       <stop
          style="stop-color:#85c0ed;stop-opacity:1;"
@@ -88,7 +79,6 @@
          id="stop4174" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4170"
        id="linearGradient4176"
        x1="8.70749"
@@ -98,7 +88,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(0.03156757,0)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4178"
        id="linearGradient4184"
        x1="20.299725"
@@ -108,7 +97,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-11.869292,0)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4190"
        id="linearGradient4196"
        x1="20.767859"
@@ -118,7 +106,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-12.074479,-0.0473509)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4200"
        id="linearGradient4206"
        x1="3.9750192"
@@ -127,7 +114,6 @@
        y2="1039.4132"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4200"
        id="linearGradient4206-3"
        x1="3.9750192"
@@ -137,7 +123,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(2.0089286,0)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4200"
        id="linearGradient4206-3-3"
        x1="3.9750192"
@@ -147,7 +132,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(4.0178572,1.596788e-7)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4200"
        id="linearGradient4206-3-3-6"
        x1="3.9750192"
@@ -157,7 +141,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(6.0044644,1.6017289e-7)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4309"
        id="linearGradient4315"
        x1="4.0354196"
@@ -166,7 +149,6 @@
        y2="1037.8348"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4200"
        id="linearGradient4206-3-3-6-5"
        x1="3.9750192"
@@ -176,31 +158,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(-1,0,0,1,16.986607,-3.7977057e-7)" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="11.2"
-     inkscape:cx="6.6494733"
-     inkscape:cy="7.7920277"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     units="px"
-     inkscape:snap-others="false"
-     inkscape:snap-grids="false"
-     inkscape:window-width="1234"
-     inkscape:window-height="964"
-     inkscape:window-x="512"
-     inkscape:window-y="347"
-     inkscape:window-maximized="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3336" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -209,13 +166,11 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      transform="translate(0,-1036.3622)">
     <rect
@@ -239,44 +194,34 @@
     <path
        style="fill:#b7d2e4;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4315);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
        d="m 4.0354196,1037.8348 8.9380894,0"
-       id="path4307"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc" />
+       id="path4307" />
     <g
        id="g4280"
        transform="translate(0.12626957,0)">
       <path
-         inkscape:connector-curvature="0"
          id="path4198"
          d="m 4.4642857,1036.8711 2.0535715,2.0536"
          style="fill:none;fill-rule:evenodd;stroke:url(#linearGradient4206);stroke-width:0.75;stroke-linecap:round;stroke-linejoin:bevel;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none" />
       <path
-         inkscape:connector-curvature="0"
          id="path4198-6"
          d="m 6.4732143,1036.8711 2.0535715,2.0536"
          style="fill:none;fill-rule:evenodd;stroke:url(#linearGradient4206-3);stroke-width:0.75;stroke-linecap:round;stroke-linejoin:bevel;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none" />
       <path
-         inkscape:connector-curvature="0"
          id="path4198-6-0"
          d="m 8.4821429,1036.8711 2.0535711,2.0536"
          style="fill:none;fill-rule:evenodd;stroke:url(#linearGradient4206-3-3);stroke-width:0.75;stroke-linecap:round;stroke-linejoin:bevel;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none" />
       <path
-         inkscape:connector-curvature="0"
          id="path4198-6-0-2"
          d="m 10.46875,1036.8711 2.053571,2.0536"
          style="fill:none;fill-rule:evenodd;stroke:url(#linearGradient4206-3-3-6);stroke-width:0.75;stroke-linecap:round;stroke-linejoin:bevel;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none" />
       <path
-         inkscape:connector-curvature="0"
          id="path4198-6-0-2-1"
          d="m 12.566964,1036.7148 -0.346775,0.2941"
-         style="fill:none;fill-rule:evenodd;stroke:url(#linearGradient4206-3-3-6-5);stroke-width:0.75;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         sodipodi:nodetypes="cc" />
+         style="fill:none;fill-rule:evenodd;stroke:url(#linearGradient4206-3-3-6-5);stroke-width:0.75;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
       <path
-         inkscape:connector-curvature="0"
          id="path4198-6-0-2-1-1"
          d="m 4.5312497,1038.6791 -0.267857,0.3572"
-         style="fill:#1c3a66;fill-rule:evenodd;stroke:#1b3965;stroke-width:0.75;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;fill-opacity:1"
-         sodipodi:nodetypes="cc" />
+         style="fill:#1c3a66;fill-rule:evenodd;stroke:#1b3965;stroke-width:0.75;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;fill-opacity:1" />
     </g>
   </g>
 </svg>
diff --git a/ui/org.eclipse.pde.ui/icons/obj16/cheatsheet_conclusion_obj.svg b/ui/org.eclipse.pde.ui/icons/obj16/cheatsheet_conclusion_obj.svg
index 92ca88875a7..86639d140a6 100644
--- a/ui/org.eclipse.pde.ui/icons/obj16/cheatsheet_conclusion_obj.svg
+++ b/ui/org.eclipse.pde.ui/icons/obj16/cheatsheet_conclusion_obj.svg
@@ -2,25 +2,20 @@
 <!-- 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="16"
    height="16"
    viewBox="0 0 16 16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r"
-   sodipodi:docname="cheatsheet_conclusion_obj.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4242">
       <stop
          style="stop-color:#fce9a0;stop-opacity:1;"
@@ -32,7 +27,6 @@
          id="stop4246" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4204">
       <stop
          style="stop-color:#a098c8;stop-opacity:1;"
@@ -44,7 +38,6 @@
          id="stop4208" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4307">
       <stop
          style="stop-color:#17325d;stop-opacity:1"
@@ -60,8 +53,7 @@
          id="stop4314" />
     </linearGradient>
     <linearGradient
-       id="linearGradient4187"
-       inkscape:collect="always">
+       id="linearGradient4187">
       <stop
          id="stop4189"
          offset="0"
@@ -76,7 +68,6 @@
          style="stop-color:#3e72a7;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4178">
       <stop
          style="stop-color:#7e713d;stop-opacity:1"
@@ -88,7 +79,6 @@
          id="stop4182" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4178"
        id="linearGradient4184"
        x1="20.299725"
@@ -98,7 +88,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-11.869292,0)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4187"
        id="linearGradient4206"
        x1="3.9750192"
@@ -108,7 +97,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-0.07102635,0)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4187"
        id="linearGradient4206-1"
        x1="3.9750192"
@@ -118,7 +106,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(1.8303571,0)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4187"
        id="linearGradient4206-1-9"
        x1="3.9750192"
@@ -128,7 +115,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(3.8839285,-4.2568467e-7)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4187"
        id="linearGradient4206-1-9-5"
        x1="3.9750192"
@@ -138,7 +124,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(0.83688828,0,0,1.10534,6.6397152,-109.42141)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4307"
        id="linearGradient4206-1-9-5-1"
        x1="3.9750192"
@@ -148,7 +133,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(7.9352678,-4.2546071e-7)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4178"
        id="linearGradient4184-6"
        x1="20.299725"
@@ -158,7 +142,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-11.869292,2.6382813e-5)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4204"
        id="linearGradient4210"
        x1="5.0507627"
@@ -168,7 +151,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1.0145296,0,0,1.1702295,-0.12918908,-178.2274)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4204"
        id="linearGradient4210-5"
        x1="5.0507627"
@@ -178,7 +160,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(0.73039537,0,0,1.1702295,1.3059054,-176.2408)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4242"
        id="linearGradient4248"
        x1="6.213675"
@@ -187,31 +168,6 @@
        y2="1044.6735"
        gradientUnits="userSpaceOnUse" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="31.678384"
-     inkscape:cx="14.196321"
-     inkscape:cy="9.7022146"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     units="px"
-     inkscape:snap-others="false"
-     inkscape:snap-grids="false"
-     inkscape:window-width="1234"
-     inkscape:window-height="964"
-     inkscape:window-x="558"
-     inkscape:window-y="449"
-     inkscape:window-maximized="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3336" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -225,8 +181,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      transform="translate(0,-1036.3622)">
     <rect
@@ -241,55 +195,36 @@
     <path
        style="fill:#b7d2e4;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
        d="m 4.0354196,1037.8348 8.9380894,0"
-       id="path4307"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc" />
+       id="path4307" />
     <g
        id="g4280"
        transform="translate(0.12626957,0)">
       <path
-         inkscape:connector-curvature="0"
          id="path4198"
          d="m 4.3932593,1036.8711 0.00271,2.0536"
-         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4206);stroke-width:1;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         sodipodi:nodetypes="cc" />
+         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4206);stroke-width:1;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
       <path
-         inkscape:connector-curvature="0"
          id="path4198-7"
          d="M 6.294643,1036.8711 6.25,1038.9247"
-         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4206-1);stroke-width:1;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         sodipodi:nodetypes="cc" />
+         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4206-1);stroke-width:1;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
       <path
-         inkscape:connector-curvature="0"
          id="path4198-7-2"
          d="m 8.3482144,1036.8711 -0.044643,2.0536"
-         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4206-1-9);stroke-width:1;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         sodipodi:nodetypes="cc" />
+         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4206-1-9);stroke-width:1;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
       <path
-         inkscape:connector-curvature="0"
          id="path4198-7-2-6"
          d="m 10.375824,1036.6737 -0.03736,2.2699"
-         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4206-1-9-5);stroke-width:0.96179312;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         sodipodi:nodetypes="cc" />
+         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4206-1-9-5);stroke-width:0.96179312;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
       <path
-         inkscape:connector-curvature="0"
          id="path4198-7-2-6-7"
          d="m 12.399554,1036.8711 -0.03348,2.0424"
-         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4206-1-9-5-1);stroke-width:1;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         sodipodi:nodetypes="cc" />
+         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4206-1-9-5-1);stroke-width:1;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
     </g>
     <image
        y="1036.2281"
        x="17.1875"
        id="image3367"
-       xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAATtJREFU
-OI2VkrFKA0EQhr8JtrEVG58hsfAtFEGw0oCtjY3WpgskPoKIpBSiEIs8gJUQENLkBdJYeQmi2eRu
-f4scl7skR+LAMuwy8+2//yySSK+d/XNJ0pqc1Gea2/WSOr2BvJc6vYFcTm7XSwmkQCoiQe3xjSmz
-TE72snlTWkGrVpbzWrtatfJqBaE3Nol0XRagwlLxSoDyAH6jfsIox4N+92UjD/rd58QDk5TAXhtl
-rbhwZRzefBjAVvrQyzi6bsW7rKFCGAaIduMkOc8AIgEa0rx3s7dOf5m4EW4c4MYBP9+fVO9OCVM6
-M4AwKoALqFSSa4FtoAjsgQncF1FqClmADFxA82l3ScHVZTF+mWX+wYIC8JMRZ8fDBRcMTUbIZiJC
-P59+ZgoAD9UDEZuFWZyEEpRxcftuuYD/xh9Qv0rRJvmDkwAAAABJRU5ErkJggg==
-"
+       xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAATtJREFU OI2VkrFKA0EQhr8JtrEVG58hsfAtFEGw0oCtjY3WpgskPoKIpBSiEIs8gJUQENLkBdJYeQmi2eRu f4scl7skR+LAMuwy8+2//yySSK+d/XNJ0pqc1Gea2/WSOr2BvJc6vYFcTm7XSwmkQCoiQe3xjSmz TE72snlTWkGrVpbzWrtatfJqBaE3Nol0XRagwlLxSoDyAH6jfsIox4N+92UjD/rd58QDk5TAXhtl rbhwZRzefBjAVvrQyzi6bsW7rKFCGAaIduMkOc8AIgEa0rx3s7dOf5m4EW4c4MYBP9+fVO9OCVM6 M4AwKoALqFSSa4FtoAjsgQncF1FqClmADFxA82l3ScHVZTF+mWX+wYIC8JMRZ8fDBRcMTUbIZiJC P59+ZgoAD9UDEZuFWZyEEpRxcftuuYD/xh9Qv0rRJvmDkwAAAABJRU5ErkJggg== "
        style="image-rendering:optimizeSpeed"
        preserveAspectRatio="none"
        height="16"
diff --git a/ui/org.eclipse.pde.ui/icons/obj16/cheatsheet_intro_obj.svg b/ui/org.eclipse.pde.ui/icons/obj16/cheatsheet_intro_obj.svg
index 0d2bd4b5be4..17687aca007 100644
--- a/ui/org.eclipse.pde.ui/icons/obj16/cheatsheet_intro_obj.svg
+++ b/ui/org.eclipse.pde.ui/icons/obj16/cheatsheet_intro_obj.svg
@@ -2,25 +2,20 @@
 <!-- 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="16"
    height="16"
    viewBox="0 0 16 16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r"
-   sodipodi:docname="cheatsheet_intro_obj.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4242">
       <stop
          style="stop-color:#fce9a0;stop-opacity:1;"
@@ -32,7 +27,6 @@
          id="stop4246" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4204">
       <stop
          style="stop-color:#a098c8;stop-opacity:1;"
@@ -44,7 +38,6 @@
          id="stop4208" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4307">
       <stop
          style="stop-color:#17325d;stop-opacity:1"
@@ -60,8 +53,7 @@
          id="stop4314" />
     </linearGradient>
     <linearGradient
-       id="linearGradient4187"
-       inkscape:collect="always">
+       id="linearGradient4187">
       <stop
          id="stop4189"
          offset="0"
@@ -76,7 +68,6 @@
          style="stop-color:#3e72a7;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4178">
       <stop
          style="stop-color:#7e713d;stop-opacity:1"
@@ -88,7 +79,6 @@
          id="stop4182" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4178"
        id="linearGradient4184"
        x1="20.299725"
@@ -98,7 +88,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-11.869292,0)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4187"
        id="linearGradient4206"
        x1="3.9750192"
@@ -108,7 +97,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-0.07102635,0)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4187"
        id="linearGradient4206-1"
        x1="3.9750192"
@@ -118,7 +106,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(1.8303571,0)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4187"
        id="linearGradient4206-1-9"
        x1="3.9750192"
@@ -128,7 +115,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(3.8839285,-4.2568467e-7)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4187"
        id="linearGradient4206-1-9-5"
        x1="3.9750192"
@@ -138,7 +124,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(0.83688828,0,0,1.10534,6.6397152,-109.42141)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4307"
        id="linearGradient4206-1-9-5-1"
        x1="3.9750192"
@@ -148,7 +133,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(7.9352678,-4.2546071e-7)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4178"
        id="linearGradient4184-6"
        x1="20.299725"
@@ -158,7 +142,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-11.869292,2.6382813e-5)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4204"
        id="linearGradient4210"
        x1="5.0507627"
@@ -168,7 +151,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1.0145296,0,0,1.1702295,-0.12918908,-178.2274)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4204"
        id="linearGradient4210-5"
        x1="5.0507627"
@@ -178,7 +160,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(0.73039537,0,0,1.1702295,1.3059054,-176.2408)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4242"
        id="linearGradient4248"
        x1="6.213675"
@@ -187,31 +168,6 @@
        y2="1044.6735"
        gradientUnits="userSpaceOnUse" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="44.8"
-     inkscape:cx="7.4984527"
-     inkscape:cy="9.2407648"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     units="px"
-     inkscape:snap-others="false"
-     inkscape:snap-grids="false"
-     inkscape:window-width="1234"
-     inkscape:window-height="964"
-     inkscape:window-x="558"
-     inkscape:window-y="449"
-     inkscape:window-maximized="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3336" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -225,8 +181,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      transform="translate(0,-1036.3622)">
     <rect
@@ -241,9 +195,7 @@
     <path
        style="fill:#b7d2e4;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
        d="m 4.0354196,1037.8348 8.9380894,0"
-       id="path4307"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc" />
+       id="path4307" />
     <g
        id="g4184"
        transform="translate(0,-6.9447987)">
@@ -283,35 +235,25 @@
        id="g4280"
        transform="translate(0.12626957,0)">
       <path
-         inkscape:connector-curvature="0"
          id="path4198"
          d="m 4.3932593,1036.8711 0.00271,2.0536"
-         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4206);stroke-width:1;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         sodipodi:nodetypes="cc" />
+         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4206);stroke-width:1;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
       <path
-         inkscape:connector-curvature="0"
          id="path4198-7"
          d="M 6.294643,1036.8711 6.25,1038.9247"
-         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4206-1);stroke-width:1;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         sodipodi:nodetypes="cc" />
+         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4206-1);stroke-width:1;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
       <path
-         inkscape:connector-curvature="0"
          id="path4198-7-2"
          d="m 8.3482144,1036.8711 -0.044643,2.0536"
-         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4206-1-9);stroke-width:1;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         sodipodi:nodetypes="cc" />
+         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4206-1-9);stroke-width:1;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
       <path
-         inkscape:connector-curvature="0"
          id="path4198-7-2-6"
          d="m 10.375824,1036.6737 -0.03736,2.2699"
-         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4206-1-9-5);stroke-width:0.96179312;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         sodipodi:nodetypes="cc" />
+         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4206-1-9-5);stroke-width:0.96179312;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
       <path
-         inkscape:connector-curvature="0"
          id="path4198-7-2-6-7"
          d="m 12.399554,1036.8711 -0.03348,2.0424"
-         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4206-1-9-5-1);stroke-width:1;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         sodipodi:nodetypes="cc" />
+         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4206-1-9-5-1);stroke-width:1;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
     </g>
     <image
        y="1036.2281"
diff --git a/ui/org.eclipse.pde.ui/icons/obj16/cheatsheet_item_obj.svg b/ui/org.eclipse.pde.ui/icons/obj16/cheatsheet_item_obj.svg
index 3040b545c69..e294c056b8f 100644
--- a/ui/org.eclipse.pde.ui/icons/obj16/cheatsheet_item_obj.svg
+++ b/ui/org.eclipse.pde.ui/icons/obj16/cheatsheet_item_obj.svg
@@ -2,25 +2,20 @@
 <!-- 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="16"
    height="16"
    viewBox="0 0 16 16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r"
-   sodipodi:docname="cheatsheet_item_obj.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4242">
       <stop
          style="stop-color:#1e5484;stop-opacity:1"
@@ -32,7 +27,6 @@
          id="stop4246" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4204">
       <stop
          style="stop-color:#a098c8;stop-opacity:1;"
@@ -44,7 +38,6 @@
          id="stop4208" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4307">
       <stop
          style="stop-color:#17325d;stop-opacity:1"
@@ -60,8 +53,7 @@
          id="stop4314" />
     </linearGradient>
     <linearGradient
-       id="linearGradient4187"
-       inkscape:collect="always">
+       id="linearGradient4187">
       <stop
          id="stop4189"
          offset="0"
@@ -76,7 +68,6 @@
          style="stop-color:#3e72a7;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4178">
       <stop
          style="stop-color:#7e713d;stop-opacity:1"
@@ -88,7 +79,6 @@
          id="stop4182" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4178"
        id="linearGradient4184"
        x1="20.299725"
@@ -98,7 +88,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-11.869292,0)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4187"
        id="linearGradient4206"
        x1="3.9750192"
@@ -108,7 +97,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-0.07102635,0)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4187"
        id="linearGradient4206-1"
        x1="3.9750192"
@@ -118,7 +106,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(1.8303571,0)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4187"
        id="linearGradient4206-1-9"
        x1="3.9750192"
@@ -128,7 +115,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(3.8839285,-4.2568467e-7)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4187"
        id="linearGradient4206-1-9-5"
        x1="3.9750192"
@@ -138,7 +124,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(0.83688828,0,0,1.10534,6.6397152,-109.42141)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4307"
        id="linearGradient4206-1-9-5-1"
        x1="3.9750192"
@@ -148,7 +133,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(7.9352678,-4.2546071e-7)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4204"
        id="linearGradient4210"
        x1="5.0507627"
@@ -158,7 +142,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1.0145296,0,0,1.1702295,-0.12918908,-178.2274)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4204"
        id="linearGradient4210-5"
        x1="5.0507627"
@@ -168,7 +151,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(0.73039537,0,0,1.1702295,1.3059054,-174.32116)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4204"
        id="linearGradient4210-6"
        x1="5.0507627"
@@ -178,7 +160,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1.0145296,0,0,1.1702295,-0.129189,-176.26314)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4242"
        id="linearGradient4248"
        x1="-9.9107141"
@@ -188,31 +169,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(12.410714,11.205357)" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="89.6"
-     inkscape:cx="3.9058471"
-     inkscape:cy="9.6636941"
-     inkscape:document-units="px"
-     inkscape:current-layer="g4189"
-     showgrid="true"
-     units="px"
-     inkscape:snap-others="false"
-     inkscape:snap-grids="false"
-     inkscape:window-width="1234"
-     inkscape:window-height="964"
-     inkscape:window-x="558"
-     inkscape:window-y="449"
-     inkscape:window-maximized="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3336" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -226,8 +182,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      transform="translate(0,-1036.3622)">
     <rect
@@ -242,9 +196,7 @@
     <path
        style="fill:#b7d2e4;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
        d="m 4.0354196,1037.8348 8.9380894,0"
-       id="path4307"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc" />
+       id="path4307" />
     <g
        id="g4184"
        transform="translate(0,-4.9358701)">
@@ -281,44 +233,32 @@
         <path
            style="fill:url(#linearGradient4248);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
            d="m 2.0089282,1044.3293 0,5 1.495536,0 2.9799108,-2.4889 -2.9799108,-2.5111 z"
-           id="path4232"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccccc" />
+           id="path4232" />
       </g>
     </g>
     <g
        id="g4280"
        transform="translate(0.12626957,0)">
       <path
-         inkscape:connector-curvature="0"
          id="path4198"
          d="m 4.3932593,1036.8711 0.00271,2.0536"
-         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4206);stroke-width:1;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         sodipodi:nodetypes="cc" />
+         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4206);stroke-width:1;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
       <path
-         inkscape:connector-curvature="0"
          id="path4198-7"
          d="M 6.294643,1036.8711 6.25,1038.9247"
-         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4206-1);stroke-width:1;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         sodipodi:nodetypes="cc" />
+         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4206-1);stroke-width:1;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
       <path
-         inkscape:connector-curvature="0"
          id="path4198-7-2"
          d="m 8.3482144,1036.8711 -0.044643,2.0536"
-         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4206-1-9);stroke-width:1;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         sodipodi:nodetypes="cc" />
+         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4206-1-9);stroke-width:1;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
       <path
-         inkscape:connector-curvature="0"
          id="path4198-7-2-6"
          d="m 10.375824,1036.6737 -0.03736,2.2699"
-         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4206-1-9-5);stroke-width:0.96179312;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         sodipodi:nodetypes="cc" />
+         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4206-1-9-5);stroke-width:0.96179312;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
       <path
-         inkscape:connector-curvature="0"
          id="path4198-7-2-6-7"
          d="m 12.399554,1036.8711 -0.03348,2.0424"
-         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4206-1-9-5-1);stroke-width:1;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         sodipodi:nodetypes="cc" />
+         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4206-1-9-5-1);stroke-width:1;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
     </g>
   </g>
 </svg>
diff --git a/ui/org.eclipse.pde.ui/icons/obj16/cheatsheet_obj.svg b/ui/org.eclipse.pde.ui/icons/obj16/cheatsheet_obj.svg
index 4a06259ff45..147dc0b5e7a 100644
--- a/ui/org.eclipse.pde.ui/icons/obj16/cheatsheet_obj.svg
+++ b/ui/org.eclipse.pde.ui/icons/obj16/cheatsheet_obj.svg
@@ -2,25 +2,20 @@
 <!-- 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="16"
    height="16"
    viewBox="0 0 16 16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r"
-   sodipodi:docname="cheatsheet_obj.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4350">
       <stop
          style="stop-color:#304bb0;stop-opacity:1"
@@ -32,7 +27,6 @@
          id="stop4354" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4190">
       <stop
          style="stop-color:#2846b3;stop-opacity:1"
@@ -44,7 +38,6 @@
          id="stop4194" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4170">
       <stop
          style="stop-color:#85c0ed;stop-opacity:1;"
@@ -56,7 +49,6 @@
          id="stop4174" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4187">
       <stop
          style="stop-color:#17325d;stop-opacity:1"
@@ -72,8 +64,7 @@
          id="stop4191" />
     </linearGradient>
     <linearGradient
-       id="linearGradient4178-1"
-       inkscape:collect="always">
+       id="linearGradient4178-1">
       <stop
          id="stop4180-5"
          offset="0"
@@ -91,8 +82,7 @@
        y1="1052.2014"
        x1="20.299725"
        id="linearGradient4184-2"
-       xlink:href="#linearGradient4350"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4350" />
     <linearGradient
        gradientTransform="translate(-0.07102635,0)"
        gradientUnits="userSpaceOnUse"
@@ -101,8 +91,7 @@
        y1="1036.3827"
        x1="3.9750192"
        id="linearGradient4206-38"
-       xlink:href="#linearGradient4187"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4187" />
     <linearGradient
        gradientTransform="translate(1.8303571,0)"
        gradientUnits="userSpaceOnUse"
@@ -111,8 +100,7 @@
        y1="1036.3827"
        x1="3.9750192"
        id="linearGradient4206-1"
-       xlink:href="#linearGradient4187"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4187" />
     <linearGradient
        gradientTransform="translate(3.8839285,-4.2568467e-7)"
        gradientUnits="userSpaceOnUse"
@@ -121,8 +109,7 @@
        y1="1036.3827"
        x1="3.9750192"
        id="linearGradient4206-1-9"
-       xlink:href="#linearGradient4187"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4187" />
     <linearGradient
        gradientTransform="matrix(0.83688828,0,0,1.10534,6.6397152,-109.42141)"
        gradientUnits="userSpaceOnUse"
@@ -131,40 +118,8 @@
        y1="1036.3827"
        x1="3.9750192"
        id="linearGradient4206-1-9-5"
-       xlink:href="#linearGradient4187"
-       inkscape:collect="always" />
-    <linearGradient
-       gradientTransform="translate(1.8303571,0)"
-       gradientUnits="userSpaceOnUse"
-       y2="1039.2346"
-       x2="3.9750192"
-       y1="1036.3827"
-       x1="3.9750192"
-       id="linearGradient4326"
-       xlink:href="#linearGradient4187"
-       inkscape:collect="always" />
-    <linearGradient
-       gradientTransform="translate(3.8839285,-4.2568467e-7)"
-       gradientUnits="userSpaceOnUse"
-       y2="1039.2346"
-       x2="3.9750192"
-       y1="1036.3827"
-       x1="3.9750192"
-       id="linearGradient4328"
-       xlink:href="#linearGradient4187"
-       inkscape:collect="always" />
-    <linearGradient
-       gradientTransform="matrix(0.83688828,0,0,1.10534,6.6397152,-109.42141)"
-       gradientUnits="userSpaceOnUse"
-       y2="1039.2346"
-       x2="3.9750192"
-       y1="1036.3827"
-       x1="3.9750192"
-       id="linearGradient4330"
-       xlink:href="#linearGradient4187"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4187" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4178-1"
        id="linearGradient4340"
        gradientUnits="userSpaceOnUse"
@@ -174,7 +129,6 @@
        x2="20.299725"
        y2="1036.755" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4187"
        id="linearGradient4342"
        gradientUnits="userSpaceOnUse"
@@ -184,7 +138,6 @@
        x2="3.9750192"
        y2="1039.2346" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4187"
        id="linearGradient4344"
        gradientUnits="userSpaceOnUse"
@@ -194,7 +147,6 @@
        x2="3.9750192"
        y2="1039.2346" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4187"
        id="linearGradient4346"
        gradientUnits="userSpaceOnUse"
@@ -204,7 +156,6 @@
        x2="3.9750192"
        y2="1039.2346" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4187"
        id="linearGradient4348"
        gradientUnits="userSpaceOnUse"
@@ -214,7 +165,6 @@
        x2="3.9750192"
        y2="1039.2346" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4170"
        id="linearGradient4362"
        x1="6.5091562"
@@ -223,7 +173,6 @@
        y2="1040.5598"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4190"
        id="linearGradient4196-9"
        x1="20.767859"
@@ -233,31 +182,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-15.034189,-0.06260848)" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="63.356768"
-     inkscape:cx="11.597325"
-     inkscape:cy="6.0808939"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     units="px"
-     inkscape:snap-others="false"
-     inkscape:snap-grids="false"
-     inkscape:window-width="1234"
-     inkscape:window-height="964"
-     inkscape:window-x="512"
-     inkscape:window-y="347"
-     inkscape:window-maximized="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3336" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -271,13 +195,10 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      transform="translate(0,-1036.3622)">
     <g
        id="layer1-3-2"
-       inkscape:label="Layer 1"
        transform="translate(4.0074104,4.2785891)">
       <rect
          ry="0.37885904"
@@ -289,8 +210,6 @@
          id="rect3368-9-6"
          style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:url(#linearGradient4340);stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
       <path
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
          id="path4307-4-6"
          d="m 4.0354196,1037.8348 6.6613034,0"
          style="fill:#b7d2e4;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
@@ -298,34 +217,25 @@
          transform="translate(0.12626957,-0.20518724)"
          id="g4280-6-2">
         <path
-           sodipodi:nodetypes="cc"
            style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4342);stroke-width:1;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
            d="m 4.3932593,1036.8711 0.00271,2.0536"
-           id="path4198-65-8"
-           inkscape:connector-curvature="0" />
+           id="path4198-65-8" />
         <path
-           sodipodi:nodetypes="cc"
            style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4344);stroke-width:1;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
            d="M 6.294643,1036.8711 6.25,1038.9247"
-           id="path4198-7-5"
-           inkscape:connector-curvature="0" />
+           id="path4198-7-5" />
         <path
-           sodipodi:nodetypes="cc"
            style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4346);stroke-width:1;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
            d="m 8.3482144,1036.8711 -0.044643,2.0536"
-           id="path4198-7-2-3"
-           inkscape:connector-curvature="0" />
+           id="path4198-7-2-3" />
         <path
-           sodipodi:nodetypes="cc"
            style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4348);stroke-width:0.96179312;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
            d="m 10.375824,1036.6737 -0.03736,2.2699"
-           id="path4198-7-2-6-7"
-           inkscape:connector-curvature="0" />
+           id="path4198-7-2-6-7" />
       </g>
     </g>
     <g
        id="layer1-3"
-       inkscape:label="Layer 1"
        transform="translate(-3.0320902,1.1849966)">
       <rect
          ry="0.37885904"
@@ -337,8 +247,6 @@
          id="rect3368-9"
          style="opacity:1;fill:url(#linearGradient4362);fill-opacity:1;stroke:url(#linearGradient4184-2);stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
       <path
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
          id="path4307-4"
          d="m 4.0354196,1037.8348 6.6613034,0"
          style="fill:#b7d2e4;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
@@ -346,29 +254,21 @@
          transform="translate(0.12626957,-0.20518724)"
          id="g4280-6">
         <path
-           sodipodi:nodetypes="cc"
            style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4206-38);stroke-width:1;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
            d="m 4.3932593,1036.8711 0.00271,2.0536"
-           id="path4198-65"
-           inkscape:connector-curvature="0" />
+           id="path4198-65" />
         <path
-           sodipodi:nodetypes="cc"
            style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4206-1);stroke-width:1;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
            d="M 6.294643,1036.8711 6.25,1038.9247"
-           id="path4198-7"
-           inkscape:connector-curvature="0" />
+           id="path4198-7" />
         <path
-           sodipodi:nodetypes="cc"
            style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4206-1-9);stroke-width:1;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
            d="m 8.3482144,1036.8711 -0.044643,2.0536"
-           id="path4198-7-2"
-           inkscape:connector-curvature="0" />
+           id="path4198-7-2" />
         <path
-           sodipodi:nodetypes="cc"
            style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4206-1-9-5);stroke-width:0.96179312;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
            d="m 10.375824,1036.6737 -0.03736,2.2699"
-           id="path4198-7-2-6"
-           inkscape:connector-curvature="0" />
+           id="path4198-7-2-6" />
       </g>
     </g>
     <rect
diff --git a/ui/org.eclipse.pde.ui/icons/obj16/cheatsheet_simple_obj.svg b/ui/org.eclipse.pde.ui/icons/obj16/cheatsheet_simple_obj.svg
index 7ed3f4d4fb0..323a57828d6 100644
--- a/ui/org.eclipse.pde.ui/icons/obj16/cheatsheet_simple_obj.svg
+++ b/ui/org.eclipse.pde.ui/icons/obj16/cheatsheet_simple_obj.svg
@@ -2,25 +2,20 @@
 <!-- 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="16"
    height="16"
    viewBox="0 0 16 16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r"
-   sodipodi:docname="cheatsheet_composite_obj (copy).svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4307">
       <stop
          style="stop-color:#17325d;stop-opacity:1"
@@ -36,8 +31,7 @@
          id="stop4314" />
     </linearGradient>
     <linearGradient
-       id="linearGradient4187"
-       inkscape:collect="always">
+       id="linearGradient4187">
       <stop
          id="stop4189"
          offset="0"
@@ -52,7 +46,6 @@
          style="stop-color:#3e72a7;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4178">
       <stop
          style="stop-color:#7e713d;stop-opacity:1"
@@ -64,7 +57,6 @@
          id="stop4182" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4178"
        id="linearGradient4184"
        x1="20.299725"
@@ -74,7 +66,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-11.869292,0)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4187"
        id="linearGradient4206"
        x1="3.9750192"
@@ -84,7 +75,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-0.07102635,0)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4187"
        id="linearGradient4206-1"
        x1="3.9750192"
@@ -94,7 +84,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(1.8303571,0)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4187"
        id="linearGradient4206-1-9"
        x1="3.9750192"
@@ -104,7 +93,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(3.8839285,-4.2568467e-7)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4187"
        id="linearGradient4206-1-9-5"
        x1="3.9750192"
@@ -114,7 +102,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(0.83688828,0,0,1.10534,6.6397152,-109.42141)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4307"
        id="linearGradient4206-1-9-5-1"
        x1="3.9750192"
@@ -124,31 +111,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(7.9352678,-4.2546071e-7)" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="22.4"
-     inkscape:cx="15.742216"
-     inkscape:cy="7.5875244"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     units="px"
-     inkscape:snap-others="false"
-     inkscape:snap-grids="false"
-     inkscape:window-width="1234"
-     inkscape:window-height="964"
-     inkscape:window-x="512"
-     inkscape:window-y="347"
-     inkscape:window-maximized="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3336" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -162,8 +124,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      transform="translate(0,-1036.3622)">
     <rect
@@ -178,42 +138,30 @@
     <path
        style="fill:#b7d2e4;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
        d="m 4.0354196,1037.8348 8.9380894,0"
-       id="path4307"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc" />
+       id="path4307" />
     <g
        id="g4280"
        transform="translate(0.12626957,0)">
       <path
-         inkscape:connector-curvature="0"
          id="path4198"
          d="m 4.3932593,1036.8711 0.00271,2.0536"
-         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4206);stroke-width:1;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         sodipodi:nodetypes="cc" />
+         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4206);stroke-width:1;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
       <path
-         inkscape:connector-curvature="0"
          id="path4198-7"
          d="M 6.294643,1036.8711 6.25,1038.9247"
-         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4206-1);stroke-width:1;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         sodipodi:nodetypes="cc" />
+         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4206-1);stroke-width:1;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
       <path
-         inkscape:connector-curvature="0"
          id="path4198-7-2"
          d="m 8.3482144,1036.8711 -0.044643,2.0536"
-         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4206-1-9);stroke-width:1;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         sodipodi:nodetypes="cc" />
+         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4206-1-9);stroke-width:1;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
       <path
-         inkscape:connector-curvature="0"
          id="path4198-7-2-6"
          d="m 10.375824,1036.6737 -0.03736,2.2699"
-         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4206-1-9-5);stroke-width:0.96179312;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         sodipodi:nodetypes="cc" />
+         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4206-1-9-5);stroke-width:0.96179312;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
       <path
-         inkscape:connector-curvature="0"
          id="path4198-7-2-6-7"
          d="m 12.399554,1036.8711 -0.03348,2.0424"
-         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4206-1-9-5-1);stroke-width:1;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         sodipodi:nodetypes="cc" />
+         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4206-1-9-5-1);stroke-width:1;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
     </g>
   </g>
 </svg>
diff --git a/ui/org.eclipse.pde.ui/icons/obj16/cheatsheet_subitem_obj.svg b/ui/org.eclipse.pde.ui/icons/obj16/cheatsheet_subitem_obj.svg
index 9000a44814d..93fb326a340 100644
--- a/ui/org.eclipse.pde.ui/icons/obj16/cheatsheet_subitem_obj.svg
+++ b/ui/org.eclipse.pde.ui/icons/obj16/cheatsheet_subitem_obj.svg
@@ -2,26 +2,21 @@
 <!-- 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="16"
    height="16"
    viewBox="0 0 16 16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="cheatsheet_subitem_obj.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient4188"
-       inkscape:collect="always">
+       id="linearGradient4188">
       <stop
          id="stop4190"
          offset="0"
@@ -32,8 +27,7 @@
          style="stop-color:#6155a0;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       id="linearGradient4180"
-       inkscape:collect="always">
+       id="linearGradient4180">
       <stop
          id="stop4183"
          offset="0"
@@ -44,7 +38,6 @@
          style="stop-color:#6155a0;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4307">
       <stop
          style="stop-color:#17325d;stop-opacity:1"
@@ -60,8 +53,7 @@
          id="stop4314" />
     </linearGradient>
     <linearGradient
-       id="linearGradient4187"
-       inkscape:collect="always">
+       id="linearGradient4187">
       <stop
          id="stop4189"
          offset="0"
@@ -76,7 +68,6 @@
          style="stop-color:#3e72a7;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4178">
       <stop
          style="stop-color:#7e713d;stop-opacity:1"
@@ -88,7 +79,6 @@
          id="stop4182" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4178"
        id="linearGradient4184"
        x1="20.299725"
@@ -98,7 +88,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-9.8636489,0)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4187"
        id="linearGradient4206"
        x1="3.9750192"
@@ -108,7 +97,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-0.07102635,0)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4187"
        id="linearGradient4206-1"
        x1="3.9750192"
@@ -118,7 +106,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(1.8303571,0)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4187"
        id="linearGradient4206-1-9"
        x1="3.9750192"
@@ -128,7 +115,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(3.8839285,-4.2568467e-7)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4187"
        id="linearGradient4206-1-9-5"
        x1="3.9750192"
@@ -138,7 +124,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(0.83688828,0,0,1.10534,6.6397152,-109.42141)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4307"
        id="linearGradient4206-1-9-5-1"
        x1="3.9750192"
@@ -170,7 +155,6 @@
          id="stop7596-5-6" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient7584-9-3"
        id="linearGradient7608-9-7"
        gradientUnits="userSpaceOnUse"
@@ -180,7 +164,6 @@
        y2="1041.7356"
        gradientTransform="translate(-0.06629126,0)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient7592-0-5"
        id="linearGradient7610-7-6"
        gradientUnits="userSpaceOnUse"
@@ -190,7 +173,6 @@
        y2="1041.7356"
        gradientTransform="translate(-0.06629126,0)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4180"
        id="linearGradient4210"
        x1="6.9209113"
@@ -200,7 +182,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1.0145296,0,0,1.1702295,1.9946511,-182.23112)" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4204">
       <stop
          style="stop-color:#c8c3df;stop-opacity:1"
@@ -212,7 +193,6 @@
          id="stop4208" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4188"
        id="linearGradient4210-6"
        x1="7.2289357"
@@ -222,7 +202,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1.0145296,0,0,1.1702295,1.9946511,-180.26682)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4204"
        id="linearGradient4210-5"
        x1="7.1288934"
@@ -232,31 +211,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(0.73039537,0,0,1.1702295,3.4297451,-178.32482)" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1"
-     inkscape:cx="57.737339"
-     inkscape:cy="8.6600448"
-     inkscape:document-units="px"
-     inkscape:current-layer="g7604-6"
-     showgrid="false"
-     units="px"
-     inkscape:snap-others="false"
-     inkscape:snap-grids="false"
-     inkscape:window-width="896"
-     inkscape:window-height="853"
-     inkscape:window-x="1148"
-     inkscape:window-y="542"
-     inkscape:window-maximized="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3336" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -270,8 +224,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      transform="translate(0,-1036.3622)">
     <rect
@@ -286,42 +238,30 @@
     <path
        style="fill:#b7d2e4;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
        d="m 6.0410627,1037.8348 8.9380893,0"
-       id="path4307"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc" />
+       id="path4307" />
     <g
        id="g4280"
        transform="translate(2.1319127,0)">
       <path
-         inkscape:connector-curvature="0"
          id="path4198"
          d="m 4.3932593,1036.8711 0.00271,2.0536"
-         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4206);stroke-width:1;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         sodipodi:nodetypes="cc" />
+         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4206);stroke-width:1;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
       <path
-         inkscape:connector-curvature="0"
          id="path4198-7"
          d="M 6.294643,1036.8711 6.25,1038.9247"
-         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4206-1);stroke-width:1;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         sodipodi:nodetypes="cc" />
+         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4206-1);stroke-width:1;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
       <path
-         inkscape:connector-curvature="0"
          id="path4198-7-2"
          d="m 8.3482144,1036.8711 -0.044643,2.0536"
-         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4206-1-9);stroke-width:1;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         sodipodi:nodetypes="cc" />
+         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4206-1-9);stroke-width:1;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
       <path
-         inkscape:connector-curvature="0"
          id="path4198-7-2-6"
          d="m 10.375824,1036.6737 -0.03736,2.2699"
-         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4206-1-9-5);stroke-width:0.96179312;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         sodipodi:nodetypes="cc" />
+         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4206-1-9-5);stroke-width:0.96179312;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
       <path
-         inkscape:connector-curvature="0"
          id="path4198-7-2-6-7"
          d="m 12.399554,1036.8711 -0.03348,2.0424"
-         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4206-1-9-5-1);stroke-width:1;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         sodipodi:nodetypes="cc" />
+         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4206-1-9-5-1);stroke-width:1;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
     </g>
     <g
        id="g4374"
@@ -359,14 +299,10 @@
        id="g7604-6"
        transform="matrix(-1,0,0,-1,28.84981,2085.3275)">
       <path
-         sodipodi:nodetypes="ccssscsscssssccc"
-         inkscape:connector-curvature="0"
          id="path7582-7"
          d="m 23.31999,1039.3249 0,-1.591 c 0,0 -0.154679,-0.8397 -1.171145,-0.044 -1.016466,0.7955 -2.209709,2.0772 -2.386486,2.4307 -0.176776,0.3536 -0.928077,0.9723 0.08839,1.9446 1.016466,0.9722 2.121321,1.9887 2.121321,1.9887 0,0 0.404271,0.3812 0.799458,0.5707 0.37782,0.1811 0.548464,0.1871 0.548464,-0.4827 l 0,-1.812 c 1.366404,-0.063 1.926219,0.3446 2.238719,0.6884 0.3125,0.3437 0.8125,1.9687 1.21875,2.0937 0.40625,0.125 0.625,-2.1875 0.625,-2.625 0,-0.4375 -0.09375,-1.3125 -0.71875,-1.9687 -0.625,-0.6563 -1.006571,-0.9555 -1.53125,-1.0998 -0.535453,-0.1295 -1.287796,-0.095 -1.832471,-0.094 z"
          style="fill:url(#linearGradient7608-9-7);fill-opacity:1;stroke:url(#linearGradient7610-7-6);stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
       <path
-         sodipodi:nodetypes="ccssscc"
-         inkscape:connector-curvature="0"
          id="path7602-2"
          d="m 22.84983,1043.0173 0,0.627 c 0,0 0.101474,0.3948 -0.202948,0.2554 -0.304423,-0.1393 -0.892974,-0.6966 -0.953858,-0.8127 -0.06088,-0.1161 -0.977287,-0.8258 -0.835223,-1.0581 0.142064,-0.2322 1.958178,-0.047 1.958178,-0.047 z"
          style="opacity:0.85714285;fill:#ffffff;fill-opacity:1;stroke:none" />
diff --git a/ui/org.eclipse.pde.ui/icons/obj16/cheatsheet_taskgroup_obj.svg b/ui/org.eclipse.pde.ui/icons/obj16/cheatsheet_taskgroup_obj.svg
index 121b4a90b4c..96ae1caa88c 100644
--- a/ui/org.eclipse.pde.ui/icons/obj16/cheatsheet_taskgroup_obj.svg
+++ b/ui/org.eclipse.pde.ui/icons/obj16/cheatsheet_taskgroup_obj.svg
@@ -2,24 +2,19 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="cheatsheet_taskgroup_obj.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4845">
       <stop
          style="stop-color:#afb8cd;stop-opacity:1;"
@@ -31,7 +26,6 @@
          id="stop4849" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4837">
       <stop
          style="stop-color:#acbfd5;stop-opacity:1;"
@@ -58,7 +52,6 @@
          id="stop4788" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4767">
       <stop
          style="stop-color:#f1c373;stop-opacity:1"
@@ -70,7 +63,6 @@
          id="stop4771" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4767"
        id="linearGradient4774"
        x1="-11.999999"
@@ -80,7 +72,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(21.03125,0)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4784"
        id="linearGradient4790"
        x1="-17.3125"
@@ -90,7 +81,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(21.03125,0)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4837"
        id="linearGradient4843"
        x1="-11.375669"
@@ -100,7 +90,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(21.03125,0)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4845"
        id="linearGradient4851"
        x1="-12.921875"
@@ -117,8 +106,7 @@
        y1="1039.153"
        x1="9.8946028"
        id="linearGradient5000-6"
-       xlink:href="#linearGradient4994-7"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4994-7" />
     <linearGradient
        gradientTransform="translate(-4,-2)"
        gradientUnits="userSpaceOnUse"
@@ -127,8 +115,7 @@
        y1="1038.5779"
        x1="10.544736"
        id="linearGradient4908"
-       xlink:href="#linearGradient4902"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4902" />
     <linearGradient
        gradientTransform="matrix(0.72293526,0,0,1,-14.096893,-4.9280777)"
        gradientUnits="userSpaceOnUse"
@@ -137,8 +124,7 @@
        y1="1047.8571"
        x1="15.198681"
        id="linearGradient4871"
-       xlink:href="#linearGradient5147"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient5147" />
     <linearGradient
        gradientTransform="matrix(0.57546531,0,0,1,-13.063564,-4.9280777)"
        gradientUnits="userSpaceOnUse"
@@ -147,8 +133,7 @@
        y1="1045.8571"
        x1="17.374683"
        id="linearGradient4869"
-       xlink:href="#linearGradient4861"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4861" />
     <linearGradient
        gradientTransform="matrix(0.82571734,0,0,1,-14.817092,-4.9280777)"
        gradientUnits="userSpaceOnUse"
@@ -157,11 +142,9 @@
        y1="1043.8571"
        x1="14.286063"
        id="linearGradient4867"
-       xlink:href="#linearGradient4877"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4877" />
     <linearGradient
-       id="linearGradient4861"
-       inkscape:collect="always">
+       id="linearGradient4861">
       <stop
          id="stop4863"
          offset="0"
@@ -172,7 +155,6 @@
          style="stop-color:#637aa7;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4877">
       <stop
          style="stop-color:#91a5c7;stop-opacity:1;"
@@ -184,8 +166,7 @@
          id="stop4881" />
     </linearGradient>
     <linearGradient
-       id="linearGradient4902"
-       inkscape:collect="always">
+       id="linearGradient4902">
       <stop
          id="stop4904"
          offset="0"
@@ -196,8 +177,7 @@
          style="stop-color:#5e76a3;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       id="linearGradient4994-7"
-       inkscape:collect="always">
+       id="linearGradient4994-7">
       <stop
          id="stop4996-7"
          offset="0"
@@ -208,7 +188,6 @@
          style="stop-color:#dce7f7;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient5147">
       <stop
          style="stop-color:#91a5c7;stop-opacity:1;"
@@ -220,31 +199,6 @@
          id="stop5151" />
     </linearGradient>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="5.6568541"
-     inkscape:cx="42.960231"
-     inkscape:cy="27.532244"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1241"
-     inkscape:window-height="814"
-     inkscape:window-x="1018"
-     inkscape:window-y="664"
-     inkscape:window-maximized="0"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3999" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -258,8 +212,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
@@ -275,29 +227,20 @@
     <path
        style="fill:url(#linearGradient4851);fill-opacity:1;stroke:none"
        d="m 4.0468751,1040.3466 1.53125,-1.3672 0.9375,-2.1172 1.5,0 1.4999999,0 0.953125,2.1172 1.546875,1.3672"
-       id="path4794"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccc" />
+       id="path4794" />
     <path
        style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient4843);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;marker:none;enable-background:accumulate"
        d="m 6.3750001,1036.375 c -0.138213,0.043 -0.255616,0.1482 -0.3125,0.2812 l -0.875,2 -0.966084,0.8634 c -0.219449,0.2194 -0.161431,0.3252 -0.190934,0.8384 0.205415,0 0.484943,0 0.746694,-3e-4 l 1.129074,-1.0139 c 0.0516,-0.043 0.0944,-0.097 0.125,-0.1563 l 0.8125,-1.8125 1.1875,0 1.1562499,0 0.8125,1.8125 c 0.0306,0.06 0.0734,0.1133 0.125,0.1563 l 1.173251,1.0325 c 0.113518,0 0.471938,-0.02 0.715999,-0.031 0,-0.2129 0.08262,-0.5753 -0.123815,-0.7817 l -1.015435,-0.9075 -0.90625,-2 c -0.07974,-0.164 -0.255243,-0.2768 -0.4375,-0.2812 l -1.4999999,0 -1.5,0 c -0.05166,-0.01 -0.104595,-0.01 -0.15625,0 z"
-       id="path4794-5"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccccccccccccccccccc" />
+       id="path4794-5" />
     <g
        style="display:inline"
        id="layer1-3"
-       inkscape:label="Layer 1"
        transform="translate(2.0004438,3.968731)">
       <path
-         sodipodi:nodetypes="cccccc"
-         inkscape:connector-curvature="0"
          id="rect4001-3"
          d="m 1.4972825,1036.3734 8.5625525,0 0.352923,3.5369 0,6.5483 -8.9154755,0 z"
          style="display:inline;fill:url(#linearGradient5000-6);fill-opacity:1;stroke:none" />
       <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
          id="rect4001"
          d="m 10.521176,1036.3724 0.04042,3.5379 0,6.0483 -9.0643145,0 1e-6,-9.5862"
          style="fill:none;stroke:url(#linearGradient4908);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1" />
diff --git a/ui/org.eclipse.pde.ui/icons/obj16/cheatsheet_unsupported_obj.svg b/ui/org.eclipse.pde.ui/icons/obj16/cheatsheet_unsupported_obj.svg
index a606783919a..6ec86af8fc4 100644
--- a/ui/org.eclipse.pde.ui/icons/obj16/cheatsheet_unsupported_obj.svg
+++ b/ui/org.eclipse.pde.ui/icons/obj16/cheatsheet_unsupported_obj.svg
@@ -2,25 +2,20 @@
 <!-- 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="16"
    height="16"
    viewBox="0 0 16 16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="cheatsheet_unsupported_obj.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4307">
       <stop
          style="stop-color:#17325d;stop-opacity:1"
@@ -36,8 +31,7 @@
          id="stop4314" />
     </linearGradient>
     <linearGradient
-       id="linearGradient4187"
-       inkscape:collect="always">
+       id="linearGradient4187">
       <stop
          id="stop4189"
          offset="0"
@@ -52,7 +46,6 @@
          style="stop-color:#3e72a7;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4178">
       <stop
          style="stop-color:#7e713d;stop-opacity:1"
@@ -64,7 +57,6 @@
          id="stop4182" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4178"
        id="linearGradient4184"
        x1="20.299725"
@@ -74,7 +66,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-11.869292,0)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4187"
        id="linearGradient4206"
        x1="3.9750192"
@@ -84,7 +75,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-0.07102635,0)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4187"
        id="linearGradient4206-1"
        x1="3.9750192"
@@ -94,7 +84,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(1.8303571,0)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4187"
        id="linearGradient4206-1-9"
        x1="3.9750192"
@@ -104,7 +93,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(3.8839285,-4.2568467e-7)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4187"
        id="linearGradient4206-1-9-5"
        x1="3.9750192"
@@ -114,7 +102,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(0.83688828,0,0,1.10534,6.6397152,-109.42141)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4307"
        id="linearGradient4206-1-9-5-1"
        x1="3.9750192"
@@ -124,31 +111,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(7.9352678,-4.2546071e-7)" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="15.839192"
-     inkscape:cx="6.6475574"
-     inkscape:cy="10.15688"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     units="px"
-     inkscape:snap-others="false"
-     inkscape:snap-grids="false"
-     inkscape:window-width="1234"
-     inkscape:window-height="964"
-     inkscape:window-x="1277"
-     inkscape:window-y="524"
-     inkscape:window-maximized="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3336" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -162,8 +124,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      transform="translate(0,-1036.3622)">
     <rect
@@ -178,42 +138,30 @@
     <path
        style="fill:#b7d2e4;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
        d="m 4.0354196,1037.8348 8.9380894,0"
-       id="path4307"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc" />
+       id="path4307" />
     <g
        id="g4280"
        transform="translate(0.12626957,0)">
       <path
-         inkscape:connector-curvature="0"
          id="path4198"
          d="m 4.3932593,1036.8711 0.00271,2.0536"
-         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4206);stroke-width:1;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         sodipodi:nodetypes="cc" />
+         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4206);stroke-width:1;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
       <path
-         inkscape:connector-curvature="0"
          id="path4198-7"
          d="M 6.294643,1036.8711 6.25,1038.9247"
-         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4206-1);stroke-width:1;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         sodipodi:nodetypes="cc" />
+         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4206-1);stroke-width:1;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
       <path
-         inkscape:connector-curvature="0"
          id="path4198-7-2"
          d="m 8.3482144,1036.8711 -0.044643,2.0536"
-         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4206-1-9);stroke-width:1;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         sodipodi:nodetypes="cc" />
+         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4206-1-9);stroke-width:1;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
       <path
-         inkscape:connector-curvature="0"
          id="path4198-7-2-6"
          d="m 10.375824,1036.6737 -0.03736,2.2699"
-         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4206-1-9-5);stroke-width:0.96179312;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         sodipodi:nodetypes="cc" />
+         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4206-1-9-5);stroke-width:0.96179312;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
       <path
-         inkscape:connector-curvature="0"
          id="path4198-7-2-6-7"
          d="m 12.399554,1036.8711 -0.03348,2.0424"
-         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4206-1-9-5-1);stroke-width:1;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         sodipodi:nodetypes="cc" />
+         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4206-1-9-5-1);stroke-width:1;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
     </g>
     <g
        id="g4174"
@@ -226,7 +174,6 @@
          id="path4170"
          style="opacity:1;fill:#f9feff;fill-opacity:1;stroke:#194e7e;stroke-width:0.99215209;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
       <path
-         inkscape:connector-curvature="0"
          id="path4172"
          d="m 22.791567,1045.8278 -4.293149,4.2931"
          style="fill:none;fill-rule:evenodd;stroke:#275c89;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
diff --git a/ui/org.eclipse.pde.ui/icons/obj16/choice_sc_obj.svg b/ui/org.eclipse.pde.ui/icons/obj16/choice_sc_obj.svg
index 71a3790e591..651a6d34ab8 100644
--- a/ui/org.eclipse.pde.ui/icons/obj16/choice_sc_obj.svg
+++ b/ui/org.eclipse.pde.ui/icons/obj16/choice_sc_obj.svg
@@ -2,24 +2,19 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="choice_sc_obj.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4203">
       <stop
          style="stop-color:#5c7aaa;stop-opacity:1"
@@ -31,8 +26,7 @@
          id="stop4207" />
     </linearGradient>
     <linearGradient
-       id="linearGradient4157"
-       inkscape:collect="always">
+       id="linearGradient4157">
       <stop
          id="stop4159"
          offset="0"
@@ -43,7 +37,6 @@
          style="stop-color:#a79aa4;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4157"
        id="linearGradient4196"
        x1="18.493853"
@@ -53,7 +46,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(10.333934,6.7239439)" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4190">
       <stop
          style="stop-color:#346692;stop-opacity:1"
@@ -65,7 +57,6 @@
          id="stop4194" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4190"
        id="linearGradient4196-4"
        x1="18.493853"
@@ -75,7 +66,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(12.294101,11.674962)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4157"
        id="linearGradient4196-5"
        x1="18.493853"
@@ -85,7 +75,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(10.326257,16.702647)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4203"
        id="linearGradient4209"
        x1="10.528622"
@@ -94,7 +83,6 @@
        y2="1043.2103"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4203"
        id="linearGradient4211"
        gradientUnits="userSpaceOnUse"
@@ -103,7 +91,6 @@
        x2="25.576739"
        y2="1043.2103" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4203"
        id="linearGradient4213"
        gradientUnits="userSpaceOnUse"
@@ -112,33 +99,6 @@
        x2="25.576739"
        y2="1043.2103" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="15.999999"
-     inkscape:cx="13.740697"
-     inkscape:cy="0.64991834"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1100"
-     inkscape:window-height="900"
-     inkscape:window-x="1111"
-     inkscape:window-y="527"
-     inkscape:window-maximized="0"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2985"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -152,8 +112,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      transform="translate(0,-1036.3622)">
     <g
@@ -166,12 +124,10 @@
            transform="translate(-0.01830566,0)"
            style="stroke:url(#linearGradient4209);stroke-opacity:1">
           <path
-             inkscape:connector-curvature="0"
              id="path4187"
              d="m 10.528622,1043.2507 15.048117,0"
              style="fill:none;fill-rule:evenodd;stroke:url(#linearGradient4211);stroke-width:1.0157845px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
           <path
-             inkscape:connector-curvature="0"
              id="path4189"
              d="m 22.993851,1041.7103 0,-3.5 -9.937501,0 0,10.0001 10.062501,0 0,-3.5626"
              style="fill:none;fill-rule:evenodd;stroke:url(#linearGradient4213);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
diff --git a/ui/org.eclipse.pde.ui/icons/obj16/command_obj.svg b/ui/org.eclipse.pde.ui/icons/obj16/command_obj.svg
index 18a7c79f8e7..1bbf2e33b05 100644
--- a/ui/org.eclipse.pde.ui/icons/obj16/command_obj.svg
+++ b/ui/org.eclipse.pde.ui/icons/obj16/command_obj.svg
@@ -2,20 +2,16 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.48.0 r9654"
-   sodipodi:docname="command_obj.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
@@ -34,7 +30,6 @@
          id="stop4742" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4741">
       <stop
          style="stop-color:#898989;stop-opacity:1"
@@ -46,7 +41,6 @@
          id="stop4745" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4741"
        id="linearGradient4747"
        x1="11.0625"
@@ -56,7 +50,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-1.314993,0)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4738"
        id="linearGradient4744"
        x1="-13.936629"
@@ -66,29 +59,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(20,0)" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="16"
-     inkscape:cx="-6.3910232"
-     inkscape:cy="4.1818005"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1389"
-     inkscape:window-height="982"
-     inkscape:window-x="50"
-     inkscape:window-y="50"
-     inkscape:window-maximized="0"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3966" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -102,16 +72,12 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
     <path
        style="fill:url(#linearGradient4744);fill-opacity:1;stroke:url(#linearGradient4747);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
        d="m 2.497507,1039.8618 0,2.0277 0,5 0,3 1,0 9.546687,-4.5273 c 0.59227,-0.3746 0.618127,-0.6299 0,-1 l -9.126842,-4.5004 z"
-       id="rect3968"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccccc" />
+       id="rect3968" />
   </g>
 </svg>
diff --git a/ui/org.eclipse.pde.ui/icons/obj16/copyviewtoclipboard_tsk.svg b/ui/org.eclipse.pde.ui/icons/obj16/copyviewtoclipboard_tsk.svg
index 1c7904926c1..1c20005cfc9 100644
--- a/ui/org.eclipse.pde.ui/icons/obj16/copyviewtoclipboard_tsk.svg
+++ b/ui/org.eclipse.pde.ui/icons/obj16/copyviewtoclipboard_tsk.svg
@@ -2,24 +2,19 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.48.0 r9654"
-   sodipodi:docname="copyviewtoclipboard_tsk.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient5000">
       <stop
          style="stop-color:#837f70;stop-opacity:1;"
@@ -31,8 +26,7 @@
          id="stop5004" />
     </linearGradient>
     <linearGradient
-       id="linearGradient4994"
-       inkscape:collect="always">
+       id="linearGradient4994">
       <stop
          id="stop4996"
          offset="0"
@@ -43,7 +37,6 @@
          style="stop-color:#ffffff;stop-opacity:0;" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4935">
       <stop
          style="stop-color:#4675ab;stop-opacity:1"
@@ -55,7 +48,6 @@
          id="stop4939" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4927">
       <stop
          style="stop-color:#6ab1e1;stop-opacity:1"
@@ -67,7 +59,6 @@
          id="stop4931" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4919">
       <stop
          style="stop-color:#ffffff;stop-opacity:1;"
@@ -79,7 +70,6 @@
          id="stop4923" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4910">
       <stop
          style="stop-color:#ffffff;stop-opacity:0"
@@ -91,7 +81,6 @@
          id="stop4914" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4845">
       <stop
          style="stop-color:#afb8cd;stop-opacity:1;"
@@ -103,7 +92,6 @@
          id="stop4849" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4837">
       <stop
          style="stop-color:#acbfd5;stop-opacity:1;"
@@ -130,7 +118,6 @@
          id="stop4788" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4767">
       <stop
          style="stop-color:#f1c373;stop-opacity:1"
@@ -142,7 +129,6 @@
          id="stop4771" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4767"
        id="linearGradient4774"
        x1="-11.999999"
@@ -152,7 +138,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(20,0)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4784"
        id="linearGradient4790"
        x1="-17.3125"
@@ -162,7 +147,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(20,0)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4837"
        id="linearGradient4843"
        x1="-11.375669"
@@ -172,7 +156,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(20,0)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4845"
        id="linearGradient4851"
        x1="-12.921875"
@@ -182,7 +165,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(20,0)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4910"
        id="linearGradient4916"
        x1="-13"
@@ -192,7 +174,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(22,4)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4919"
        id="linearGradient4925"
        x1="-10"
@@ -202,7 +183,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(20,0)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4927"
        id="linearGradient4933"
        x1="-13"
@@ -212,7 +192,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(20,0)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4935"
        id="linearGradient4941"
        x1="-13.981359"
@@ -229,10 +208,8 @@
        gradientUnits="userSpaceOnUse"
        id="linearGradient4975"
        xlink:href="#linearGradient4994"
-       inkscape:collect="always"
        gradientTransform="translate(22,4)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient5000"
        id="linearGradient5006"
        x1="-10"
@@ -242,7 +219,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(20,0)" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4919-9">
       <stop
          style="stop-color:#ffffff;stop-opacity:1;"
@@ -261,34 +237,8 @@
        gradientUnits="userSpaceOnUse"
        id="linearGradient5023"
        xlink:href="#linearGradient4919-9"
-       inkscape:collect="always"
        gradientTransform="matrix(0,1,1,0,-1038.3622,1058.3622)" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="31.999999"
-     inkscape:cx="14.615779"
-     inkscape:cy="7.5700537"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1241"
-     inkscape:window-height="814"
-     inkscape:window-x="441"
-     inkscape:window-y="664"
-     inkscape:window-maximized="0"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3999" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -302,8 +252,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
@@ -319,15 +267,11 @@
     <path
        style="fill:url(#linearGradient4851);fill-opacity:1;stroke:none"
        d="m 3.015625,1040.3466 1.53125,-1.3672 0.9375,-2.1172 1.5,0 1.5,0 0.953125,2.1172 1.546875,1.3672"
-       id="path4794"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccc" />
+       id="path4794" />
     <path
        style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:url(#linearGradient4843);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
        d="m 5.34375,1036.375 c -0.138213,0.043 -0.255616,0.1482 -0.3125,0.2812 l -0.875,2 -0.966084,0.8634 c -0.219449,0.2194 -0.161431,0.3252 -0.190934,0.8384 0.205415,0 0.484943,0 0.746694,-3e-4 L 4.875,1039.3438 c 0.0516,-0.043 0.0944,-0.097 0.125,-0.1563 l 0.8125,-1.8125 1.1875,0 1.15625,0 0.8125,1.8125 c 0.0306,0.06 0.0734,0.1133 0.125,0.1563 l 1.173251,1.0325 c 0.113518,0 0.471938,-0.02 0.715999,-0.031 0,-0.2129 0.08262,-0.5753 -0.123815,-0.7817 l -1.015435,-0.9075 -0.90625,-2 c -0.07974,-0.164 -0.255243,-0.2768 -0.4375,-0.2812 l -1.5,0 -1.5,0 c -0.05166,-0.01 -0.104595,-0.01 -0.15625,0 z"
-       id="path4794-5"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccccccccccccccccccc" />
+       id="path4794-5" />
     <rect
        style="fill:#ebf6fe;fill-opacity:1;stroke:url(#linearGradient5006);stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline"
        id="rect4853-8"
@@ -338,15 +282,11 @@
     <path
        style="fill:url(#linearGradient4925);fill-opacity:1;stroke:none;display:inline"
        d="m 6,1044.3622 7,0 0,-1 -8,0 z"
-       id="rect4853-82"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+       id="rect4853-82" />
     <path
        style="fill:url(#linearGradient4916);fill-opacity:1;stroke:none;display:inline"
        d="m 8,1048.3622 0,3 -1,0 0,-4 z"
-       id="rect4853-82-7"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+       id="rect4853-82-7" />
     <rect
        style="fill:url(#linearGradient4933);fill-opacity:1;stroke:url(#linearGradient4941);stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
        id="rect4853"
@@ -357,14 +297,10 @@
     <path
        style="fill:url(#linearGradient4975);fill-opacity:1;stroke:none;display:inline"
        d="m 8,1048.3622 6,0 0,-1 -7,0 z"
-       id="rect4853-82-0"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+       id="rect4853-82-0" />
     <path
        style="fill:url(#linearGradient5023);fill-opacity:1;stroke:none;display:inline"
        d="m 6,1044.3622 0,7 -1,0 0,-8 z"
-       id="rect4853-82-3"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+       id="rect4853-82-3" />
   </g>
 </svg>
diff --git a/ui/org.eclipse.pde.ui/icons/obj16/ctxhelp_command_obj.svg b/ui/org.eclipse.pde.ui/icons/obj16/ctxhelp_command_obj.svg
index b06b04b0a43..62c9cef8f2e 100644
--- a/ui/org.eclipse.pde.ui/icons/obj16/ctxhelp_command_obj.svg
+++ b/ui/org.eclipse.pde.ui/icons/obj16/ctxhelp_command_obj.svg
@@ -2,20 +2,16 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.48.0 r9654"
-   sodipodi:docname="ctxhelp_command_obj.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
@@ -34,7 +30,6 @@
          id="stop4742" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4741">
       <stop
          style="stop-color:#30825a;stop-opacity:1"
@@ -46,7 +41,6 @@
          id="stop4745" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4741"
        id="linearGradient4747"
        x1="11.0625"
@@ -56,7 +50,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-1.314993,0)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4738"
        id="linearGradient4744"
        x1="-13.936629"
@@ -66,29 +59,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(20,0)" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="4"
-     inkscape:cx="-26.185413"
-     inkscape:cy="2.4368339"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1389"
-     inkscape:window-height="982"
-     inkscape:window-x="104"
-     inkscape:window-y="89"
-     inkscape:window-maximized="0"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3966" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -102,16 +72,12 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
     <path
        style="fill:url(#linearGradient4744);fill-opacity:1;stroke:url(#linearGradient4747);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
        d="m 2.497507,1039.8618 0,2.0277 0,5 0,3 1,0 9.546687,-4.5273 c 0.59227,-0.3746 0.618127,-0.6299 0,-1 l -9.126842,-4.5004 z"
-       id="rect3968"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccccc" />
+       id="rect3968" />
   </g>
 </svg>
diff --git a/ui/org.eclipse.pde.ui/icons/obj16/ctxhelp_context_obj.svg b/ui/org.eclipse.pde.ui/icons/obj16/ctxhelp_context_obj.svg
index b24ab9a8267..9ee410cc28a 100644
--- a/ui/org.eclipse.pde.ui/icons/obj16/ctxhelp_context_obj.svg
+++ b/ui/org.eclipse.pde.ui/icons/obj16/ctxhelp_context_obj.svg
@@ -2,24 +2,19 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="ctxhelp_context_obj.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4181">
       <stop
          style="stop-color:#5680a8;stop-opacity:1"
@@ -31,7 +26,6 @@
          id="stop4185" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4238">
       <stop
          style="stop-color:#84a7cb;stop-opacity:1"
@@ -43,7 +37,6 @@
          id="stop4242" />
     </linearGradient>
     <radialGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4887-7-5"
        id="radialGradient4975-4"
        gradientUnits="userSpaceOnUse"
@@ -54,8 +47,7 @@
        fy="1056.0647"
        r="2.4573503" />
     <linearGradient
-       id="linearGradient4887-7-5"
-       inkscape:collect="always">
+       id="linearGradient4887-7-5">
       <stop
          id="stop4889-4-5"
          offset="0"
@@ -66,7 +58,6 @@
          style="stop-color:#778eb6;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4893-4-1"
        id="linearGradient4977-7"
        gradientUnits="userSpaceOnUse"
@@ -76,7 +67,6 @@
        x2="-6.6929808"
        y2="1053.8477" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4893-4-1">
       <stop
          style="stop-color:#7890b8;stop-opacity:1"
@@ -88,7 +78,6 @@
          id="stop4897-8-5" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4877-7">
       <stop
          style="stop-color:#f7f9fc;stop-opacity:1"
@@ -100,7 +89,6 @@
          id="stop4881-1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4901-2">
       <stop
          style="stop-color:#6c96c1;stop-opacity:1"
@@ -120,8 +108,7 @@
        gradientTransform="matrix(0.9878308,0.00829728,-0.01514192,1.7912223,18.37536,1047.474)"
        gradientUnits="userSpaceOnUse"
        id="radialGradient5007"
-       xlink:href="#linearGradient4877-7"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4877-7" />
     <linearGradient
        y2="3.2040119"
        x2="4.1679511"
@@ -130,7 +117,6 @@
        gradientUnits="userSpaceOnUse"
        id="linearGradient5009"
        xlink:href="#linearGradient4901-2"
-       inkscape:collect="always"
        gradientTransform="matrix(1.3487176,0,0,1.3638541,16.991693,1048.5837)" />
     <linearGradient
        id="linearGradient4877">
@@ -153,7 +139,6 @@
        y2="17.832731"
        gradientTransform="matrix(0.72618098,0,0,0.72618098,-20.175843,1059.2142)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4238"
        id="linearGradient4244"
        x1="12.606616"
@@ -163,7 +148,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-0.02762136,-0.03314563)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4181"
        id="linearGradient4187"
        x1="10.198831"
@@ -172,31 +156,6 @@
        y2="1061.1849"
        gradientUnits="userSpaceOnUse" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="32.000001"
-     inkscape:cx="2.4850082"
-     inkscape:cy="15.679322"
-     inkscape:document-units="px"
-     inkscape:current-layer="g4203"
-     showgrid="false"
-     inkscape:window-width="1160"
-     inkscape:window-height="909"
-     inkscape:window-x="1137"
-     inkscape:window-y="597"
-     inkscape:window-maximized="0"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid4092" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -210,8 +169,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
@@ -222,14 +179,11 @@
       <path
          style="fill:url(#linearGradient4244);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4187);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
          d="m 10.698831,1058.6151 0,5.1437 3.987329,0 0,-5.1114 z"
-         id="path4207"
-         inkscape:connector-curvature="0" />
+         id="path4207" />
       <g
          id="g4203"
          transform="matrix(1.4295578,0,0,1.4341381,-18.323561,-457.01045)">
         <path
-           sodipodi:nodetypes="cssssc"
-           inkscape:connector-curvature="0"
            id="rect4875-2-1"
            d="m 23.789274,1057.2805 0,-1.7812 c 0,-1.0276 -0.738157,-1.875 -1.7657,-1.875 l -0.63424,0 c -1.027543,0 -1.78756,0.5423 -1.78756,1.5699 l 0,2.0863"
            style="display:inline;fill:url(#radialGradient4975-4);fill-opacity:1;stroke:url(#linearGradient4977-7);stroke-width:0.69839907;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
@@ -254,18 +208,15 @@
             <path
                d="m -4.3360189,1067.7015 a 7.1710367,7.1710367 0 0 1 -7.1710371,7.1709 7.1710367,7.1710367 0 0 1 -7.171036,-7.1709 7.1710367,7.1710367 0 0 1 7.171036,-7.1711 7.1710367,7.1710367 0 0 1 7.1710371,7.1711 z"
                id="path4110"
-               style="fill:url(#linearGradient4118);fill-opacity:1;stroke:#304b8a;stroke-width:1.45764947;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-               inkscape:connector-curvature="0" />
+               style="fill:url(#linearGradient4118);fill-opacity:1;stroke:#304b8a;stroke-width:1.45764947;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
             <g
                id="g4234"
                transform="matrix(0.81211594,0,0,0.79627474,-3.7855424,211.70207)">
               <path
-                 inkscape:connector-curvature="0"
                  style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:20.03678703px;line-height:125%;font-family:Reznor;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#2a4484;fill-opacity:1;stroke:none"
                  d="m -9.4357617,1068.2736 c -1.2738953,10e-5 -2.2909443,0.3542 -3.0669773,1.0668 -0.776035,0.7126 -1.180487,1.6995 -1.22679,2.9336 l 2.106879,0.2667 c 0.06927,-1.5258 0.767628,-2.2669 2.0535413,-2.2669 0.544332,0 0.986005,0.1392 1.333468,0.4534 0.347451,0.3142 0.50671,0.7177 0.506718,1.2001 -8e-6,0.4489 -0.155573,0.8368 -0.480048,1.1734 -0.173559,0.1795 -0.518749,0.4482 -1.040106,0.7735 -0.47471,0.2917 -0.7828553,0.6247 -0.9334273,1.04 -0.13927,0.348 -0.21336,0.8822 -0.213355,1.6002 l 0,0.9601 1.9468633,0 0,-0.6134 c -6e-6,-0.7067 0.304445,-1.2494 0.906758,-1.6534 0.787868,-0.5387 1.32567,-1.0168 1.626831,-1.3868 0.416727,-0.5387 0.640055,-1.1881 0.640064,-1.9736 -9e-6,-1.0772 -0.431305,-1.9671 -1.253459,-2.6403 -0.787883,-0.6283 -1.760322,-0.9333 -2.90696,-0.9334 z"
                  id="text4882" />
               <path
-                 inkscape:connector-curvature="0"
                  style="display:inline;fill:#294384;fill-opacity:1;stroke:none"
                  id="path4908-1"
                  d="m -8.0758489,1079.7271 a 1.472991,1.2557853 0 0 1 -1.4729931,1.2558 1.472991,1.2557853 0 0 1 -1.472991,-1.2558 1.472991,1.2557853 0 0 1 1.472991,-1.2558 1.472991,1.2557853 0 0 1 1.4729931,1.2558 z" />
diff --git a/ui/org.eclipse.pde.ui/icons/obj16/ctxhelp_desc_obj.svg b/ui/org.eclipse.pde.ui/icons/obj16/ctxhelp_desc_obj.svg
index 448b368ccf4..43b4d2abcb7 100644
--- a/ui/org.eclipse.pde.ui/icons/obj16/ctxhelp_desc_obj.svg
+++ b/ui/org.eclipse.pde.ui/icons/obj16/ctxhelp_desc_obj.svg
@@ -2,20 +2,16 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r"
-   sodipodi:docname="ctxhelp_desc_obj.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
@@ -30,18 +26,6 @@
          id="stop5242" />
     </linearGradient>
     <linearGradient
-       id="linearGradient5148-9-8">
-      <stop
-         style="stop-color:#05507d;stop-opacity:1;"
-         offset="0"
-         id="stop5150-6-3" />
-      <stop
-         style="stop-color:#6b8fa5;stop-opacity:1;"
-         offset="1"
-         id="stop5152-5-4" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient5238"
        id="linearGradient5244"
        x1="12.531334"
@@ -68,8 +52,7 @@
        x1="12.531334"
        gradientUnits="userSpaceOnUse"
        id="linearGradient5261"
-       xlink:href="#linearGradient5238-1"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient5238-1" />
     <linearGradient
        id="linearGradient5238-1-3">
       <stop
@@ -89,8 +72,7 @@
        gradientTransform="matrix(0.84444446,0,0,1,0.81631946,5.9182454)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient5295"
-       xlink:href="#linearGradient5238-1-3"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient5238-1-3" />
     <linearGradient
        id="linearGradient5238-1-3-6">
       <stop
@@ -110,8 +92,7 @@
        gradientTransform="translate(-0.07812493,7.9807454)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient5329"
-       xlink:href="#linearGradient5238-1-3-6"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient5238-1-3-6" />
     <linearGradient
        id="linearGradient5238-1-3-6-4">
       <stop
@@ -131,11 +112,9 @@
        gradientTransform="matrix(1.2844444,0,0,1,-1.7136804,9.918245)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient5363"
-       xlink:href="#linearGradient5238-1-3-6-4"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient5238-1-3-6-4" />
     <linearGradient
        gradientTransform="translate(7.1228027e-8,1.9687552)"
-       inkscape:collect="always"
        xlink:href="#linearGradient5238"
        id="linearGradient5244-9"
        x1="12.531334"
@@ -144,32 +123,6 @@
        y2="1041.9091"
        gradientUnits="userSpaceOnUse" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="31.999999"
-     inkscape:cx="5.3721275"
-     inkscape:cy="7.5712502"
-     inkscape:document-units="px"
-     inkscape:current-layer="g5382"
-     showgrid="true"
-     inkscape:window-width="1181"
-     inkscape:window-height="870"
-     inkscape:window-x="360"
-     inkscape:window-y="543"
-     inkscape:window-maximized="0"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-others="false"
-     inkscape:snap-nodes="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid4176" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -183,8 +136,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
diff --git a/ui/org.eclipse.pde.ui/icons/obj16/debug_exc.svg b/ui/org.eclipse.pde.ui/icons/obj16/debug_exc.svg
index 6b517c56b38..3ce2da325b3 100644
--- a/ui/org.eclipse.pde.ui/icons/obj16/debug_exc.svg
+++ b/ui/org.eclipse.pde.ui/icons/obj16/debug_exc.svg
@@ -1,19 +1,15 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <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"
-   sodipodi:docname="debug_exc.svg"
-   inkscape:version="1.0rc1 (09960d6, 2020-04-09)"
    version="1.1"
    id="svg2"
    height="16"
-   width="16">
+   width="16"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
@@ -28,7 +24,6 @@
          id="stop4519" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4490">
       <stop
          style="stop-color:#3c624f;stop-opacity:1"
@@ -40,7 +35,6 @@
          id="stop4494" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4484">
       <stop
          style="stop-color:#3c624f;stop-opacity:1"
@@ -52,7 +46,6 @@
          id="stop4488" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4478">
       <stop
          style="stop-color:#3c624f;stop-opacity:1"
@@ -64,7 +57,6 @@
          id="stop4482" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4472">
       <stop
          style="stop-color:#3c624f;stop-opacity:1"
@@ -76,7 +68,6 @@
          id="stop4476" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4258">
       <stop
          style="stop-color:#387a31;stop-opacity:1"
@@ -88,7 +79,6 @@
          id="stop4262" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4252">
       <stop
          style="stop-color:#127091;stop-opacity:1"
@@ -100,7 +90,6 @@
          id="stop4256" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4246">
       <stop
          style="stop-color:#3b5f4d;stop-opacity:1"
@@ -112,8 +101,7 @@
          id="stop4250" />
     </linearGradient>
     <linearGradient
-       id="linearGradient12717-5-0-4-3"
-       inkscape:collect="always">
+       id="linearGradient12717-5-0-4-3">
       <stop
          id="stop12719-6-3-0-0"
          offset="0"
@@ -124,94 +112,6 @@
          style="stop-color:#8ebc7b;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       gradientUnits="userSpaceOnUse"
-       y2="166.79221"
-       x2="675.20258"
-       y1="180.63965"
-       x1="674.84711"
-       id="linearGradient12876-4-0-6-3"
-       xlink:href="#linearGradient12862-1-8-7-9"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient12862-1-8-7-9"
-       inkscape:collect="always">
-      <stop
-         id="stop12864-3-6-2-8"
-         offset="0"
-         style="stop-color:#2d493b;stop-opacity:1;" />
-      <stop
-         id="stop12866-4-9-5-0"
-         offset="1"
-         style="stop-color:#296c79;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       gradientTransform="matrix(1,0,0,1.1270932,264.63772,-229.51558)"
-       gradientUnits="userSpaceOnUse"
-       y2="364.92181"
-       x2="429.94864"
-       y1="366.6012"
-       x1="413.01102"
-       id="linearGradient12878-2-7-1-1"
-       xlink:href="#linearGradient12862-1-8-7-1"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient12862-1-8-7-1"
-       inkscape:collect="always">
-      <stop
-         id="stop12864-3-6-2-9"
-         offset="0"
-         style="stop-color:#2d493b;stop-opacity:1;" />
-      <stop
-         id="stop12866-4-9-5-1"
-         offset="1"
-         style="stop-color:#296c79;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       gradientTransform="matrix(1,0,0,1.1270932,264.63772,-229.51558)"
-       gradientUnits="userSpaceOnUse"
-       y2="381.80399"
-       x2="432.86548"
-       y1="378.7988"
-       x1="420.52402"
-       id="linearGradient12880-3-5-6-6"
-       xlink:href="#linearGradient12862-1-8-7-96"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient12862-1-8-7-96"
-       inkscape:collect="always">
-      <stop
-         id="stop12864-3-6-2-86"
-         offset="0"
-         style="stop-color:#2d493b;stop-opacity:1;" />
-      <stop
-         id="stop12866-4-9-5-8"
-         offset="1"
-         style="stop-color:#296c79;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       gradientTransform="matrix(1,0,0,1.1270932,265.19769,-229.45247)"
-       gradientUnits="userSpaceOnUse"
-       y2="350.94641"
-       x2="396.21149"
-       y1="359.4902"
-       x1="396.0101"
-       id="linearGradient12868-4-7-0-0"
-       xlink:href="#linearGradient12862-1-8-7-7"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient12862-1-8-7-7"
-       inkscape:collect="always">
-      <stop
-         id="stop12864-3-6-2-1"
-         offset="0"
-         style="stop-color:#2d493b;stop-opacity:1;" />
-      <stop
-         id="stop12866-4-9-5-12"
-         offset="1"
-         style="stop-color:#296c79;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient12862-1-8-7-96-9"
        id="linearGradient3881-0"
        gradientUnits="userSpaceOnUse"
@@ -221,8 +121,7 @@
        x2="432.86548"
        y2="381.80399" />
     <linearGradient
-       id="linearGradient12862-1-8-7-96-9"
-       inkscape:collect="always">
+       id="linearGradient12862-1-8-7-96-9">
       <stop
          id="stop12864-3-6-2-86-2"
          offset="0"
@@ -232,28 +131,6 @@
          offset="1"
          style="stop-color:#599a85;stop-opacity:1" />
     </linearGradient>
-    <linearGradient
-       gradientTransform="matrix(1,0,0,1.1270932,264.63772,-229.51558)"
-       gradientUnits="userSpaceOnUse"
-       y2="381.80399"
-       x2="432.86548"
-       y1="378.7988"
-       x1="420.52402"
-       id="linearGradient12880-3-5-6-9"
-       xlink:href="#linearGradient12862-1-8-7-75"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient12862-1-8-7-75"
-       inkscape:collect="always">
-      <stop
-         id="stop12864-3-6-2-4"
-         offset="0"
-         style="stop-color:#2d493b;stop-opacity:1;" />
-      <stop
-         id="stop12866-4-9-5-16"
-         offset="1"
-         style="stop-color:#296c79;stop-opacity:1" />
-    </linearGradient>
     <linearGradient
        gradientTransform="matrix(0.27903303,0,0,0.27903304,-104.76098,-96.354723)"
        gradientUnits="userSpaceOnUse"
@@ -262,10 +139,8 @@
        y1="366.81937"
        x1="414.86481"
        id="linearGradient12878-2-7-1-2"
-       xlink:href="#linearGradient4478"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4478" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient12862-1-8-7-1-9"
        id="linearGradient3847-1"
        gradientUnits="userSpaceOnUse"
@@ -275,8 +150,7 @@
        x2="429.94864"
        y2="364.92181" />
     <linearGradient
-       id="linearGradient12862-1-8-7-1-9"
-       inkscape:collect="always">
+       id="linearGradient12862-1-8-7-1-9">
       <stop
          id="stop12864-3-6-2-9-6"
          offset="0"
@@ -287,7 +161,6 @@
          style="stop-color:#599a85;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient12862-1-8-7-9-7"
        id="linearGradient3813-8"
        gradientUnits="userSpaceOnUse"
@@ -297,8 +170,7 @@
        y2="166.79221"
        gradientTransform="matrix(0,0.27903302,0.24756874,0,-39.521247,-178.59954)" />
     <linearGradient
-       id="linearGradient12862-1-8-7-9-7"
-       inkscape:collect="always">
+       id="linearGradient12862-1-8-7-9-7">
       <stop
          id="stop12864-3-6-2-8-0"
          offset="0"
@@ -316,7 +188,6 @@
        x1="675.9187"
        id="linearGradient12876-4-0-6-7"
        xlink:href="#linearGradient4484"
-       inkscape:collect="always"
        gradientTransform="matrix(0.27903303,0,0,0.24756874,-178.60364,-39.53384)" />
     <linearGradient
        gradientTransform="matrix(0.27903303,0,0,0.27903304,-104.60473,-96.339099)"
@@ -326,10 +197,8 @@
        y1="359.4902"
        x1="396.0101"
        id="linearGradient12868-4-7-0-8"
-       xlink:href="#linearGradient4490"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4490" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient12862-1-8-7-7-5"
        id="linearGradient3915-6"
        gradientUnits="userSpaceOnUse"
@@ -339,8 +208,7 @@
        x2="396.21149"
        y2="350.94641" />
     <linearGradient
-       id="linearGradient12862-1-8-7-7-5"
-       inkscape:collect="always">
+       id="linearGradient12862-1-8-7-7-5">
       <stop
          id="stop12864-3-6-2-1-6"
          offset="0"
@@ -351,7 +219,6 @@
          style="stop-color:#599a85;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4472"
        id="linearGradient3993"
        gradientUnits="userSpaceOnUse"
@@ -368,30 +235,7 @@
        gradientTransform="matrix(0.27903303,0,0,0.24756874,-178.8909,996.82836)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient4086"
-       xlink:href="#linearGradient4258"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient12862-1-8-7-75-5"
-       id="linearGradient3993-5"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.27903303,0,0,0.27903304,-104.76098,-96.354723)"
-       x1="420.52402"
-       y1="378.7988"
-       x2="432.86548"
-       y2="381.80399" />
-    <linearGradient
-       id="linearGradient12862-1-8-7-75-5"
-       inkscape:collect="always">
-      <stop
-         id="stop12864-3-6-2-4-2"
-         offset="0"
-         style="stop-color:#2d493b;stop-opacity:1;" />
-      <stop
-         id="stop12866-4-9-5-16-6"
-         offset="1"
-         style="stop-color:#296c79;stop-opacity:1" />
-    </linearGradient>
+       xlink:href="#linearGradient4258" />
     <linearGradient
        y2="417.26108"
        x2="440.35345"
@@ -399,8 +243,7 @@
        x1="427.92853"
        gradientUnits="userSpaceOnUse"
        id="linearGradient4190"
-       xlink:href="#linearGradient4252"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4252" />
     <radialGradient
        r="12.027534"
        fy="424.34106"
@@ -410,8 +253,7 @@
        gradientTransform="matrix(1.2231981,-0.08344257,0.10167677,1.4904962,-139.87254,-174.00694)"
        gradientUnits="userSpaceOnUse"
        id="radialGradient4192"
-       xlink:href="#linearGradient4515"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4515" />
     <radialGradient
        r="12.952347"
        fy="420.74988"
@@ -421,8 +263,7 @@
        gradientTransform="matrix(1,0,0,1.2797889,0,-120.61151)"
        gradientUnits="userSpaceOnUse"
        id="radialGradient4194"
-       xlink:href="#linearGradient12717-5-0-4-3"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient12717-5-0-4-3" />
     <linearGradient
        y2="415.1088"
        x2="425.4519"
@@ -430,262 +271,8 @@
        x1="427.53012"
        gradientUnits="userSpaceOnUse"
        id="linearGradient4196"
-       xlink:href="#linearGradient4246"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="183.92403"
-       x2="666.19678"
-       y1="204.12044"
-       x1="684.11578"
-       gradientTransform="matrix(0.27903303,0,0,0.24756874,-178.8909,996.82836)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4086-5"
-       xlink:href="#linearGradient4258-3"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient4258-3">
-      <stop
-         style="stop-color:#387a31;stop-opacity:1"
-         offset="0"
-         id="stop4260-4" />
-      <stop
-         style="stop-color:#397b3b;stop-opacity:0;"
-         offset="1"
-         id="stop4262-6" />
-    </linearGradient>
-    <linearGradient
-       y2="417.26108"
-       x2="440.35345"
-       y1="447.02145"
-       x1="427.92853"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4190-8"
-       xlink:href="#linearGradient4252-7"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient4252-7">
-      <stop
-         style="stop-color:#1d6279;stop-opacity:1"
-         offset="0"
-         id="stop4254-1" />
-      <stop
-         style="stop-color:#2d707c;stop-opacity:1"
-         offset="1"
-         id="stop4256-4" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4228-4"
-       id="linearGradient4141-2"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.27903303,0,0,0.27903304,-104.76098,-96.35472)"
-       x1="420.52402"
-       y1="378.7988"
-       x2="432.86548"
-       y2="381.80399" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient4228-4">
-      <stop
-         style="stop-color:#203932;stop-opacity:1"
-         offset="0"
-         id="stop4230-4" />
-      <stop
-         style="stop-color:#314e4a;stop-opacity:1"
-         offset="1"
-         id="stop4232-0" />
-    </linearGradient>
-    <linearGradient
-       y2="399.07361"
-       x2="396.94577"
-       y1="388.32217"
-       x1="400.52957"
-       gradientTransform="matrix(0.27903303,0,0,0.27903304,-104.76098,-96.35472)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4094-1"
-       xlink:href="#linearGradient4222-4"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient4222-4">
-      <stop
-         style="stop-color:#203c37;stop-opacity:1"
-         offset="0"
-         id="stop4224-9" />
-      <stop
-         style="stop-color:#31564a;stop-opacity:1"
-         offset="1"
-         id="stop4226-6" />
-    </linearGradient>
-    <linearGradient
-       y2="388.69827"
-       x2="385.57773"
-       y1="381.15457"
-       x1="393.36197"
-       gradientTransform="matrix(0.27903303,0,0,0.27903304,-104.76098,940.00748)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4097-3"
-       xlink:href="#linearGradient4216-0"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient4216-0">
-      <stop
-         style="stop-color:#233e32;stop-opacity:1"
-         offset="0"
-         id="stop4218-3" />
-      <stop
-         style="stop-color:#31564a;stop-opacity:0.8650133"
-         offset="1"
-         id="stop4220-8" />
-    </linearGradient>
-    <linearGradient
-       y2="371.10898"
-       x2="379.65567"
-       y1="375.17487"
-       x1="393.4772"
-       gradientTransform="matrix(0.27903303,0,0,0.27903304,-104.76098,-96.35472)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4100-2"
-       xlink:href="#linearGradient4210-9"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient4210-9">
-      <stop
-         style="stop-color:#284539;stop-opacity:1"
-         offset="0"
-         id="stop4212-8" />
-      <stop
-         style="stop-color:#385653;stop-opacity:1"
-         offset="1"
-         id="stop4214-5" />
-    </linearGradient>
-    <linearGradient
-       y2="360.85596"
-       x2="381.86542"
-       y1="362.80048"
-       x1="390.38361"
-       gradientTransform="matrix(0.27903303,0,0,0.27903304,-104.76098,-96.35472)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4091-0"
-       xlink:href="#linearGradient4204-6"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient4204-6">
-      <stop
-         style="stop-color:#28483d;stop-opacity:1"
-         offset="0"
-         id="stop4206-3" />
-      <stop
-         style="stop-color:#31564a;stop-opacity:1"
-         offset="1"
-         id="stop4208-8" />
-    </linearGradient>
-    <linearGradient
-       gradientTransform="matrix(0.27903303,0,0,0.27903304,-104.60473,-96.3391)"
-       gradientUnits="userSpaceOnUse"
-       y2="350.94641"
-       x2="396.21149"
-       y1="359.4902"
-       x1="396.0101"
-       id="linearGradient12868-4-7-0-8-7-6"
-       xlink:href="#linearGradient4198-8"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient4198-8">
-      <stop
-         style="stop-color:#2d483d;stop-opacity:1"
-         offset="0"
-         id="stop4200-3" />
-      <stop
-         style="stop-color:#38564e;stop-opacity:1"
-         offset="1"
-         id="stop4202-0" />
-    </linearGradient>
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       y2="166.79221"
-       x2="675.20258"
-       y1="180.63965"
-       x1="674.84711"
-       id="linearGradient12876-4-0-6-7-3-6"
-       xlink:href="#linearGradient4240-5"
-       inkscape:collect="always"
-       gradientTransform="matrix(0.27903303,0,0,0.24756874,-178.60364,-39.53384)" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient4240-5">
-      <stop
-         style="stop-color:#284539;stop-opacity:1"
-         offset="0"
-         id="stop4242-0" />
-      <stop
-         style="stop-color:#385653;stop-opacity:1"
-         offset="1"
-         id="stop4244-3" />
-    </linearGradient>
-    <linearGradient
-       gradientTransform="matrix(0.27903303,0,0,0.27903304,-104.76098,-96.35472)"
-       gradientUnits="userSpaceOnUse"
-       y2="364.92181"
-       x2="429.94864"
-       y1="366.6012"
-       x1="413.01102"
-       id="linearGradient12878-2-7-1-2-8-9"
-       xlink:href="#linearGradient4234-5"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient4234-5">
-      <stop
-         style="stop-color:#203932;stop-opacity:1"
-         offset="0"
-         id="stop4236-7" />
-      <stop
-         style="stop-color:#31564a;stop-opacity:1"
-         offset="1"
-         id="stop4238-1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4216-0"
-       id="linearGradient4382"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.27903303,0,0,0.27903304,-104.76098,-96.35472)"
-       x1="393.36197"
-       y1="381.15457"
-       x2="385.57773"
-       y2="388.69827" />
+       xlink:href="#linearGradient4246" />
   </defs>
-  <sodipodi:namedview
-     inkscape:snap-global="false"
-     inkscape:document-rotation="0"
-     inkscape:window-maximized="1"
-     inkscape:window-y="23"
-     inkscape:window-x="0"
-     inkscape:window-height="1035"
-     inkscape:window-width="1920"
-     showgrid="true"
-     inkscape:current-layer="layer1"
-     inkscape:document-units="px"
-     inkscape:cy="5.5843391"
-     inkscape:cx="0.064493671"
-     inkscape:zoom="22.627417"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0"
-     borderopacity="1.0"
-     bordercolor="#666666"
-     pagecolor="#484848"
-     id="base">
-    <inkscape:grid
-       id="grid3017"
-       type="xygrid" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -694,117 +281,73 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
   <g
      style="display:inline"
-     inkscape:label="alt#1"
-     id="layer3"
-     inkscape:groupmode="layer">
+     id="layer3">
     <path
-       sodipodi:nodetypes="ccc"
        style="fill:none;stroke:url(#linearGradient3993);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
        d="m 12.82579,9.4971188 1.661134,0 1.422561,1.4112212"
-       id="path12694-8"
-       inkscape:connector-curvature="0" />
+       id="path12694-8" />
     <path
-       sodipodi:nodetypes="ccccc"
        style="fill:none;stroke:url(#linearGradient12878-2-7-1-2);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
        d="m 10,6.9999994 1.508233,-1.4917651 0.983535,-2.4e-6 0.977902,0.9889529 1.541382,0"
-       id="path12696-5"
-       inkscape:connector-curvature="0" />
+       id="path12696-5" />
     <path
-       sodipodi:nodetypes="cccc"
        style="fill:none;stroke:url(#linearGradient12876-4-0-6-7);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
        d="m 8.497184,5.9999999 0,-1.4696695 1.0021304,-1.0554648 0,-1.4697487"
-       id="path12698-4"
-       inkscape:connector-curvature="0" />
+       id="path12698-4" />
     <path
-       sodipodi:nodetypes="cc"
        style="fill:none;stroke:url(#linearGradient12868-4-7-0-8);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
        d="M 5.516768,6.0186776 5.4903436,0.99696"
-       id="path12700-8"
-       inkscape:connector-curvature="0" />
+       id="path12700-8" />
     <path
-       sodipodi:nodetypes="cccc"
        style="fill:none;stroke:url(#linearGradient3813-8);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
        d="m 6.0125902,8.501281 -1.4696698,0 -1.0554648,1.0021285 -1.4697478,0"
-       id="path12698-4-3"
-       inkscape:connector-curvature="0" />
+       id="path12698-4-3" />
     <path
-       sodipodi:nodetypes="ccccc"
        style="fill:none;stroke:url(#linearGradient3847-1);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
        d="m 7.0014107,10.06109 -1.4917664,1.508234 -2.8e-6,0.983533 0.9889544,0.977904 0,1.541381"
-       id="path12696-5-5"
-       inkscape:connector-curvature="0" />
+       id="path12696-5-5" />
     <path
-       sodipodi:nodetypes="ccc"
        style="fill:none;stroke:url(#linearGradient3881-0);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
        d="m 9.4588992,12.848383 0,1.661134 1.4112208,1.422562"
-       id="path12694-8-2"
-       inkscape:connector-curvature="0" />
+       id="path12694-8-2" />
     <path
-       sodipodi:nodetypes="cc"
        style="fill:none;stroke:url(#linearGradient3915-6);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
        d="M 6.0300382,5.4946057 1.0083225,5.5210287"
-       id="path12700-8-0"
-       inkscape:connector-curvature="0" />
+       id="path12700-8-0" />
   </g>
   <g
      transform="translate(0,-1036.3622)"
      style="display:inline"
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1">
+     id="layer1">
     <path
        transform="matrix(0.0982715,-0.0982715,0.0982715,0.0982715,-78.62319,1042.923)"
        d="m 444.77016,431.08047 a 11.313708,14.937631 0 1 1 -22.62742,0 11.313708,14.937631 0 1 1 22.62742,0 z"
-       sodipodi:ry="14.937631"
-       sodipodi:rx="11.313708"
-       sodipodi:cy="431.08047"
-       sodipodi:cx="433.45645"
        id="path12648-2-2"
-       style="fill:url(#radialGradient4194);fill-opacity:1;stroke:url(#linearGradient4196);stroke-width:7.19544077;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline"
-       sodipodi:type="arc" />
+       style="fill:url(#radialGradient4194);fill-opacity:1;stroke:url(#linearGradient4196);stroke-width:7.19544077;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline" />
     <path
        transform="matrix(0.19686609,-0.19686609,0.1968661,0.1968661,-161.15278,1045.6329)"
        d="m 444.77016,431.08047 a 11.313708,14.937631 0 1 1 -22.62742,0 11.313708,14.937631 0 1 1 22.62742,0 z"
-       sodipodi:ry="14.937631"
-       sodipodi:rx="11.313708"
-       sodipodi:cy="431.08047"
-       sodipodi:cx="433.45645"
        id="path12648-9"
-       style="fill:url(#radialGradient4192);fill-opacity:1;stroke:none;display:inline"
-       sodipodi:type="arc" />
+       style="fill:url(#radialGradient4192);fill-opacity:1;stroke:none;display:inline" />
     <path
-       inkscape:connector-curvature="0"
        id="path12686-5"
        d="m 5.88715,1042.2397 5.808198,5.8082"
        style="fill:none;stroke:url(#linearGradient4086);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
     <path
        transform="matrix(0.18984474,-0.18571766,0.18984475,0.18571767,-155.10466,1045.8163)"
        d="m 444.77016,431.08047 a 11.313708,14.937631 0 1 1 -22.62742,0 11.313708,14.937631 0 1 1 22.62742,0 z"
-       sodipodi:ry="14.937631"
-       sodipodi:rx="11.313708"
-       sodipodi:cy="431.08047"
-       sodipodi:cx="433.45645"
        id="path12648-1-6"
-       style="fill:none;stroke:url(#linearGradient4190);stroke-width:3.76581596999999979;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline"
-       sodipodi:type="arc" />
+       style="fill:none;stroke:url(#linearGradient4190);stroke-width:3.76581596999999979;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline" />
     <path
-       sodipodi:open="true"
-       sodipodi:end="4.931597"
-       sodipodi:start="4.5270744"
        transform="matrix(0.18984474,-0.18571766,0.18984475,0.18571767,-155.10466,1045.8163)"
        d="m 431.37184,416.3986 a 11.313708,14.937631 0 0 1 4.54485,0.1017"
-       sodipodi:ry="14.937631"
-       sodipodi:rx="11.313708"
-       sodipodi:cy="431.08047"
-       sodipodi:cx="433.45645"
        id="path12648-1-6-2"
-       style="fill:#2e6a22;fill-opacity:1;stroke:#2e6a22;stroke-width:3.76581597;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline"
-       sodipodi:type="arc" />
+       style="fill:#2e6a22;fill-opacity:1;stroke:#2e6a22;stroke-width:3.76581597;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline" />
   </g>
 </svg>
diff --git a/ui/org.eclipse.pde.ui/icons/obj16/discovery.svg b/ui/org.eclipse.pde.ui/icons/obj16/discovery.svg
index e001b4dba39..67a47fee89e 100644
--- a/ui/org.eclipse.pde.ui/icons/obj16/discovery.svg
+++ b/ui/org.eclipse.pde.ui/icons/obj16/discovery.svg
@@ -2,20 +2,16 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="discovery.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
@@ -34,8 +30,7 @@
          style="stop-color:#4364a7;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       id="linearGradient7580"
-       inkscape:collect="always">
+       id="linearGradient7580">
       <stop
          id="stop7582"
          offset="0"
@@ -46,7 +41,6 @@
          style="stop-color:#4fa8ca;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient8349">
       <stop
          style="stop-color:#ffffff;stop-opacity:1;"
@@ -77,7 +71,6 @@
          id="stop8386" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient8382"
        id="linearGradient7571"
        gradientUnits="userSpaceOnUse"
@@ -87,7 +80,6 @@
        y2="12.665515"
        gradientTransform="matrix(1.4450739,0,0,1.4450739,-8.184556,1029.6884)" />
     <radialGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient8349"
        id="radialGradient7574"
        gradientUnits="userSpaceOnUse"
@@ -98,7 +90,6 @@
        fy="395.31625"
        r="232.85715" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient7580"
        id="linearGradient7576"
        gradientUnits="userSpaceOnUse"
@@ -107,7 +98,6 @@
        x2="-1030.4867"
        y2="328.19562" />
     <radialGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient8396"
        id="radialGradient7578"
        gradientUnits="userSpaceOnUse"
@@ -144,34 +134,8 @@
        gradientTransform="matrix(1.4450739,0,0,1.4450739,-8.184556,1029.9384)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient7603"
-       xlink:href="#linearGradient8382-7"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient8382-7" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="45.254832"
-     inkscape:cx="6.3275243"
-     inkscape:cy="7.8609076"
-     inkscape:document-units="px"
-     inkscape:current-layer="g3375"
-     showgrid="true"
-     inkscape:window-width="1208"
-     inkscape:window-height="913"
-     inkscape:window-x="1262"
-     inkscape:window-y="634"
-     inkscape:window-maximized="0"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid8762" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -185,8 +149,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
@@ -203,13 +165,11 @@
       <path
          style="display:inline;fill:url(#linearGradient7603);fill-opacity:1;stroke:#767554;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
          d="m 9.066013,1039.3313 c -0.08358,-10e-5 -0.146685,0.025 0,0.045 0.101849,0.014 -0.05818,0.061 0.09032,0.045 0.07519,-0.065 -0.01658,-0.09 -0.09032,-0.09 z m -1.806342,0.045 c -0.08085,0.016 -0.146193,0.071 -0.225793,0.09 0.167199,-0.042 0.324172,-0.063 0.496744,-0.09 -0.08865,0.014 -0.183662,-0.017 -0.270951,0 z m 0.722537,0 c -0.100838,0.019 -0.125577,0.038 0,0.045 0.08577,-0.039 0.08961,-0.048 0.135475,-0.045 -0.05026,0 -0.09312,-0.014 -0.135475,0 z m 1.625708,0 c -0.0091,-8e-4 -0.03685,0.046 -0.04516,0.045 -0.01605,0.03 -0.129334,0.049 0.04516,0.045 0.0048,0.019 0.01431,0.067 0.04516,0.045 0.01156,-0.019 0.01983,-0.077 0.04516,-0.09 -0.03183,0 -0.05829,-0.039 -0.09032,-0.045 z m -1.128964,0.045 c -0.02416,6e-4 -0.03418,0.051 -0.04516,0.09 -0.09662,-0.065 -0.29735,-0.055 -0.361269,-0.045 -0.05552,0.027 -0.05,0.055 0.135476,0.045 0.103958,0 -0.01496,0.032 -0.09032,0.045 0.02251,0 0.01773,10e-4 0.09032,0 0.09883,0 0.621851,-0.055 0.31611,-0.09 0.02353,-0.04 -0.02653,-0.045 -0.04516,-0.045 z m 0.722537,0 c -0.01127,0.014 0.02183,0.048 0.135475,0.045 0.03143,-0.042 0.03666,-0.046 0,-0.045 -0.03753,5e-4 -0.12416,-0.014 -0.135475,0 z m -0.451586,0.045 c -0.01501,6e-4 8e-5,0.039 0,0.045 0,0 0.04516,0 0.04516,0 0,0 -0.04516,-0.045 -0.04516,-0.045 z m 0.04516,0.045 c -0.04631,0.014 -0.04368,0.033 0.09032,0.045 -0.03234,0 -0.123857,0.062 0.04516,0.045 0.132571,-0.04 0.176165,-0.1373 0.04516,-0.1358 -0.01358,10e-5 -0.02783,0.043 -0.04516,0.045 0.01672,0.017 -0.08916,-0.014 -0.135476,0 z m 1.128964,-0.045 c -0.01387,0.017 -0.03883,0.027 -0.04516,0.045 -0.009,0.026 0.01026,0.077 0,0.09 -0.0072,0 -0.03152,0 -0.04516,0 -0.05439,-3e-4 -0.162088,0.014 -0.180634,0 -0.153773,-0.014 -0.07519,0.025 -0.04516,0.045 0.138264,0.014 0.297103,0.08 0.31611,0.09 0.136704,0.014 0.03662,-0.1584 0.270951,-0.09 -0.0059,-0.024 0.0011,-0.039 0.04516,-0.045 -0.105129,-0.035 -0.208457,-0.1069 -0.316109,-0.1358 z m -0.722537,0.045 c 0.01559,0.014 0.002,0.033 0.04516,0.045 0.06509,-0.037 0.0069,-0.045 -0.04516,-0.045 z m -1.625708,0.045 c -0.253349,0.1142 -0.426184,0.1817 -0.406427,0.271 0.180027,-0.019 0.371333,-0.1717 0.587061,-0.1807 0.223903,-0.075 -0.05272,-0.085 -0.180634,-0.09 z m 1.445074,0.045 c -0.0409,0.016 -0.01728,0.074 0.09032,0.09 0.02965,-0.053 -0.0091,-0.091 -0.04516,-0.09 -0.01504,2e-4 -0.03153,0 -0.04516,0 z m -0.677379,0.045 c -0.04481,0 -0.05671,0.036 0,0.09 0.172461,-0.032 0.0655,-0.091 0,-0.09 z m 0.31611,0.045 c -0.137831,0.038 0.04928,0.025 -0.09032,0.09 -0.207472,-0.068 -0.03163,0.1658 0,0.1807 0.04266,0 0.131011,-0.088 0.180635,-0.1359 -0.03626,-0.026 0.01566,-0.071 0.04516,-0.09 3.77e-4,-0.014 -0.01069,-0.04 -0.04516,-0.045 -0.0196,0 -0.06061,9e-4 -0.09032,0 z m 1.716025,0 c -0.004,0 -0.01945,0.029 0,0.045 0.07818,0.033 0.02507,0.035 0.04516,0.045 0.03601,0.071 0.313666,0.1649 0.180634,0.1359 0.135678,0.027 0.416206,0.3372 0.361268,0.2257 0.04163,0.069 0.111546,0.3245 0.09032,0.2258 0.0104,0 0.09364,0.062 0.09032,0.09 0.07303,0.017 0.09192,0.066 0.09032,0.09 0.01387,0 0.03951,0.059 0,0.045 0,0 -0.04516,0 -0.04516,0 0.0066,0 -0.0061,0.043 0,0.045 0.123612,0.045 0.0056,0.1286 0.04516,0.1359 -0.04496,4e-4 -0.04601,0.036 -0.04516,0.045 0.0078,0 -0.0058,0.042 0,0.045 0.01988,0 -0.03053,0.046 0.09032,0.045 -0.02273,-9e-4 -0.102253,0.014 -0.135475,0 0.01098,0 0.0066,0.027 0.04516,0.045 -0.05684,0.014 -0.08789,0.068 -0.09032,0.09 0.156122,-0.053 0.09485,0.022 0.04516,0.045 0.04858,0 0.08897,0.019 0.09032,0.045 0.01497,0 0.03866,0.033 0,0.045 -0.0022,0 0.004,0.039 0,0.045 0.0072,0 -0.0046,0.041 0,0.045 -0.08747,0.03 -0.03464,0.1041 0,0.1359 -0.002,7e-4 0.0424,0.014 0.04516,0 -0.0084,0.09 0.04516,0.2208 0.04516,0.1806 0.08871,0.084 0.176136,0.1171 0.180634,0.09 0.02958,0 0.141039,0.071 0.135476,0.09 0.04514,0.014 0.07444,0 0.04516,-0.045 0.0042,-0.02 -0.0097,-0.055 0,-0.09 0.01272,-0.048 0.01607,-0.066 0,-0.045 -0.04244,-0.038 0.08587,-0.075 0.04516,-0.09 0.04006,-0.039 0.02247,-0.3081 0.04516,-0.1806 0.124681,-0.045 0.167427,0.042 0.180635,-0.045 3.52e-4,0.069 0.06373,0.014 0.09032,0 0.0064,0 0.04063,0 0.04516,0 0.03445,-0.027 -0.01487,-0.1848 0.04516,-0.1359 0.07386,0.1171 0.333387,0.12 0.406427,0.045 -0.06679,-0.035 -0.100563,-0.071 -0.135476,-0.09 -0.05608,-0.02 -0.07516,-0.078 -0.09032,-0.09 0.0149,0 0.03384,0.029 0.09032,0.045 0.02376,0.022 0.03107,-0.014 0.04516,0 -0.04337,-0.059 -0.08394,-0.1445 -0.09032,-0.1358 -0.04805,-0.045 -0.05874,-0.053 -0.04516,-0.045 -0.07471,-0.052 -0.0069,-0.071 0.09032,0 -0.503631,-0.4665 -1.072016,-0.862 -1.716025,-1.1289 -0.03867,0 -0.236008,-0.039 -0.31611,-0.045 z m -2.619196,0.045 c -0.05805,0.035 -0.103164,0.066 -0.180634,0.09 0.08266,0 -0.436024,0.1185 0.04516,0.09 -0.06329,0.036 -0.540547,0.059 -0.180634,0.1806 -0.12825,0.2039 0.586882,-0.068 0.406427,0 0.06181,-0.017 0.09822,0.091 0.225793,0.09 0.162503,-0.03 0.129551,-0.1228 0.09032,-0.1358 0.0322,-0.02 0.06892,-0.048 0.09032,-0.045 -0.05185,-0.059 -0.08393,-0.087 0,-0.1806 -0.05951,0.04 -0.194185,0.088 -0.180634,0 0.0082,-0.059 0.01776,-0.1739 -0.04516,-0.09 -0.09198,0.024 -0.17661,0.014 -0.225793,0 -0.0104,0 -0.04373,0 -0.04516,0 z m 1.535391,0.09 c -0.107831,0.033 -0.344638,0.2215 -0.09032,0.271 -0.04356,-0.014 -0.07185,0 -0.09032,0 0.04418,0.037 0.112152,0.1069 0.09032,0.09 0.04681,0.014 0.147535,0.032 0.225793,0.045 0.105317,0.019 0.193436,0.033 0.135476,0.045 0.130201,0.058 0.05777,-0.1893 0.135475,0.045 0.128077,0.02 0.27517,0.1141 0.135476,0.1358 -0.0069,10e-5 -0.01567,0.081 0,0.045 0.0402,0.062 0.150499,0.1579 0.135476,0.09 0.08315,0.065 -0.110548,0.1569 -0.180635,0.1806 0.0177,0.059 -0.03884,0.1113 -0.09032,0.1359 0.06264,-0.014 0.246448,0.246 0.180635,0.1806 -0.02867,0.014 -0.02299,0.022 0,0.045 -0.0098,0 0.02185,0.061 0.04516,0.045 0.097426,0.065 0.245697,0.1257 0.270951,0.1358 0.01,-0.036 -0.04431,-0.1257 -0.09032,-0.1806 0.01185,0 0.02392,-0.014 0.04516,0 0.04767,0.014 0.146999,0.027 0.135476,0.09 0.04169,-0.036 -0.0049,-0.1807 0,-0.1807 -0.1151,-0.1611 -0.108568,-0.098 -0.135476,-0.2257 -0.02711,-0.023 0.167583,-0.014 0.135476,0 0.02048,0.032 0.0404,0.062 0.04516,0.09 -0.01575,0 0.140056,-0.068 0.135475,0.045 0.03637,-0.023 0.03461,-0.061 0.04516,-0.09 0.168702,0 -0.05389,-0.052 0,-0.045 0.01402,-0.1011 -0.11841,-0.053 -0.09032,-0.1358 -0.04477,-0.051 -0.130837,-0.1156 -0.09032,-0.045 -0.01753,0 -0.07007,-0.058 -0.09032,-0.09 0.0078,-0.02 -0.0017,-0.058 0.135476,-0.045 -0.05561,-0.017 -0.08386,-0.032 -0.09032,-0.045 0.01798,-0.016 0.03208,-0.055 -0.09032,-0.045 -0.0299,-0.03 0.01838,-0.038 0.04516,-0.045 -6.12e-4,-0.014 -0.01171,-0.02 -0.04516,-0.045 -0.109146,0.048 -0.0098,-0.017 -0.04516,-0.045 -0.02155,0.014 -0.04663,0.014 -0.04516,0 0.09383,-0.043 0.01718,-0.1055 -0.04516,-0.09 0.02032,-0.019 -0.02958,-0.066 -0.090317,-0.045 -0.106357,-0.024 0.01585,0 -0.09032,-0.09 -0.01676,-0.038 -0.01501,-0.09 -0.04516,-0.09 -0.05507,2e-4 -0.07881,0.043 -0.09032,0.045 -0.01653,-0.046 -0.0349,-0.062 -0.04516,-0.045 0.0046,-0.056 -0.03548,-0.1055 -0.180634,-0.045 -0.07579,0.02 -0.05127,0.1577 -0.09032,0.09 -0.0397,-0.032 -0.06827,-0.027 -0.09032,0 -0.02205,0.028 -0.02562,0.071 0,0.09 -0.08386,0.017 -0.04658,-0.035 0,-0.09 0.06987,-0.084 0.144175,-0.1831 0.04516,-0.1806 -0.02027,4e-4 -0.04897,-0.014 -0.09032,0 z m -2.528879,0.09 c -0.04168,0.016 -0.138857,0.061 -0.225793,0.09 -0.08448,0.02 -0.177462,0.014 -0.135476,0 -0.03442,-0.014 -0.225251,0.104 -0.31611,-0.045 -0.15475,0.014 -0.22998,0 -0.316109,0 -0.01172,0 -0.03348,0 -0.04516,0 -0.51809,0.2744 -0.988949,0.6277 -1.399916,1.0387 -0.05146,0.048 -0.09312,0.1229 -0.135475,0.1807 -0.06051,0.084 -0.07162,0.1445 0,0.09 -0.08021,0.088 -0.106752,0.2593 0.04516,0.1358 -0.127771,0.1948 -0.324817,0.3604 -0.451586,0.4968 0.207116,-0.1689 0.390662,-0.3587 0.587061,-0.5419 0.01575,-0.084 0.1341,-0.1329 0.225793,-0.1806 -0.09124,0.084 -0.180188,0.2231 -0.09032,0.1358 0.0882,-0.035 0.212553,-0.1668 0.270951,-0.2257 -0.0011,0 0.04432,0 0.04516,0 0.01399,-4e-4 0.02171,0 0,0.045 0.04249,0.014 0.1853,0.077 0.225793,0.09 0.04562,-0.023 0.147873,0.085 0.135476,0.1358 0.0124,-0.014 0.03244,-0.022 0.04516,-0.09 0.0099,-0.039 -0.03141,0.2057 0,0.1807 -0.01275,0.029 -0.0353,0.061 -0.04516,0.09 0,0 -0.04516,0.045 -0.04516,0.045 -0.0081,0.019 -0.0064,0.039 0,0.045 0,0 0.04516,-0.045 0.04516,-0.045 -0.0034,0.014 -0.0015,0.035 0,0.045 -0.005,5e-4 -0.02389,0.059 0,0.045 0.0046,0 0.03764,-4e-4 0.04516,0 -0.02653,0.027 -0.01638,0.036 0,0.045 0.01488,0.014 5.5e-5,0.041 -0.04516,0.09 -0.01454,0.014 0.02371,0.025 0,0.045 -0.02886,0.095 0.01342,0.1359 0.04516,0.1359 -0.01798,0.079 -0.01867,0.1579 0,0.1806 -0.0415,0.059 -0.07669,0.1416 -0.04516,0.09 0.07378,-0.014 0.0011,0.1257 -0.04516,0.1806 0.02834,-0.014 0.07674,-0.026 0.180634,-0.09 -0.0082,0.025 0.123813,0.082 0.04516,0.1359 0.03263,0.051 0.02895,0.1286 0,0.1806 -0.01908,0.033 -0.0424,0.038 -0.04516,0.045 -0.05049,-0.2244 -0.182126,0.3601 -0.180634,0.2257 -0.09281,0.2171 -0.184077,0.401 -0.225793,0.6322 -0.08139,0.1739 -0.02076,0.4711 0.04516,0.4065 0.04001,0.1529 0.01708,0.3703 0.180634,0.4064 0.155322,0.152 0.10817,0.4311 0.270952,0.5871 0.02048,0.12 -0.128768,0.1931 0.04516,0.2258 0.113208,0.2501 0.133117,0.4109 0.270951,0.3612 -0.09169,-0.1055 -0.25631,-0.5183 -0.225793,-0.4966 -0.07931,-0.1287 -0.173621,-0.4827 0,-0.3613 0.07233,0.1521 0.132911,0.363 0.270952,0.4967 0.0043,0.1563 0.22556,0.3085 0.270951,0.5419 -0.03782,0.1572 0.02529,0.2692 0.180634,0.3612 0.218358,0.061 0.436111,0.2914 0.677379,0.1807 0.156357,-0.027 0.289166,0.3063 0.496744,0.2709 0.229001,0.023 0.220627,0.081 0.361268,0.271 -0.01156,0.1828 0.112181,-0.048 0.135476,0.1806 0.07209,-0.014 0.307461,0.062 0.361268,0.09 0.008,-0.1884 0.269413,-0.1286 0.225793,0.045 0.0747,0.1574 0.06241,0.3712 -0.09032,0.4967 -0.101184,0.04 -0.200609,0.2345 -0.225793,0.3161 0.227877,-0.024 0.131112,0.3285 0.04516,0.3613 0.205709,0.1171 0.276077,0.371 0.406427,0.5419 0.08621,0.1857 0.388537,0.1857 0.496745,0.3613 0.02814,0.2003 -0.01387,0.35 0,0.5419 -0.08689,0.1501 0.0177,0.3206 -0.04516,0.4516 -0.07473,0.1185 -0.115361,0.3503 0.04516,0.3612 -0.0084,0.039 -0.07266,0.092 -0.09032,0.1359 -0.0056,0.014 0,0.037 0,0.045 -0.112398,0 -0.08498,0.022 -0.04516,0.045 0,0 0.04516,0.045 0.04516,0.045 0.01329,5e-4 0.02896,0.014 0.04516,0 0.01402,0.014 -0.01,0.038 0,0.045 0.136082,-0.014 0.273318,-0.022 0.406427,-0.045 -0.182325,-0.026 0.237626,-0.1416 0,-0.1807 0.0987,-0.026 0.0774,-0.091 0.180634,-0.1358 0.0084,-0.042 0.196108,-0.2228 0.361268,-0.2257 0.411132,-0.071 -0.203677,-0.3353 0.180634,-0.2259 0.116964,0.065 0.29323,-0.1387 0.361268,-0.2257 -0.05939,0.1585 0.281741,-0.3464 0.270952,-0.3613 0.152708,-0.1141 0.609512,-0.2704 0.451585,-0.2709 0.207422,-0.1445 0.281629,-0.4255 0.31611,-0.6775 0.174726,-0.1458 0.295933,-0.4276 0.31611,-0.4967 -0.03568,-0.1242 -0.504442,-0.2372 -0.361268,-0.2258 -0.09757,-0.046 -0.233604,-0.068 -0.270952,0 -0.0094,-0.091 -0.304507,-0.12 -0.225792,-0.09 -0.04999,0.036 -0.06761,0.019 -0.09032,0.045 -0.08046,0.091 -0.03829,0.1402 -0.135475,0.045 0.07592,-0.014 0.116516,-0.022 0.135475,-0.045 0.02843,-0.035 0.0011,-0.084 -0.04516,-0.09 -0.0077,6e-4 -0.04117,0 -0.04516,0 -0.0056,0 -0.0429,0 -0.04516,0 -0.03051,0.014 -0.06114,0.051 -0.09032,0.09 -0.08452,-0.025 -0.05975,-0.4036 0.09032,-0.3162 -0.04208,-0.1644 -0.180697,-0.2458 -0.361269,-0.2709 -0.226956,0.053 -0.267778,-0.088 -0.406428,-0.2258 -0.12468,0.029 -0.226532,-0.1741 -0.225792,-0.1806 -0.170932,0.1199 -0.602057,-0.014 -0.677378,-0.045 -0.07045,0 -0.113251,0.051 -0.09032,0.1806 -0.206379,0.081 0.108481,-0.3398 -0.09032,-0.2257 -0.128959,0.162 -0.280423,0.02 -0.31611,0.2257 -0.133785,0.2002 -0.09785,0.082 -0.31611,0 -0.251648,0.1373 -0.45284,-0.023 -0.406427,-0.1806 0.05422,-0.1344 -0.01026,-0.3454 0,-0.3613 -0.06094,-0.014 -0.195335,-0.087 -0.361269,-0.045 -0.246457,0.08 0.06764,-0.1517 0,-0.2258 -0.01619,-0.075 -0.120895,-0.3133 0.04516,-0.3161 -0.247612,-0.039 -0.264447,0.1746 -0.361268,0.3161 -0.0863,-0.074 -0.302964,0.075 -0.406427,-0.09 -0.179455,-0.1674 -0.16357,-0.4262 -0.09032,-0.6322 0.0687,-0.079 -0.0041,-0.3479 0.180634,-0.3613 0.172498,-0.097 0.118395,-0.1272 0.361268,-0.09 0.05499,0.014 0.126242,-0.1012 0.225793,0 0.0094,-0.1448 0.439329,-0.085 0.31611,-0.09 0.08587,0.1098 0.246796,0.014 0.270952,0.2259 -0.01344,0.075 0.142137,0.2426 0.180634,0.316 0.169985,-0.2103 -0.187016,-0.5442 0.09032,-0.7225 0.159459,-0.107 0.428687,-0.2989 0.406427,-0.3161 0.01301,0 0.026,-0.042 0.04516,-0.045 -0.01344,-0.014 -0.01026,-0.03 -0.04516,-0.045 0.08519,-0.064 0.01448,-0.2354 0,-0.2709 0.0055,0 0.101155,-0.1952 0.09032,0.045 0.03461,0.2464 0.06759,-0.1026 0.09032,-0.1807 0.0452,-0.03 0.08222,-0.074 0.135475,-0.1358 0.0077,-0.014 0.03254,0 0.04516,0 0.04512,-0.043 0.102095,-0.1084 0.180635,-0.09 0.166978,-0.014 0.07412,-0.014 0.09032,-0.1806 0.113308,-0.133 0.258747,-0.1768 0.31611,-0.1807 -0.0461,-0.072 0.156313,-0.014 0.225792,-0.045 -0.07598,0.039 -0.223603,0.1755 -0.04516,0.2259 0.03367,-0.1416 0.343512,-0.1402 0.31611,-0.2259 -0.0039,-0.014 -0.02468,0.019 -0.04516,0 -0.210821,0.091 -0.329963,-0.2102 -0.270952,-0.2257 -0.212243,-0.046 0.384506,-0.1315 0,-0.1806 -0.317741,0.091 -0.597593,0.3519 -0.225793,0 0.177503,-0.055 0.196233,-0.2214 0.406428,-0.1358 0.136068,0.02 0.347227,0.1156 0.451585,-0.045 0.104349,0.029 0.233393,-0.082 0.180635,-0.1359 0.05896,-0.08 -0.02912,-0.1657 -0.04516,-0.1358 -0.01055,-0.074 -0.115635,-0.035 -0.180634,0 0.0053,-0.014 -0.01857,-0.025 0,-0.045 0.05017,-0.03 0.248185,-0.045 0.04516,-0.1359 -0.06626,0.025 -0.157196,-0.052 -0.09032,-0.045 -0.132657,-0.084 -0.07231,-0.2902 -0.09032,-0.2258 0.04756,-0.069 0.08129,-0.1875 0,-0.1358 -0.116054,0.016 0.0048,-0.069 -0.09032,-0.1806 -0.0026,-0.03 -0.03958,-0.036 -0.04516,-0.045 -0.02613,0.046 -0.09116,0.1199 -0.09032,0.09 -0.0039,0.071 -0.174478,0.1098 -0.180634,0.09 -0.07276,0.03 0.034436,-0.071 -0.135476,-0.09 -0.01477,-0.026 -0.01754,-0.1055 -0.04516,-0.1359 0.15668,0.065 0.206565,-0.1513 0.04516,-0.1358 -0.05439,-0.042 -0.357893,-0.1402 -0.225793,-0.1807 -0.200677,-0.1069 -0.247223,-0.014 -0.31611,0.1359 0.06246,0 -0.06841,0.1228 0,0.1358 -0.09434,0.1315 -0.02214,0.3989 0,0.4516 -0.0052,0.1041 -0.239914,0.361 -0.316109,0.2257 -0.04092,0.1041 -0.103554,0.3613 -0.04516,0.271 0.03178,0.1185 -0.08633,0.03 -0.135476,0.045 -0.119681,-0.1 -0.109262,-0.2182 -0.04516,-0.4065 -0.03478,-0.1704 -0.223877,-0.029 -0.31611,-0.2257 -0.07438,-0.097 -0.278593,-0.1869 -0.361269,-0.1807 0.0474,-0.2799 -0.188827,-0.027 -0.09032,-0.2258 0.03785,-0.1539 0.16659,-0.2857 0.270952,-0.3613 0.07663,-0.055 0.137267,-0.014 0.09032,-0.1358 0.182851,0.1758 0.08571,-0.023 0.09032,-0.045 0.168566,0.097 0.129536,-0.09 0.270951,0 0.06816,-0.014 0.115606,-0.027 0.135476,-0.045 0.03516,-0.033 -0.0032,-0.098 -0.04516,-0.1359 0.178419,0.092 0.196885,-0.2188 0.31611,-0.09 0.0051,0 0.02697,-0.042 0.04516,0 0.17381,0.029 0.142296,-0.2815 0.180634,-0.1806 0.01484,0 -0.0064,-0.043 0,-0.045 -0.03571,-0.032 -0.07068,-0.065 -0.09032,-0.09 -0.06392,0.051 -0.170448,0.1286 -0.225793,0.1806 -0.03445,0.017 -0.054,0.058 -0.04516,0.045 -0.08305,-0.014 0.07733,-0.3585 -0.09032,-0.2257 -0.03918,0.032 -0.06835,0.045 -0.09032,0.045 -0.0104,-0.035 -0.009,-0.1127 0.04516,-0.1358 -0.11984,-0.059 0.102268,-0.061 0,-0.2259 -0.06704,-0.068 -0.211871,0.1629 -0.180634,0.09 -0.20411,0.072 0.216982,0.151 -0.04516,0.1806 0.186072,0.035 -0.11247,0.2885 -0.135476,0.1807 -0.09621,0.092 0.08105,-0.2178 0,-0.1359 -0.02632,0 -0.09958,0 -0.135476,0 -0.0012,0 -0.02827,0.02 0,0.045 0.0055,0.038 -0.330384,-0.037 -0.406427,-0.045 -0.05374,-0.052 -0.06724,-0.093 -0.135475,-0.09 -0.124204,0 -0.150668,0.1496 -0.180634,0.1807 -0.111517,0.1214 -0.13773,-0.097 -0.04516,-0.09 -0.134609,-0.023 -0.225598,-0.061 -0.270952,-0.09 -0.0033,-0.017 -0.02208,-0.075 -0.04516,-0.09 -0.114594,-0.1513 -0.229456,-0.2437 -0.31611,-0.1358 -0.159354,0.1621 -0.08913,-0.049 -0.135475,-0.045 -0.0085,5e-4 -0.02415,-0.019 -0.04516,0 z m 1.716025,0.3613 0.04516,0 c 0.08851,0.022 0.01697,-0.1791 -0.04516,-0.1807 -0.01011,-2e-4 -0.03498,0.035 -0.04516,0.045 -0.11364,0.051 -0.160962,0.023 0,0.09 l 0.04516,0.045 z m 0.361269,0.5419 c -0.0079,0.014 -0.0117,0.072 0,0.045 0.0048,0.035 0.08076,0.1112 0.09032,0.09 0.15424,-0.195 0.164664,0.046 0.31611,0 -0.03415,-0.04 -0.227202,-0.261 -0.225793,-0.271 -0.05786,-3e-4 -0.156921,0.1055 -0.180634,0.1359 z m 1.399914,2.3933 c 0.0016,0.014 0.01286,0 0.04516,0 0.02961,-0.048 0.103626,0.014 0.04516,-0.1358 -0.0038,0.014 -0.09519,0.098 -0.09032,0.1358 z m -5.102916,-0.7676 c 0.02219,0.046 0.01172,0.1141 0,0.09 0.06356,0.033 0.08657,0.1257 0.180634,0.09 0.02836,-0.081 -0.112878,-0.1272 -0.180634,-0.1807 z m 4.651331,-1.9419 c -0.06072,-10e-5 -0.231662,0.094 -0.04516,0.09 0.06634,-0.065 0.07481,-0.09 0.04516,-0.09 z m 1.309598,0.09 c -0.05374,-2e-4 -0.06829,0.1402 0.09032,0.1358 -0.04105,-0.09 -0.06407,-0.1358 -0.09032,-0.1358 z m 1.535391,0.9484 c 0.02032,0.016 0.02788,0.074 0.04516,0.09 -0.03007,-0.041 -0.02595,-0.091 -0.04516,-0.09 z m 0.04516,0.09 c 0.07977,0.068 -0.03724,0.1199 0.135475,0.1806 l 0.04516,0.045 c 0.104508,0.014 0.05055,-0.1823 0.04516,-0.2257 -0.08876,-0.014 -0.177523,0.071 -0.180634,0 -0.01127,-0.019 -0.03513,0.014 -0.04516,0 z m -3.612685,0.1806 c -0.02996,0 -0.110215,0.1185 0,0.09 0.03486,-0.04 0.01272,-0.091 0,-0.09 z m -0.316109,0.4064 c -0.04649,4e-4 -0.0422,0.065 0.09032,0.045 -0.01562,-0.035 -0.07069,-0.045 -0.09032,-0.045 z m 4.922282,0.3162 c 0.02285,0.065 0.03779,0.117 0.09032,0.2257 0.01546,0 0.02498,0.026 0.04516,0.045 -0.04052,-0.092 -0.09033,-0.1807 -0.135475,-0.271 z m -0.180634,0.045 c -0.0026,0.088 0.04016,0.2547 0.09032,0.3612 0.0082,0.017 -0.0074,0.03 0,0.045 -0.0045,6e-4 -0.01373,0.049 0,0.045 0.003,0 0.04264,0 0.04516,0 -0.04351,0.1471 0.05649,0.1713 0,0.2259 0.201321,0.042 0.08532,-0.2345 0.04516,-0.3162 -0.05098,-0.1669 -0.167239,-0.3111 -0.180635,-0.3613 z m -3.386892,0.1358 c -0.05487,10e-5 -0.03402,0.081 0.180634,0.1358 -0.05527,-0.082 -0.140591,-0.1358 -0.180634,-0.1358 z m 0.541903,0 c -0.04708,0.08 -0.09808,0.1676 -0.180635,0.1806 -0.05662,0.074 0.103049,0.181 0.270952,0.1359 -0.0013,0.042 -0.06347,0.117 0.09032,0.045 0.01597,-0.038 -0.0059,-0.046 0,-0.045 0,0 0.04516,0.045 0.04516,0.045 0.0055,0.04 0.01156,0.097 0.04516,0.09 0.121487,-0.1185 -0.04139,-0.094 -0.04516,-0.1359 -0.0013,-0.014 0.0012,-0.055 0.04516,-0.09 -0.145799,0.081 -0.211123,-0.059 -0.09032,-0.09 -0.19025,-0.016 -0.02279,-0.03 -0.09032,-0.09 -0.103309,0.062 -0.115679,0.014 -0.09032,-0.045 z m 2.79983,0.09 c -0.01468,9e-4 -0.03501,0.014 -0.04516,0.045 -0.01171,0.058 0.02377,0.2852 0.04516,0.2259 0.01494,0.014 0.01387,0.062 0.04516,0.045 0.141545,-0.022 0.02559,-0.3205 -0.04516,-0.316 z m 0.406427,0.1358 c 0.01685,0.1416 -0.002,0.3213 0,0.3613 -0.05686,0.077 -0.144873,0.1199 -0.180634,0.1358 0.07341,0.08 -0.01626,0.3265 0.04516,0.4064 -0.122759,-0.016 -0.140562,0.2322 -0.135475,0.3162 -0.01455,0.2338 0.150043,0.3205 0.180634,0.316 0.165256,0 0.194273,-0.4905 0.180634,-0.3613 0.02171,-0.2263 0.177348,-0.2855 0.225793,0 -0.07153,-0.4133 -0.162611,-0.7953 -0.31611,-1.1741 z m 0,1.5354 c -0.07381,0.019 -0.108785,0.056 -0.04516,0.09 -0.155097,-0.022 -0.26964,0.6838 -0.270952,0.5419 -0.174871,0.1601 -0.273942,0.3996 -0.31611,0.6322 0.09247,0.1928 0.04996,0.7639 0,0.6775 0.04069,0.117 0.14247,0.4104 0.135476,0.2709 0.05247,0.159 0.220336,0.3128 0.361268,0.1359 0.196646,-0.1599 0.3696,-0.1979 0.225793,0.1358 0.200782,-0.5907 0.361269,-1.193 0.361269,-1.8516 0,-0.063 -0.04318,-0.1185 -0.04516,-0.1806 -0.126574,-0.1431 -0.353445,-0.4402 -0.180634,-0.4516 -0.06779,-0.02 -0.151984,-0.019 -0.225793,0 z m -5.735136,1.1291 c -0.07149,-6e-4 -0.109219,0.043 -0.180635,0.089 -0.04014,0.049 0.02093,0.055 0.09032,0.045 0,0 0.04516,0 0.04516,0 0.04747,-0.014 0.08867,-0.036 0.09032,-0.045 0.009,0.014 0.613981,0.2571 0.361269,0.1807 0.02809,0.02 0.04955,0.032 0.04516,0.045 0.0053,0.014 0.03601,0.049 0.180634,0.045 0.208289,-0.065 -0.190365,-0.1866 -0.180634,-0.1807 -0.01957,-0.014 -0.02504,-0.035 -0.04516,-0.045 -0.02554,-0.038 -0.03158,-0.045 -0.04516,-0.045 -0.105924,-0.053 -0.248041,-0.089 -0.361268,-0.089 z m -5.148076,0.089 c -0.01985,0 -0.05147,0.056 0,0.09 0.0185,-0.063 0.01358,-0.091 0,-0.09 z m 6.006088,0.2258 c -0.03209,5e-4 -0.05499,0.033 -0.04516,0.045 0.02298,0.016 -0.01,0.033 0,0.045 -0.0094,-2e-4 -0.01896,0.059 0,0.045 -0.02114,0 -0.02792,0.043 -0.04516,0.045 0.12221,-0.067 0.110953,0.078 0.180635,0.045 0.02858,-0.095 0.375135,-0.032 0.270951,-0.1359 -0.02182,-0.051 -0.264998,-0.092 -0.361268,-0.09 z m 0.587062,0.1358 c -0.05835,0 -0.187045,0.1171 0,0.09 0.01783,-0.039 0.02464,-0.091 0,-0.09 z m -1.083806,0.045 c 0.0097,0.014 0.01912,0.032 0.04516,0.045 l 0.04516,0 c 0.172535,-0.016 -0.01402,-0.046 -0.09032,-0.045 z m -1.219281,1.6257 c -0.0163,0 -0.0011,0.1185 0.04516,0.09 -0.0078,-0.061 -0.03802,-0.09 -0.04516,-0.09 z"
-         id="path3800-3-8-0-8"
-         inkscape:connector-curvature="0" />
+         id="path3800-3-8-0-8" />
       <path
          style="display:inline;fill:url(#linearGradient7571);fill-opacity:1;stroke:none"
          d="m 9.066013,1039.0813 c -0.08358,-10e-5 -0.146685,0.025 0,0.045 0.101849,0.014 -0.05818,0.061 0.09032,0.045 0.07519,-0.065 -0.01658,-0.09 -0.09032,-0.09 z m -1.806342,0.045 c -0.08085,0.016 -0.146193,0.071 -0.225793,0.09 0.167199,-0.042 0.324172,-0.063 0.496744,-0.09 -0.08865,0.014 -0.183662,-0.017 -0.270951,0 z m 0.722537,0 c -0.100838,0.019 -0.125577,0.038 0,0.045 0.08577,-0.039 0.08961,-0.048 0.135475,-0.045 -0.05026,0 -0.09312,-0.014 -0.135475,0 z m 1.625708,0 c -0.0091,-8e-4 -0.03685,0.046 -0.04516,0.045 -0.01605,0.03 -0.129334,0.049 0.04516,0.045 0.0048,0.019 0.01431,0.067 0.04516,0.045 0.01156,-0.019 0.01983,-0.077 0.04516,-0.09 -0.03183,0 -0.05829,-0.039 -0.09032,-0.045 z m -1.128964,0.045 c -0.02416,6e-4 -0.03418,0.051 -0.04516,0.09 -0.09662,-0.065 -0.29735,-0.055 -0.361269,-0.045 -0.05552,0.027 -0.05,0.055 0.135476,0.045 0.103958,0 -0.01496,0.032 -0.09032,0.045 0.02251,0 0.01773,10e-4 0.09032,0 0.09883,0 0.621851,-0.055 0.31611,-0.09 0.02353,-0.04 -0.02653,-0.045 -0.04516,-0.045 z m 0.722537,0 c -0.01127,0.014 0.02183,0.048 0.135475,0.045 0.03143,-0.042 0.03666,-0.046 0,-0.045 -0.03753,5e-4 -0.12416,-0.014 -0.135475,0 z m -0.451586,0.045 c -0.01501,6e-4 8e-5,0.039 0,0.045 0,0 0.04516,0 0.04516,0 0,0 -0.04516,-0.045 -0.04516,-0.045 z m 0.04516,0.045 c -0.04631,0.014 -0.04368,0.033 0.09032,0.045 -0.03234,0 -0.123857,0.062 0.04516,0.045 0.132571,-0.04 0.176165,-0.1373 0.04516,-0.1358 -0.01358,10e-5 -0.02783,0.043 -0.04516,0.045 0.01672,0.017 -0.08916,-0.014 -0.135476,0 z m 1.128964,-0.045 c -0.01387,0.017 -0.03883,0.027 -0.04516,0.045 -0.009,0.026 0.01026,0.077 0,0.09 -0.0072,0 -0.03152,0 -0.04516,0 -0.05439,-3e-4 -0.162088,0.014 -0.180634,0 -0.153773,-0.014 -0.07519,0.025 -0.04516,0.045 0.138264,0.014 0.297103,0.08 0.31611,0.09 0.136704,0.014 0.03662,-0.1584 0.270951,-0.09 -0.0059,-0.024 0.0011,-0.039 0.04516,-0.045 -0.105129,-0.035 -0.208457,-0.1069 -0.316109,-0.1358 z m -0.722537,0.045 c 0.01559,0.014 0.002,0.033 0.04516,0.045 0.06509,-0.037 0.0069,-0.045 -0.04516,-0.045 z m -1.625708,0.045 c -0.253349,0.1142 -0.426184,0.1817 -0.406427,0.271 0.180027,-0.019 0.371333,-0.1717 0.587061,-0.1807 0.223903,-0.075 -0.05272,-0.085 -0.180634,-0.09 z m 1.445074,0.045 c -0.0409,0.016 -0.01728,0.074 0.09032,0.09 0.02965,-0.053 -0.0091,-0.091 -0.04516,-0.09 -0.01504,2e-4 -0.03153,0 -0.04516,0 z m -0.677379,0.045 c -0.04481,0 -0.05671,0.036 0,0.09 0.172461,-0.032 0.0655,-0.091 0,-0.09 z m 0.31611,0.045 c -0.137831,0.038 0.04928,0.025 -0.09032,0.09 -0.207472,-0.068 -0.03163,0.1658 0,0.1807 0.04266,0 0.131011,-0.088 0.180635,-0.1359 -0.03626,-0.026 0.01566,-0.071 0.04516,-0.09 3.77e-4,-0.014 -0.01069,-0.04 -0.04516,-0.045 -0.0196,0 -0.06061,9e-4 -0.09032,0 z m 1.716025,0 c -0.004,0 -0.01945,0.029 0,0.045 0.07818,0.033 0.02507,0.035 0.04516,0.045 0.03601,0.071 0.313666,0.1649 0.180634,0.1359 0.135678,0.027 0.416206,0.3372 0.361268,0.2257 0.04163,0.069 0.111546,0.3245 0.09032,0.2258 0.0104,0 0.09364,0.062 0.09032,0.09 0.07303,0.017 0.09192,0.066 0.09032,0.09 0.01387,0 0.03951,0.059 0,0.045 0,0 -0.04516,0 -0.04516,0 0.0066,0 -0.0061,0.043 0,0.045 0.123612,0.045 0.0056,0.1286 0.04516,0.1359 -0.04496,4e-4 -0.04601,0.036 -0.04516,0.045 0.0078,0 -0.0058,0.042 0,0.045 0.01988,0 -0.03053,0.046 0.09032,0.045 -0.02273,-9e-4 -0.102253,0.014 -0.135475,0 0.01098,0 0.0066,0.027 0.04516,0.045 -0.05684,0.014 -0.08789,0.068 -0.09032,0.09 0.156122,-0.053 0.09485,0.022 0.04516,0.045 0.04858,0 0.08897,0.019 0.09032,0.045 0.01497,0 0.03866,0.033 0,0.045 -0.0022,0 0.004,0.039 0,0.045 0.0072,0 -0.0046,0.041 0,0.045 -0.08747,0.03 -0.03464,0.1041 0,0.1359 -0.002,7e-4 0.0424,0.014 0.04516,0 -0.0084,0.09 0.04516,0.2208 0.04516,0.1806 0.08871,0.084 0.176136,0.1171 0.180634,0.09 0.02958,0 0.141039,0.071 0.135476,0.09 0.04514,0.014 0.07444,0 0.04516,-0.045 0.0042,-0.02 -0.0097,-0.055 0,-0.09 0.01272,-0.048 0.01607,-0.066 0,-0.045 -0.04244,-0.038 0.08587,-0.075 0.04516,-0.09 0.04006,-0.039 0.02247,-0.3081 0.04516,-0.1806 0.124681,-0.045 0.167427,0.042 0.180635,-0.045 3.52e-4,0.069 0.06373,0.014 0.09032,0 0.0064,0 0.04063,0 0.04516,0 0.03445,-0.027 -0.01487,-0.1848 0.04516,-0.1359 0.07386,0.1171 0.333387,0.12 0.406427,0.045 -0.06679,-0.035 -0.100563,-0.071 -0.135476,-0.09 -0.05608,-0.02 -0.07516,-0.078 -0.09032,-0.09 0.0149,0 0.03384,0.029 0.09032,0.045 0.02376,0.022 0.03107,-0.014 0.04516,0 -0.04337,-0.059 -0.08394,-0.1445 -0.09032,-0.1358 -0.04805,-0.045 -0.05874,-0.053 -0.04516,-0.045 -0.07471,-0.052 -0.0069,-0.071 0.09032,0 -0.503631,-0.4665 -1.072016,-0.862 -1.716025,-1.1289 -0.03867,0 -0.236008,-0.039 -0.31611,-0.045 z m -2.619196,0.045 c -0.05805,0.035 -0.103164,0.066 -0.180634,0.09 0.08266,0 -0.436024,0.1185 0.04516,0.09 -0.06329,0.036 -0.540547,0.059 -0.180634,0.1806 -0.12825,0.2039 0.586882,-0.068 0.406427,0 0.06181,-0.017 0.09822,0.091 0.225793,0.09 0.162503,-0.03 0.129551,-0.1228 0.09032,-0.1358 0.0322,-0.02 0.06892,-0.048 0.09032,-0.045 -0.05185,-0.059 -0.08393,-0.087 0,-0.1806 -0.05951,0.04 -0.194185,0.088 -0.180634,0 0.0082,-0.059 0.01776,-0.1739 -0.04516,-0.09 -0.09198,0.024 -0.17661,0.014 -0.225793,0 -0.0104,0 -0.04373,0 -0.04516,0 z m 1.535391,0.09 c -0.107831,0.033 -0.344638,0.2215 -0.09032,0.271 -0.04356,-0.014 -0.07185,-10e-4 -0.09032,0 0.04418,0.037 0.112152,0.1069 0.09032,0.09 0.04681,0.014 0.147535,0.032 0.225793,0.045 0.105317,0.019 0.193436,0.033 0.135476,0.045 0.130201,0.058 0.05777,-0.1893 0.135475,0.045 0.128077,0.02 0.27517,0.1141 0.135476,0.1358 -0.0069,10e-5 -0.01567,0.081 0,0.045 0.0402,0.062 0.150499,0.1579 0.135476,0.09 0.08315,0.065 -0.110548,0.1569 -0.180635,0.1806 0.0177,0.059 -0.03884,0.1113 -0.09032,0.1359 0.06264,-0.014 0.246448,0.246 0.180635,0.1806 -0.02867,0.014 -0.02299,0.022 0,0.045 -0.0098,0 0.02185,0.061 0.04516,0.045 0.097426,0.065 0.245697,0.1257 0.270951,0.1358 0.01,-0.036 -0.04431,-0.1257 -0.09032,-0.1806 0.01185,0 0.02392,-0.014 0.04516,0 0.04767,0.014 0.146999,0.027 0.135476,0.09 0.04169,-0.036 -0.0049,-0.1807 0,-0.1807 -0.1151,-0.1611 -0.108568,-0.098 -0.135476,-0.2257 -0.02711,-0.023 0.167583,-0.014 0.135476,0 0.02048,0.032 0.0404,0.062 0.04516,0.09 -0.01575,0 0.140056,-0.068 0.135475,0.045 0.03637,-0.023 0.03461,-0.061 0.04516,-0.09 0.168702,0 -0.05389,-0.052 0,-0.045 0.01402,-0.1011 -0.11841,-0.053 -0.09032,-0.1358 -0.04477,-0.051 -0.130837,-0.1156 -0.09032,-0.045 -0.01753,0 -0.07007,-0.058 -0.09032,-0.09 0.0078,-0.02 -0.0017,-0.058 0.135476,-0.045 -0.05561,-0.017 -0.08386,-0.032 -0.09032,-0.045 0.01798,-0.016 0.03208,-0.055 -0.09032,-0.045 -0.0299,-0.03 0.01838,-0.038 0.04516,-0.045 -6.12e-4,-0.014 -0.01171,-0.02 -0.04516,-0.045 -0.109146,0.048 -0.0098,-0.017 -0.04516,-0.045 -0.02155,0.014 -0.04663,0.014 -0.04516,0 0.09383,-0.043 0.01718,-0.1055 -0.04516,-0.09 0.02032,-0.019 -0.02958,-0.066 -0.090317,-0.045 -0.106357,-0.024 0.01585,0 -0.09032,-0.09 -0.01676,-0.038 -0.01501,-0.09 -0.04516,-0.09 -0.05507,2e-4 -0.07881,0.043 -0.09032,0.045 -0.01653,-0.046 -0.0349,-0.062 -0.04516,-0.045 0.0046,-0.056 -0.03548,-0.1055 -0.180634,-0.045 -0.07579,0.02 -0.05127,0.1577 -0.09032,0.09 -0.0397,-0.032 -0.06827,-0.027 -0.09032,0 -0.02205,0.028 -0.02562,0.071 0,0.09 -0.08386,0.017 -0.04658,-0.035 0,-0.09 0.06987,-0.084 0.144175,-0.1831 0.04516,-0.1806 -0.02027,4e-4 -0.04897,-0.014 -0.09032,0 z m -2.528879,0.09 c -0.04168,0.016 -0.138857,0.061 -0.225793,0.09 -0.08448,0.02 -0.177462,0.014 -0.135476,0 -0.03442,-0.014 -0.225251,0.104 -0.31611,-0.045 -0.15475,0.014 -0.22998,0 -0.316109,0 -0.01172,0 -0.03348,0 -0.04516,0 -0.51809,0.2744 -0.988949,0.6277 -1.399916,1.0387 -0.05146,0.048 -0.09312,0.1229 -0.135475,0.1807 -0.06051,0.084 -0.07162,0.1445 0,0.09 -0.08021,0.088 -0.106752,0.2593 0.04516,0.1358 -0.127771,0.1948 -0.324817,0.3604 -0.451586,0.4968 0.207116,-0.1689 0.390662,-0.3587 0.587061,-0.5419 0.01575,-0.084 0.1341,-0.1329 0.225793,-0.1806 -0.09124,0.084 -0.180188,0.2231 -0.09032,0.1358 0.0882,-0.035 0.212553,-0.1668 0.270951,-0.2257 -0.0011,0 0.04432,0 0.04516,0 0.01399,-4e-4 0.02171,0 0,0.045 0.04249,0.014 0.1853,0.077 0.225793,0.09 0.04562,-0.023 0.147873,0.085 0.135476,0.1358 0.0124,-0.014 0.03244,-0.022 0.04516,-0.09 0.0099,-0.039 -0.03141,0.2057 0,0.1807 -0.01275,0.029 -0.0353,0.061 -0.04516,0.09 0,0 -0.04516,0.045 -0.04516,0.045 -0.0081,0.019 -0.0064,0.039 0,0.045 0,0 0.04516,-0.045 0.04516,-0.045 -0.0034,0.014 -0.0015,0.035 0,0.045 -0.005,5e-4 -0.02389,0.059 0,0.045 0.0046,0 0.03764,-4e-4 0.04516,0 -0.02653,0.027 -0.01638,0.036 0,0.045 0.01488,0.014 5.5e-5,0.041 -0.04516,0.09 -0.01454,0.014 0.02371,0.025 0,0.045 -0.02886,0.095 0.01342,0.1359 0.04516,0.1359 -0.01798,0.079 -0.01867,0.1579 0,0.1806 -0.0415,0.059 -0.07669,0.1416 -0.04516,0.09 0.07378,-0.014 0.0011,0.1257 -0.04516,0.1806 0.02834,-0.014 0.07674,-0.026 0.180634,-0.09 -0.0082,0.025 0.123813,0.082 0.04516,0.1359 0.03263,0.051 0.02895,0.1286 0,0.1806 -0.01908,0.033 -0.0424,0.038 -0.04516,0.045 -0.05049,-0.2244 -0.182126,0.3601 -0.180634,0.2257 -0.09281,0.2171 -0.184077,0.401 -0.225793,0.6322 -0.08139,0.1739 -0.02076,0.4711 0.04516,0.4065 0.04001,0.1529 0.01708,0.3703 0.180634,0.4064 0.155322,0.152 0.10817,0.4311 0.270952,0.5871 0.02048,0.12 -0.128768,0.1931 0.04516,0.2258 0.113208,0.2501 0.133117,0.4109 0.270951,0.3612 -0.09169,-0.1055 -0.25631,-0.5183 -0.225793,-0.4966 -0.07931,-0.1287 -0.173621,-0.4827 0,-0.3613 0.07233,0.1521 0.132911,0.363 0.270952,0.4967 0.0043,0.1563 0.22556,0.3085 0.270951,0.5419 -0.03782,0.1572 0.02529,0.2692 0.180634,0.3612 0.218358,0.061 0.436111,0.2914 0.677379,0.1807 0.156357,-0.027 0.289166,0.3063 0.496744,0.2709 0.229001,0.023 0.220627,0.081 0.361268,0.271 -0.01156,0.1828 0.112181,-0.048 0.135476,0.1806 0.07209,-0.014 0.307461,0.062 0.361268,0.09 0.008,-0.1884 0.269413,-0.1286 0.225793,0.045 0.0747,0.1574 0.06241,0.3712 -0.09032,0.4967 -0.101184,0.04 -0.200609,0.2345 -0.225793,0.3161 0.227877,-0.024 0.131112,0.3285 0.04516,0.3613 0.205709,0.1171 0.276077,0.371 0.406427,0.5419 0.08621,0.1857 0.388537,0.1857 0.496745,0.3613 0.02814,0.2003 -0.01387,0.35 0,0.5419 -0.08689,0.1501 0.0177,0.3206 -0.04516,0.4516 -0.07473,0.1185 -0.115361,0.3503 0.04516,0.3612 -0.0084,0.039 -0.07266,0.092 -0.09032,0.1359 -0.0056,0.014 0,0.037 0,0.045 -0.112398,0 -0.08498,0.022 -0.04516,0.045 0,0 0.04516,0.045 0.04516,0.045 0.01329,5e-4 0.02896,0.014 0.04516,0 0.01402,0.014 -0.01,0.038 0,0.045 0.136082,-0.014 0.273318,-0.022 0.406427,-0.045 -0.182325,-0.026 0.237626,-0.1416 0,-0.1807 0.0987,-0.026 0.0774,-0.091 0.180634,-0.1358 0.0084,-0.042 0.196108,-0.2228 0.361268,-0.2257 0.411132,-0.071 -0.203677,-0.3353 0.180634,-0.2259 0.116964,0.065 0.29323,-0.1387 0.361268,-0.2257 -0.05939,0.1585 0.281741,-0.3464 0.270952,-0.3613 0.152708,-0.1141 0.609512,-0.2704 0.451585,-0.2709 0.207422,-0.1445 0.281629,-0.4255 0.31611,-0.6775 0.174726,-0.1458 0.295933,-0.4276 0.31611,-0.4967 -0.03568,-0.1242 -0.504442,-0.2372 -0.361268,-0.2258 -0.09757,-0.046 -0.233604,-0.068 -0.270952,0 -0.0094,-0.091 -0.304507,-0.12 -0.225792,-0.09 -0.04999,0.036 -0.06761,0.019 -0.09032,0.045 -0.08046,0.091 -0.03829,0.1402 -0.135475,0.045 0.07592,-0.014 0.116516,-0.022 0.135475,-0.045 0.02843,-0.035 0.0011,-0.084 -0.04516,-0.09 -0.0077,6e-4 -0.04117,0 -0.04516,0 -0.0056,0 -0.0429,0 -0.04516,0 -0.03051,0.014 -0.06114,0.051 -0.09032,0.09 -0.08452,-0.025 -0.05975,-0.4036 0.09032,-0.3162 -0.04208,-0.1644 -0.180697,-0.2458 -0.361269,-0.2709 -0.226956,0.053 -0.267778,-0.088 -0.406428,-0.2258 -0.12468,0.029 -0.226532,-0.1741 -0.225792,-0.1806 -0.170932,0.1199 -0.602057,-0.014 -0.677378,-0.045 -0.07045,0 -0.113251,0.051 -0.09032,0.1806 -0.206379,0.081 0.108481,-0.3398 -0.09032,-0.2257 -0.128959,0.162 -0.280423,0.02 -0.31611,0.2257 -0.133785,0.2002 -0.09785,0.082 -0.31611,0 -0.251648,0.1373 -0.45284,-0.023 -0.406427,-0.1806 0.05422,-0.1344 -0.01026,-0.3454 0,-0.3613 -0.06094,-0.014 -0.195335,-0.087 -0.361269,-0.045 -0.246457,0.08 0.06764,-0.1517 0,-0.2258 -0.01619,-0.075 -0.120895,-0.3133 0.04516,-0.3161 -0.247612,-0.039 -0.264447,0.1746 -0.361268,0.3161 -0.0863,-0.074 -0.302964,0.075 -0.406427,-0.09 -0.179455,-0.1674 -0.16357,-0.4262 -0.09032,-0.6322 0.0687,-0.079 -0.0041,-0.3479 0.180634,-0.3613 0.172498,-0.097 0.118395,-0.1272 0.361268,-0.09 0.05499,0.014 0.126242,-0.1012 0.225793,0 0.0094,-0.1448 0.439329,-0.085 0.31611,-0.09 0.08587,0.1098 0.246796,0.014 0.270952,0.2259 -0.01344,0.075 0.142137,0.2426 0.180634,0.316 0.169985,-0.2103 -0.187016,-0.5442 0.09032,-0.7225 0.159459,-0.107 0.428687,-0.2989 0.406427,-0.3161 0.01301,0 0.026,-0.042 0.04516,-0.045 -0.01344,-0.014 -0.01026,-0.03 -0.04516,-0.045 0.08519,-0.064 0.01448,-0.2354 0,-0.2709 0.0055,0 0.101155,-0.1952 0.09032,0.045 0.03461,0.2464 0.06759,-0.1026 0.09032,-0.1807 0.0452,-0.03 0.08222,-0.074 0.135475,-0.1358 0.0077,-0.014 0.03254,0 0.04516,0 0.04512,-0.043 0.102095,-0.1084 0.180635,-0.09 0.166978,-0.014 0.07412,-0.014 0.09032,-0.1806 0.113308,-0.133 0.258747,-0.1768 0.31611,-0.1807 -0.0461,-0.072 0.156313,-0.014 0.225792,-0.045 -0.07598,0.039 -0.223603,0.1755 -0.04516,0.2259 0.03367,-0.1416 0.343512,-0.1402 0.31611,-0.2259 -0.0039,-0.014 -0.02468,0.019 -0.04516,0 -0.210821,0.091 -0.329963,-0.2102 -0.270952,-0.2257 -0.212243,-0.046 0.384506,-0.1315 0,-0.1806 -0.317741,0.091 -0.597593,0.3519 -0.225793,0 0.177503,-0.055 0.196233,-0.2214 0.406428,-0.1358 0.136068,0.02 0.347227,0.1156 0.451585,-0.045 0.104349,0.029 0.233393,-0.082 0.180635,-0.1359 0.05896,-0.08 -0.02912,-0.1657 -0.04516,-0.1358 -0.01055,-0.074 -0.115635,-0.035 -0.180634,0 0.0053,-0.014 -0.01857,-0.025 0,-0.045 0.05017,-0.03 0.248185,-0.045 0.04516,-0.1359 -0.06626,0.025 -0.157196,-0.052 -0.09032,-0.045 -0.132657,-0.084 -0.07231,-0.2902 -0.09032,-0.2258 0.04756,-0.069 0.08129,-0.1875 0,-0.1358 -0.116054,0.016 0.0048,-0.069 -0.09032,-0.1806 -0.0026,-0.03 -0.03958,-0.036 -0.04516,-0.045 -0.02613,0.046 -0.09116,0.1199 -0.09032,0.09 -0.0039,0.071 -0.174478,0.1098 -0.180634,0.09 -0.07276,0.03 0.034436,-0.071 -0.135476,-0.09 -0.01477,-0.026 -0.01754,-0.1055 -0.04516,-0.1359 0.15668,0.065 0.206565,-0.1513 0.04516,-0.1358 -0.05439,-0.042 -0.357893,-0.1402 -0.225793,-0.1807 -0.200677,-0.1069 -0.247223,-0.014 -0.31611,0.1359 0.06246,0 -0.06841,0.1228 0,0.1358 -0.09434,0.1315 -0.02214,0.3989 0,0.4516 -0.0052,0.1041 -0.239914,0.361 -0.316109,0.2257 -0.04092,0.1041 -0.103554,0.3613 -0.04516,0.271 0.03178,0.1185 -0.08633,0.03 -0.135476,0.045 -0.119681,-0.1 -0.109262,-0.2182 -0.04516,-0.4065 -0.03478,-0.1704 -0.223877,-0.029 -0.31611,-0.2257 -0.07438,-0.097 -0.278593,-0.1869 -0.361269,-0.1807 0.0474,-0.2799 -0.188827,-0.027 -0.09032,-0.2258 0.03785,-0.1539 0.16659,-0.2857 0.270952,-0.3613 0.07663,-0.055 0.137267,-0.014 0.09032,-0.1358 0.182851,0.1758 0.08571,-0.023 0.09032,-0.045 0.168566,0.097 0.129536,-0.09 0.270951,0 0.06816,-0.014 0.115606,-0.027 0.135476,-0.045 0.03516,-0.033 -0.0032,-0.098 -0.04516,-0.1359 0.178419,0.092 0.196885,-0.2188 0.31611,-0.09 0.0051,0 0.02697,-0.042 0.04516,0 0.17381,0.029 0.142296,-0.2815 0.180634,-0.1806 0.01484,0 -0.0064,-0.043 0,-0.045 -0.03571,-0.032 -0.07068,-0.065 -0.09032,-0.09 -0.06392,0.051 -0.170448,0.1286 -0.225793,0.1806 -0.03445,0.017 -0.054,0.058 -0.04516,0.045 -0.08305,-0.014 0.07733,-0.3585 -0.09032,-0.2257 -0.03918,0.032 -0.06835,0.045 -0.09032,0.045 -0.0104,-0.035 -0.009,-0.1127 0.04516,-0.1358 -0.11984,-0.059 0.102268,-0.061 0,-0.2259 -0.06704,-0.068 -0.211871,0.1629 -0.180634,0.09 -0.20411,0.072 0.216982,0.151 -0.04516,0.1806 0.186072,0.035 -0.11247,0.2885 -0.135476,0.1807 -0.09621,0.092 0.08105,-0.2178 0,-0.1359 -0.02632,0 -0.09958,0 -0.135476,0 -0.0012,0 -0.02827,0.02 0,0.045 0.0055,0.038 -0.330384,-0.037 -0.406427,-0.045 -0.05374,-0.052 -0.06724,-0.093 -0.135475,-0.09 -0.124204,0 -0.150668,0.1496 -0.180634,0.1807 -0.111517,0.1214 -0.13773,-0.097 -0.04516,-0.09 -0.134609,-0.023 -0.225598,-0.061 -0.270952,-0.09 -0.0033,-0.017 -0.02208,-0.075 -0.04516,-0.09 -0.114594,-0.1513 -0.229456,-0.2437 -0.31611,-0.1358 -0.159354,0.1621 -0.08913,-0.049 -0.135475,-0.045 -0.0085,5e-4 -0.02415,-0.019 -0.04516,0 z m 1.716025,0.3613 0.04516,0 c 0.08851,0.022 0.01697,-0.1791 -0.04516,-0.1807 -0.01011,-2e-4 -0.03498,0.035 -0.04516,0.045 -0.11364,0.051 -0.160962,0.023 0,0.09 l 0.04516,0.045 z m 0.361269,0.5419 c -0.0079,0.014 -0.0117,0.072 0,0.045 0.0048,0.035 0.08076,0.1112 0.09032,0.09 0.15424,-0.195 0.164664,0.046 0.31611,0 -0.03415,-0.04 -0.227202,-0.261 -0.225793,-0.271 -0.05786,-3e-4 -0.156921,0.1055 -0.180634,0.1359 z m 1.399914,2.3933 c 0.0016,0.014 0.01286,0 0.04516,0 0.02961,-0.048 0.103626,0.014 0.04516,-0.1358 -0.0038,0.014 -0.09519,0.098 -0.09032,0.1358 z m -5.102916,-0.7676 c 0.02219,0.046 0.01172,0.1141 0,0.09 0.06356,0.033 0.08657,0.1257 0.180634,0.09 0.02836,-0.081 -0.112878,-0.1272 -0.180634,-0.1807 z m 4.651331,-1.9419 c -0.06072,-10e-5 -0.231662,0.094 -0.04516,0.09 0.06634,-0.065 0.07481,-0.09 0.04516,-0.09 z m 1.309598,0.09 c -0.05374,-2e-4 -0.06829,0.1402 0.09032,0.1358 -0.04105,-0.09 -0.06407,-0.1358 -0.09032,-0.1358 z m 1.535391,0.9484 c 0.02032,0.016 0.02788,0.074 0.04516,0.09 -0.03007,-0.041 -0.02595,-0.091 -0.04516,-0.09 z m 0.04516,0.09 c 0.07977,0.068 -0.03724,0.1199 0.135475,0.1806 l 0.04516,0.045 c 0.104508,0.014 0.05055,-0.1823 0.04516,-0.2257 -0.08876,-0.014 -0.177523,0.071 -0.180634,0 -0.01127,-0.019 -0.03513,0.014 -0.04516,0 z m -3.612685,0.1806 c -0.02996,0 -0.110215,0.1185 0,0.09 0.03486,-0.04 0.01272,-0.091 0,-0.09 z m -0.316109,0.4064 c -0.04649,4e-4 -0.0422,0.065 0.09032,0.045 -0.01562,-0.035 -0.07069,-0.045 -0.09032,-0.045 z m 4.922282,0.3162 c 0.02285,0.065 0.03779,0.117 0.09032,0.2257 0.01546,0 0.02498,0.026 0.04516,0.045 -0.04052,-0.092 -0.09033,-0.1807 -0.135475,-0.271 z m -0.180634,0.045 c -0.0026,0.088 0.04016,0.2547 0.09032,0.3612 0.0082,0.017 -0.0074,0.03 0,0.045 -0.0045,6e-4 -0.01373,0.049 0,0.045 0.003,0 0.04264,0 0.04516,0 -0.04351,0.1471 0.05649,0.1713 0,0.2259 0.201321,0.042 0.08532,-0.2345 0.04516,-0.3162 -0.05098,-0.1669 -0.167239,-0.3111 -0.180635,-0.3613 z m -3.386892,0.1358 c -0.05487,10e-5 -0.03402,0.081 0.180634,0.1358 -0.05527,-0.082 -0.140591,-0.1358 -0.180634,-0.1358 z m 0.541903,0 c -0.04708,0.08 -0.09808,0.1676 -0.180635,0.1806 -0.05662,0.074 0.103049,0.181 0.270952,0.1359 -0.0013,0.042 -0.06347,0.117 0.09032,0.045 0.01597,-0.038 -0.0059,-0.046 0,-0.045 0,0 0.04516,0.045 0.04516,0.045 0.0055,0.04 0.01156,0.097 0.04516,0.09 0.121487,-0.1185 -0.04139,-0.094 -0.04516,-0.1359 -0.0013,-0.014 0.0012,-0.055 0.04516,-0.09 -0.145799,0.081 -0.211123,-0.059 -0.09032,-0.09 -0.19025,-0.016 -0.02279,-0.03 -0.09032,-0.09 -0.103309,0.062 -0.115679,0.014 -0.09032,-0.045 z m 2.79983,0.09 c -0.01468,9e-4 -0.03501,0.014 -0.04516,0.045 -0.01171,0.058 0.02377,0.2852 0.04516,0.2259 0.01494,0.014 0.01387,0.062 0.04516,0.045 0.141545,-0.022 0.02559,-0.3205 -0.04516,-0.316 z m 0.406427,0.1358 c 0.01685,0.1416 -0.002,0.3213 0,0.3613 -0.05686,0.077 -0.144873,0.1199 -0.180634,0.1358 0.07341,0.08 -0.01626,0.3265 0.04516,0.4064 -0.122759,-0.016 -0.140562,0.2322 -0.135475,0.3162 -0.01455,0.2338 0.150043,0.3205 0.180634,0.316 0.165256,0 0.194273,-0.4905 0.180634,-0.3613 0.02171,-0.2263 0.177348,-0.2855 0.225793,0 -0.07153,-0.4133 -0.162611,-0.7953 -0.31611,-1.1741 z m 0,1.5354 c -0.07381,0.019 -0.108785,0.056 -0.04516,0.09 -0.155097,-0.022 -0.26964,0.6838 -0.270952,0.5419 -0.174871,0.1601 -0.273942,0.3996 -0.31611,0.6322 0.09247,0.1928 0.04996,0.7639 0,0.6775 0.04069,0.117 0.14247,0.4104 0.135476,0.2709 0.05247,0.159 0.220336,0.3128 0.361268,0.1359 0.196646,-0.1599 0.3696,-0.1979 0.225793,0.1358 0.200782,-0.5907 0.361269,-1.193 0.361269,-1.8516 0,-0.063 -0.04318,-0.1185 -0.04516,-0.1806 -0.126574,-0.1431 -0.353445,-0.4402 -0.180634,-0.4516 -0.06779,-0.02 -0.151984,-0.019 -0.225793,0 z m -5.735136,1.1291 c -0.07149,-6e-4 -0.109219,0.043 -0.180635,0.089 -0.04014,0.049 0.02093,0.055 0.09032,0.045 0,0 0.04516,0 0.04516,0 0.04747,-0.014 0.08867,-0.036 0.09032,-0.045 0.009,0.014 0.613981,0.2571 0.361269,0.1807 0.02809,0.02 0.04955,0.032 0.04516,0.045 0.0053,0.014 0.03601,0.049 0.180634,0.045 0.208289,-0.065 -0.190365,-0.1866 -0.180634,-0.1807 -0.01957,-0.014 -0.02504,-0.035 -0.04516,-0.045 -0.02554,-0.038 -0.03158,-0.045 -0.04516,-0.045 -0.105924,-0.053 -0.248041,-0.089 -0.361268,-0.089 z m -5.148076,0.089 c -0.01985,0 -0.05147,0.056 0,0.09 0.0185,-0.063 0.01358,-0.091 0,-0.09 z m 6.006088,0.2258 c -0.03209,5e-4 -0.05499,0.033 -0.04516,0.045 0.02298,0.016 -0.01,0.033 0,0.045 -0.0094,-2e-4 -0.01896,0.059 0,0.045 -0.02114,0 -0.02792,0.043 -0.04516,0.045 0.12221,-0.067 0.110953,0.078 0.180635,0.045 0.02858,-0.095 0.375135,-0.032 0.270951,-0.1359 -0.02182,-0.051 -0.264998,-0.092 -0.361268,-0.09 z m 0.587062,0.1358 c -0.05835,0 -0.187045,0.1171 0,0.09 0.01783,-0.039 0.02464,-0.091 0,-0.09 z m -1.083806,0.045 c 0.0097,0.014 0.01912,0.032 0.04516,0.045 l 0.04516,0 c 0.172535,-0.016 -0.01402,-0.046 -0.09032,-0.045 z m -1.219281,1.6257 c -0.0163,0 -0.0011,0.1185 0.04516,0.09 -0.0078,-0.061 -0.03802,-0.09 -0.04516,-0.09 z"
-         id="path3800-3-8-0"
-         inkscape:connector-curvature="0" />
+         id="path3800-3-8-0" />
       <circle
          transform="matrix(0.02626348,0,0,0.02626348,32.157999,1031.0319)"
          id="path3800-3-8-1"
diff --git a/ui/org.eclipse.pde.ui/icons/obj16/doc_section_obj.svg b/ui/org.eclipse.pde.ui/icons/obj16/doc_section_obj.svg
index 411418cb257..cd36acb363e 100644
--- a/ui/org.eclipse.pde.ui/icons/obj16/doc_section_obj.svg
+++ b/ui/org.eclipse.pde.ui/icons/obj16/doc_section_obj.svg
@@ -2,24 +2,19 @@
 <!-- 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="16"
    height="16"
    id="svg25490"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="doc_section_obj.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs25492">
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4217">
       <stop
          style="stop-color:#b4903d;stop-opacity:1"
@@ -31,7 +26,6 @@
          id="stop4221" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient11290"
        id="linearGradient8238"
        gradientUnits="userSpaceOnUse"
@@ -40,7 +34,6 @@
        x2="12.51806"
        y2="1044.4806" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient11290">
       <stop
          style="stop-color:#567ead;stop-opacity:1"
@@ -58,8 +51,7 @@
        x1="12.51806"
        gradientUnits="userSpaceOnUse"
        id="linearGradient25569"
-       xlink:href="#linearGradient11290"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient11290" />
     <linearGradient
        y2="1044.4806"
        x2="12.51806"
@@ -67,11 +59,9 @@
        x1="12.51806"
        gradientUnits="userSpaceOnUse"
        id="linearGradient25571"
-       xlink:href="#linearGradient11290"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient11290" />
     <linearGradient
        gradientTransform="translate(-3.8518331,-1.9404214)"
-       inkscape:collect="always"
        xlink:href="#linearGradient4994-6"
        id="linearGradient4101"
        gradientUnits="userSpaceOnUse"
@@ -80,8 +70,7 @@
        x2="9.8946028"
        y2="1051.8378" />
     <linearGradient
-       id="linearGradient4994-6"
-       inkscape:collect="always">
+       id="linearGradient4994-6">
       <stop
          id="stop4996-1"
          offset="0"
@@ -92,8 +81,7 @@
          style="stop-color:#dce7f7;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       id="linearGradient4894-6"
-       inkscape:collect="always">
+       id="linearGradient4894-6">
       <stop
          id="stop4896-8"
          offset="0"
@@ -111,11 +99,9 @@
        y1="1042.2307"
        x1="7.9987183"
        id="linearGradient4900-1"
-       xlink:href="#linearGradient4894-6"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4894-6" />
     <linearGradient
-       id="linearGradient4902-3"
-       inkscape:collect="always">
+       id="linearGradient4902-3">
       <stop
          id="stop4904-2"
          offset="0"
@@ -133,10 +119,8 @@
        y1="1038.5779"
        x1="10.544736"
        id="linearGradient4908-2"
-       xlink:href="#linearGradient4217"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4217" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4877-6">
       <stop
          style="stop-color:#91a5c7;stop-opacity:1;"
@@ -149,7 +133,6 @@
     </linearGradient>
     <linearGradient
        gradientTransform="matrix(1.0848495,0,0,1.0848495,-10.926878,-91.847701)"
-       inkscape:collect="always"
        xlink:href="#linearGradient4994-6"
        id="linearGradient4101-4"
        gradientUnits="userSpaceOnUse"
@@ -165,8 +148,7 @@
        y1="1038.5779"
        x1="10.544736"
        id="linearGradient4908-2-3"
-       xlink:href="#linearGradient4902-3"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4902-3" />
     <linearGradient
        gradientTransform="matrix(1.1428334,0,0,0.91936291,-18.114501,93.119046)"
        gradientUnits="userSpaceOnUse"
@@ -175,8 +157,7 @@
        y1="1043.8571"
        x1="7.0070496"
        id="linearGradient4867-7-1"
-       xlink:href="#linearGradient4877-6"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4877-6" />
     <linearGradient
        gradientTransform="matrix(0.2399227,0,0,0.91936295,-13.652308,93.119024)"
        gradientUnits="userSpaceOnUse"
@@ -185,8 +166,7 @@
        y1="1043.8571"
        x1="7.0070496"
        id="linearGradient4867-7-1-3"
-       xlink:href="#linearGradient4877-6"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4877-6" />
     <linearGradient
        gradientTransform="matrix(0.45748694,0,0,0.91936295,-13.312246,89.392524)"
        gradientUnits="userSpaceOnUse"
@@ -195,8 +175,7 @@
        y1="1043.8571"
        x1="7.0070496"
        id="linearGradient4867-7-1-6"
-       xlink:href="#linearGradient4877-6"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4877-6" />
     <linearGradient
        gradientTransform="matrix(0.23992271,0,0,0.91936299,-13.652309,89.392524)"
        gradientUnits="userSpaceOnUse"
@@ -205,8 +184,7 @@
        y1="1043.8571"
        x1="7.0070496"
        id="linearGradient4867-7-1-3-2"
-       xlink:href="#linearGradient4877-6"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4877-6" />
     <linearGradient
        gradientTransform="matrix(0.23992271,0,0,0.91936299,-13.652309,96.79556)"
        gradientUnits="userSpaceOnUse"
@@ -215,8 +193,7 @@
        y1="1043.8571"
        x1="7.0070496"
        id="linearGradient4867-7-1-3-3"
-       xlink:href="#linearGradient4877-6"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4877-6" />
     <linearGradient
        gradientTransform="matrix(1.1428334,0,0,0.91936295,-18.114502,96.79556)"
        gradientUnits="userSpaceOnUse"
@@ -225,36 +202,8 @@
        y1="1043.8571"
        x1="7.0070496"
        id="linearGradient4867-7-1-2"
-       xlink:href="#linearGradient4877-6"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4877-6" />
   </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="3.0736352"
-     inkscape:cy="13.811978"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1-95"
-     showgrid="true"
-     inkscape:snap-global="false"
-     inkscape:window-width="1429"
-     inkscape:window-height="852"
-     inkscape:window-x="1528"
-     inkscape:window-y="672"
-     inkscape:window-maximized="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid26727"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
   <metadata
      id="metadata25495">
     <rdf:RDF>
@@ -268,15 +217,12 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      transform="translate(0,-1036.3622)">
     <g
        transform="translate(324.0078,-599.7683)"
        style="stroke:url(#linearGradient8238);stroke-opacity:1;display:inline"
-       id="layer1-2"
-       inkscape:label="Layer 1">
+       id="layer1-2">
       <g
          id="g11331-3-1-1-7"
          style="stroke:url(#linearGradient25569);display:inline"
@@ -300,7 +246,6 @@
           <g
              style="font-size:13.58917427px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#236298;fill-opacity:1;stroke:#236298;stroke-width:0.24860173;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline;font-family:Sans"
              id="layer1-9"
-             inkscape:label="Layer 1"
              transform="matrix(1.2778996,0,0.03747938,1.2778996,-58.56426,-297.79529)">
             <g
                transform="translate(20,0)"
@@ -309,22 +254,16 @@
               <g
                  transform="matrix(0.84893168,0,-0.02489823,0.84893168,-258.1493,627.19515)"
                  style="display:inline"
-                 id="layer1-95"
-                 inkscape:label="Layer 1">
+                 id="layer1-95">
                 <path
-                   sodipodi:nodetypes="cccccc"
-                   inkscape:connector-curvature="0"
                    id="rect4001-3"
                    d="m 2.623152,1038.1449 6.0319669,0 3.0620571,3.0066 0,8.7732 -9.094024,0 z"
                    style="display:inline;fill:url(#linearGradient4101);fill-opacity:1;stroke:none" />
                 <path
-                   inkscape:connector-curvature="0"
                    id="path4884"
                    d="m 8.4914264,1037.4785 0,3.626 3.6108396,0 z"
                    style="display:inline;fill:url(#linearGradient4900-1);fill-opacity:1;stroke:none" />
                 <path
-                   sodipodi:nodetypes="cccccc"
-                   inkscape:connector-curvature="0"
                    id="rect4001"
                    d="m 2.57223,1037.9069 6.0828889,0 3.0620571,3.0066 0,9.0112 -9.144946,0 z"
                    style="display:inline;fill:none;stroke:url(#linearGradient4908-2);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1" />
@@ -335,14 +274,10 @@
                      transform="matrix(0.92178689,0,0,0.92178689,-9.6471143,96.760191)"
                      id="g4214">
                     <path
-                       sodipodi:nodetypes="cccccc"
-                       inkscape:connector-curvature="0"
                        id="rect4001-3-0"
                        d="m -4.9631536,1035.2067 c 0,0 8.5285363,-0.9593 10.8748056,0 1.4364002,0.5873 0.614002,3.9804 0.614002,3.9804 l -0.5625,-0.04 -10.9263073,0 z"
                        style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:11.05178356px;line-height:125%;font-family:AustralianFlyingCorpsStencil;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;display:inline;fill:url(#linearGradient4101-4);fill-opacity:1;stroke:none;stroke-width:0.24860173;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
                     <path
-                       sodipodi:nodetypes="ccccc"
-                       inkscape:connector-curvature="0"
                        id="rect4001-31"
                        d="m -4.9631536,1035.2067 11.8877497,0 c 0.012962,4.687 0.00731,-0.7023 0.00731,3.9847 l -11.8950573,0 z"
                        style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:11.05178356px;line-height:125%;font-family:AustralianFlyingCorpsStencil;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;display:inline;fill:none;fill-opacity:1;stroke:url(#linearGradient4908-2-3);stroke-width:1.08484948;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
diff --git a/ui/org.eclipse.pde.ui/icons/obj16/eclipse.svg b/ui/org.eclipse.pde.ui/icons/obj16/eclipse.svg
index f5b63bb40dd..39e612e12cf 100644
--- a/ui/org.eclipse.pde.ui/icons/obj16/eclipse.svg
+++ b/ui/org.eclipse.pde.ui/icons/obj16/eclipse.svg
@@ -7,12 +7,6 @@
    viewBox="0 0 1.3617021 1.3617021"
    version="1.1"
    id="SVGRoot"
-   sodipodi:docname="eclipse16.svg"
-   inkscape:export-xdpi="192"
-   inkscape:export-ydpi="192"
-   inkscape:version="1.3.2 (091e20e, 2023-11-25, custom)"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
@@ -71,91 +65,7 @@
          style="stop-color:#2C2255"
          id="stop48" />
     </linearGradient>
-    <linearGradient
-       id="linearGradient4675"
-       gradientUnits="userSpaceOnUse"
-       x1="131.3853"
-       y1="358.5762"
-       x2="131.3853"
-       y2="432.21109"
-       gradientTransform="matrix(1,0,0,-1,0,793)">
-      <stop
-         offset="0.3033"
-         style="stop-color:#473788"
-         id="stop4671" />
-      <stop
-         offset="0.872"
-         style="stop-color:#2C2255"
-         id="stop4673" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4682"
-       gradientUnits="userSpaceOnUse"
-       x1="131.3853"
-       y1="358.5752"
-       x2="131.3853"
-       y2="432.21011"
-       gradientTransform="matrix(1,0,0,-1,0,793)">
-      <stop
-         offset="0.3033"
-         style="stop-color:#473788"
-         id="stop4678" />
-      <stop
-         offset="0.872"
-         style="stop-color:#2C2255"
-         id="stop4680" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4689"
-       gradientUnits="userSpaceOnUse"
-       x1="131.3853"
-       y1="358.57709"
-       x2="131.3853"
-       y2="432.2084"
-       gradientTransform="matrix(1,0,0,-1,0,793)">
-      <stop
-         offset="0.3033"
-         style="stop-color:#473788"
-         id="stop4685" />
-      <stop
-         offset="0.8631"
-         style="stop-color:#2C2255"
-         id="stop4687" />
-    </linearGradient>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="32"
-     inkscape:cx="7.3906251"
-     inkscape:cy="5.2343751"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="1682"
-     inkscape:window-height="1033"
-     inkscape:window-x="220"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     inkscape:grid-bbox="true"
-     showguides="false"
-     inkscape:pagecheckerboard="0"
-     inkscape:showpageshadow="0"
-     inkscape:deskcolor="#505050">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2674"
-       originx="0"
-       originy="0"
-       spacingy="1"
-       spacingx="1"
-       units="px"
-       visible="false" />
-  </sodipodi:namedview>
   <metadata
      id="metadata1981">
     <rdf:RDF>
@@ -168,63 +78,50 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1">
     <path
-       inkscape:connector-curvature="0"
        style="fill:#2c2255;stroke-width:0.133163"
        d="M 0.40346119,0.84984676 H 0.21424145 c 0.0250542,0.0911041 0.0715448,0.17275664 0.13960955,0.24492124 0.10850978,0.1150391 0.23898823,0.1724809 0.39157083,0.1724809 0.0305008,0 0.0600526,-0.00242 0.0887563,-0.00699 C 0.94910676,1.2418648 1.0497284,1.186783 1.1359419,1.0947681 1.2044471,1.022627 1.2512661,0.94095104 1.2765119,0.84984685 H 1.1997235 1.0874392 Z"
        id="path2" />
     <path
        d="m 0.29912249,0.57740797 h -0.0988478 c -0.003616,0.0230246 -0.00608,0.0465284 -0.007199,0.0706312 h 0.1174827 0.0589335 0.85066471 0.077648 c -0.00113,-0.0241028 -0.00359,-0.0476066 -0.00724,-0.0706312"
        id="path4"
-       inkscape:connector-curvature="0"
        style="fill:#2c2255;stroke-width:0.133164" />
     <path
        d="m 0.19307616,0.71362698 c 0.001119,0.0241148 0.003571,0.0476186 0.007199,0.0706312 h 0.10276911 0.0778961 0.83227843 0.077365 c 0.00364,-0.0230126 0.00612,-0.0465164 0.00726,-0.0706312"
        id="path6"
-       inkscape:connector-curvature="0"
        style="fill:#2c2255;stroke-width:0.133164" />
     <path
-       inkscape:connector-curvature="0"
        style="fill:#2c2255;stroke-width:0.133163"
        d="M 1.2765345,0.51180881 C 1.2513112,0.42045308 1.2044808,0.33841738 1.1359418,0.26574966 1.0499544,0.17459763 0.94961507,0.11991109 0.83505943,0.1015106 0.80608483,0.0968525 0.77623933,0.0944056 0.74542233,0.0944056 c -0.1525826,0 -0.28307238,0.05712998 -0.39157084,0.17134289 -0.0680866,0.0726676 -0.11460096,0.1547034 -0.13964335,0.24605915"
        id="path10" />
     <path
        d="m 0.16022485,0.68085105 c 0,-0.30935886 0.21917824,-0.56640322 0.50430771,-0.61161389 -0.007074,-2.7553e-4 -0.0141825,-5.7502e-4 -0.0213245,-5.7502e-4 -0.31996972,0 -0.57937867,0.2740912 -0.57937867,0.61218891 0,0.33810975 0.25939765,0.61218895 0.57937867,0.61218895 0.007165,0 0.0142729,-2.875e-4 0.0213697,-5.63e-4 C 0.37940309,1.2472663 0.16022485,0.9902219 0.16022485,0.68085105 Z"
        id="path12"
-       inkscape:connector-curvature="0"
        style="fill:#f7941e;stroke-width:0.133164" />
     <path
        d="M 1.1213884,0.6480272 C 1.1195384,0.6238166 1.1156884,0.60020499 1.1099524,0.577396 H 0.38093999 c -0.005741,0.022797 -0.009594,0.0464086 -0.0114477,0.0706312 z"
        id="path37"
-       inkscape:connector-curvature="0"
        style="fill:url(#SVGID_1_);stroke-width:0.133164" />
     <path
        d="M 1.1213884,0.71362698 H 0.36950362 c 0.001853,0.0242106 0.005684,0.0478222 0.0114364,0.0706312 H 1.1099633 c 0.00574,-0.022809 0.00957,-0.0464206 0.011425,-0.0706312 z"
        id="path44"
-       inkscape:connector-curvature="0"
        style="fill:url(#SVGID_2_);stroke-width:0.133164" />
     <path
        d="m 0.745446,1.080823 c 0.15139629,0 0.2818975,-0.0945544 0.3419949,-0.23097701 H 0.4034511 C 0.46354855,0.98626865 0.59404972,1.080823 0.745446,1.080823 Z"
        id="path51"
-       inkscape:connector-curvature="0"
        style="fill:url(#SVGID_3_);stroke-width:0.133164" />
     <path
        d="M 0.31377957,0.71362698 H 0.36897247 1.122801 1.22183 1.297059 c 5.198e-4,-0.0104342 8.137e-4,-0.0209402 8.137e-4,-0.0315181 0,-0.0114404 -3.956e-4,-0.022785 -0.00101,-0.0340817 H 1.2218182 1.1227897 0.36896118 0.30986951 0.19307616 c -6.1025e-4,0.0112847 -0.001006,0.0226413 -0.001006,0.0340817 0,0.0105779 2.9382e-4,0.0210839 8.1365e-4,0.0315181 z"
        id="path55"
-       inkscape:connector-curvature="0"
        style="fill:#ffffff;stroke-width:0.133164" />
     <path
        d="M 0.40124746,0.51180818 H 0.21419728 c -0.006148,0.0213595 -0.0101142,0.04327 -0.0139225,0.0655998 h 0.096339 0.0820322 0.73092182 0.103515 0.073986 c -0.00382,-0.0223178 -0.00874,-0.0442283 -0.014872,-0.0655998"
        id="path57"
-       inkscape:connector-curvature="0"
        style="fill:#ffffff;stroke-width:0.133164" />
     <path
        d="M 1.2160096,0.7842462 H 1.1124947 0.38158413 0.30347328 0.20026344 c 0.003707,0.0223178 0.007922,0.0442164 0.0139677,0.0655998 h 0.18993187 0.68575279 0.1125781 0.073319 c 0.00603,-0.0213714 0.010905,-0.04327 0.014623,-0.0655998 z"
        id="path59"
-       inkscape:connector-curvature="0"
        style="fill:#ffffff;stroke-width:0.133164" />
   </g>
 </svg>
diff --git a/ui/org.eclipse.pde.ui/icons/obj16/element.svg b/ui/org.eclipse.pde.ui/icons/obj16/element.svg
index 28ce03754e2..9fd506c89b3 100644
--- a/ui/org.eclipse.pde.ui/icons/obj16/element.svg
+++ b/ui/org.eclipse.pde.ui/icons/obj16/element.svg
@@ -2,24 +2,19 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="element.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4163">
       <stop
          style="stop-color:#1c65a2;stop-opacity:1"
@@ -31,7 +26,6 @@
          id="stop4167" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4883">
       <stop
          style="stop-color:#eefaff;stop-opacity:1"
@@ -43,7 +37,6 @@
          id="stop4887" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4883"
        id="linearGradient4889"
        x1="28"
@@ -53,7 +46,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-20,0)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4163"
        id="linearGradient4169"
        x1="8"
@@ -62,31 +54,6 @@
        y2="1038.3622"
        gradientUnits="userSpaceOnUse" />
   </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="7.8349134"
-     inkscape:cy="4.0598941"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1006"
-     inkscape:window-height="814"
-     inkscape:window-x="1208"
-     inkscape:window-y="639"
-     inkscape:window-maximized="0"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3999" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -100,25 +67,17 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
     <path
        style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:url(#linearGradient4169);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
        d="m 2,1038.3622 0.03125,12 11.96875,0 -0.03125,-12 z m 1,1 9.96875,0 0.03125,10 -9.96875,0 z"
-       id="rect3997-9-1"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccccccc"
-       inkscape:export-filename="C:\Users\jmietling\Documents\rect3997-9-1.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
+       id="rect3997-9-1" />
     <path
        style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:url(#linearGradient4889);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
        d="m 3,1039.3622 9.96875,0 0.03125,10 -9.96875,0 z"
-       id="rect3997-9-1-1"
-       inkscape:connector-curvature="0" />
+       id="rect3997-9-1-1" />
     <g
        transform="matrix(0.92701985,0,0,0.92908308,1.1505214,-11.113055)"
        style="font-style:normal;font-weight:normal;font-size:11.40601158px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#113d95;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
@@ -126,9 +85,7 @@
       <path
          d="m 7.390042,1133.8908 c 0,0 -0.4093235,0.015 -1.0483383,0.015 0,0.926 0.022627,0.4658 0.00406,1.0827 l 2.0895325,0 c 0,-0.2934 0.00827,-0.5662 0.00827,-0.8019 0,-0.7536 0.015047,0.1258 0.015047,-0.268 -0.5059218,0 -1.0685709,-0.028 -1.0685709,-0.028 z m 0.2488377,5.372 c -0.4826763,0 -0.9096591,-0.072 -1.2809485,-0.2145 -0.3675765,-0.143 -0.6757468,-0.3499 -0.9245107,-0.6207 -0.2487639,-0.2708 -0.4362651,-0.6019 -0.5625035,-0.9931 -0.1262384,-0.3951 -0.1893576,-0.8446 -0.1893576,-1.3487 0,-0.5417 0.063119,-1.0175 0.1893576,-1.4276 0.1262384,-0.41 0.3100267,-0.7524 0.5513648,-1.027 0.2413381,-0.2746 0.5365132,-0.4796 0.8855253,-0.6151 0.352725,-0.1392 0.7537176,-0.2088 1.2029778,-0.2088 0.4121313,0 0.7834207,0.06 1.1138683,0.1806 0.3304476,0.1166 0.6107711,0.2916 0.8409706,0.5248 0.2301995,0.2332 0.4065619,0.5229 0.5290874,0.869 0.1225258,0.3461 0.1837888,0.7487 0.1837888,1.2075 l 0,0.5926 -3.7370287,0 c 0.011139,0.3874 0.05198,0.7203 0.1225255,0.9988 0.074258,0.2783 0.174506,0.5078 0.3007445,0.6883 0.1299513,0.1807 0.2858928,0.1937 0.4678247,0.2802 0.1856447,0.086 0.3972796,0.058 0.6349049,0.058 0.1967834,0 0.5457955,-0.019 0.5457955,-0.019 0,0 0.013833,-0.3359 0.081648,-0.4462 0.1217967,-0.1981 0.2050718,-0.3195 0.3480104,-0.3686 0.3070312,-0.1055 0.432417,-0.031 0.558238,0.015 0.125821,0.046 0.3821617,0.3767 0.3821617,0.64 0,0.1655 -0.044555,0.3235 -0.1336642,0.474 -0.089109,0.1467 -0.2264866,0.2765 -0.4121313,0.3893 -0.1856447,0.1129 -0.4195571,0.2032 -0.701737,0.2709 -0.2784671,0.068 -0.6107711,0.1016 -0.9969122,0.1016 z"
          style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:'Droid Serif';fill:#113d95;fill-opacity:1"
-         id="path4167"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccsccccscscccscssscccccsccsszcscccc" />
+         id="path4167" />
     </g>
   </g>
 </svg>
diff --git a/ui/org.eclipse.pde.ui/icons/obj16/elref_sc_obj.svg b/ui/org.eclipse.pde.ui/icons/obj16/elref_sc_obj.svg
index abd8fdff7ec..9beb877b924 100644
--- a/ui/org.eclipse.pde.ui/icons/obj16/elref_sc_obj.svg
+++ b/ui/org.eclipse.pde.ui/icons/obj16/elref_sc_obj.svg
@@ -2,24 +2,19 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="elref_sc_obj.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4187">
       <stop
          style="stop-color:#2269a4;stop-opacity:1"
@@ -31,7 +26,6 @@
          id="stop4191" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4883">
       <stop
          style="stop-color:#ebf9ff;stop-opacity:1"
@@ -50,10 +44,8 @@
        gradientTransform="matrix(1,0,0,0.74374999,18,264.1678)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient5062"
-       xlink:href="#linearGradient4910-4"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4910-4" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4910-4">
       <stop
          style="stop-color:#ffffff;stop-opacity:0"
@@ -72,11 +64,9 @@
        gradientUnits="userSpaceOnUse"
        id="linearGradient4975-2"
        xlink:href="#linearGradient4994-4"
-       inkscape:collect="always"
        gradientTransform="matrix(0.79999998,0,0,1,15,-3.000037)" />
     <linearGradient
-       id="linearGradient4994-4"
-       inkscape:collect="always">
+       id="linearGradient4994-4">
       <stop
          id="stop4996-5"
          offset="0"
@@ -87,7 +77,6 @@
          style="stop-color:#ffffff;stop-opacity:0;" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4883"
        id="linearGradient4889"
        x1="28"
@@ -97,68 +86,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-20,0)" />
     <linearGradient
-       id="linearGradient10448-9-7-0-5">
-      <stop
-         style="stop-color:#cf9307;stop-opacity:1"
-         offset="0"
-         id="stop10450-3-5-6-7" />
-      <stop
-         id="stop10456-4-1-5-3"
-         offset="0.5"
-         style="stop-color:#f7d87b;stop-opacity:1" />
-      <stop
-         style="stop-color:#ebb313;stop-opacity:1"
-         offset="1"
-         id="stop10452-22-7-8-4" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10748-8">
-      <stop
-         id="stop10750-5"
-         offset="0"
-         style="stop-color:#ecac18;stop-opacity:1" />
-      <stop
-         style="stop-color:#f1ce66;stop-opacity:1"
-         offset="0.25"
-         id="stop10752-8" />
-      <stop
-         style="stop-color:#f6e5a6;stop-opacity:1"
-         offset="0.5"
-         id="stop10754-8" />
-      <stop
-         id="stop10756-4"
-         offset="0.75"
-         style="stop-color:#f1cf6c;stop-opacity:1" />
-      <stop
-         id="stop10758-7"
-         offset="1"
-         style="stop-color:#e5b630;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10448-90">
-      <stop
-         style="stop-color:#ecac18;stop-opacity:1"
-         offset="0"
-         id="stop10450-0" />
-      <stop
-         id="stop10458-2"
-         offset="0.25"
-         style="stop-color:#ffe38d;stop-opacity:1" />
-      <stop
-         id="stop10456-96"
-         offset="0.5"
-         style="stop-color:#fdf5d2;stop-opacity:1" />
-      <stop
-         style="stop-color:#ffeba7;stop-opacity:1"
-         offset="0.75"
-         id="stop10460-3" />
-      <stop
-         style="stop-color:#e5b630;stop-opacity:1"
-         offset="1"
-         id="stop10452-1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient28456"
        id="linearGradient28462"
        x1="27.221357"
@@ -179,7 +106,6 @@
          id="stop28460" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4187"
        id="linearGradient4193"
        x1="6.9375"
@@ -188,31 +114,6 @@
        y2="1038.3934"
        gradientUnits="userSpaceOnUse" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="16"
-     inkscape:cx="13.535192"
-     inkscape:cy="13.32836"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1071"
-     inkscape:window-height="842"
-     inkscape:window-x="1283"
-     inkscape:window-y="676"
-     inkscape:window-maximized="0"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3999" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -226,8 +127,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
@@ -235,42 +134,30 @@
        id="g4163"
        transform="translate(4.0625001,-2.0312502)">
       <path
-         inkscape:export-ydpi="90"
-         inkscape:export-xdpi="90"
-         inkscape:export-filename="C:\Users\jmietling\Documents\rect3997-9-1.png"
-         sodipodi:nodetypes="cccccccccc"
-         inkscape:connector-curvature="0"
          id="rect3997-9-1"
          d="m 2,1038.3622 0.03125,10.0156 9.90625,0 -0.03125,-10.0156 z m 1,1 7.90625,0 0.03125,8.0156 -7.90625,0 z"
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient4193);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" />
       <path
-         inkscape:connector-curvature="0"
          id="rect3997-9-1-1"
          d="m 3,1039.3622 7.96875,0 0.03125,7.4375 -7.96875,0 z"
-         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient4889);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate"
-         sodipodi:nodetypes="ccccc" />
+         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient4889);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" />
       <g
          id="g4195"
          transform="matrix(-0.9921875,0,0,-1.06875,13.914062,2158.1962)">
         <path
            style="display:inline;fill:url(#linearGradient5062);fill-opacity:1;stroke:none"
            d="m 5,1040.9122 0,5.95 -2,0 0,-7.4375 z"
-           id="rect4853-82-7"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
+           id="rect4853-82-7" />
         <path
            style="display:inline;fill:url(#linearGradient4975-2);fill-opacity:1;stroke:none"
            d="m 4.6,1041.3622 6.4,0 0,-2 -8,0 z"
-           id="rect4853-82-0"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
+           id="rect4853-82-0" />
       </g>
       <g
          id="text4162"
          style="font-style:normal;font-weight:normal;font-size:11.40601158px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#113d95;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
          transform="matrix(0.96721873,0,0,0.94701896,-0.22517213,-32.50569)">
         <path
-           inkscape:connector-curvature="0"
            id="path4167"
            style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:'Droid Serif';fill:#113d95;fill-opacity:1"
            d="m 7.5330622,1133.6321 q -0.4789633,0 -0.7629997,0.4734 -0.2784671,0.4734 -0.3063138,1.3868 l 1.9715469,0 q 0,-0.4344 -0.050124,-0.7797 -0.050124,-0.3453 -0.1615109,-0.5848 -0.1058175,-0.2395 -0.2784671,-0.3676 -0.1670802,-0.1281 -0.4121313,-0.1281 z m 0.1058175,5.6307 q -0.7240144,0 -1.2809485,-0.2117 -0.5513648,-0.2116 -0.9245107,-0.6126 -0.3731459,-0.401 -0.5625035,-0.9802 -0.1893576,-0.5848 -0.1893576,-1.3311 0,-0.802 0.1893576,-1.409 0.1893576,-0.6071 0.5513648,-1.0136 0.3620072,-0.4066 0.8855253,-0.6071 0.5290875,-0.2061 1.2029778,-0.2061 0.6181969,0 1.1138683,0.1782 0.4956714,0.1727 0.8409706,0.518 0.3452992,0.3453 0.5290874,0.8577 0.1837888,0.5124 0.1837888,1.1918 l 0,0.5848 -3.7370287,0 q 0.016708,0.5736 0.1225255,0.9858 0.1113868,0.4121 0.3007445,0.6794 0.1949269,0.2674 0.4678247,0.3954 0.278467,0.1281 0.6349049,0.1281 0.2951751,0 0.5457955,-0.067 0.2506203,-0.072 0.4511166,-0.1949 0.2060657,-0.1281 0.3564379,-0.2952 0.1559416,-0.1726 0.2561897,-0.3676 0.3063138,0.1671 0.3063138,0.557 0,0.245 -0.1336642,0.4678 -0.1336642,0.2172 -0.4121313,0.3843 -0.2784671,0.1671 -0.701737,0.2673 -0.4177006,0.1003 -0.9969122,0.1003 z" />
@@ -287,8 +174,6 @@
          id="rect28446"
          style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;stroke:url(#linearGradient28462);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
       <path
-         sodipodi:nodetypes="cccccccc"
-         inkscape:connector-curvature="0"
          id="path3986"
          d="m 6.5825306,1052.7505 -0.689928,0.7034 -3.1702308,-3.1333 -1.121382,1.0476 -0.00373,-3.0017 3.0026559,-0 -1.0871113,1.2442 z"
          style="display:inline;fill:#17325d;fill-opacity:1;stroke:none" />
diff --git a/ui/org.eclipse.pde.ui/icons/obj16/environment.svg b/ui/org.eclipse.pde.ui/icons/obj16/environment.svg
index 4a61177275f..a0d3635eb4e 100644
--- a/ui/org.eclipse.pde.ui/icons/obj16/environment.svg
+++ b/ui/org.eclipse.pde.ui/icons/obj16/environment.svg
@@ -2,24 +2,19 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="environment.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4361">
       <stop
          style="stop-color:#665d92;stop-opacity:1"
@@ -30,21 +25,6 @@
          offset="1"
          id="stop4366" />
     </linearGradient>
-    <linearGradient
-       id="linearGradient8396">
-      <stop
-         id="stop8398"
-         offset="0"
-         style="stop-color:#6fd9ff;stop-opacity:1" />
-      <stop
-         style="stop-color:#55add0;stop-opacity:1"
-         offset="0.5"
-         id="stop8400" />
-      <stop
-         id="stop8402"
-         offset="1"
-         style="stop-color:#4364a7;stop-opacity:1" />
-    </linearGradient>
     <linearGradient
        id="linearGradient8382">
       <stop
@@ -64,27 +44,7 @@
          offset="1"
          style="stop-color:#5e3b1e;stop-opacity:1" />
     </linearGradient>
-    <linearGradient
-       id="linearGradient8382-7">
-      <stop
-         style="stop-color:#fffcf2;stop-opacity:1"
-         offset="0"
-         id="stop8384-4" />
-      <stop
-         id="stop8392-0"
-         offset="0.35072023"
-         style="stop-color:#adc977;stop-opacity:1" />
-      <stop
-         id="stop8390-9"
-         offset="0.7120198"
-         style="stop-color:#7f9f3f;stop-opacity:1" />
-      <stop
-         style="stop-color:#77775c;stop-opacity:1"
-         offset="1"
-         id="stop8386-4" />
-    </linearGradient>
     <radialGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient8374"
        id="radialGradient8380"
        cx="-839.01245"
@@ -95,7 +55,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(-0.33102748,-5.1291738,6.9726876,-0.47367511,-5813.1835,-4441.9548)" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient8374">
       <stop
          style="stop-color:#6fd9ff;stop-opacity:1"
@@ -112,7 +71,6 @@
     </linearGradient>
     <linearGradient
        gradientTransform="matrix(2.4504897,0,0,2.4504897,-745.02988,750.67901)"
-       inkscape:collect="always"
        xlink:href="#linearGradient5184"
        id="linearGradient5190"
        x1="3.6013324"
@@ -121,7 +79,6 @@
        y2="1.5550991"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient5184">
       <stop
          style="stop-color:#7d6f79;stop-opacity:1"
@@ -133,7 +90,6 @@
          id="stop5188" />
     </linearGradient>
     <radialGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient8382"
        id="radialGradient4361"
        cx="-2261.5786"
@@ -144,20 +100,17 @@
        gradientTransform="matrix(-1.4307844,-0.80728921,0.57053019,-1.1092966,-4927.184,-2123.5377)"
        gradientUnits="userSpaceOnUse" />
     <filter
-       inkscape:collect="always"
        style="color-interpolation-filters:sRGB"
        id="filter4531"
-       x="-0.11127777"
-       width="1.2225555"
-       y="-0.11192389"
-       height="1.2238478">
+       x="-0.26463708"
+       width="1.5292742"
+       y="-0.085970481"
+       height="1.171941">
       <feGaussianBlur
-         inkscape:collect="always"
          stdDeviation="70.771383"
          id="feGaussianBlur4533" />
     </filter>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4361"
        id="linearGradient4368"
        x1="-837.95416"
@@ -174,10 +127,8 @@
        gradientTransform="matrix(1.5271965,-4.0707222,8.2882798,3.0665114,-4479.1973,-6529.2449)"
        gradientUnits="userSpaceOnUse"
        id="radialGradient7906"
-       xlink:href="#linearGradient8349"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient8349" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient8349">
       <stop
          style="stop-color:#ffffff;stop-opacity:1"
@@ -193,31 +144,6 @@
          id="stop8353" />
     </linearGradient>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="32"
-     inkscape:cx="17.071022"
-     inkscape:cy="7.9271162"
-     inkscape:document-units="px"
-     inkscape:current-layer="g4199"
-     showgrid="false"
-     inkscape:window-width="1606"
-     inkscape:window-height="913"
-     inkscape:window-x="634"
-     inkscape:window-y="519"
-     inkscape:window-maximized="0"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid8762" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -231,21 +157,17 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
     <path
        style="fill:none;fill-rule:evenodd;stroke:#585157;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
        d="m 3.09375,1038.081 2.5,2.5"
-       id="path4246"
-       inkscape:connector-curvature="0" />
+       id="path4246" />
     <path
        style="display:inline;fill:none;fill-rule:evenodd;stroke:#585157;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
        d="m 11,1045.7997 2.5,2.5"
-       id="path4246-8"
-       inkscape:connector-curvature="0" />
+       id="path4246-8" />
     <g
        id="g3375"
        transform="translate(2.6958447,-2.5632622)">
@@ -260,17 +182,10 @@
            id="rect4243-4"
            style="display:inline;fill:#7d6f79;fill-opacity:1;stroke:none" />
         <path
-           sodipodi:end="4.712389"
-           sodipodi:start="1.5707963"
            transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,0,0)"
            d="m -731.49268,763.57058 a 4.223597,4.223597 0 0 1 -3.65774,-2.1118 4.223597,4.223597 0 0 1 0,-4.22359 4.223597,4.223597 0 0 1 3.65774,-2.1118 l 0,4.22359 z"
-           sodipodi:ry="4.223597"
-           sodipodi:rx="4.223597"
-           sodipodi:cy="759.34698"
-           sodipodi:cx="-731.49268"
            id="path4245-1"
-           style="display:inline;fill:none;stroke:url(#linearGradient5190);stroke-width:0.57384032;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           sodipodi:type="arc" />
+           style="display:inline;fill:none;stroke:url(#linearGradient5190);stroke-width:0.57384032;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
         <g
            id="g3894"
            transform="matrix(0.00124788,-0.00124544,0.00124788,0.00124544,22.099311,1051.3941)"
@@ -278,9 +193,7 @@
           <path
              style="fill:#2f522a;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:325.48294067px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter4531);opacity:0.658"
              d="m -2462.6051,-1029.6298 c -20.3625,20.3625 -92.2489,722.25517 -102.5497,854.49264 -10.3007,132.237481 -168.3199,503.64594 -137.9154,615.50089 30.4046,111.85493 111.5365,355.88763 136.94,381.29111 25.4035,25.4035 50.7174,142.3491 -0.1195,122.05619 -50.8367,-20.29298 -132.1678,-60.8987 -152.4905,-81.22147 -20.3228,-20.32271 -45.6965,-76.24026 -45.6965,-76.24026 l -126.8979,-249.07364 -81.2613,-111.80518 -116.8063,-167.71277 c 0,0 -30.305,-213.568429 -4.8517,-239.021673 25.4532,-25.453245 122.2751,-223.889077 122.2751,-223.889077 l 15.3616,-106.81407 -20.0939,-254.26376 -55.8578,-86.40173 c 0,0 219.0075,-330.78277 259.6829,-320.65123 40.6754,10.13158 310.2809,-56.24597 310.2809,-56.24597 z"
-             id="path4381"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="csssssccccsccccsc" />
+             id="path4381" />
           <g
              id="g4199"
              transform="matrix(0.96541926,0.25881954,-0.25881954,0.9664324,-35.985455,590.79528)">
@@ -299,11 +212,9 @@
                id="path3800-3-8-9-8"
                style="display:inline;opacity:1;fill:url(#radialGradient7906);fill-opacity:1;stroke:none" />
             <path
-               sodipodi:nodetypes="ccccccccccccccccccccccccscccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccscsccccccccccccccccccccccccccccccccccccc"
                style="display:inline;fill:url(#radialGradient4361);fill-opacity:1;stroke:none"
                d="m -1465.1147,-979.21837 c -3153.8919,1612.14574 -1576.9459,806.07287 0,0 z m 897.08188,1203.56434 c -3460.46628,-1342.21487 -1730.23308,-671.10747 0,0 z M -1285.2333,-905.12195 c -21.7551,-0.15662 -39.4458,1.13574 -65.1406,-5.10652 22.2493,15.99366 -141.6422,-40.5065 -1.3958,33.2212 -23.4906,-0.58715 -161.8043,-75.1354 -79.2854,20.44914 -68.141,35.92559 176.3234,80.40298 114.7406,68.98979 20.1086,5.68618 13.4574,42.45869 49.6002,63.88335 50.7256,18.82432 55.7096,-12.58163 46.7151,-23.00229 12.2617,-0.26627 26.8185,-1.60432 32.5701,2.55315 -5.4621,-25.37881 -10.182,-38.66091 28.2895,-51.11127 -23.0606,1.20986 -68.5986,-8.07072 -50.9957,-30.66202 11.6055,-15.36845 32.2365,-46.16908 1.3956,-33.22133 -29.9171,-8.47619 -51.9823,-26.14343 -63.7445,-38.32756 -3.637,-0.50263 -11.6096,-8.75153 -12.7491,-7.66564 z m -308.7666,-117.53055 c -14.3131,-2.4718 -48.7166,-6.3796 -77.8895,-12.7721 -27.0912,-8.4839 -52.2301,-26.276 -38.2469,-22.9965 -8.4505,-8.1328 -79.8699,-8.8265 -82.1704,-66.4368 -45.9041,-22.2654 -64.2754,-40.2161 -89.2428,-53.6588 -4.2658,-0.2597 -8.4836,-7.4333 -12.7487,-7.6654 -189.2446,-10.2922 -596.6719,-41.8778 -777.0563,4.6466 -22.0916,4.9319 -45.4343,18.7855 -66.5364,28.1146 -30.1461,13.3274 -42.8422,28.7141 -14.1447,25.5556 -36.5224,11.4564 -70.7759,55.301 -8.4683,45.9988 -66.5782,33.4285 71.0187,98.47173 13.8884,115.51173 84.9096,-12.608 -52.715,-86.77943 31.4312,-105.29263 17.6778,-21.2295 58.6881,-14.8705 92.0342,-12.7836 -38.9238,8.3013 -85.83,32.576 -46.715,23.0024 30.2356,5.3315 86.1315,-11.12 111.8555,-17.8959 -0.1259,-0.541 11.9899,8.468 12.749,7.6655 4.0157,2.2542 6.7181,2.6225 -7.0725,12.7778 10.3664,10.1568 40.4292,52.9251 49.6,63.88331 16.4459,1.2981 28.3612,49.28584 17.03,61.33028 4.7766,-0.20173 12.576,-0.66739 26.8936,-17.89023 8.9071,-9.39284 -41.0955,52.89314 -28.2895,51.11126 -8.0318,5.84663 -19.5427,11.31361 -26.8936,17.89009 l -19.8214,5.11223 c -5.2193,3.93817 -7.9505,10.03182 -7.0723,12.77785 l 19.8214,-5.11224 c -3.3365,3.68006 -5.78,9.43057 -7.0724,12.77778 -1.4825,-0.70096 -16.1156,12.8724 -7.0724,12.77778 0.7849,1.67635 10.6876,6.2784 12.7489,7.6655 -11.7515,3.19705 -10.3007,7.47322 -7.0725,12.7778 2.2411,6.06685 -6.2387,11.31063 -26.8935,17.89017 -6.3034,1.50158 2.8244,11.01767 -7.0724,12.77777 -23.0758,22.07292 -17.5481,40.83049 -8.4682,45.99892 -17.4119,19.23146 -30.0127,41.52946 -28.2896,51.11119 -21.0193,9.76312 -43.8418,27.07436 -26.8936,17.89013 22.0204,10.37361 -19.2734,35.58978 -41.0384,43.44566 9.8446,1.48322 25.6815,5.76669 65.1405,5.10657 -6.1322,5.52826 22.0714,44.29244 -8.468,45.99906 1.3124,19.81168 -11.9748,41.31659 -28.2895,51.11118 -10.607,6.19417 -17.8549,3.43354 -19.8215,5.11218 20.8908,-72.06887 -25.1068,114.56954 -3.6299,76.78102 -60.1965,45.66476 21.6739,90.28032 -26.3119,148.61843 -50.2076,35.38332 -79.6407,129.77879 -50.9025,122.66572 -12.6484,50.05381 -53.177,107.687163 -12.6554,145.662493 20.0313,69.398101 -36.979,140.346037 -15.447,212.104747 -12.9344,37.29168 -66.59,32.77178 -22.6129,71.55461 -7.2161,89.99812 -26.7758,138.87098 19.9149,148.21576 -9.4035,-45.34389 8.8139,-190.16739 14.0511,-178.88368 -2.1472,-50.0383 26.5734,-166.041033 56.579,-102.22241 -3.4169,55.34082 -19.3452,125.30528 -1.3025,186.54901 -23.2728,44.97488 15.37,125.56944 -8.3746,199.32691 -35.302,38.07023 -35.0319,80.48714 -5.5829,132.88473 52.0497,54.40249 77.484,156.48068 162.9447,166.09425 48.4624,18.73556 33.6684,135.74996 97.8043,160.98779 61.0928,45.29998 49.4949,60.56118 59.5575,137.99128 -31.8981,49.7715 9.9575,74.1079 9.9575,74.1079 l 55.1834,-69.0013 c 0,0 51.2036,-99.4864 56.5788,-102.2225 -15.0994,-14.14697 -41.6443,-57.55202 -94.9194,-74.10222 -81.974,-19.44051 42.8595,-31.45025 35.3618,-63.889 7.2489,-24.09955 14.9446,-109.18639 62.2556,-81.77908 -63.6946,-53.25139 -102.0004,4.51164 -151.4982,28.12032 -12.8331,-35.4821 -97.1982,-30.34915 -100.596,-94.54554 -24.4647,-77.79512 20.5692,-148.35929 73.5153,-194.22031 31.7584,-10.67622 53.3328,-99.10826 107.5747,-71.56036 63.7718,2.04918 53.3497,-15.90136 116.1366,35.76887 14.0519,11.99123 51.5272,-7.27498 63.7446,38.32757 25.3201,-39.36078 137.2847,50.62624 103.3875,28.10319 7.0117,45.70424 67.4564,45.90007 41.132,109.88234 -15.6032,19.05465 2.1129,92.80897 1.4893,120.10686 80.9289,-30.65771 32.4351,-185.73705 138.6559,-189.11381 61.6951,-3.06324 167.8203,-11.77825 164.247,-20.45486 4.4051,0.88294 13.8367,-7.3259 19.8212,-5.11233 -2.4041,-4.79162 1.9186,-10.44059 -5.6764,-20.4433 34.022,-3.55703 40.9511,-64.14376 42.4342,-76.6668 0.7514,2.37551 59.1127,-38.03339 18.4255,28.10884 -28.8219,75.60149 35.0441,-17.36887 53.7877,-35.77993 17.5305,-0.94412 34.7976,-6.9725 59.4639,-15.33691 3.5043,-1.12459 8.3636,7.01245 12.7489,7.66555 19.5973,-4.73687 45.8672,-13.46456 65.1406,5.10655 49.3741,24.30826 22.6922,9.38791 53.7873,-35.78018 52.8301,-18.42085 100.7216,-6.07583 117.5321,2.54754 -1.6932,-28.27841 46.237,22.72715 70.8173,25.54999 -27.4933,-1.9808 -90.606,11.69129 -48.1107,56.22351 31.7943,-34.55411 118.8412,18.81002 124.6046,-10.23019 0.8266,-4.14611 -9.9091,1.12326 -12.7491,-7.66561 -73.7965,-9.9885 -60.2343,-115.48579 -41.1318,-109.88224 -52.754,-48.97459 129.0939,28.15508 28.2895,-51.11126 -103.9764,-28.14828 -223.8322,-1.84929 -63.7449,-38.32776 58.825,14.38837 90.0556,-29.30388 135.9578,30.65653 35.1717,28.95534 80.0311,91.4553 134.56189,63.87754 24.8399,26.05877 78.7112,16.45367 72.2129,-7.67122 29.2062,-12.68598 17.7338,-51.83478 8.4681,-45.99902 8.4605,-22.45719 -27.3392,-29.21551 -50.9957,-30.66212 2.8267,-1.47212 -1.469,-9.96944 7.0724,-12.7778 18.9579,-0.14358 76.9694,29.65728 33.966,-30.66789 -22.5227,-4.34968 -36.3201,-41.24382 -18.4256,-28.10893 -24.3315,-46.222 25.0338,-94.38731 9.8641,-79.21999 24.1875,-11.36995 52.3204,-39.26994 21.2172,-38.3334 -35.3143,-15.092103 12.2828,-18.950173 2.7915,-66.442304 3.9017,-8.817692 -5.6022,-16.786053 -5.6766,-20.443386 -14.6498,8.706802 -44.4956,18.422295 -39.6429,10.22442 -12.1396,19.280991 -66.5705,1.66213 -65.1404,-5.106436 -25.2702,-3.806595 20.8679,-14.291867 -24.102,-48.552181 -0.078,-9.89491 11.6051,-32.89553 8.4681,-45.99906 99.27117,9.085038 -1.32328,-106.696263 -1.4896,-120.106873 -39.86649,-64.39506 -68.09749,-45.03209 -110.45959,-15.32529 16.9239,11.88141 -38.5022,23.05634 -21.217,38.33345 -47.134,21.0283 -68.7156,109.099853 -70.7238,127.777993 -17.7862,28.5983487 -124.2761,61.435383 -124.6044,10.23034 -27.9417,22.6611007 -85.8196,84.654681 -55.1832,69.001267 -9.4879,38.744347 -392.1691,-12.594296 -408.3107,-16.841871 -18.1773,-48.519754 -115.3047,-133.973539 -67.7121,-176.381189 16.8715,-54.13174 -440.1912,-193.42538 -435.3056,-264.95347 -5.8445,-40.00344 -49.4023,-100.13491 -73.7022,-112.43556 57.215,-71.14973 -48.941,-39.94454 9.8638,-79.22019 34.791,-37.12921 -29.458,-151.55902 11.8401,-155.22725 30.1502,-2.37705 7.0365,-97.9079 12.7833,-140.20794 24.0669,80.82214 81.4575,-195.30591 86.1779,-200.70061 32.3936,56.0675 676.0216,245.98607 701.8684,295.42363 20.7624,8.8271 376.0294,389.844 384.5318,387.98997 15.0443,-3.27922 14.4851,-28.33142 8.4682,-45.99876 35.8433,56.53272 89.8383,-28.46697 103.3876,28.10319 0.5092,2.51864 14.1786,-7.28597 12.7489,7.6655 17.6023,-233.54135 -11.6921,-104.01688 -294.7152,-296.41425 -6.9978,-23.89183 -4.44,-37.68819 -24.1022,-48.55234 -35.9951,-19.40285 -65.9785,16.77882 -79.2853,20.44911 -50.4231,15.29044 -23.679,-50.84886 1.3957,-33.22119 -34.4746,-29.2219 -54.2753,-55.30362 -62.3488,-71.54881 1.6847,-5.3037 5.5885,-25.10784 1.3956,-33.22119 -8.6723,-62.23433 -26.6322,-107.86983 -68.0256,-91.99233 -70.3822,18.8307 -17.5046,-28.96763 -31.1744,-35.77433 -2.5158,-1.2508 -3.8045,-9.5422 -12.749,-7.6655 z m 445.0045,608.1709 c -3.8302,1.51731 -14.6734,18.55373 -7.0723,12.77775 -4.1228,10.69092 5.3475,45.24421 11.3534,40.88693 74.0646,-28.96008 39.3197,40.90121 89.2427,53.65878 -3.2274,-17.38273 -23.2648,-112.42186 -21.3106,-114.99441 -16.2916,-9.90014 -60.7617,3.1024 -72.2132,7.67095 z m 20.3824,914.85571 c -1.518,3.82303 4.4637,0.67837 12.7489,7.6655 15.7391,-8.30744 26.8758,21.88931 33.966,-30.66792 -3.1089,3.06266 -42.1926,11.52078 -46.7149,23.00242 z M -2668.189,-634.66595 c -0.9278,16.76337 -14.612,34.36639 -14.1448,25.55563 12.7696,20.13529 4.7518,50.26534 36.8511,56.21773 20.7129,-18.14143 -12.0503,-54.96428 -22.7063,-81.77336 z m 1427.3465,539.623923 c -8.7808,-4.50027 -49.7101,14.8859 -14.1448,25.55558 16.1149,-5.41982 17.871,-23.64314 14.1448,-25.55558 z m 151.7787,431.863637 c -15.523,-9.25536 -22.2063,16.99504 29.7786,68.99552 -2.7684,-32.57451 -18.4503,-62.24144 -29.7786,-68.99552 z m 152.98759,91.98654 c -25.7879,14.58491 -53.9497,30.79774 -79.28559,20.44892 -27.5567,11.29785 0.7424,68.71255 55.27669,84.32668 -6.9488,11.66188 -36.2907,22.42104 18.4258,28.10903 10.3496,-7.84431 5.6558,-14.24699 7.0723,-12.77782 l 5.6765,20.44326 c -4.8051,12.41407 -11.9039,29.36567 -1.3957,33.2212 52.9173,-13.01851 2.9813,-33.52235 8.4681,-45.99896 1.8293,-4.15902 8.9051,-15.26939 26.8937,-17.89008 -53.9491,-1.64563 -50.2834,-52.67605 -11.353,-40.8866 -51.1906,-36.84799 -1.6522,-12.50747 -11.3535,-40.88683 -38.8224,-0.089 -34.6561,-16.0256 -18.4253,-28.1088 z M -2102.6498,817.31724 c -20.1105,-12.26463 -37.7299,-6.08065 -65.1405,-5.10648 -18.9807,7.00196 -2.6906,19.08549 18.4253,28.10874 l 12.7491,7.66566 c 15.1896,4.82776 30.8061,4.62062 32.5703,2.55327 0.877,4.5056 133.0649,176.98007 73.7021,112.43542 4.8508,10.33368 8.9015,17.60308 5.6766,20.44338 0.3325,3.0338 2.5487,19.87607 43.9235,43.43997 69.08,16.7888 -24.5323,-85.08974 -22.7065,-81.77338 -3.8942,-6.26526 -1.6836,-13.98249 -5.6764,-20.44329 -1.4015,-14.82646 -1.8916,-18.04762 -5.6765,-20.44328 -21.4332,-33.28513 -55.9944,-67.45554 -87.847,-86.88001 z M -3570.1761,-30.998987 c -5.7804,-3.04887 -23.3282,7.15631 -14.1446,25.5556577 15.0996,-14.7033977 18.1018,-23.4706177 14.1446,-25.5556577 z M -1909.926,1052.4073 c -9.1493,-5.2891 -20.7989,0.1974 -19.8215,5.1122 3.9269,8.5247 -8.0679,7.7978 -7.0723,12.7779 -2.6274,-1.6392 -14.5954,13.4807 -7.0724,12.7778 -6.3533,-2.8936 -14.581,7.3639 -19.8216,5.1122 15.1365,10.8715 35.8584,-23.8534 53.7878,-35.7801 z m -168.5282,-33.2099 c 1.3528,4.1377 0.4998,12.0937 5.6765,20.4433 l 12.7489,7.6656 c 51.1036,24.9613 3.2668,-15.4312 -18.4254,-28.1089 z"
-               id="path3800-3-8-0-6"
-               inkscape:connector-curvature="0" />
+               id="path3800-3-8-0-6" />
             <circle
                r="232.85715"
                cy="526.64789"
@@ -332,7 +243,6 @@
              x="16.920635"
              y="1059.6458" />
           <path
-             inkscape:connector-curvature="0"
              style="display:inline;fill:#958892;fill-opacity:1;stroke:none"
              d="m 16.920636,1059.6458 c -0.553985,0 -1,0.446 -1,1 l 7,0 c 0,-0.554 -0.446015,-1 -1,-1 l -5,0 z"
              id="rect4243-6" />
diff --git a/ui/org.eclipse.pde.ui/icons/obj16/error_st_obj.svg b/ui/org.eclipse.pde.ui/icons/obj16/error_st_obj.svg
index bc695d75373..39a1c673b0b 100644
--- a/ui/org.eclipse.pde.ui/icons/obj16/error_st_obj.svg
+++ b/ui/org.eclipse.pde.ui/icons/obj16/error_st_obj.svg
@@ -2,24 +2,19 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="error_st_obj.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10798-1-9-3-7-1-15-1-7-6-1"
        id="linearGradient8163-2"
        gradientUnits="userSpaceOnUse"
@@ -44,31 +39,6 @@
          id="stop10802-1-5-3-0-2-0-9-8-4-3" />
     </linearGradient>
   </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="11.412462"
-     inkscape:cy="-3.3569328"
-     inkscape:document-units="px"
-     inkscape:current-layer="g4155"
-     showgrid="true"
-     inkscape:window-width="1171"
-     inkscape:window-height="959"
-     inkscape:window-x="851"
-     inkscape:window-y="531"
-     inkscape:window-maximized="0"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid4099" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -77,13 +47,11 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
@@ -108,8 +76,6 @@
              transform="matrix(1.0905016,0,0,1.0905016,-0.09572826,-95.681285)"
              id="g4095">
             <path
-               sodipodi:nodetypes="ccscccccccccccccccccc"
-               inkscape:connector-curvature="0"
                id="path5021"
                transform="matrix(0.77187105,0,0,0.77316463,-4.647127,1051.0563)"
                d="M 6.2265625,3.6953125 C 5.9177427,3.7062384 5.125,4.3515625 5.125,4.3515625 c 0,0 0.2885111,0.2731764 0.78125,0.6796875 0.4927389,0.4065111 0.9552143,0.9554552 1.0625,1.4375 C 7.068619,6.9173537 7.1051563,7.3329889 7.15625,7.75 L 4.2010947,10.96967 5.0906092,11.868663 7.4375,9.375 c 0.2792655,0.4616799 0.5966442,0.914462 0.8125,1.28125 0.2533102,0.354 0.6860498,0.734189 1.40625,1.09375 1.285897,0.641907 1.105068,0.565316 1.105068,0.565316 l 0.965609,-0.791649 c 0,0 -0.202967,-0.247189 -1.508177,-0.898667 C 9.6433969,10.337868 9.4953002,10.118107 9.34375,9.90625 8.8239337,9.3154094 8.6327445,8.816423 8.5,8.1875 L 11.629711,4.6423859 10.681163,3.8870243 8.28125,6.5 C 8.263796,6.4030643 8.2724218,6.3194727 8.25,6.21875 8.0333974,5.2456067 7.3191341,4.5264873 6.71875,4.03125 6.4464909,3.8171333 6.4806949,3.8796991 6.2265625,3.6953125 Z"
diff --git a/ui/org.eclipse.pde.ui/icons/obj16/ext_plugin_obj.svg b/ui/org.eclipse.pde.ui/icons/obj16/ext_plugin_obj.svg
index 4c9a1397437..7299c935a98 100644
--- a/ui/org.eclipse.pde.ui/icons/obj16/ext_plugin_obj.svg
+++ b/ui/org.eclipse.pde.ui/icons/obj16/ext_plugin_obj.svg
@@ -2,20 +2,16 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="ext_plugin_obj.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
@@ -34,203 +30,6 @@
          style="stop-color:#809dcb;stop-opacity:0" />
     </linearGradient>
     <linearGradient
-       id="linearGradient10448-9-7-0-5">
-      <stop
-         style="stop-color:#cf9307;stop-opacity:1"
-         offset="0"
-         id="stop10450-3-5-6-7" />
-      <stop
-         id="stop10456-4-1-5-3"
-         offset="0.5"
-         style="stop-color:#f7d87b;stop-opacity:1" />
-      <stop
-         style="stop-color:#ebb313;stop-opacity:1"
-         offset="1"
-         id="stop10452-22-7-8-4" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10440-1-0-0-3">
-      <stop
-         style="stop-color:#ae7603;stop-opacity:1;"
-         offset="0"
-         id="stop10442-43-2-0-9" />
-      <stop
-         id="stop10521-1-2-5-3"
-         offset="0.5"
-         style="stop-color:#e8d8a3;stop-opacity:1" />
-      <stop
-         style="stop-color:#bb9221;stop-opacity:1"
-         offset="1"
-         id="stop10444-3-4-0-4" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10748-8">
-      <stop
-         id="stop10750-5"
-         offset="0"
-         style="stop-color:#ecac18;stop-opacity:1" />
-      <stop
-         style="stop-color:#f1ce66;stop-opacity:1"
-         offset="0.25"
-         id="stop10752-8" />
-      <stop
-         style="stop-color:#f6e5a6;stop-opacity:1"
-         offset="0.5"
-         id="stop10754-8" />
-      <stop
-         id="stop10756-4"
-         offset="0.75"
-         style="stop-color:#f1cf6c;stop-opacity:1" />
-      <stop
-         id="stop10758-7"
-         offset="1"
-         style="stop-color:#e5b630;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10440-1-3-4">
-      <stop
-         style="stop-color:#ae7603;stop-opacity:1;"
-         offset="0"
-         id="stop10442-43-0-5" />
-      <stop
-         id="stop10521-1-4-7"
-         offset="0.5"
-         style="stop-color:#e8d8a3;stop-opacity:1" />
-      <stop
-         style="stop-color:#bb9221;stop-opacity:1"
-         offset="1"
-         id="stop10444-3-2-0" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10448-90">
-      <stop
-         style="stop-color:#ecac18;stop-opacity:1"
-         offset="0"
-         id="stop10450-0" />
-      <stop
-         id="stop10458-2"
-         offset="0.25"
-         style="stop-color:#ffe38d;stop-opacity:1" />
-      <stop
-         id="stop10456-96"
-         offset="0.5"
-         style="stop-color:#fdf5d2;stop-opacity:1" />
-      <stop
-         style="stop-color:#ffeba7;stop-opacity:1"
-         offset="0.75"
-         id="stop10460-3" />
-      <stop
-         style="stop-color:#e5b630;stop-opacity:1"
-         offset="1"
-         id="stop10452-1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10440-18">
-      <stop
-         style="stop-color:#ae7603;stop-opacity:1;"
-         offset="0"
-         id="stop10442-8" />
-      <stop
-         id="stop10521-7"
-         offset="0.5"
-         style="stop-color:#e8d8a3;stop-opacity:1" />
-      <stop
-         style="stop-color:#bb9221;stop-opacity:1"
-         offset="1"
-         id="stop10444-0" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10414-9">
-      <stop
-         style="stop-color:#5078b9;stop-opacity:1;"
-         offset="0"
-         id="stop10416-3" />
-      <stop
-         id="stop10422-8"
-         offset="0.5"
-         style="stop-color:#6d8cbd;stop-opacity:1" />
-      <stop
-         style="stop-color:#5f88c9;stop-opacity:1"
-         offset="1"
-         id="stop10418-4" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10432-3">
-      <stop
-         id="stop10434-4"
-         offset="0"
-         style="stop-color:#1f4d9a;stop-opacity:1" />
-      <stop
-         style="stop-color:#4e6da1;stop-opacity:1"
-         offset="0.5"
-         id="stop10436-2" />
-      <stop
-         id="stop10438-9"
-         offset="1"
-         style="stop-color:#567ebc;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10157-6">
-      <stop
-         style="stop-color:#6588c1;stop-opacity:1"
-         offset="0"
-         id="stop10159-5" />
-      <stop
-         id="stop10165-9"
-         offset="0.5"
-         style="stop-color:#becce3;stop-opacity:1" />
-      <stop
-         style="stop-color:#809dcb;stop-opacity:1"
-         offset="1"
-         id="stop10161-55" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10396-5">
-      <stop
-         style="stop-color:#1b3e79;stop-opacity:1;"
-         offset="0"
-         id="stop10398-7" />
-      <stop
-         id="stop10404-9"
-         offset="0.5"
-         style="stop-color:#728fbf;stop-opacity:1" />
-      <stop
-         style="stop-color:#1f4d9a;stop-opacity:1"
-         offset="1"
-         id="stop10400-9" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10157-2-5">
-      <stop
-         style="stop-color:#6588c1;stop-opacity:1"
-         offset="0"
-         id="stop10159-8-3" />
-      <stop
-         id="stop10165-3-9"
-         offset="0.5"
-         style="stop-color:#becce3;stop-opacity:1" />
-      <stop
-         style="stop-color:#809dcb;stop-opacity:1"
-         offset="1"
-         id="stop10161-5-0" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10149-6-5-4">
-      <stop
-         style="stop-color:#1f4d9a;stop-opacity:1"
-         offset="0"
-         id="stop10151-5-7-2" />
-      <stop
-         id="stop10394-3"
-         offset="0.5"
-         style="stop-color:#b9c7df;stop-opacity:1" />
-      <stop
-         style="stop-color:#567ebc;stop-opacity:1"
-         offset="1"
-         id="stop10153-8-1-2" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4284"
        id="linearGradient10790-8-2"
        gradientUnits="userSpaceOnUse"
@@ -240,29 +39,6 @@
        x2="305"
        y2="545.35248" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="2.8284271"
-     inkscape:cx="21.429616"
-     inkscape:cy="34.865018"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="905"
-     inkscape:window-height="917"
-     inkscape:window-x="458"
-     inkscape:window-y="227"
-     inkscape:window-maximized="0"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid4210" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -276,8 +52,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
@@ -293,18 +67,14 @@
          id="rect10007-0-74-2-7-6"
          style="fill:#f2f2f2;fill-opacity:1;stroke:none;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
       <path
-         inkscape:connector-curvature="0"
          id="path4313-8-8"
          d="m 12.648438,1043.3652 0,1 3.351562,0 0,-1 -3.351562,0 z"
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#7d7d7d;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
       <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
          id="path4313-8-8-7"
          d="m 12.981809,1043.3594 0,3.0195 1.01551,0 0,-3.0195 z"
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#616161;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.94926554px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
       <path
-         inkscape:connector-curvature="0"
          id="path4313-5-1-8"
          d="m 15.992188,1045.3613 -3.359376,0.031 0.0098,1 3.359375,-0.031 -0.0098,-1 z"
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#7d7d7d;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
@@ -318,12 +88,10 @@
          id="rect10007-0-74-2-7"
          style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
       <path
-         inkscape:connector-curvature="0"
          id="path4313-5-1"
          d="m 13.005859,1046.3711 -3.3593746,0.031 0.00977,1 3.359375,-0.031 -0.0098,-1 z"
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#4f4f4f;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
       <path
-         inkscape:connector-curvature="0"
          id="path4313-8"
          d="m 12.996094,1042.3633 -3.3593752,0.031 0.00977,1 3.3593746,-0.031 -0.0098,-1 z"
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#616161;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
@@ -364,12 +132,10 @@
          id="rect10007-0-74"
          style="fill:#f5f5f5;fill-opacity:1;stroke:none;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
       <path
-         inkscape:connector-curvature="0"
          id="path4313"
          d="m 10.996094,1041.3613 -3.3593752,0.031 0.00977,1 3.3593746,-0.031 -0.0098,-1 z"
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#616161;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
       <path
-         inkscape:connector-curvature="0"
          id="path4313-5"
          d="m 11.001953,1047.3613 -3.3593749,0.031 0.00977,1 3.3593752,-0.031 -0.0098,-1 z"
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#4f4f4f;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
@@ -389,8 +155,6 @@
          id="rect10007-6-6"
          style="display:inline;fill:url(#linearGradient10790-8-2);fill-opacity:1;stroke:none;stroke-width:3.58380508;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
       <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
          id="path4313-8-8-7-8"
          d="m 11.003629,1043.3647 0,3.01 1.000277,0 0,-3.01 z"
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#787878;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.97351193px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
diff --git a/ui/org.eclipse.pde.ui/icons/obj16/ext_point_obj.svg b/ui/org.eclipse.pde.ui/icons/obj16/ext_point_obj.svg
index 01f127aa4a9..1ff4157461e 100644
--- a/ui/org.eclipse.pde.ui/icons/obj16/ext_point_obj.svg
+++ b/ui/org.eclipse.pde.ui/icons/obj16/ext_point_obj.svg
@@ -2,20 +2,16 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="ext_point_obj.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
@@ -34,113 +30,6 @@
          style="stop-color:#809dcb;stop-opacity:0" />
     </linearGradient>
     <linearGradient
-       id="linearGradient10448-9-7-0-5">
-      <stop
-         style="stop-color:#cf9307;stop-opacity:1"
-         offset="0"
-         id="stop10450-3-5-6-7" />
-      <stop
-         id="stop10456-4-1-5-3"
-         offset="0.5"
-         style="stop-color:#f7d87b;stop-opacity:1" />
-      <stop
-         style="stop-color:#ebb313;stop-opacity:1"
-         offset="1"
-         id="stop10452-22-7-8-4" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10440-1-0-0-3">
-      <stop
-         style="stop-color:#ae7603;stop-opacity:1;"
-         offset="0"
-         id="stop10442-43-2-0-9" />
-      <stop
-         id="stop10521-1-2-5-3"
-         offset="0.5"
-         style="stop-color:#e8d8a3;stop-opacity:1" />
-      <stop
-         style="stop-color:#bb9221;stop-opacity:1"
-         offset="1"
-         id="stop10444-3-4-0-4" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10748-8">
-      <stop
-         id="stop10750-5"
-         offset="0"
-         style="stop-color:#ecac18;stop-opacity:1" />
-      <stop
-         style="stop-color:#f1ce66;stop-opacity:1"
-         offset="0.25"
-         id="stop10752-8" />
-      <stop
-         style="stop-color:#f6e5a6;stop-opacity:1"
-         offset="0.5"
-         id="stop10754-8" />
-      <stop
-         id="stop10756-4"
-         offset="0.75"
-         style="stop-color:#f1cf6c;stop-opacity:1" />
-      <stop
-         id="stop10758-7"
-         offset="1"
-         style="stop-color:#e5b630;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10440-1-3-4">
-      <stop
-         style="stop-color:#ae7603;stop-opacity:1;"
-         offset="0"
-         id="stop10442-43-0-5" />
-      <stop
-         id="stop10521-1-4-7"
-         offset="0.5"
-         style="stop-color:#e8d8a3;stop-opacity:1" />
-      <stop
-         style="stop-color:#bb9221;stop-opacity:1"
-         offset="1"
-         id="stop10444-3-2-0" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10448-90">
-      <stop
-         style="stop-color:#ecac18;stop-opacity:1"
-         offset="0"
-         id="stop10450-0" />
-      <stop
-         id="stop10458-2"
-         offset="0.25"
-         style="stop-color:#ffe38d;stop-opacity:1" />
-      <stop
-         id="stop10456-96"
-         offset="0.5"
-         style="stop-color:#fdf5d2;stop-opacity:1" />
-      <stop
-         style="stop-color:#ffeba7;stop-opacity:1"
-         offset="0.75"
-         id="stop10460-3" />
-      <stop
-         style="stop-color:#e5b630;stop-opacity:1"
-         offset="1"
-         id="stop10452-1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10440-18">
-      <stop
-         style="stop-color:#ae7603;stop-opacity:1;"
-         offset="0"
-         id="stop10442-8" />
-      <stop
-         id="stop10521-7"
-         offset="0.5"
-         style="stop-color:#e8d8a3;stop-opacity:1" />
-      <stop
-         style="stop-color:#bb9221;stop-opacity:1"
-         offset="1"
-         id="stop10444-0" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10414-9"
        id="linearGradient10782-3"
        gradientUnits="userSpaceOnUse"
@@ -165,7 +54,6 @@
          id="stop10418-4" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10432-3"
        id="linearGradient10784-2"
        gradientUnits="userSpaceOnUse"
@@ -190,7 +78,6 @@
          style="stop-color:#567ebc;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10157-6"
        id="linearGradient10786-1"
        gradientUnits="userSpaceOnUse"
@@ -215,22 +102,6 @@
          id="stop10161-55" />
     </linearGradient>
     <linearGradient
-       id="linearGradient10396-5">
-      <stop
-         style="stop-color:#1b3e79;stop-opacity:1;"
-         offset="0"
-         id="stop10398-7" />
-      <stop
-         id="stop10404-9"
-         offset="0.5"
-         style="stop-color:#728fbf;stop-opacity:1" />
-      <stop
-         style="stop-color:#1f4d9a;stop-opacity:1"
-         offset="1"
-         id="stop10400-9" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10157-2-5"
        id="linearGradient10790-8"
        gradientUnits="userSpaceOnUse"
@@ -255,7 +126,6 @@
          id="stop10161-5-0" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10149-39-0"
        id="linearGradient10792-6"
        gradientUnits="userSpaceOnUse"
@@ -265,7 +135,6 @@
        x2="322.875"
        y2="504.44818" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient10149-39-0">
       <stop
          style="stop-color:#1d4d9d;stop-opacity:1"
@@ -277,22 +146,6 @@
          id="stop10153-72-3" />
     </linearGradient>
     <linearGradient
-       id="linearGradient10149-6-5-4">
-      <stop
-         style="stop-color:#1f4d9a;stop-opacity:1"
-         offset="0"
-         id="stop10151-5-7-2" />
-      <stop
-         id="stop10394-3"
-         offset="0.5"
-         style="stop-color:#b9c7df;stop-opacity:1" />
-      <stop
-         style="stop-color:#567ebc;stop-opacity:1"
-         offset="1"
-         id="stop10153-8-1-2" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4284"
        id="linearGradient10790-8-2"
        gradientUnits="userSpaceOnUse"
@@ -302,29 +155,6 @@
        x2="305"
        y2="545.35248" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="32"
-     inkscape:cx="20.60795"
-     inkscape:cy="7.0519948"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="941"
-     inkscape:window-height="855"
-     inkscape:window-x="1268"
-     inkscape:window-y="608"
-     inkscape:window-maximized="0"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid4210" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -338,8 +168,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
diff --git a/ui/org.eclipse.pde.ui/icons/obj16/ext_points_obj.svg b/ui/org.eclipse.pde.ui/icons/obj16/ext_points_obj.svg
index 43cd6f7222a..c64426115ae 100644
--- a/ui/org.eclipse.pde.ui/icons/obj16/ext_points_obj.svg
+++ b/ui/org.eclipse.pde.ui/icons/obj16/ext_points_obj.svg
@@ -2,20 +2,16 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="ext_points_obj.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
@@ -34,113 +30,6 @@
          style="stop-color:#809dcb;stop-opacity:0" />
     </linearGradient>
     <linearGradient
-       id="linearGradient10448-9-7-0-5">
-      <stop
-         style="stop-color:#cf9307;stop-opacity:1"
-         offset="0"
-         id="stop10450-3-5-6-7" />
-      <stop
-         id="stop10456-4-1-5-3"
-         offset="0.5"
-         style="stop-color:#f7d87b;stop-opacity:1" />
-      <stop
-         style="stop-color:#ebb313;stop-opacity:1"
-         offset="1"
-         id="stop10452-22-7-8-4" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10440-1-0-0-3">
-      <stop
-         style="stop-color:#ae7603;stop-opacity:1;"
-         offset="0"
-         id="stop10442-43-2-0-9" />
-      <stop
-         id="stop10521-1-2-5-3"
-         offset="0.5"
-         style="stop-color:#e8d8a3;stop-opacity:1" />
-      <stop
-         style="stop-color:#bb9221;stop-opacity:1"
-         offset="1"
-         id="stop10444-3-4-0-4" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10748-8">
-      <stop
-         id="stop10750-5"
-         offset="0"
-         style="stop-color:#ecac18;stop-opacity:1" />
-      <stop
-         style="stop-color:#f1ce66;stop-opacity:1"
-         offset="0.25"
-         id="stop10752-8" />
-      <stop
-         style="stop-color:#f6e5a6;stop-opacity:1"
-         offset="0.5"
-         id="stop10754-8" />
-      <stop
-         id="stop10756-4"
-         offset="0.75"
-         style="stop-color:#f1cf6c;stop-opacity:1" />
-      <stop
-         id="stop10758-7"
-         offset="1"
-         style="stop-color:#e5b630;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10440-1-3-4">
-      <stop
-         style="stop-color:#ae7603;stop-opacity:1;"
-         offset="0"
-         id="stop10442-43-0-5" />
-      <stop
-         id="stop10521-1-4-7"
-         offset="0.5"
-         style="stop-color:#e8d8a3;stop-opacity:1" />
-      <stop
-         style="stop-color:#bb9221;stop-opacity:1"
-         offset="1"
-         id="stop10444-3-2-0" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10448-90">
-      <stop
-         style="stop-color:#ecac18;stop-opacity:1"
-         offset="0"
-         id="stop10450-0" />
-      <stop
-         id="stop10458-2"
-         offset="0.25"
-         style="stop-color:#ffe38d;stop-opacity:1" />
-      <stop
-         id="stop10456-96"
-         offset="0.5"
-         style="stop-color:#fdf5d2;stop-opacity:1" />
-      <stop
-         style="stop-color:#ffeba7;stop-opacity:1"
-         offset="0.75"
-         id="stop10460-3" />
-      <stop
-         style="stop-color:#e5b630;stop-opacity:1"
-         offset="1"
-         id="stop10452-1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10440-18">
-      <stop
-         style="stop-color:#ae7603;stop-opacity:1;"
-         offset="0"
-         id="stop10442-8" />
-      <stop
-         id="stop10521-7"
-         offset="0.5"
-         style="stop-color:#e8d8a3;stop-opacity:1" />
-      <stop
-         style="stop-color:#bb9221;stop-opacity:1"
-         offset="1"
-         id="stop10444-0" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10414-9"
        id="linearGradient10782-3"
        gradientUnits="userSpaceOnUse"
@@ -165,7 +54,6 @@
          id="stop10418-4" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10432-3"
        id="linearGradient10784-2"
        gradientUnits="userSpaceOnUse"
@@ -190,7 +78,6 @@
          style="stop-color:#567ebc;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10157-6"
        id="linearGradient10786-1"
        gradientUnits="userSpaceOnUse"
@@ -215,22 +102,6 @@
          id="stop10161-55" />
     </linearGradient>
     <linearGradient
-       id="linearGradient10396-5">
-      <stop
-         style="stop-color:#1b3e79;stop-opacity:1;"
-         offset="0"
-         id="stop10398-7" />
-      <stop
-         id="stop10404-9"
-         offset="0.5"
-         style="stop-color:#728fbf;stop-opacity:1" />
-      <stop
-         style="stop-color:#1f4d9a;stop-opacity:1"
-         offset="1"
-         id="stop10400-9" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10157-2-5"
        id="linearGradient10790-8"
        gradientUnits="userSpaceOnUse"
@@ -255,7 +126,6 @@
          id="stop10161-5-0" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10149-39-0"
        id="linearGradient10792-6"
        gradientUnits="userSpaceOnUse"
@@ -265,7 +135,6 @@
        x2="322.875"
        y2="504.44818" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient10149-39-0">
       <stop
          style="stop-color:#1d4d9d;stop-opacity:1"
@@ -277,22 +146,6 @@
          id="stop10153-72-3" />
     </linearGradient>
     <linearGradient
-       id="linearGradient10149-6-5-4">
-      <stop
-         style="stop-color:#1f4d9a;stop-opacity:1"
-         offset="0"
-         id="stop10151-5-7-2" />
-      <stop
-         id="stop10394-3"
-         offset="0.5"
-         style="stop-color:#b9c7df;stop-opacity:1" />
-      <stop
-         style="stop-color:#567ebc;stop-opacity:1"
-         offset="1"
-         id="stop10153-8-1-2" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4284"
        id="linearGradient10790-8-2"
        gradientUnits="userSpaceOnUse"
@@ -302,7 +155,6 @@
        x2="305"
        y2="545.35248" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10414-9"
        id="linearGradient4353"
        gradientUnits="userSpaceOnUse"
@@ -312,7 +164,6 @@
        x2="298.34253"
        y2="519.08923" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10432-3"
        id="linearGradient4355"
        gradientUnits="userSpaceOnUse"
@@ -322,7 +173,6 @@
        x2="289.8125"
        y2="519.36218" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10157-6"
        id="linearGradient4357"
        gradientUnits="userSpaceOnUse"
@@ -332,7 +182,6 @@
        x2="306.05069"
        y2="514.75818" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10157-2-5"
        id="linearGradient4359"
        gradientUnits="userSpaceOnUse"
@@ -342,7 +191,6 @@
        x2="305"
        y2="542.73901" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10149-39-0"
        id="linearGradient4361"
        gradientUnits="userSpaceOnUse"
@@ -352,7 +200,6 @@
        x2="322.875"
        y2="504.44818" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4284"
        id="linearGradient4363"
        gradientUnits="userSpaceOnUse"
@@ -362,29 +209,6 @@
        x2="305"
        y2="545.35248" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="32.000001"
-     inkscape:cx="12.50382"
-     inkscape:cy="9.4155735"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="917"
-     inkscape:window-height="656"
-     inkscape:window-x="1346"
-     inkscape:window-y="605"
-     inkscape:window-maximized="0"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid4210" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -398,8 +222,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
diff --git a/ui/org.eclipse.pde.ui/icons/obj16/extension_obj.svg b/ui/org.eclipse.pde.ui/icons/obj16/extension_obj.svg
index 410d8e62973..80562add19b 100644
--- a/ui/org.eclipse.pde.ui/icons/obj16/extension_obj.svg
+++ b/ui/org.eclipse.pde.ui/icons/obj16/extension_obj.svg
@@ -2,20 +2,16 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="extension_obj.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
@@ -80,7 +76,6 @@
          id="stop10452-1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10448-9-7-0-5"
        id="linearGradient10770-6"
        gradientUnits="userSpaceOnUse"
@@ -90,7 +85,6 @@
        x2="323.98331"
        y2="518.28192" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10748-8"
        id="linearGradient10774-5"
        gradientUnits="userSpaceOnUse"
@@ -100,7 +94,6 @@
        x2="324.1601"
        y2="515.53949" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10448-90"
        id="linearGradient10778-6"
        gradientUnits="userSpaceOnUse"
@@ -110,31 +103,6 @@
        y2="511.66458"
        gradientTransform="matrix(0.30039597,0,0,0.29632024,-93.823234,870.37106)" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="5.656854"
-     inkscape:cx="4.0882847"
-     inkscape:cy="10.907925"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1006"
-     inkscape:window-height="814"
-     inkscape:window-x="1420"
-     inkscape:window-y="641"
-     inkscape:window-maximized="0"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3999" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -148,8 +116,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
@@ -162,18 +128,14 @@
          style="display:inline"
          id="g4386">
         <path
-           sodipodi:nodetypes="ccccc"
            style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#9e7400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
            d="m 2.3385061,1041.3342 -3.4062511,0.031 0.0098,1 3.4062501,-0.031 z"
-           id="path4313-5-1-8-6"
-           inkscape:connector-curvature="0" />
+           id="path4313-5-1-8-6" />
       </g>
       <path
-         inkscape:connector-curvature="0"
          id="path4313-5-1-8-6-0"
          d="m 20.608712,1042.3225 3.421876,0.031 -0.0098,1 -3.421875,-0.031 z"
-         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#9e7400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-         sodipodi:nodetypes="ccccc" />
+         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#9e7400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
       <g
          style="display:inline"
          id="g4239"
@@ -188,23 +150,17 @@
            id="rect10007-0-74-2-7-6"
            style="display:inline;fill:url(#linearGradient10770-6);fill-opacity:1;stroke:none;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
         <path
-           inkscape:connector-curvature="0"
            id="path4313-8-8"
            d="m 5.9540546,1024.1006 0,1 8.2734374,0 0,-1 z"
-           style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-           sodipodi:nodetypes="ccccc" />
+           style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
         <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
            id="path4313-8-8-7"
            d="m 6.2874256,1024.0948 0,3.0195 1.01551,0 0,-3.0195 z"
            style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.94926554px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
         <path
-           inkscape:connector-curvature="0"
            id="path4313-5-1-8"
            d="m 14.275248,1026.0967 -8.0937514,0.031 0.0098,1 8.0937504,-0.031 z"
-           style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#9e7400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-           sodipodi:nodetypes="ccccc" />
+           style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#9e7400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
         <rect
            ry="0"
            rx="0"
@@ -215,12 +171,10 @@
            id="rect10007-0-74-2-7"
            style="display:inline;fill:url(#linearGradient10774-5);fill-opacity:1;stroke:none;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
         <path
-           inkscape:connector-curvature="0"
            id="path4313-5-1"
            d="m 6.3114756,1027.1065 -3.3593746,0.031 0.00977,1 3.3593746,-0.031 -0.0098,-1 z"
            style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#9e7400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
         <path
-           inkscape:connector-curvature="0"
            id="path4313-8"
            d="m 6.3017106,1023.0987 -3.3593752,0.031 0.00977,1 3.3593742,-0.031 -0.0098,-1 z"
            style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
@@ -234,26 +188,18 @@
            id="rect10007-0-74-2"
            style="display:inline;fill:url(#linearGradient10778-6);fill-opacity:1;stroke:none;stroke-width:1.50161433;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
         <path
-           inkscape:connector-curvature="0"
            id="path4313"
            d="m 4.3017106,1022.0967 -2.0335499,0.031 0.00977,1 2.0335489,-0.031 -0.0098,-1 z"
-           style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-           sodipodi:nodetypes="cccccc" />
+           style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
         <path
-           inkscape:connector-curvature="0"
            id="path4313-5"
            d="m 4.3075696,1028.0967 -1.9999998,0.031 0.00977,1 1.9999998,-0.031 -0.0098,-1 z"
-           style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#9e7400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-           sodipodi:nodetypes="cccccc" />
+           style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#9e7400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
         <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
            id="path4313-8-8-7-8"
            d="m 4.3092456,1024.1001 0,3.01 1.000277,0 0,-3.01 z"
            style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:0.64640886;fill-rule:evenodd;stroke:none;stroke-width:0.97351193px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
         <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
            id="path4313-8-8-7-8-8"
            d="m 1.3092454,1023.0922 0,5.0101 1.000277,0 0,-5.0101 z"
            style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.97351193px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
diff --git a/ui/org.eclipse.pde.ui/icons/obj16/extensions_obj.svg b/ui/org.eclipse.pde.ui/icons/obj16/extensions_obj.svg
index 8a3283cc3e2..2b2d332f2dd 100644
--- a/ui/org.eclipse.pde.ui/icons/obj16/extensions_obj.svg
+++ b/ui/org.eclipse.pde.ui/icons/obj16/extensions_obj.svg
@@ -2,20 +2,16 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="extensions_obj.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
@@ -80,7 +76,6 @@
          id="stop10452-1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10448-9-7-0-5"
        id="linearGradient10770-6"
        gradientUnits="userSpaceOnUse"
@@ -90,7 +85,6 @@
        x2="323.98331"
        y2="518.28192" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10748-8"
        id="linearGradient10774-5"
        gradientUnits="userSpaceOnUse"
@@ -100,7 +94,6 @@
        x2="324.1601"
        y2="515.53949" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10448-90"
        id="linearGradient10778-6"
        gradientUnits="userSpaceOnUse"
@@ -110,7 +103,6 @@
        y2="511.66458"
        gradientTransform="matrix(0.30039597,0,0,0.29632024,-93.823234,870.37106)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10448-9-7-0-5"
        id="linearGradient4291"
        gradientUnits="userSpaceOnUse"
@@ -120,7 +112,6 @@
        x2="323.98331"
        y2="518.28192" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10748-8"
        id="linearGradient4293"
        gradientUnits="userSpaceOnUse"
@@ -130,7 +121,6 @@
        x2="324.1601"
        y2="515.53949" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10448-90"
        id="linearGradient4295"
        gradientUnits="userSpaceOnUse"
@@ -140,31 +130,6 @@
        x2="324.1601"
        y2="511.66458" />
   </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="13.031454"
-     inkscape:cy="12.308121"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1006"
-     inkscape:window-height="814"
-     inkscape:window-x="1420"
-     inkscape:window-y="641"
-     inkscape:window-maximized="0"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3999" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -178,8 +143,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
@@ -192,18 +155,14 @@
          style="display:inline"
          id="g4386">
         <path
-           sodipodi:nodetypes="ccccc"
            style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#9e7400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
            d="m 2.3385061,1041.3342 -3.4062511,0.031 0.0098,1 3.4062501,-0.031 z"
-           id="path4313-5-1-8-6"
-           inkscape:connector-curvature="0" />
+           id="path4313-5-1-8-6" />
       </g>
       <path
-         inkscape:connector-curvature="0"
          id="path4313-5-1-8-6-0"
          d="m 20.608712,1042.3225 3.421876,0.031 -0.0098,1 -3.421875,-0.031 z"
-         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#9e7400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-         sodipodi:nodetypes="ccccc" />
+         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#9e7400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
       <g
          style="display:inline"
          id="g4239"
@@ -218,23 +177,17 @@
            id="rect10007-0-74-2-7-6"
            style="display:inline;fill:url(#linearGradient10770-6);fill-opacity:1;stroke:none;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
         <path
-           inkscape:connector-curvature="0"
            id="path4313-8-8"
            d="m 5.9540546,1024.1006 0,1 5.4296874,0 0,-1 z"
-           style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-           sodipodi:nodetypes="ccccc" />
+           style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
         <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
            id="path4313-8-8-7"
            d="m 6.2874256,1024.0948 0,3.0195 1.01551,0 0,-3.0195 z"
            style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.94926554px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
         <path
-           inkscape:connector-curvature="0"
            id="path4313-5-1-8"
            d="m 11.337748,1026.0967 -5.1562514,0.031 0.0098,1 5.1562504,-0.031 z"
-           style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#9e7400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-           sodipodi:nodetypes="ccccc" />
+           style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#9e7400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
         <rect
            ry="0"
            rx="0"
@@ -245,12 +198,10 @@
            id="rect10007-0-74-2-7"
            style="display:inline;fill:url(#linearGradient10774-5);fill-opacity:1;stroke:none;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
         <path
-           inkscape:connector-curvature="0"
            id="path4313-5-1"
            d="m 6.3114756,1027.1065 -3.3593746,0.031 0.00977,1 3.3593746,-0.031 -0.0098,-1 z"
            style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#9e7400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
         <path
-           inkscape:connector-curvature="0"
            id="path4313-8"
            d="m 6.3017106,1023.0987 -3.3593752,0.031 0.00977,1 3.3593742,-0.031 -0.0098,-1 z"
            style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
@@ -264,26 +215,18 @@
            id="rect10007-0-74-2"
            style="display:inline;fill:url(#linearGradient10778-6);fill-opacity:1;stroke:none;stroke-width:1.50161433;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
         <path
-           inkscape:connector-curvature="0"
            id="path4313"
            d="m 4.3017106,1022.0967 -2.0335499,0.031 0.00977,1 2.0335489,-0.031 -0.0098,-1 z"
-           style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-           sodipodi:nodetypes="cccccc" />
+           style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
         <path
-           inkscape:connector-curvature="0"
            id="path4313-5"
            d="m 4.3075696,1028.0967 -1.9999998,0.031 0.00977,1 1.9999998,-0.031 -0.0098,-1 z"
-           style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#9e7400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-           sodipodi:nodetypes="cccccc" />
+           style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#9e7400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
         <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
            id="path4313-8-8-7-8"
            d="m 4.3092456,1024.1001 0,3.01 1.000277,0 0,-3.01 z"
            style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:0.64640886;fill-rule:evenodd;stroke:none;stroke-width:0.97351193px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
         <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
            id="path4313-8-8-7-8-8"
            d="m 1.3092454,1023.0922 0,5.0101 1.000277,0 0,-5.0101 z"
            style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.97351193px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
@@ -298,18 +241,14 @@
          style="display:inline"
          id="g4386-4">
         <path
-           sodipodi:nodetypes="ccccc"
            style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#9e7400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
            d="m 2.3385061,1041.3342 -3.4062511,0.031 0.0098,1 3.4062501,-0.031 z"
-           id="path4313-5-1-8-6-5"
-           inkscape:connector-curvature="0" />
+           id="path4313-5-1-8-6-5" />
       </g>
       <path
-         inkscape:connector-curvature="0"
          id="path4313-5-1-8-6-0-6"
          d="m 20.608712,1042.3225 3.421876,0.031 -0.0098,1 -3.421875,-0.031 z"
-         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#9e7400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-         sodipodi:nodetypes="ccccc" />
+         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#9e7400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
       <g
          style="display:inline"
          id="g4239-3"
@@ -324,23 +263,17 @@
            id="rect10007-0-74-2-7-6-9"
            style="display:inline;fill:url(#linearGradient4291);fill-opacity:1;stroke:none;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
         <path
-           inkscape:connector-curvature="0"
            id="path4313-8-8-3"
            d="m 5.9540546,1024.1006 0,1 5.4296874,0 0,-1 z"
-           style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-           sodipodi:nodetypes="ccccc" />
+           style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
         <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
            id="path4313-8-8-7-3"
            d="m 6.2874256,1024.0948 0,3.0195 1.01551,0 0,-3.0195 z"
            style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.94926554px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
         <path
-           inkscape:connector-curvature="0"
            id="path4313-5-1-8-8"
            d="m 11.337748,1026.0967 -5.1562514,0.031 0.0098,1 5.1562504,-0.031 z"
-           style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#9e7400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-           sodipodi:nodetypes="ccccc" />
+           style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#9e7400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
         <rect
            ry="0"
            rx="0"
@@ -351,12 +284,10 @@
            id="rect10007-0-74-2-7-1"
            style="display:inline;fill:url(#linearGradient4293);fill-opacity:1;stroke:none;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
         <path
-           inkscape:connector-curvature="0"
            id="path4313-5-1-0"
            d="m 6.3114756,1027.1065 -3.3593746,0.031 0.00977,1 3.3593746,-0.031 -0.0098,-1 z"
            style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#9e7400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
         <path
-           inkscape:connector-curvature="0"
            id="path4313-8-5"
            d="m 6.3017106,1023.0987 -3.3593752,0.031 0.00977,1 3.3593742,-0.031 -0.0098,-1 z"
            style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
@@ -370,26 +301,18 @@
            id="rect10007-0-74-2-1"
            style="display:inline;fill:url(#linearGradient4295);fill-opacity:1;stroke:none;stroke-width:1.50161433;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
         <path
-           inkscape:connector-curvature="0"
            id="path4313-2"
            d="m 4.3017106,1022.0967 -2.0335499,0.031 0.00977,1 2.0335489,-0.031 -0.0098,-1 z"
-           style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-           sodipodi:nodetypes="cccccc" />
+           style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
         <path
-           inkscape:connector-curvature="0"
            id="path4313-5-0"
            d="m 4.3075696,1028.0967 -1.9999998,0.031 0.00977,1 1.9999998,-0.031 -0.0098,-1 z"
-           style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#9e7400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-           sodipodi:nodetypes="cccccc" />
+           style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#9e7400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
         <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
            id="path4313-8-8-7-8-5"
            d="m 4.3092456,1024.1001 0,3.01 1.000277,0 0,-3.01 z"
            style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:0.64640886;fill-rule:evenodd;stroke:none;stroke-width:0.97351193px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
         <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
            id="path4313-8-8-7-8-8-0"
            d="m 1.3092454,1023.0922 0,5.0101 1.000277,0 0,-5.0101 z"
            style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.97351193px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
diff --git a/ui/org.eclipse.pde.ui/icons/obj16/external_frgmt_obj.svg b/ui/org.eclipse.pde.ui/icons/obj16/external_frgmt_obj.svg
index 9c87be1e6a0..65a9e9e1106 100644
--- a/ui/org.eclipse.pde.ui/icons/obj16/external_frgmt_obj.svg
+++ b/ui/org.eclipse.pde.ui/icons/obj16/external_frgmt_obj.svg
@@ -2,256 +2,17 @@
 <!-- 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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="external_frgmt_obj.svg">
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient4284">
-      <stop
-         id="stop4286"
-         offset="0"
-         style="stop-color:#6588c1;stop-opacity:0" />
-      <stop
-         style="stop-color:#becce3;stop-opacity:1"
-         offset="0.49999967"
-         id="stop4288" />
-      <stop
-         id="stop4290"
-         offset="1"
-         style="stop-color:#809dcb;stop-opacity:0" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10448-9-7-0-5">
-      <stop
-         style="stop-color:#cf9307;stop-opacity:1"
-         offset="0"
-         id="stop10450-3-5-6-7" />
-      <stop
-         id="stop10456-4-1-5-3"
-         offset="0.5"
-         style="stop-color:#f7d87b;stop-opacity:1" />
-      <stop
-         style="stop-color:#ebb313;stop-opacity:1"
-         offset="1"
-         id="stop10452-22-7-8-4" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10440-1-0-0-3">
-      <stop
-         style="stop-color:#ae7603;stop-opacity:1;"
-         offset="0"
-         id="stop10442-43-2-0-9" />
-      <stop
-         id="stop10521-1-2-5-3"
-         offset="0.5"
-         style="stop-color:#e8d8a3;stop-opacity:1" />
-      <stop
-         style="stop-color:#bb9221;stop-opacity:1"
-         offset="1"
-         id="stop10444-3-4-0-4" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10748-8">
-      <stop
-         id="stop10750-5"
-         offset="0"
-         style="stop-color:#ecac18;stop-opacity:1" />
-      <stop
-         style="stop-color:#f1ce66;stop-opacity:1"
-         offset="0.25"
-         id="stop10752-8" />
-      <stop
-         style="stop-color:#f6e5a6;stop-opacity:1"
-         offset="0.5"
-         id="stop10754-8" />
-      <stop
-         id="stop10756-4"
-         offset="0.75"
-         style="stop-color:#f1cf6c;stop-opacity:1" />
-      <stop
-         id="stop10758-7"
-         offset="1"
-         style="stop-color:#e5b630;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10440-1-3-4">
-      <stop
-         style="stop-color:#ae7603;stop-opacity:1;"
-         offset="0"
-         id="stop10442-43-0-5" />
-      <stop
-         id="stop10521-1-4-7"
-         offset="0.5"
-         style="stop-color:#e8d8a3;stop-opacity:1" />
-      <stop
-         style="stop-color:#bb9221;stop-opacity:1"
-         offset="1"
-         id="stop10444-3-2-0" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10448-90">
-      <stop
-         style="stop-color:#ecac18;stop-opacity:1"
-         offset="0"
-         id="stop10450-0" />
-      <stop
-         id="stop10458-2"
-         offset="0.25"
-         style="stop-color:#ffe38d;stop-opacity:1" />
-      <stop
-         id="stop10456-96"
-         offset="0.5"
-         style="stop-color:#fdf5d2;stop-opacity:1" />
-      <stop
-         style="stop-color:#ffeba7;stop-opacity:1"
-         offset="0.75"
-         id="stop10460-3" />
-      <stop
-         style="stop-color:#e5b630;stop-opacity:1"
-         offset="1"
-         id="stop10452-1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10440-18">
-      <stop
-         style="stop-color:#ae7603;stop-opacity:1;"
-         offset="0"
-         id="stop10442-8" />
-      <stop
-         id="stop10521-7"
-         offset="0.5"
-         style="stop-color:#e8d8a3;stop-opacity:1" />
-      <stop
-         style="stop-color:#bb9221;stop-opacity:1"
-         offset="1"
-         id="stop10444-0" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10414-9">
-      <stop
-         style="stop-color:#5078b9;stop-opacity:1;"
-         offset="0"
-         id="stop10416-3" />
-      <stop
-         id="stop10422-8"
-         offset="0.5"
-         style="stop-color:#6d8cbd;stop-opacity:1" />
-      <stop
-         style="stop-color:#5f88c9;stop-opacity:1"
-         offset="1"
-         id="stop10418-4" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10432-3">
-      <stop
-         id="stop10434-4"
-         offset="0"
-         style="stop-color:#1f4d9a;stop-opacity:1" />
-      <stop
-         style="stop-color:#4e6da1;stop-opacity:1"
-         offset="0.5"
-         id="stop10436-2" />
-      <stop
-         id="stop10438-9"
-         offset="1"
-         style="stop-color:#567ebc;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10157-6">
-      <stop
-         style="stop-color:#6588c1;stop-opacity:1"
-         offset="0"
-         id="stop10159-5" />
-      <stop
-         id="stop10165-9"
-         offset="0.5"
-         style="stop-color:#becce3;stop-opacity:1" />
-      <stop
-         style="stop-color:#809dcb;stop-opacity:1"
-         offset="1"
-         id="stop10161-55" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10396-5">
-      <stop
-         style="stop-color:#1b3e79;stop-opacity:1;"
-         offset="0"
-         id="stop10398-7" />
-      <stop
-         id="stop10404-9"
-         offset="0.5"
-         style="stop-color:#728fbf;stop-opacity:1" />
-      <stop
-         style="stop-color:#1f4d9a;stop-opacity:1"
-         offset="1"
-         id="stop10400-9" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10157-2-5">
-      <stop
-         style="stop-color:#6588c1;stop-opacity:1"
-         offset="0"
-         id="stop10159-8-3" />
-      <stop
-         id="stop10165-3-9"
-         offset="0.5"
-         style="stop-color:#becce3;stop-opacity:1" />
-      <stop
-         style="stop-color:#809dcb;stop-opacity:1"
-         offset="1"
-         id="stop10161-5-0" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10149-6-5-4">
-      <stop
-         style="stop-color:#1f4d9a;stop-opacity:1"
-         offset="0"
-         id="stop10151-5-7-2" />
-      <stop
-         id="stop10394-3"
-         offset="0.5"
-         style="stop-color:#b9c7df;stop-opacity:1" />
-      <stop
-         style="stop-color:#567ebc;stop-opacity:1"
-         offset="1"
-         id="stop10153-8-1-2" />
-    </linearGradient>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="16"
-     inkscape:cx="7.4446331"
-     inkscape:cy="-0.67168056"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="929"
-     inkscape:window-height="668"
-     inkscape:window-x="1408"
-     inkscape:window-y="647"
-     inkscape:window-maximized="0"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid4210" />
-  </sodipodi:namedview>
+     id="defs4" />
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -265,8 +26,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
@@ -282,19 +41,15 @@
     <path
        style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#7d7d7d;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
        d="m 12.648438,1043.3652 0,1 3.351562,0 0,-1 -3.351562,0 z"
-       id="path4313-8-8"
-       inkscape:connector-curvature="0" />
+       id="path4313-8-8" />
     <path
        style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#616161;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.94926554px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
        d="m 12.981809,1043.3594 0,3.0195 1.01551,0 0,-3.0195 z"
-       id="path4313-8-8-7"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+       id="path4313-8-8-7" />
     <path
        style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#7d7d7d;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
        d="m 15.992188,1045.3613 -3.359376,0.031 0.0098,1 3.359375,-0.031 -0.0098,-1 z"
-       id="path4313-5-1-8"
-       inkscape:connector-curvature="0" />
+       id="path4313-5-1-8" />
     <rect
        style="fill:#eeeeee;fill-opacity:1;stroke:none;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        id="rect10007-0-74-2-7"
@@ -307,13 +62,11 @@
     <path
        style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#4f4f4f;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
        d="m 13.005859,1046.3711 -3.3593746,0.031 0.00977,1 3.359375,-0.031 -0.0098,-1 z"
-       id="path4313-5-1"
-       inkscape:connector-curvature="0" />
+       id="path4313-5-1" />
     <path
        style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#616161;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
        d="m 12.996094,1042.3633 -3.3593752,0.031 0.00977,1 3.3593746,-0.031 -0.0098,-1 z"
-       id="path4313-8"
-       inkscape:connector-curvature="0" />
+       id="path4313-8" />
     <rect
        style="fill:#f5f5f5;fill-opacity:1;stroke:none;stroke-width:1.50161433;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        id="rect10007-0-74-2"
@@ -353,14 +106,11 @@
     <path
        style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#4f4f4f;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
        d="m 11.001953,1047.3613 -3.3593749,0.031 0.00977,1 3.3593752,-0.031 -0.0098,-1 z"
-       id="path4313-5"
-       inkscape:connector-curvature="0" />
+       id="path4313-5" />
     <path
        style="fill:#f8f8f8;fill-opacity:1;stroke:#525252;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        d="m 8.4996643,1041.3606 0,7.0018 c 0,0.8271 -0.6658339,1.4929 -1.4929011,1.4929 -0.8270672,0 -1.4929011,-0.6658 -1.4929011,-1.4929 l 0,-6.0296"
-       id="rect10007-6"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="csssc" />
+       id="rect10007-6" />
     <rect
        style="display:inline;fill:#f2f2f2;fill-opacity:1;stroke:none;stroke-width:3.58380508;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        id="rect10007-6-6"
@@ -371,8 +121,6 @@
     <path
        style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#787878;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.97351193px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
        d="m 11.003629,1043.3647 0,3.01 1.000277,0 0,-3.01 z"
-       id="path4313-8-8-7-8"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+       id="path4313-8-8-7-8" />
   </g>
 </svg>
diff --git a/ui/org.eclipse.pde.ui/icons/obj16/feature_obj.svg b/ui/org.eclipse.pde.ui/icons/obj16/feature_obj.svg
index 64f218880c8..8da40287ade 100644
--- a/ui/org.eclipse.pde.ui/icons/obj16/feature_obj.svg
+++ b/ui/org.eclipse.pde.ui/icons/obj16/feature_obj.svg
@@ -2,25 +2,20 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="feature_obj.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient3973"
-       inkscape:collect="always">
+       id="linearGradient3973">
       <stop
          id="stop3975"
          offset="0"
@@ -31,8 +26,7 @@
          style="stop-color:#f8f0c8;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       id="linearGradient3967"
-       inkscape:collect="always">
+       id="linearGradient3967">
       <stop
          id="stop3969"
          offset="0"
@@ -66,7 +60,6 @@
          style="stop-color:#ba772f;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3949">
       <stop
          style="stop-color:#9e6627;stop-opacity:1"
@@ -78,7 +71,6 @@
          id="stop3953" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient3967"
        id="linearGradient3939"
        gradientUnits="userSpaceOnUse"
@@ -88,7 +80,6 @@
        x2="531.09253"
        y2="371.17883" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient3955"
        id="linearGradient3945"
        gradientUnits="userSpaceOnUse"
@@ -97,18 +88,7 @@
        x2="543.91406"
        y2="373.2294"
        gradientTransform="translate(-60.558598,1.4188)" />
-    <mask
-       maskUnits="userSpaceOnUse"
-       id="mask4917">
-      <path
-         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;display:inline"
-         d="m 462.77563,373.22885 29.11636,0 c 1.45425,0 2.625,1.17075 2.625,2.625 l 0,18.76896 c 0,1.45425 -1.17412,2.52598 -2.625,2.625 l -29.11636,1.98708 c -1.45088,0.099 -2.625,-1.17075 -2.625,-2.625 l 0,-20.75604 c 0,-1.45425 1.17075,-2.625 2.625,-2.625 z"
-         id="path4919"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="sssssssss" />
-    </mask>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient3973"
        id="linearGradient4933"
        gradientUnits="userSpaceOnUse"
@@ -118,7 +98,6 @@
        x2="538.00562"
        y2="374.21222" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient3949"
        id="linearGradient4935"
        gradientUnits="userSpaceOnUse"
@@ -128,7 +107,6 @@
        x2="548.45923"
        y2="373.77069" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4284"
        id="linearGradient10790-8-2"
        gradientUnits="userSpaceOnUse"
@@ -153,7 +131,6 @@
          style="stop-color:#809dcb;stop-opacity:0" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10157-2-5"
        id="linearGradient10790-8"
        gradientUnits="userSpaceOnUse"
@@ -178,7 +155,6 @@
          id="stop10161-5-0" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10149-39-0"
        id="linearGradient10792-6"
        gradientUnits="userSpaceOnUse"
@@ -188,7 +164,6 @@
        x2="322.875"
        y2="504.44818" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient10149-39-0">
       <stop
          style="stop-color:#1d4d9d;stop-opacity:1"
@@ -200,7 +175,6 @@
          id="stop10153-72-3" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10157-2-5"
        id="linearGradient10786-1"
        gradientUnits="userSpaceOnUse"
@@ -210,7 +184,6 @@
        y2="514.75818"
        gradientTransform="matrix(1.0391435,0,0,0.59796602,202.46608,47.009545)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10414-9"
        id="linearGradient10782-3"
        gradientUnits="userSpaceOnUse"
@@ -235,7 +208,6 @@
          id="stop10418-4" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10432-3"
        id="linearGradient10784-2"
        gradientUnits="userSpaceOnUse"
@@ -260,7 +232,6 @@
          style="stop-color:#567ebc;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10448-90"
        id="linearGradient10778-6"
        gradientUnits="userSpaceOnUse"
@@ -293,7 +264,6 @@
          id="stop10452-1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10748-8"
        id="linearGradient10774-5"
        gradientUnits="userSpaceOnUse"
@@ -326,7 +296,6 @@
          style="stop-color:#e5b630;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10448-9-7-0-5"
        id="linearGradient10770-6"
        gradientUnits="userSpaceOnUse"
@@ -351,29 +320,6 @@
          id="stop10452-22-7-8-4" />
     </linearGradient>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="16.000001"
-     inkscape:cx="8.3558937"
-     inkscape:cy="3.2291786"
-     inkscape:document-units="px"
-     inkscape:current-layer="g4301"
-     showgrid="true"
-     inkscape:window-width="1324"
-     inkscape:window-height="686"
-     inkscape:window-x="1214"
-     inkscape:window-y="797"
-     inkscape:window-maximized="0"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3947" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -387,8 +333,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
@@ -411,14 +355,11 @@
         <path
            style="fill:url(#linearGradient4933);fill-opacity:1;stroke:url(#linearGradient4935);stroke-width:3.02792978;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
            d="m 463.24874,374.64819 28.07551,0 c 1.45425,0 2.625,1.17075 2.625,2.625 l 0,11.29376 c 0,1.45425 -1.22088,2.24642 -2.625,2.625 l -28.07551,7.56983 c -1.40411,0.37858 -2.625,-1.17075 -2.625,-2.625 l 0,-18.86359 c 0,-1.45425 1.17075,-2.625 2.625,-2.625 z"
-           id="rect13693"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="sssssssss" />
+           id="rect13693" />
         <path
            style="fill:none;stroke:url(#linearGradient3945);stroke-width:3.02792978;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
            d="m 462.26171,374.64819 20.09375,0"
-           id="path13797"
-           inkscape:connector-curvature="0" />
+           id="path13797" />
       </g>
       <g
          id="g4301"
@@ -433,18 +374,14 @@
            id="rect10007-0-74-2-7-6"
            style="display:inline;fill:url(#linearGradient10770-6);fill-opacity:1;stroke:none;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
         <path
-           inkscape:connector-curvature="0"
            id="path4313-8-8"
            d="m 548.23888,354.95116 0,3.5838 12.01134,0 0,-3.5838 -12.01134,0 z"
            style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
         <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
            id="path4313-8-8-7"
            d="m 549.43361,354.93037 0,10.8213 3.63939,0 0,-10.8213 z"
            style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.94926554px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
         <path
-           inkscape:connector-curvature="0"
            id="path4313-5-1-8"
            d="m 560.22222,362.10479 -12.03934,0.1111 0.0351,3.58381 12.03934,-0.1111 -0.0351,-3.58381 z"
            style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#9e7400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
@@ -458,12 +395,10 @@
            id="rect10007-0-74-2-7"
            style="display:inline;fill:url(#linearGradient10774-5);fill-opacity:1;stroke:none;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
         <path
-           inkscape:connector-curvature="0"
            id="path4313-5-1"
            d="m 549.5198,365.72372 -12.03934,0.1111 0.035,3.5838 12.03935,-0.1111 -0.0351,-3.5838 z"
            style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#9e7400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
         <path
-           inkscape:connector-curvature="0"
            id="path4313-8"
            d="m 549.48481,351.36054 -12.03935,0.1111 0.035,3.58381 12.03935,-0.1111 -0.0351,-3.58381 z"
            style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
@@ -504,12 +439,10 @@
            id="rect10007-0-74"
            style="display:inline;fill:url(#linearGradient10786-1);fill-opacity:1;stroke:none;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
         <path
-           inkscape:connector-curvature="0"
            id="path4313"
            d="m 542.3172,347.76957 -12.03935,0.1111 0.035,3.5838 12.03935,-0.11109 -0.0351,-3.58381 z"
            style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
         <path
-           inkscape:connector-curvature="0"
            id="path4313-5"
            d="m 542.33819,369.2724 -12.03934,0.1111 0.035,3.58381 12.03935,-0.1111 -0.0351,-3.58381 z"
            style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#9e7400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
@@ -529,8 +462,6 @@
            id="rect10007-6-6"
            style="display:inline;fill:url(#linearGradient10790-8-2);fill-opacity:1;stroke:none;stroke-width:3.58380508;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
         <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
            id="path4313-8-8-7-8"
            d="m 542.3442,354.94937 0,10.78725 3.5848,0 0,-10.78725 z"
            style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:0.64640886;fill-rule:evenodd;stroke:none;stroke-width:0.97351193px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
diff --git a/ui/org.eclipse.pde.ui/icons/obj16/fldr_obj.svg b/ui/org.eclipse.pde.ui/icons/obj16/fldr_obj.svg
index 0ea71affd69..df66d5eeb06 100644
--- a/ui/org.eclipse.pde.ui/icons/obj16/fldr_obj.svg
+++ b/ui/org.eclipse.pde.ui/icons/obj16/fldr_obj.svg
@@ -2,25 +2,20 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.48.0 r9654"
-   sodipodi:docname="fldr_obj.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient4807"
-       inkscape:collect="always">
+       id="linearGradient4807">
       <stop
          id="stop4809"
          offset="0"
@@ -31,8 +26,7 @@
          style="stop-color:#bc8532;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       id="linearGradient3973"
-       inkscape:collect="always">
+       id="linearGradient3973">
       <stop
          id="stop3975"
          offset="0"
@@ -43,8 +37,7 @@
          style="stop-color:#f8f0c8;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       id="linearGradient3967"
-       inkscape:collect="always">
+       id="linearGradient3967">
       <stop
          id="stop3969"
          offset="0"
@@ -78,7 +71,6 @@
          style="stop-color:#ba772f;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3949">
       <stop
          style="stop-color:#9e6627;stop-opacity:1"
@@ -90,7 +82,6 @@
          id="stop3953" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient3967"
        id="linearGradient3939"
        gradientUnits="userSpaceOnUse"
@@ -100,7 +91,6 @@
        x2="531.09253"
        y2="371.17883" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient3955"
        id="linearGradient3945"
        gradientUnits="userSpaceOnUse"
@@ -110,8 +100,7 @@
        y2="373.2294"
        gradientTransform="translate(-60.558598,1.4188)" />
     <linearGradient
-       id="linearGradient3973-7"
-       inkscape:collect="always">
+       id="linearGradient3973-7">
       <stop
          id="stop3975-4"
          offset="0"
@@ -129,8 +118,7 @@
        gradientTransform="matrix(1,0,0,1.4165687,344.32442,-1.0061522e-6)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient4776"
-       xlink:href="#linearGradient3973-7"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient3973-7" />
     <linearGradient
        y2="381.19754"
        x2="548.01556"
@@ -139,32 +127,26 @@
        gradientTransform="matrix(1,0,0,1.4165687,344.32442,-1.0061522e-6)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient4778"
-       xlink:href="#linearGradient4807"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4807" />
     <mask
        maskUnits="userSpaceOnUse"
        id="mask4917">
       <path
          style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;display:inline"
          d="m 462.77563,373.22885 29.11636,0 c 1.45425,0 2.625,1.17075 2.625,2.625 l 0,18.76896 c 0,1.45425 -1.17412,2.52598 -2.625,2.625 l -29.11636,1.98708 c -1.45088,0.099 -2.625,-1.17075 -2.625,-2.625 l 0,-20.75604 c 0,-1.45425 1.17075,-2.625 2.625,-2.625 z"
-         id="path4919"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="sssssssss" />
+         id="path4919" />
     </mask>
     <filter
-       inkscape:collect="always"
        id="filter4929"
-       x="-0.13757156"
-       width="1.2751431"
-       y="-0.37744917"
-       height="1.7548983">
+       x="-0.39147933"
+       width="1.7829587"
+       y="-0.42999801"
+       height="1.859996">
       <feGaussianBlur
-         inkscape:collect="always"
          stdDeviation="3.5620748"
          id="feGaussianBlur4931" />
     </filter>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient3973"
        id="linearGradient4933"
        gradientUnits="userSpaceOnUse"
@@ -174,7 +156,6 @@
        x2="538.00562"
        y2="374.21222" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient3949"
        id="linearGradient4935"
        gradientUnits="userSpaceOnUse"
@@ -184,29 +165,6 @@
        x2="548.45923"
        y2="373.77069" />
   </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="-2.033873"
-     inkscape:cy="6.587213"
-     inkscape:document-units="px"
-     inkscape:current-layer="g13862"
-     showgrid="true"
-     inkscape:window-width="472"
-     inkscape:window-height="455"
-     inkscape:window-x="75"
-     inkscape:window-y="75"
-     inkscape:window-maximized="0"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3947" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -220,8 +178,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
@@ -244,14 +200,11 @@
         <path
            style="fill:url(#linearGradient4933);fill-opacity:1;stroke:url(#linearGradient4935);stroke-width:3.02792978;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
            d="m 463.24874,374.64819 28.07551,0 c 1.45425,0 2.625,1.17075 2.625,2.625 l 0,11.29376 c 0,1.45425 -1.22088,2.24642 -2.625,2.625 l -28.07551,7.56983 c -1.40411,0.37858 -2.625,-1.17075 -2.625,-2.625 l 0,-18.86359 c 0,-1.45425 1.17075,-2.625 2.625,-2.625 z"
-           id="rect13693"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="sssssssss" />
+           id="rect13693" />
         <path
            style="fill:none;stroke:url(#linearGradient3945);stroke-width:3.02792978;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
            d="m 462.26171,374.64819 20.09375,0"
-           id="path13797"
-           inkscape:connector-curvature="0" />
+           id="path13797" />
         <g
            id="g4914"
            mask="url(#mask4917)">
diff --git a/ui/org.eclipse.pde.ui/icons/obj16/focus.svg b/ui/org.eclipse.pde.ui/icons/obj16/focus.svg
index cfcc733fad9..3f29cdddf3f 100644
--- a/ui/org.eclipse.pde.ui/icons/obj16/focus.svg
+++ b/ui/org.eclipse.pde.ui/icons/obj16/focus.svg
@@ -2,24 +2,19 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="focus.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4177">
       <stop
          style="stop-color:#ffffff;stop-opacity:1"
@@ -31,7 +26,6 @@
          id="stop4181" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4167"
        id="linearGradient4173"
        x1="22.69014"
@@ -41,7 +35,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-6.8437503,0)" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4167">
       <stop
          style="stop-color:#b7aa81;stop-opacity:1;"
@@ -53,7 +46,6 @@
          id="stop4171" />
     </linearGradient>
     <radialGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4177"
        id="radialGradient4245"
        cx="14.311938"
@@ -64,33 +56,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(0.80131957,0,0,1,3.1831868,0)" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="22.627416"
-     inkscape:cx="-1.3275092"
-     inkscape:cy="6.7652752"
-     inkscape:document-units="px"
-     inkscape:current-layer="g4196"
-     showgrid="true"
-     inkscape:window-width="1100"
-     inkscape:window-height="900"
-     inkscape:window-x="1260"
-     inkscape:window-y="590"
-     inkscape:window-maximized="0"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2985"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -104,8 +69,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      transform="translate(0,-1036.3622)">
     <g
@@ -116,7 +79,6 @@
         <g
            id="g4196">
           <path
-             inkscape:connector-curvature="0"
              id="path4185"
              d="m 24.177062,1049.1816 0,-0.9107 -4.082341,-3.9411 -1.05718,1.0207 4.163663,4.0196 z"
              style="fill:#7b4e42;fill-opacity:1;fill-rule:evenodd;stroke:#9f8882;stroke-width:0.71592331;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
diff --git a/ui/org.eclipse.pde.ui/icons/obj16/frgmt_dis_obj.svg b/ui/org.eclipse.pde.ui/icons/obj16/frgmt_dis_obj.svg
index b267e8b4143..7e127898d11 100644
--- a/ui/org.eclipse.pde.ui/icons/obj16/frgmt_dis_obj.svg
+++ b/ui/org.eclipse.pde.ui/icons/obj16/frgmt_dis_obj.svg
@@ -2,20 +2,16 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="frgmt_dis_obj.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
@@ -34,7 +30,6 @@
          style="stop-color:#763db7;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10448-9-7-0-5"
        id="linearGradient10770-6"
        gradientUnits="userSpaceOnUse"
@@ -59,22 +54,6 @@
          id="stop10452-22-7-8-4" />
     </linearGradient>
     <linearGradient
-       id="linearGradient10440-1-0-0-3">
-      <stop
-         style="stop-color:#ae7603;stop-opacity:1;"
-         offset="0"
-         id="stop10442-43-2-0-9" />
-      <stop
-         id="stop10521-1-2-5-3"
-         offset="0.5"
-         style="stop-color:#e8d8a3;stop-opacity:1" />
-      <stop
-         style="stop-color:#bb9221;stop-opacity:1"
-         offset="1"
-         id="stop10444-3-4-0-4" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10748-8"
        id="linearGradient10774-5"
        gradientUnits="userSpaceOnUse"
@@ -107,22 +86,6 @@
          style="stop-color:#e5b630;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       id="linearGradient10440-1-3-4">
-      <stop
-         style="stop-color:#ae7603;stop-opacity:1;"
-         offset="0"
-         id="stop10442-43-0-5" />
-      <stop
-         id="stop10521-1-4-7"
-         offset="0.5"
-         style="stop-color:#e8d8a3;stop-opacity:1" />
-      <stop
-         style="stop-color:#bb9221;stop-opacity:1"
-         offset="1"
-         id="stop10444-3-2-0" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10448-90"
        id="linearGradient10778-6"
        gradientUnits="userSpaceOnUse"
@@ -155,52 +118,6 @@
          id="stop10452-1" />
     </linearGradient>
     <linearGradient
-       id="linearGradient10440-18">
-      <stop
-         style="stop-color:#ae7603;stop-opacity:1;"
-         offset="0"
-         id="stop10442-8" />
-      <stop
-         id="stop10521-7"
-         offset="0.5"
-         style="stop-color:#e8d8a3;stop-opacity:1" />
-      <stop
-         style="stop-color:#bb9221;stop-opacity:1"
-         offset="1"
-         id="stop10444-0" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10414-9">
-      <stop
-         style="stop-color:#5078b9;stop-opacity:1;"
-         offset="0"
-         id="stop10416-3" />
-      <stop
-         id="stop10422-8"
-         offset="0.5"
-         style="stop-color:#6d8cbd;stop-opacity:1" />
-      <stop
-         style="stop-color:#5f88c9;stop-opacity:1"
-         offset="1"
-         id="stop10418-4" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10432-3">
-      <stop
-         id="stop10434-4"
-         offset="0"
-         style="stop-color:#1f4d9a;stop-opacity:1" />
-      <stop
-         style="stop-color:#4e6da1;stop-opacity:1"
-         offset="0.5"
-         id="stop10436-2" />
-      <stop
-         id="stop10438-9"
-         offset="1"
-         style="stop-color:#567ebc;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10157-6"
        id="linearGradient10786-1"
        gradientUnits="userSpaceOnUse"
@@ -225,22 +142,6 @@
          id="stop10161-55" />
     </linearGradient>
     <linearGradient
-       id="linearGradient10396-5">
-      <stop
-         style="stop-color:#1b3e79;stop-opacity:1;"
-         offset="0"
-         id="stop10398-7" />
-      <stop
-         id="stop10404-9"
-         offset="0.5"
-         style="stop-color:#728fbf;stop-opacity:1" />
-      <stop
-         style="stop-color:#1f4d9a;stop-opacity:1"
-         offset="1"
-         id="stop10400-9" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10157-2-5"
        id="linearGradient10790-8"
        gradientUnits="userSpaceOnUse"
@@ -265,7 +166,6 @@
          id="stop10161-5-0" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10149-39-0"
        id="linearGradient10792-6"
        gradientUnits="userSpaceOnUse"
@@ -275,7 +175,6 @@
        x2="322.875"
        y2="504.44818" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient10149-39-0">
       <stop
          style="stop-color:#6936ae;stop-opacity:1"
@@ -287,22 +186,6 @@
          id="stop10153-72-3" />
     </linearGradient>
     <linearGradient
-       id="linearGradient10149-6-5-4">
-      <stop
-         style="stop-color:#1f4d9a;stop-opacity:1"
-         offset="0"
-         id="stop10151-5-7-2" />
-      <stop
-         id="stop10394-3"
-         offset="0.5"
-         style="stop-color:#b9c7df;stop-opacity:1" />
-      <stop
-         style="stop-color:#567ebc;stop-opacity:1"
-         offset="1"
-         id="stop10153-8-1-2" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4284"
        id="linearGradient10790-8-2"
        gradientUnits="userSpaceOnUse"
@@ -312,29 +195,6 @@
        x2="305"
        y2="545.35248" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="5.6568542"
-     inkscape:cx="-9.3081127"
-     inkscape:cy="25.270321"
-     inkscape:document-units="px"
-     inkscape:current-layer="g4174"
-     showgrid="true"
-     inkscape:window-width="1349"
-     inkscape:window-height="978"
-     inkscape:window-x="979"
-     inkscape:window-y="516"
-     inkscape:window-maximized="0"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid4210" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -348,8 +208,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
@@ -365,19 +223,15 @@
     <path
        style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
        d="m 12.648438,1043.3652 0,1 3.351562,0 0,-1 -3.351562,0 z"
-       id="path4313-8-8"
-       inkscape:connector-curvature="0" />
+       id="path4313-8-8" />
     <path
        style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.94926554px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
        d="m 12.981809,1043.3594 0,3.0195 1.01551,0 0,-3.0195 z"
-       id="path4313-8-8-7"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+       id="path4313-8-8-7" />
     <path
        style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#9e7400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
        d="m 15.992188,1045.3613 -3.359376,0.031 0.0098,1 3.359375,-0.031 -0.0098,-1 z"
-       id="path4313-5-1-8"
-       inkscape:connector-curvature="0" />
+       id="path4313-5-1-8" />
     <rect
        style="fill:url(#linearGradient10774-5);fill-opacity:1;stroke:none;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        id="rect10007-0-74-2-7"
@@ -390,13 +244,11 @@
     <path
        style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#9e7400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
        d="m 13.005859,1046.3711 -3.3593746,0.031 0.00977,1 3.359375,-0.031 -0.0098,-1 z"
-       id="path4313-5-1"
-       inkscape:connector-curvature="0" />
+       id="path4313-5-1" />
     <path
        style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
        d="m 11.991204,1043.3634 -2.3544852,0.028 0.00685,0.9091 2.3544839,-0.028 -0.0069,-0.909 z"
-       id="path4313-8"
-       inkscape:connector-curvature="0" />
+       id="path4313-8" />
     <rect
        style="fill:url(#linearGradient10778-6);fill-opacity:1;stroke:none;stroke-width:1.50161433;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        id="rect10007-0-74-2"
@@ -436,19 +288,15 @@
     <path
        style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
        d="m 11.042833,1043.3647 -3.4061142,0.029 0.00991,0.9204 3.4061133,-0.028 -0.0099,-0.9205 z"
-       id="path4313"
-       inkscape:connector-curvature="0" />
+       id="path4313" />
     <path
        style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#9e7400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
        d="m 11.001953,1047.3613 -3.3593749,0.031 0.00977,1 3.3593752,-0.031 -0.0098,-1 z"
-       id="path4313-5"
-       inkscape:connector-curvature="0" />
+       id="path4313-5" />
     <path
        style="fill:url(#linearGradient10790-8);fill-opacity:1;stroke:url(#linearGradient10792-6);stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        d="m 6.4755132,1043.9833 c 1.0259795,0 2.0241511,-0.1891 2.0241511,0.834 l 0,3.5451 c 0,0.8271 -0.6658339,1.4929 -1.4929011,1.4929 -0.8270672,0 -1.4929011,-0.6658 -1.4929011,-1.4929 l 0,-3.5537"
-       id="rect10007-6"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cssssc" />
+       id="rect10007-6" />
     <rect
        style="display:inline;fill:url(#linearGradient10790-8-2);fill-opacity:1;stroke:none;stroke-width:3.58380508;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        id="rect10007-6-6"
@@ -459,15 +307,11 @@
     <path
        style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:0.64640886;fill-rule:evenodd;stroke:none;stroke-width:0.97351193px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
        d="m 11.003629,1043.3647 0,3.01 1.000277,0 0,-3.01 z"
-       id="path4313-8-8-7-8"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+       id="path4313-8-8-7-8" />
     <path
        style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.94926554px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
        d="m 11.992245,1042.3524 0,1.0351 1.01551,0 0,-1.0351 z"
-       id="path4313-8-8-7-5"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+       id="path4313-8-8-7-5" />
     <g
        id="g4174"
        transform="translate(-9.9368785,-7.0197441)"
@@ -480,11 +324,9 @@
          id="path4170"
          style="opacity:1;fill:#f9feff;fill-opacity:1;stroke:#ed0000;stroke-width:0.99215209;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
       <path
-         inkscape:connector-curvature="0"
          id="path4172"
          d="m 23.004333,1045.3553 -5.011305,5.0334"
-         style="fill:none;fill-rule:evenodd;stroke:#ed0000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         sodipodi:nodetypes="cc" />
+         style="fill:none;fill-rule:evenodd;stroke:#ed0000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
     </g>
   </g>
 </svg>
diff --git a/ui/org.eclipse.pde.ui/icons/obj16/frgmt_mf_obj.svg b/ui/org.eclipse.pde.ui/icons/obj16/frgmt_mf_obj.svg
index 8864cd50b87..cfd17db9677 100644
--- a/ui/org.eclipse.pde.ui/icons/obj16/frgmt_mf_obj.svg
+++ b/ui/org.eclipse.pde.ui/icons/obj16/frgmt_mf_obj.svg
@@ -2,37 +2,18 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="frgmt_mf_obj.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
-    <linearGradient
-       id="linearGradient4284">
-      <stop
-         id="stop4286"
-         offset="0"
-         style="stop-color:#6588c1;stop-opacity:0" />
-      <stop
-         style="stop-color:#becce3;stop-opacity:1"
-         offset="0.49999967"
-         id="stop4288" />
-      <stop
-         id="stop4290"
-         offset="1"
-         style="stop-color:#809dcb;stop-opacity:0" />
-    </linearGradient>
     <linearGradient
        id="linearGradient10448-9-7-0-5">
       <stop
@@ -48,21 +29,6 @@
          offset="1"
          id="stop10452-22-7-8-4" />
     </linearGradient>
-    <linearGradient
-       id="linearGradient10440-1-0-0-3">
-      <stop
-         style="stop-color:#ae7603;stop-opacity:1;"
-         offset="0"
-         id="stop10442-43-2-0-9" />
-      <stop
-         id="stop10521-1-2-5-3"
-         offset="0.5"
-         style="stop-color:#e8d8a3;stop-opacity:1" />
-      <stop
-         style="stop-color:#bb9221;stop-opacity:1"
-         offset="1"
-         id="stop10444-3-4-0-4" />
-    </linearGradient>
     <linearGradient
        id="linearGradient10748-8">
       <stop
@@ -86,21 +52,6 @@
          offset="1"
          style="stop-color:#e5b630;stop-opacity:1" />
     </linearGradient>
-    <linearGradient
-       id="linearGradient10440-1-3-4">
-      <stop
-         style="stop-color:#ae7603;stop-opacity:1;"
-         offset="0"
-         id="stop10442-43-0-5" />
-      <stop
-         id="stop10521-1-4-7"
-         offset="0.5"
-         style="stop-color:#e8d8a3;stop-opacity:1" />
-      <stop
-         style="stop-color:#bb9221;stop-opacity:1"
-         offset="1"
-         id="stop10444-3-2-0" />
-    </linearGradient>
     <linearGradient
        id="linearGradient10448-90">
       <stop
@@ -125,112 +76,6 @@
          id="stop10452-1" />
     </linearGradient>
     <linearGradient
-       id="linearGradient10440-18">
-      <stop
-         style="stop-color:#ae7603;stop-opacity:1;"
-         offset="0"
-         id="stop10442-8" />
-      <stop
-         id="stop10521-7"
-         offset="0.5"
-         style="stop-color:#e8d8a3;stop-opacity:1" />
-      <stop
-         style="stop-color:#bb9221;stop-opacity:1"
-         offset="1"
-         id="stop10444-0" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10414-9">
-      <stop
-         style="stop-color:#5078b9;stop-opacity:1;"
-         offset="0"
-         id="stop10416-3" />
-      <stop
-         id="stop10422-8"
-         offset="0.5"
-         style="stop-color:#6d8cbd;stop-opacity:1" />
-      <stop
-         style="stop-color:#5f88c9;stop-opacity:1"
-         offset="1"
-         id="stop10418-4" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10432-3">
-      <stop
-         id="stop10434-4"
-         offset="0"
-         style="stop-color:#1f4d9a;stop-opacity:1" />
-      <stop
-         style="stop-color:#4e6da1;stop-opacity:1"
-         offset="0.5"
-         id="stop10436-2" />
-      <stop
-         id="stop10438-9"
-         offset="1"
-         style="stop-color:#567ebc;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10157-6">
-      <stop
-         style="stop-color:#6588c1;stop-opacity:1"
-         offset="0"
-         id="stop10159-5" />
-      <stop
-         id="stop10165-9"
-         offset="0.5"
-         style="stop-color:#becce3;stop-opacity:1" />
-      <stop
-         style="stop-color:#809dcb;stop-opacity:1"
-         offset="1"
-         id="stop10161-55" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10396-5">
-      <stop
-         style="stop-color:#1b3e79;stop-opacity:1;"
-         offset="0"
-         id="stop10398-7" />
-      <stop
-         id="stop10404-9"
-         offset="0.5"
-         style="stop-color:#728fbf;stop-opacity:1" />
-      <stop
-         style="stop-color:#1f4d9a;stop-opacity:1"
-         offset="1"
-         id="stop10400-9" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10157-2-5">
-      <stop
-         style="stop-color:#6588c1;stop-opacity:1"
-         offset="0"
-         id="stop10159-8-3" />
-      <stop
-         id="stop10165-3-9"
-         offset="0.5"
-         style="stop-color:#becce3;stop-opacity:1" />
-      <stop
-         style="stop-color:#809dcb;stop-opacity:1"
-         offset="1"
-         id="stop10161-5-0" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10149-6-5-4">
-      <stop
-         style="stop-color:#1f4d9a;stop-opacity:1"
-         offset="0"
-         id="stop10151-5-7-2" />
-      <stop
-         id="stop10394-3"
-         offset="0.5"
-         style="stop-color:#b9c7df;stop-opacity:1" />
-      <stop
-         style="stop-color:#567ebc;stop-opacity:1"
-         offset="1"
-         id="stop10153-8-1-2" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4902-3"
        id="linearGradient4908-2"
        x1="10.544736"
@@ -240,7 +85,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-2.009153,-1.0294)" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4902-3">
       <stop
          style="stop-color:#b28a30;stop-opacity:1"
@@ -252,7 +96,6 @@
          id="stop4906-2" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4894-6"
        id="linearGradient4900-1"
        x1="7.9987183"
@@ -262,7 +105,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(1.990847,-1.0294)" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4894-6">
       <stop
          style="stop-color:#e0c88f;stop-opacity:1"
@@ -281,10 +123,8 @@
        gradientUnits="userSpaceOnUse"
        id="linearGradient4101"
        xlink:href="#linearGradient4994-6"
-       inkscape:collect="always"
        gradientTransform="translate(-2.009153,-1.0294)" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4994-6">
       <stop
          style="stop-color:#f9fafc;stop-opacity:1;"
@@ -296,7 +136,6 @@
          id="stop4998-89" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4284-2"
        id="linearGradient10790-8-2"
        gradientUnits="userSpaceOnUse"
@@ -321,7 +160,6 @@
          style="stop-color:#763db7;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10157-2-5-5"
        id="linearGradient10790-8"
        gradientUnits="userSpaceOnUse"
@@ -346,7 +184,6 @@
          id="stop10161-5-0-6" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10149-39-0"
        id="linearGradient10792-6"
        gradientUnits="userSpaceOnUse"
@@ -356,7 +193,6 @@
        x2="322.875"
        y2="504.44818" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient10149-39-0">
       <stop
          style="stop-color:#6936ae;stop-opacity:1"
@@ -368,7 +204,6 @@
          id="stop10153-72-3" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10157-6-1"
        id="linearGradient10786-1"
        gradientUnits="userSpaceOnUse"
@@ -393,7 +228,6 @@
          id="stop10161-55-6" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10448-90"
        id="linearGradient10778-6"
        gradientUnits="userSpaceOnUse"
@@ -403,7 +237,6 @@
        y2="511.66458"
        gradientTransform="matrix(0.30039597,0,0,0.29264682,-87.12885,891.60319)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10748-8"
        id="linearGradient10774-5"
        gradientUnits="userSpaceOnUse"
@@ -413,7 +246,6 @@
        x2="324.1601"
        y2="515.53949" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10448-9-7-0-5"
        id="linearGradient10770-6"
        gradientUnits="userSpaceOnUse"
@@ -423,29 +255,6 @@
        x2="323.98331"
        y2="518.28192" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="16"
-     inkscape:cx="3.6465933"
-     inkscape:cy="8.8880279"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="987"
-     inkscape:window-height="965"
-     inkscape:window-x="1343"
-     inkscape:window-y="521"
-     inkscape:window-maximized="0"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid4210" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -459,27 +268,20 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
     <g
        id="g4325">
       <path
-         sodipodi:nodetypes="cccccc"
-         inkscape:connector-curvature="0"
          id="rect4001-3"
          d="m 3.4881295,1037.8727 7.0096695,0 3.062057,3.0066 0,9.9546 -10.0717265,0 z"
          style="display:inline;fill:url(#linearGradient4101);fill-opacity:1;stroke:none" />
       <path
-         inkscape:connector-curvature="0"
          id="path4884"
          d="m 9.967468,1037.41 0,3.9112 3.977479,0 z"
          style="display:inline;fill:url(#linearGradient4900-1);fill-opacity:1;stroke:none" />
       <path
-         sodipodi:nodetypes="cccccc"
-         inkscape:connector-curvature="0"
          id="rect4001"
          d="m 3.4881295,1037.8727 6.9471695,0 3.062057,3.0066 0,9.9546 -10.0092265,0 z"
          style="display:inline;fill:none;stroke:url(#linearGradient4908-2);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1" />
@@ -497,18 +299,14 @@
          id="rect10007-0-74-2-7-6"
          style="display:inline;fill:url(#linearGradient10770-6);fill-opacity:1;stroke:none;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
       <path
-         inkscape:connector-curvature="0"
          id="path4313-8-8"
          d="m 12.648438,1043.3652 0,1 3.351562,0 0,-1 -3.351562,0 z"
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
       <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
          id="path4313-8-8-7"
          d="m 12.981809,1043.3594 0,3.0195 1.01551,0 0,-3.0195 z"
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.94926554px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
       <path
-         inkscape:connector-curvature="0"
          id="path4313-5-1-8"
          d="m 15.992188,1045.3613 -3.359376,0.031 0.0098,1 3.359375,-0.031 -0.0098,-1 z"
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#9e7400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
@@ -522,12 +320,10 @@
          id="rect10007-0-74-2-7"
          style="display:inline;fill:url(#linearGradient10774-5);fill-opacity:1;stroke:none;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
       <path
-         inkscape:connector-curvature="0"
          id="path4313-5-1"
          d="m 13.005859,1046.3711 -3.3593746,0.031 0.00977,1 3.3593746,-0.031 -0.0098,-1 z"
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#9e7400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
       <path
-         inkscape:connector-curvature="0"
          id="path4313-8"
          d="m 11.991204,1043.3634 -2.3544852,0.028 0.00685,0.9091 2.3544842,-0.028 -0.0069,-0.909 z"
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
@@ -568,18 +364,14 @@
          id="rect10007-0-74"
          style="display:inline;fill:url(#linearGradient10786-1);fill-opacity:1;stroke:none;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
       <path
-         inkscape:connector-curvature="0"
          id="path4313"
          d="m 11.042833,1043.3647 -3.4061142,0.029 0.00991,0.9204 3.4061132,-0.028 -0.0099,-0.9205 z"
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
       <path
-         inkscape:connector-curvature="0"
          id="path4313-5"
          d="m 11.001953,1047.3613 -3.3593749,0.031 0.00977,1 3.3593749,-0.031 -0.0098,-1 z"
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#9e7400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
       <path
-         sodipodi:nodetypes="cssssc"
-         inkscape:connector-curvature="0"
          id="rect10007-6"
          d="m 6.4755132,1043.9833 c 1.0259795,0 2.0241511,-0.1891 2.0241511,0.834 l 0,3.5451 c 0,0.8271 -0.6658339,1.4929 -1.4929011,1.4929 -0.8270672,0 -1.4929011,-0.6658 -1.4929011,-1.4929 l 0,-3.5537"
          style="display:inline;fill:url(#linearGradient10790-8);fill-opacity:1;stroke:url(#linearGradient10792-6);stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
@@ -591,14 +383,10 @@
          id="rect10007-6-6"
          style="display:inline;fill:url(#linearGradient10790-8-2);fill-opacity:1;stroke:none;stroke-width:3.58380508;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
       <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
          id="path4313-8-8-7-8"
          d="m 11.003629,1043.3647 0,3.01 1.000277,0 0,-3.01 z"
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:0.64640886;fill-rule:evenodd;stroke:none;stroke-width:0.97351193px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
       <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
          id="path4313-8-8-7-5"
          d="m 11.992245,1042.3524 0,1.0351 1.01551,0 0,-1.0351 z"
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.94926554px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
diff --git a/ui/org.eclipse.pde.ui/icons/obj16/frgmt_obj.svg b/ui/org.eclipse.pde.ui/icons/obj16/frgmt_obj.svg
index 87758e9fcb5..88b9b1fc152 100644
--- a/ui/org.eclipse.pde.ui/icons/obj16/frgmt_obj.svg
+++ b/ui/org.eclipse.pde.ui/icons/obj16/frgmt_obj.svg
@@ -2,20 +2,16 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="frgmt_obj.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
@@ -34,7 +30,6 @@
          style="stop-color:#763db7;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10448-9-7-0-5"
        id="linearGradient10770-6"
        gradientUnits="userSpaceOnUse"
@@ -59,22 +54,6 @@
          id="stop10452-22-7-8-4" />
     </linearGradient>
     <linearGradient
-       id="linearGradient10440-1-0-0-3">
-      <stop
-         style="stop-color:#ae7603;stop-opacity:1;"
-         offset="0"
-         id="stop10442-43-2-0-9" />
-      <stop
-         id="stop10521-1-2-5-3"
-         offset="0.5"
-         style="stop-color:#e8d8a3;stop-opacity:1" />
-      <stop
-         style="stop-color:#bb9221;stop-opacity:1"
-         offset="1"
-         id="stop10444-3-4-0-4" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10748-8"
        id="linearGradient10774-5"
        gradientUnits="userSpaceOnUse"
@@ -107,22 +86,6 @@
          style="stop-color:#e5b630;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       id="linearGradient10440-1-3-4">
-      <stop
-         style="stop-color:#ae7603;stop-opacity:1;"
-         offset="0"
-         id="stop10442-43-0-5" />
-      <stop
-         id="stop10521-1-4-7"
-         offset="0.5"
-         style="stop-color:#e8d8a3;stop-opacity:1" />
-      <stop
-         style="stop-color:#bb9221;stop-opacity:1"
-         offset="1"
-         id="stop10444-3-2-0" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10448-90"
        id="linearGradient10778-6"
        gradientUnits="userSpaceOnUse"
@@ -155,52 +118,6 @@
          id="stop10452-1" />
     </linearGradient>
     <linearGradient
-       id="linearGradient10440-18">
-      <stop
-         style="stop-color:#ae7603;stop-opacity:1;"
-         offset="0"
-         id="stop10442-8" />
-      <stop
-         id="stop10521-7"
-         offset="0.5"
-         style="stop-color:#e8d8a3;stop-opacity:1" />
-      <stop
-         style="stop-color:#bb9221;stop-opacity:1"
-         offset="1"
-         id="stop10444-0" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10414-9">
-      <stop
-         style="stop-color:#5078b9;stop-opacity:1;"
-         offset="0"
-         id="stop10416-3" />
-      <stop
-         id="stop10422-8"
-         offset="0.5"
-         style="stop-color:#6d8cbd;stop-opacity:1" />
-      <stop
-         style="stop-color:#5f88c9;stop-opacity:1"
-         offset="1"
-         id="stop10418-4" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10432-3">
-      <stop
-         id="stop10434-4"
-         offset="0"
-         style="stop-color:#1f4d9a;stop-opacity:1" />
-      <stop
-         style="stop-color:#4e6da1;stop-opacity:1"
-         offset="0.5"
-         id="stop10436-2" />
-      <stop
-         id="stop10438-9"
-         offset="1"
-         style="stop-color:#567ebc;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10157-6"
        id="linearGradient10786-1"
        gradientUnits="userSpaceOnUse"
@@ -225,22 +142,6 @@
          id="stop10161-55" />
     </linearGradient>
     <linearGradient
-       id="linearGradient10396-5">
-      <stop
-         style="stop-color:#1b3e79;stop-opacity:1;"
-         offset="0"
-         id="stop10398-7" />
-      <stop
-         id="stop10404-9"
-         offset="0.5"
-         style="stop-color:#728fbf;stop-opacity:1" />
-      <stop
-         style="stop-color:#1f4d9a;stop-opacity:1"
-         offset="1"
-         id="stop10400-9" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10157-2-5"
        id="linearGradient10790-8"
        gradientUnits="userSpaceOnUse"
@@ -265,7 +166,6 @@
          id="stop10161-5-0" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10149-39-0"
        id="linearGradient10792-6"
        gradientUnits="userSpaceOnUse"
@@ -275,7 +175,6 @@
        x2="322.875"
        y2="504.44818" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient10149-39-0">
       <stop
          style="stop-color:#6936ae;stop-opacity:1"
@@ -287,22 +186,6 @@
          id="stop10153-72-3" />
     </linearGradient>
     <linearGradient
-       id="linearGradient10149-6-5-4">
-      <stop
-         style="stop-color:#1f4d9a;stop-opacity:1"
-         offset="0"
-         id="stop10151-5-7-2" />
-      <stop
-         id="stop10394-3"
-         offset="0.5"
-         style="stop-color:#b9c7df;stop-opacity:1" />
-      <stop
-         style="stop-color:#567ebc;stop-opacity:1"
-         offset="1"
-         id="stop10153-8-1-2" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4284"
        id="linearGradient10790-8-2"
        gradientUnits="userSpaceOnUse"
@@ -312,29 +195,6 @@
        x2="305"
        y2="545.35248" />
   </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="8.0832705"
-     inkscape:cy="12.606498"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1349"
-     inkscape:window-height="978"
-     inkscape:window-x="979"
-     inkscape:window-y="516"
-     inkscape:window-maximized="0"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid4210" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -348,8 +208,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
@@ -366,18 +224,14 @@
          id="rect10007-0-74-2-7-6"
          style="fill:url(#linearGradient10770-6);fill-opacity:1;stroke:none;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
       <path
-         inkscape:connector-curvature="0"
          id="path4313-8-8"
          d="m 12.648438,1043.3652 0,1 3.351562,0 0,-1 -3.351562,0 z"
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
       <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
          id="path4313-8-8-7"
          d="m 12.981809,1043.3594 0,3.0195 1.01551,0 0,-3.0195 z"
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.94926554px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
       <path
-         inkscape:connector-curvature="0"
          id="path4313-5-1-8"
          d="m 15.992188,1045.3613 -3.359376,0.031 0.0098,1 3.359375,-0.031 -0.0098,-1 z"
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#9e7400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
@@ -391,12 +245,10 @@
          id="rect10007-0-74-2-7"
          style="fill:url(#linearGradient10774-5);fill-opacity:1;stroke:none;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
       <path
-         inkscape:connector-curvature="0"
          id="path4313-5-1"
          d="m 13.005859,1046.3711 -3.3593746,0.031 0.00977,1 3.3593746,-0.031 -0.0098,-1 z"
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#9e7400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
       <path
-         inkscape:connector-curvature="0"
          id="path4313-8"
          d="m 11.991204,1043.3634 -2.3544852,0.028 0.00685,0.9091 2.3544842,-0.028 -0.0069,-0.909 z"
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
@@ -437,18 +289,14 @@
          id="rect10007-0-74"
          style="fill:url(#linearGradient10786-1);fill-opacity:1;stroke:none;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
       <path
-         inkscape:connector-curvature="0"
          id="path4313"
          d="m 11.042833,1043.3647 -3.4061142,0.029 0.00991,0.9204 3.4061132,-0.028 -0.0099,-0.9205 z"
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
       <path
-         inkscape:connector-curvature="0"
          id="path4313-5"
          d="m 11.001953,1047.3613 -3.3593749,0.031 0.00977,1 3.3593749,-0.031 -0.0098,-1 z"
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#9e7400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
       <path
-         sodipodi:nodetypes="cssssc"
-         inkscape:connector-curvature="0"
          id="rect10007-6"
          d="m 6.4755132,1043.9833 c 1.0259795,0 2.0241511,-0.1891 2.0241511,0.834 l 0,3.5451 c 0,0.8271 -0.6658339,1.4929 -1.4929011,1.4929 -0.8270672,0 -1.4929011,-0.6658 -1.4929011,-1.4929 l 0,-3.5537"
          style="fill:url(#linearGradient10790-8);fill-opacity:1;stroke:url(#linearGradient10792-6);stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
@@ -460,14 +308,10 @@
          id="rect10007-6-6"
          style="display:inline;fill:url(#linearGradient10790-8-2);fill-opacity:1;stroke:none;stroke-width:3.58380508;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
       <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
          id="path4313-8-8-7-8"
          d="m 11.003629,1043.3647 0,3.01 1.000277,0 0,-3.01 z"
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:0.64640886;fill-rule:evenodd;stroke:none;stroke-width:0.97351193px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
       <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
          id="path4313-8-8-7-5"
          d="m 11.992245,1042.3524 0,1.0351 1.01551,0 0,-1.0351 z"
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.94926554px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
diff --git a/ui/org.eclipse.pde.ui/icons/obj16/frgmts_obj.svg b/ui/org.eclipse.pde.ui/icons/obj16/frgmts_obj.svg
index b28a5e0effc..cdceb76bdbb 100644
--- a/ui/org.eclipse.pde.ui/icons/obj16/frgmts_obj.svg
+++ b/ui/org.eclipse.pde.ui/icons/obj16/frgmts_obj.svg
@@ -2,20 +2,16 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="frgmts_obj.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
@@ -34,7 +30,6 @@
          style="stop-color:#763db7;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10448-9-7-0-5"
        id="linearGradient10770-6"
        gradientUnits="userSpaceOnUse"
@@ -59,22 +54,6 @@
          id="stop10452-22-7-8-4" />
     </linearGradient>
     <linearGradient
-       id="linearGradient10440-1-0-0-3">
-      <stop
-         style="stop-color:#ae7603;stop-opacity:1;"
-         offset="0"
-         id="stop10442-43-2-0-9" />
-      <stop
-         id="stop10521-1-2-5-3"
-         offset="0.5"
-         style="stop-color:#e8d8a3;stop-opacity:1" />
-      <stop
-         style="stop-color:#bb9221;stop-opacity:1"
-         offset="1"
-         id="stop10444-3-4-0-4" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10748-8"
        id="linearGradient10774-5"
        gradientUnits="userSpaceOnUse"
@@ -107,22 +86,6 @@
          style="stop-color:#e5b630;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       id="linearGradient10440-1-3-4">
-      <stop
-         style="stop-color:#ae7603;stop-opacity:1;"
-         offset="0"
-         id="stop10442-43-0-5" />
-      <stop
-         id="stop10521-1-4-7"
-         offset="0.5"
-         style="stop-color:#e8d8a3;stop-opacity:1" />
-      <stop
-         style="stop-color:#bb9221;stop-opacity:1"
-         offset="1"
-         id="stop10444-3-2-0" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10448-90"
        id="linearGradient10778-6"
        gradientUnits="userSpaceOnUse"
@@ -155,52 +118,6 @@
          id="stop10452-1" />
     </linearGradient>
     <linearGradient
-       id="linearGradient10440-18">
-      <stop
-         style="stop-color:#ae7603;stop-opacity:1;"
-         offset="0"
-         id="stop10442-8" />
-      <stop
-         id="stop10521-7"
-         offset="0.5"
-         style="stop-color:#e8d8a3;stop-opacity:1" />
-      <stop
-         style="stop-color:#bb9221;stop-opacity:1"
-         offset="1"
-         id="stop10444-0" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10414-9">
-      <stop
-         style="stop-color:#5078b9;stop-opacity:1;"
-         offset="0"
-         id="stop10416-3" />
-      <stop
-         id="stop10422-8"
-         offset="0.5"
-         style="stop-color:#6d8cbd;stop-opacity:1" />
-      <stop
-         style="stop-color:#5f88c9;stop-opacity:1"
-         offset="1"
-         id="stop10418-4" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10432-3">
-      <stop
-         id="stop10434-4"
-         offset="0"
-         style="stop-color:#1f4d9a;stop-opacity:1" />
-      <stop
-         style="stop-color:#4e6da1;stop-opacity:1"
-         offset="0.5"
-         id="stop10436-2" />
-      <stop
-         id="stop10438-9"
-         offset="1"
-         style="stop-color:#567ebc;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10157-6"
        id="linearGradient10786-1"
        gradientUnits="userSpaceOnUse"
@@ -225,22 +142,6 @@
          id="stop10161-55" />
     </linearGradient>
     <linearGradient
-       id="linearGradient10396-5">
-      <stop
-         style="stop-color:#1b3e79;stop-opacity:1;"
-         offset="0"
-         id="stop10398-7" />
-      <stop
-         id="stop10404-9"
-         offset="0.5"
-         style="stop-color:#728fbf;stop-opacity:1" />
-      <stop
-         style="stop-color:#1f4d9a;stop-opacity:1"
-         offset="1"
-         id="stop10400-9" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10157-2-5"
        id="linearGradient10790-8"
        gradientUnits="userSpaceOnUse"
@@ -265,7 +166,6 @@
          id="stop10161-5-0" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10149-39-0"
        id="linearGradient10792-6"
        gradientUnits="userSpaceOnUse"
@@ -275,7 +175,6 @@
        x2="322.875"
        y2="504.44818" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient10149-39-0">
       <stop
          style="stop-color:#6936ae;stop-opacity:1"
@@ -287,22 +186,6 @@
          id="stop10153-72-3" />
     </linearGradient>
     <linearGradient
-       id="linearGradient10149-6-5-4">
-      <stop
-         style="stop-color:#1f4d9a;stop-opacity:1"
-         offset="0"
-         id="stop10151-5-7-2" />
-      <stop
-         id="stop10394-3"
-         offset="0.5"
-         style="stop-color:#b9c7df;stop-opacity:1" />
-      <stop
-         style="stop-color:#567ebc;stop-opacity:1"
-         offset="1"
-         id="stop10153-8-1-2" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4284"
        id="linearGradient10790-8-2"
        gradientUnits="userSpaceOnUse"
@@ -312,7 +195,6 @@
        x2="305"
        y2="545.35248" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10448-9-7-0-5"
        id="linearGradient4545"
        gradientUnits="userSpaceOnUse"
@@ -322,7 +204,6 @@
        x2="323.98331"
        y2="518.28192" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10748-8"
        id="linearGradient4547"
        gradientUnits="userSpaceOnUse"
@@ -332,7 +213,6 @@
        x2="324.1601"
        y2="515.53949" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10448-90"
        id="linearGradient4549"
        gradientUnits="userSpaceOnUse"
@@ -342,7 +222,6 @@
        x2="324.1601"
        y2="511.66458" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10157-6"
        id="linearGradient4551"
        gradientUnits="userSpaceOnUse"
@@ -352,7 +231,6 @@
        x2="306.05069"
        y2="514.75818" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10157-2-5"
        id="linearGradient4553"
        gradientUnits="userSpaceOnUse"
@@ -362,7 +240,6 @@
        x2="305"
        y2="542.73901" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10149-39-0"
        id="linearGradient4555"
        gradientUnits="userSpaceOnUse"
@@ -372,7 +249,6 @@
        x2="322.875"
        y2="504.44818" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4284"
        id="linearGradient4557"
        gradientUnits="userSpaceOnUse"
@@ -382,29 +258,6 @@
        x2="305"
        y2="545.35248" />
   </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.388724"
-     inkscape:cy="-6.4881816"
-     inkscape:document-units="px"
-     inkscape:current-layer="g4228"
-     showgrid="true"
-     inkscape:window-width="1349"
-     inkscape:window-height="978"
-     inkscape:window-x="454"
-     inkscape:window-y="456"
-     inkscape:window-maximized="0"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid4210" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -418,8 +271,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
@@ -436,18 +287,14 @@
          id="rect10007-0-74-2-7-6"
          style="fill:url(#linearGradient10770-6);fill-opacity:1;stroke:none;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
       <path
-         inkscape:connector-curvature="0"
          id="path4313-8-8"
          d="m 12.648438,1043.3652 0,1 3.351562,0 0,-1 -3.351562,0 z"
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
       <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
          id="path4313-8-8-7"
          d="m 12.981809,1043.3594 0,3.0195 1.01551,0 0,-3.0195 z"
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.94926554px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
       <path
-         inkscape:connector-curvature="0"
          id="path4313-5-1-8"
          d="m 15.992188,1045.3613 -3.359376,0.031 0.0098,1 3.359375,-0.031 -0.0098,-1 z"
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#9e7400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
@@ -461,12 +308,10 @@
          id="rect10007-0-74-2-7"
          style="fill:url(#linearGradient10774-5);fill-opacity:1;stroke:none;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
       <path
-         inkscape:connector-curvature="0"
          id="path4313-5-1"
          d="m 13.005859,1046.3711 -3.3593746,0.031 0.00977,1 3.3593746,-0.031 -0.0098,-1 z"
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#9e7400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
       <path
-         inkscape:connector-curvature="0"
          id="path4313-8"
          d="m 11.991204,1043.3634 -2.3544852,0.028 0.00685,0.9091 2.3544842,-0.028 -0.0069,-0.909 z"
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
@@ -507,18 +352,14 @@
          id="rect10007-0-74"
          style="fill:url(#linearGradient10786-1);fill-opacity:1;stroke:none;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
       <path
-         inkscape:connector-curvature="0"
          id="path4313"
          d="m 11.042833,1043.3647 -3.4061142,0.029 0.00991,0.9204 3.4061132,-0.028 -0.0099,-0.9205 z"
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
       <path
-         inkscape:connector-curvature="0"
          id="path4313-5"
          d="m 11.001953,1047.3613 -3.3593749,0.031 0.00977,1 3.3593749,-0.031 -0.0098,-1 z"
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#9e7400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
       <path
-         sodipodi:nodetypes="cssssc"
-         inkscape:connector-curvature="0"
          id="rect10007-6"
          d="m 6.4755132,1043.9833 c 1.0259795,0 2.0241511,-0.1891 2.0241511,0.834 l 0,3.5451 c 0,0.8271 -0.6658339,1.4929 -1.4929011,1.4929 -0.8270672,0 -1.4929011,-0.6658 -1.4929011,-1.4929 l 0,-3.5537"
          style="fill:url(#linearGradient10790-8);fill-opacity:1;stroke:url(#linearGradient10792-6);stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
@@ -530,14 +371,10 @@
          id="rect10007-6-6"
          style="display:inline;fill:url(#linearGradient10790-8-2);fill-opacity:1;stroke:none;stroke-width:3.58380508;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
       <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
          id="path4313-8-8-7-8"
          d="m 11.003629,1043.3647 0,3.01 1.000277,0 0,-3.01 z"
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:0.64640886;fill-rule:evenodd;stroke:none;stroke-width:0.97351193px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
       <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
          id="path4313-8-8-7-5"
          d="m 11.992245,1042.2086 0,1.1789 1.01551,0 0,-1.1789 z"
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.94926554px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
@@ -556,23 +393,17 @@
          id="rect10007-0-74-2-7-6-5"
          style="fill:url(#linearGradient4545);fill-opacity:1;stroke:none;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
       <path
-         inkscape:connector-curvature="0"
          id="path4313-8-8-8"
          d="m 12.648438,1043.3652 0,1 5.233552,0 0,-1 z"
-         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-         sodipodi:nodetypes="ccccc" />
+         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
       <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
          id="path4313-8-8-7-1"
          d="m 12.981809,1043.3594 0,3.0195 1.01551,0 0,-3.0195 z"
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.94926554px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
       <path
-         inkscape:connector-curvature="0"
          id="path4313-5-1-8-1"
          d="m 17.874178,1045.3613 -5.241366,0.031 0.0098,1 5.241365,-0.031 z"
-         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#9e7400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-         sodipodi:nodetypes="ccccc" />
+         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#9e7400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
       <rect
          ry="0"
          rx="0"
@@ -583,12 +414,10 @@
          id="rect10007-0-74-2-7-7"
          style="fill:url(#linearGradient4547);fill-opacity:1;stroke:none;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
       <path
-         inkscape:connector-curvature="0"
          id="path4313-5-1-5"
          d="m 13.005859,1046.3711 -3.3593746,0.031 0.00977,1 3.3593746,-0.031 -0.0098,-1 z"
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#9e7400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
       <path
-         inkscape:connector-curvature="0"
          id="path4313-8-2"
          d="m 11.991204,1043.3634 -2.3544852,0.028 0.00685,0.9091 2.3544842,-0.028 -0.0069,-0.909 z"
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
@@ -629,18 +458,14 @@
          id="rect10007-0-74-0"
          style="fill:url(#linearGradient4551);fill-opacity:1;stroke:none;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
       <path
-         inkscape:connector-curvature="0"
          id="path4313-6"
          d="m 11.042833,1043.3647 -3.4061142,0.029 0.00991,0.9204 3.4061132,-0.028 -0.0099,-0.9205 z"
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
       <path
-         inkscape:connector-curvature="0"
          id="path4313-5-2"
          d="m 11.001953,1047.3613 -3.3593749,0.031 0.00977,1 3.3593749,-0.031 -0.0098,-1 z"
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#9e7400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
       <path
-         sodipodi:nodetypes="cssssc"
-         inkscape:connector-curvature="0"
          id="rect10007-6-5"
          d="m 6.4755132,1043.9833 c 1.0259795,0 2.0241511,-0.1891 2.0241511,0.834 l 0,3.5451 c 0,0.8271 -0.6658339,1.4929 -1.4929011,1.4929 -0.8270672,0 -1.4929011,-0.6658 -1.4929011,-1.4929 l 0,-3.5537"
          style="fill:url(#linearGradient4553);fill-opacity:1;stroke:url(#linearGradient4555);stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
@@ -652,14 +477,10 @@
          id="rect10007-6-6-0"
          style="display:inline;fill:url(#linearGradient4557);fill-opacity:1;stroke:none;stroke-width:3.58380508;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
       <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
          id="path4313-8-8-7-8-4"
          d="m 11.003629,1043.3647 0,3.01 1.000277,0 0,-3.01 z"
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:0.64640886;fill-rule:evenodd;stroke:none;stroke-width:0.97351193px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
       <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
          id="path4313-8-8-7-5-5"
          d="m 11.992245,1042.3524 0,1.0351 1.01551,0 0,-1.0351 z"
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.94926554px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
diff --git a/ui/org.eclipse.pde.ui/icons/obj16/ftr_jar_obj.svg b/ui/org.eclipse.pde.ui/icons/obj16/ftr_jar_obj.svg
index 102674d0e65..d390e1c723e 100644
--- a/ui/org.eclipse.pde.ui/icons/obj16/ftr_jar_obj.svg
+++ b/ui/org.eclipse.pde.ui/icons/obj16/ftr_jar_obj.svg
@@ -2,20 +2,16 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.48.0 r9654"
-   sodipodi:docname="ftr_jar_obj.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
@@ -72,7 +68,6 @@
          id="stop4851" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4825">
       <stop
          style="stop-color:#c7a229;stop-opacity:1"
@@ -84,7 +79,6 @@
          id="stop4829" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4817">
       <stop
          style="stop-color:#fefdef;stop-opacity:1;"
@@ -96,7 +90,6 @@
          id="stop4821" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4817"
        id="linearGradient4823"
        x1="25.082857"
@@ -106,7 +99,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-20,0)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4825"
        id="linearGradient4831"
        x1="27.425272"
@@ -116,7 +108,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-20,0)" />
     <radialGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4847"
        id="radialGradient4853"
        cx="28.538633"
@@ -134,10 +125,8 @@
        gradientUnits="userSpaceOnUse"
        id="linearGradient4882"
        xlink:href="#linearGradient4968"
-       inkscape:collect="always"
        gradientTransform="translate(-20,0)" />
     <radialGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4960"
        id="radialGradient4958"
        cx="28.552979"
@@ -148,31 +137,6 @@
        gradientTransform="matrix(0.88536081,0.01424168,-0.02077996,1.2918258,4.947957,-305.15187)"
        gradientUnits="userSpaceOnUse" />
   </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="33.004068"
-     inkscape:cy="-10.60689"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1882"
-     inkscape:window-height="1174"
-     inkscape:window-x="416"
-     inkscape:window-y="55"
-     inkscape:window-maximized="0"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid4042" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -186,29 +150,21 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
     <path
        style="fill:url(#radialGradient4853);fill-opacity:1;stroke:none"
        d="m 6.253476,1039.2695 4.507805,0 c 0.453044,1.6907 2.762136,2.5911 2.762136,5.1157 l 0,3.7565 c 0,1.5302 -1.231912,2.7621 -2.762136,2.7621 l -4.507805,0 c -1.530224,0 -2.762136,-1.2319 -2.762136,-2.7621 l 0,-3.7565 c 0,-2.5909 2.334749,-3.5207 2.762136,-5.1157 z"
-       id="rect4044"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccssssssc" />
+       id="rect4044" />
     <path
        style="fill:url(#radialGradient4958);fill-opacity:1;stroke:none;display:inline"
        d="m 6.253476,1039.2695 4.507805,0 c 0.453044,1.6907 2.762136,2.5911 2.762136,5.1157 l 0,3.7565 c 0,1.5302 -1.231912,2.7621 -2.762136,2.7621 l -4.507805,0 c -1.530224,0 -2.762136,-1.2319 -2.762136,-2.7621 l 0,-3.7565 c 0,-2.5909 2.334749,-3.5207 2.762136,-5.1157 z"
-       id="rect4044-7"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccssssssc" />
+       id="rect4044-7" />
     <path
        style="fill:none;stroke:url(#linearGradient4882);stroke-width:0.75;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;display:inline"
        d="m 6.253476,1039.2695 4.507805,0 c 0.453044,1.6907 2.762136,2.5911 2.762136,5.1157 l 0,3.7565 c 0,1.5302 -1.231912,2.7621 -2.762136,2.7621 l -4.507805,0 c -1.530224,0 -2.762136,-1.2319 -2.762136,-2.7621 l 0,-3.7565 c 0,-2.5909 2.334749,-3.5207 2.762136,-5.1157 z"
-       id="rect4044-1"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccssssssc" />
+       id="rect4044-1" />
     <rect
        style="fill:url(#linearGradient4823);fill-opacity:1;stroke:url(#linearGradient4831);stroke-width:0.75;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
        id="rect4815"
diff --git a/ui/org.eclipse.pde.ui/icons/obj16/ftr_mf_obj.svg b/ui/org.eclipse.pde.ui/icons/obj16/ftr_mf_obj.svg
index 39865f28ace..f0e421c74b3 100644
--- a/ui/org.eclipse.pde.ui/icons/obj16/ftr_mf_obj.svg
+++ b/ui/org.eclipse.pde.ui/icons/obj16/ftr_mf_obj.svg
@@ -2,66 +2,19 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="ftr_mf_obj.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient5103-3">
-      <stop
-         style="stop-color:#fefdef;stop-opacity:1"
-         offset="0"
-         id="stop5105-5" />
-      <stop
-         id="stop7550-07"
-         offset="0.26694915"
-         style="stop-color:#fef5d4;stop-opacity:1" />
-      <stop
-         id="stop7548-6"
-         offset="0.51694918"
-         style="stop-color:#fbe08e;stop-opacity:1" />
-      <stop
-         style="stop-color:#fbdd83;stop-opacity:1"
-         offset="1"
-         id="stop5107-7" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3955-9">
-      <stop
-         style="stop-color:#73667b;stop-opacity:1"
-         offset="0"
-         id="stop3957-3" />
-      <stop
-         id="stop3959-2"
-         offset="0.15381166"
-         style="stop-color:#78b8f0;stop-opacity:1" />
-      <stop
-         id="stop3961-3"
-         offset="0.65650523"
-         style="stop-color:#78b8f0;stop-opacity:1" />
-      <stop
-         style="stop-color:#3068d8;stop-opacity:1"
-         offset="0.87807345"
-         id="stop3963-9" />
-      <stop
-         style="stop-color:#73667b;stop-opacity:1"
-         offset="1"
-         id="stop3965-8" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient5135-7"
        id="linearGradient4873-1"
        x1="7.0070496"
@@ -71,8 +24,7 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-2.0013405,-2.994089)" />
     <linearGradient
-       id="linearGradient5135-7"
-       inkscape:collect="always">
+       id="linearGradient5135-7">
       <stop
          id="stop5137-4"
          offset="0"
@@ -83,7 +35,6 @@
          style="stop-color:#637aa7;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient5135-7"
        id="linearGradient4875-9"
        x1="7.0070496"
@@ -93,7 +44,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-2.0013405,-2.994089)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient5135-7"
        id="linearGradient4871-2"
        x1="7.0070496"
@@ -103,7 +53,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-2.0013405,-2.994089)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient5135-7"
        id="linearGradient4869-17"
        x1="7.0070496"
@@ -113,7 +62,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-2.0013405,-2.994089)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4877-6"
        id="linearGradient4867-7"
        x1="7.0070496"
@@ -123,8 +71,7 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-2.0013405,-2.994089)" />
     <linearGradient
-       id="linearGradient4877-6"
-       inkscape:collect="always">
+       id="linearGradient4877-6">
       <stop
          id="stop4879-1"
          offset="0"
@@ -135,7 +82,6 @@
          style="stop-color:#5e76a3;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4902-3"
        id="linearGradient4908-2"
        x1="10.544736"
@@ -145,7 +91,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-1.977903,-1.0442)" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4902-3">
       <stop
          style="stop-color:#b4903d;stop-opacity:1"
@@ -157,7 +102,6 @@
          id="stop4906-2" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4894-6"
        id="linearGradient4900-1"
        x1="7.9987183"
@@ -167,7 +111,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(2.022097,-1.0442)" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4894-6">
       <stop
          style="stop-color:#e0c88f;stop-opacity:1"
@@ -186,10 +129,8 @@
        gradientUnits="userSpaceOnUse"
        id="linearGradient4101"
        xlink:href="#linearGradient4994-6"
-       inkscape:collect="always"
        gradientTransform="translate(-1.977903,-1.0442)" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4994-6">
       <stop
          style="stop-color:#f9fafc;stop-opacity:1;"
@@ -208,11 +149,9 @@
        gradientTransform="translate(-4.9012955,0)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient4933-7"
-       xlink:href="#linearGradient4762"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4762" />
     <linearGradient
-       id="linearGradient4762"
-       inkscape:collect="always">
+       id="linearGradient4762">
       <stop
          id="stop4764"
          offset="0"
@@ -223,31 +162,6 @@
          style="stop-color:#92cef9;stop-opacity:1" />
     </linearGradient>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="2"
-     inkscape:cx="17.512464"
-     inkscape:cy="80.160055"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="900"
-     inkscape:window-x="1135"
-     inkscape:window-y="637"
-     inkscape:window-maximized="0"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3999" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -261,8 +175,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
@@ -270,25 +182,19 @@
        transform="matrix(1.2394243,0,0,1.2394243,-21.274665,-254.90388)"
        style="font-style:normal;font-weight:normal;font-size:13.58917427px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;display:inline;fill:#ffffff;fill-opacity:1;stroke:none"
        id="layer1-9"
-       inkscape:label="Layer 1"
        mask="none" />
     <g
        id="g4486"
        transform="translate(-2.0108349,-0.99436891)">
       <path
-         sodipodi:nodetypes="cccccc"
-         inkscape:connector-curvature="0"
          id="rect4001-3"
          d="m 3.5193795,1037.8597 7.0096695,0 3.062057,3.0066 0,9.9546 -10.0717265,0 z"
          style="display:inline;fill:url(#linearGradient4101);fill-opacity:1;stroke:none" />
       <path
-         inkscape:connector-curvature="0"
          id="path4884"
          d="m 9.998718,1037.397 0,3.9112 3.977479,0 z"
          style="display:inline;fill:url(#linearGradient4900-1);fill-opacity:1;stroke:none" />
       <path
-         sodipodi:nodetypes="cccccc"
-         inkscape:connector-curvature="0"
          id="rect4001"
          d="m 3.5193795,1037.8597 7.0096695,0 2.984717,3.0066 0,9.9937 -9.9943865,0 z"
          style="display:inline;fill:none;stroke:url(#linearGradient4908-2);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1" />
@@ -358,8 +264,6 @@
            style="font-style:normal;font-weight:normal;font-size:13.58917427px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;display:inline;fill:url(#linearGradient4933-7);fill-opacity:1;stroke:#1b2c90;stroke-width:4.49057722;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
            d="m 518.90604,375.19128 26.12171,0 c 1.45425,0 2.625,1.17075 2.625,2.625 l 0,16.98144 c 0,1.45425 -1.17076,2.62076 -2.625,2.625 l -26.12171,0.0761 c -1.45424,0.004 -2.625,-1.17075 -2.625,-2.625 l 0,-17.05753 c 0,-1.45425 1.17075,-2.62501 2.625,-2.62501 z"
            id="rect13693-38"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="sssssssss"
            transform="matrix(0.64390564,0,0,0.64390564,199.15323,71.672134)" />
         <rect
            style="font-style:normal;font-weight:normal;font-size:13.58917427px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;display:inline;fill:#73667b;fill-opacity:1;stroke:none"
diff --git a/ui/org.eclipse.pde.ui/icons/obj16/ftr_xml_obj.svg b/ui/org.eclipse.pde.ui/icons/obj16/ftr_xml_obj.svg
index 4d4bad921be..a58c5acc94c 100644
--- a/ui/org.eclipse.pde.ui/icons/obj16/ftr_xml_obj.svg
+++ b/ui/org.eclipse.pde.ui/icons/obj16/ftr_xml_obj.svg
@@ -2,24 +2,19 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="ftr_xml_obj.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4466">
       <stop
          style="stop-color:#3461ab;stop-opacity:1"
@@ -31,49 +26,6 @@
          id="stop4470" />
     </linearGradient>
     <linearGradient
-       id="linearGradient5103-3">
-      <stop
-         style="stop-color:#fefdef;stop-opacity:1"
-         offset="0"
-         id="stop5105-5" />
-      <stop
-         id="stop7550-07"
-         offset="0.26694915"
-         style="stop-color:#fef5d4;stop-opacity:1" />
-      <stop
-         id="stop7548-6"
-         offset="0.51694918"
-         style="stop-color:#fbe08e;stop-opacity:1" />
-      <stop
-         style="stop-color:#fbdd83;stop-opacity:1"
-         offset="1"
-         id="stop5107-7" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3955-9">
-      <stop
-         style="stop-color:#3870da;stop-opacity:1"
-         offset="0"
-         id="stop3957-3" />
-      <stop
-         id="stop3959-2"
-         offset="0.15381166"
-         style="stop-color:#78b8f0;stop-opacity:1" />
-      <stop
-         id="stop3961-3"
-         offset="0.65650523"
-         style="stop-color:#78b8f0;stop-opacity:1" />
-      <stop
-         style="stop-color:#3068d8;stop-opacity:1"
-         offset="0.92272848"
-         id="stop3963-9" />
-      <stop
-         style="stop-color:#3068d8;stop-opacity:1"
-         offset="1"
-         id="stop3965-8" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient5135-7"
        id="linearGradient4873-1"
        x1="7.0070496"
@@ -83,8 +35,7 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-1.977903,-3.0442)" />
     <linearGradient
-       id="linearGradient5135-7"
-       inkscape:collect="always">
+       id="linearGradient5135-7">
       <stop
          id="stop5137-4"
          offset="0"
@@ -95,7 +46,6 @@
          style="stop-color:#637aa7;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient5135-7"
        id="linearGradient4875-9"
        x1="7.0070496"
@@ -105,7 +55,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-1.977903,-3.0442)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient5135-7"
        id="linearGradient4871-2"
        x1="7.0070496"
@@ -115,7 +64,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-1.977903,-3.0442)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4902-3"
        id="linearGradient4908-2"
        x1="10.544736"
@@ -125,7 +73,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-1.977903,-1.0442)" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4902-3">
       <stop
          style="stop-color:#b4903d;stop-opacity:1"
@@ -137,7 +84,6 @@
          id="stop4906-2" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4894-6"
        id="linearGradient4900-1"
        x1="7.9987183"
@@ -147,7 +93,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(2.022097,-1.0442)" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4894-6">
       <stop
          style="stop-color:#e0c88f;stop-opacity:1"
@@ -166,10 +111,8 @@
        gradientUnits="userSpaceOnUse"
        id="linearGradient4101"
        xlink:href="#linearGradient4994-6"
-       inkscape:collect="always"
        gradientTransform="translate(-1.977903,-1.0442)" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4994-6">
       <stop
          style="stop-color:#f9fafc;stop-opacity:1;"
@@ -204,7 +147,6 @@
          style="stop-color:#ba772f;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient3973-6"
        id="linearGradient5313"
        gradientUnits="userSpaceOnUse"
@@ -214,8 +156,7 @@
        x2="538.00562"
        y2="374.21222" />
     <linearGradient
-       id="linearGradient3973-6"
-       inkscape:collect="always">
+       id="linearGradient3973-6">
       <stop
          id="stop3975-0"
          offset="0"
@@ -226,7 +167,6 @@
          style="stop-color:#f8f0c8;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient3949-4"
        id="linearGradient5315"
        gradientUnits="userSpaceOnUse"
@@ -236,7 +176,6 @@
        x2="548.45923"
        y2="373.77069" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3949-4">
       <stop
          style="stop-color:#9e6627;stop-opacity:1"
@@ -248,7 +187,6 @@
          id="stop3953-6" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient3967-5"
        id="linearGradient5318"
        gradientUnits="userSpaceOnUse"
@@ -258,8 +196,7 @@
        x2="531.09253"
        y2="371.17883" />
     <linearGradient
-       id="linearGradient3967-5"
-       inkscape:collect="always">
+       id="linearGradient3967-5">
       <stop
          id="stop3969-3"
          offset="0"
@@ -270,7 +207,6 @@
          style="stop-color:#ad6c24;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient3955-1"
        id="linearGradient5310"
        gradientUnits="userSpaceOnUse"
@@ -280,128 +216,6 @@
        x2="543.91406"
        y2="373.2294" />
     <linearGradient
-       id="linearGradient10448-9-7-0-5">
-      <stop
-         id="stop10450-3-5-6-7"
-         offset="0"
-         style="stop-color:#cf9307;stop-opacity:1" />
-      <stop
-         style="stop-color:#f7d87b;stop-opacity:1"
-         offset="0.5"
-         id="stop10456-4-1-5-3" />
-      <stop
-         id="stop10452-22-7-8-4"
-         offset="1"
-         style="stop-color:#ebb313;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10748-8">
-      <stop
-         style="stop-color:#ecac18;stop-opacity:1"
-         offset="0"
-         id="stop10750-5" />
-      <stop
-         id="stop10752-8"
-         offset="0.25"
-         style="stop-color:#f1ce66;stop-opacity:1" />
-      <stop
-         id="stop10754-8"
-         offset="0.5"
-         style="stop-color:#f6e5a6;stop-opacity:1" />
-      <stop
-         style="stop-color:#f1cf6c;stop-opacity:1"
-         offset="0.75"
-         id="stop10756-4" />
-      <stop
-         style="stop-color:#e5b630;stop-opacity:1"
-         offset="1"
-         id="stop10758-7" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10448-90">
-      <stop
-         id="stop10450-0"
-         offset="0"
-         style="stop-color:#ecac18;stop-opacity:1" />
-      <stop
-         style="stop-color:#ffe38d;stop-opacity:1"
-         offset="0.25"
-         id="stop10458-2" />
-      <stop
-         style="stop-color:#fdf5d2;stop-opacity:1"
-         offset="0.5"
-         id="stop10456-96" />
-      <stop
-         id="stop10460-3"
-         offset="0.75"
-         style="stop-color:#ffeba7;stop-opacity:1" />
-      <stop
-         id="stop10452-1"
-         offset="1"
-         style="stop-color:#e5b630;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10414-9">
-      <stop
-         id="stop10416-3"
-         offset="0"
-         style="stop-color:#5078b9;stop-opacity:1;" />
-      <stop
-         style="stop-color:#6d8cbd;stop-opacity:1"
-         offset="0.5"
-         id="stop10422-8" />
-      <stop
-         id="stop10418-4"
-         offset="1"
-         style="stop-color:#5f88c9;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10432-3">
-      <stop
-         style="stop-color:#1f4d9a;stop-opacity:1"
-         offset="0"
-         id="stop10434-4" />
-      <stop
-         id="stop10436-2"
-         offset="0.5"
-         style="stop-color:#4e6da1;stop-opacity:1" />
-      <stop
-         style="stop-color:#567ebc;stop-opacity:1"
-         offset="1"
-         id="stop10438-9" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10157-6">
-      <stop
-         id="stop10159-5"
-         offset="0"
-         style="stop-color:#6588c1;stop-opacity:1" />
-      <stop
-         style="stop-color:#becce3;stop-opacity:1"
-         offset="0.5"
-         id="stop10165-9" />
-      <stop
-         id="stop10161-55"
-         offset="1"
-         style="stop-color:#809dcb;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4284">
-      <stop
-         style="stop-color:#6588c1;stop-opacity:0"
-         offset="0"
-         id="stop4286" />
-      <stop
-         id="stop4288"
-         offset="0.49999967"
-         style="stop-color:#becce3;stop-opacity:1" />
-      <stop
-         style="stop-color:#809dcb;stop-opacity:0"
-         offset="1"
-         id="stop4290" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10748-8-5"
        id="linearGradient4426"
        gradientUnits="userSpaceOnUse"
@@ -434,7 +248,6 @@
          style="stop-color:#f3f4f0;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10448-90-9"
        id="linearGradient4428"
        gradientUnits="userSpaceOnUse"
@@ -467,7 +280,6 @@
          id="stop10452-1-6" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4322"
        id="linearGradient4328"
        x1="10.003791"
@@ -477,7 +289,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(14.996209,-0.985039)" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4322">
       <stop
          style="stop-color:#a0b5d7;stop-opacity:1"
@@ -501,7 +312,6 @@
          id="stop4326" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4285"
        id="linearGradient4291"
        x1="11.923064"
@@ -511,7 +321,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(14.668084,-11.177808)" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4285">
       <stop
          style="stop-color:#7e9cca;stop-opacity:1"
@@ -535,7 +344,6 @@
          id="stop4289" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4295"
        id="linearGradient4301"
        x1="13.425666"
@@ -545,7 +353,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(14.668084,-11.177808)" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4295">
       <stop
          style="stop-color:#5d88cb;stop-opacity:1"
@@ -557,7 +364,6 @@
          id="stop4299" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4466"
        id="linearGradient4472"
        x1="22.577358"
@@ -566,31 +372,6 @@
        y2="1059.3608"
        gradientUnits="userSpaceOnUse" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="11.313709"
-     inkscape:cx="16.847542"
-     inkscape:cy="14.649777"
-     inkscape:document-units="px"
-     inkscape:current-layer="g4474"
-     showgrid="true"
-     inkscape:window-width="1055"
-     inkscape:window-height="900"
-     inkscape:window-x="1306"
-     inkscape:window-y="602"
-     inkscape:window-maximized="0"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3999" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -604,8 +385,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
@@ -613,25 +392,19 @@
        transform="matrix(1.2394243,0,0,1.2394243,-21.274665,-254.90388)"
        style="font-style:normal;font-weight:normal;font-size:13.58917427px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;display:inline;fill:#ffffff;fill-opacity:1;stroke:none"
        id="layer1-9"
-       inkscape:label="Layer 1"
        mask="none" />
     <g
        id="g4486"
        transform="translate(-2.0108349,-0.99436891)">
       <path
-         sodipodi:nodetypes="cccccc"
-         inkscape:connector-curvature="0"
          id="rect4001-3"
          d="m 3.5193795,1037.8597 7.0096695,0 3.062057,3.0066 -1.59099,7.9217 -8.4807365,2.0329 z"
          style="display:inline;fill:url(#linearGradient4101);fill-opacity:1;stroke:none" />
       <path
-         inkscape:connector-curvature="0"
          id="path4884"
          d="m 9.998718,1037.397 0,3.9112 3.977479,0 z"
          style="display:inline;fill:url(#linearGradient4900-1);fill-opacity:1;stroke:none" />
       <path
-         sodipodi:nodetypes="cccccccc"
-         inkscape:connector-curvature="0"
          id="rect4001"
          d="m 3.5193795,1037.8597 7.0096695,0 3.062057,3.0066 0,5.8169 -1.856155,2.2815 -2.6088541,1.8562 -5.6067174,0 z"
          style="display:inline;fill:none;stroke:url(#linearGradient4908-2);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1" />
@@ -669,14 +442,11 @@
     <path
        style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:11.05178356px;line-height:125%;font-family:AustralianFlyingCorpsStencil;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;display:inline;fill:url(#linearGradient5313);fill-opacity:1;stroke:url(#linearGradient5315);stroke-width:0.99999994;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        d="m 4.3206642,1042.8678 8.3447228,0 c 0.190636,0 0.36652,0.061 0.509329,0.1644 0.216977,0.1573 0.3576,0.4128 0.3576,0.7025 l 0,1.8699 c 0,0.4803 -4.7177154,4.276 -5.197958,4.2699 l -4.0136938,-0.051 c -0.4802242,-0.01 -0.8669289,-0.3866 -0.8669289,-0.8669 l 0,-5.222 c 0,-0.4803 0.3163169,-0.8676 0.7966164,-0.8669 z"
-       id="rect13693"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="csssssssssc" />
+       id="rect13693" />
     <path
        style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:11.05178356px;line-height:125%;font-family:AustralianFlyingCorpsStencil;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;display:inline;fill:none;stroke:url(#linearGradient5310);stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="m 3.9781162,1042.8618 6.6361338,0"
-       id="path13797"
-       inkscape:connector-curvature="0" />
+       id="path13797" />
     <g
        transform="translate(-9.1031407,15.987384)"
        style="display:inline"
@@ -703,12 +473,10 @@
            id="rect10007-0-74-2-7-0"
            style="display:inline;fill:url(#linearGradient4426);fill-opacity:1;stroke:none;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
         <path
-           inkscape:connector-curvature="0"
            id="path4313-5-1-2"
            d="m 31.080203,1061.363 -3.351585,0.031 0.0098,0.9887 3.351585,-0.031 -0.0098,-0.9886 z"
            style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#a16928;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
         <path
-           inkscape:connector-curvature="0"
            id="path4313-8-0"
            d="m 31.076676,1058.3551 -3.297057,0.03 0.0096,0.9772 3.297056,-0.03 -0.0096,-0.9773 z"
            style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ba9726;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
@@ -722,12 +490,10 @@
            id="rect10007-0-74-2-0"
            style="display:inline;fill:url(#linearGradient4428);fill-opacity:1;stroke:none;stroke-width:1.50161433;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
         <path
-           inkscape:connector-curvature="0"
            id="path4313-54"
            d="m 29.072701,1057.3648 -3.320426,0.03 0.0096,0.9774 3.320425,-0.031 -0.0097,-0.9772 z"
            style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
         <path
-           inkscape:connector-curvature="0"
            id="path4313-5-0"
            d="m 29.074745,1062.3415 -3.289267,0.032 0.0096,1.0214 3.289267,-0.032 -0.0096,-1.0214 z"
            style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#a16928;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
@@ -736,21 +502,15 @@
           <path
              style="display:inline;opacity:1;fill:url(#linearGradient4472);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
              d="m 19.080965,1061.381 6.465143,0 0,-1.9778 -6.465143,0"
-             id="rect4317-3"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="cccc" />
+             id="rect4317-3" />
           <path
              style="fill:url(#linearGradient4328);fill-opacity:1;fill-rule:evenodd;stroke:#3461ab;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
              d="m 24.09375,1058.9107 2.53125,0 -0.09375,2.9871 -2.422823,0"
-             id="path4303"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="cccc" />
+             id="path4303" />
           <path
              style="fill:url(#linearGradient4291);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4301);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
              d="m 25.609375,1059.4434 0,-1.2876 c 0,-0.4714 1.015625,-1.2031 1.015625,-1.2031 0,0 0.96875,0.4413 0.96875,0.8906 l 0,4.9063 c 0,0.5045 -1.070312,1.0547 -1.070312,1.0547 0,0 -0.945313,-0.5336 -0.945313,-1.0234 l 0,-1.3759"
-             id="path4274"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="cscssccc" />
+             id="path4274" />
         </g>
       </g>
     </g>
diff --git a/ui/org.eclipse.pde.ui/icons/obj16/gel_sc_obj.svg b/ui/org.eclipse.pde.ui/icons/obj16/gel_sc_obj.svg
index dce5030868a..151255c6dc9 100644
--- a/ui/org.eclipse.pde.ui/icons/obj16/gel_sc_obj.svg
+++ b/ui/org.eclipse.pde.ui/icons/obj16/gel_sc_obj.svg
@@ -2,24 +2,19 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="gel_sc_obj.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4211">
       <stop
          style="stop-color:#6a9ac2;stop-opacity:1"
@@ -46,8 +41,7 @@
          style="stop-color:#4364a7;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       id="linearGradient7580"
-       inkscape:collect="always">
+       id="linearGradient7580">
       <stop
          id="stop7582"
          offset="0"
@@ -58,7 +52,6 @@
          style="stop-color:#4fa8ca;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient8349">
       <stop
          style="stop-color:#ffffff;stop-opacity:1;"
@@ -89,7 +82,6 @@
          id="stop8386" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient8382"
        id="linearGradient7571"
        gradientUnits="userSpaceOnUse"
@@ -99,7 +91,6 @@
        y2="12.665515"
        gradientTransform="matrix(1.4450739,0,0,1.4450739,-8.184556,1029.6884)" />
     <radialGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient8349"
        id="radialGradient7574"
        gradientUnits="userSpaceOnUse"
@@ -110,7 +101,6 @@
        fy="395.31625"
        r="232.85715" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient7580"
        id="linearGradient7576"
        gradientUnits="userSpaceOnUse"
@@ -119,7 +109,6 @@
        x2="-1030.4867"
        y2="328.19562" />
     <radialGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient8396"
        id="radialGradient7578"
        gradientUnits="userSpaceOnUse"
@@ -156,10 +145,8 @@
        gradientTransform="matrix(1.4450739,0,0,1.4450739,-8.184556,1029.9384)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient7603"
-       xlink:href="#linearGradient8382-7"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient8382-7" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4883"
        id="linearGradient4889"
        x1="28"
@@ -169,7 +156,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-20,0)" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4883">
       <stop
          style="stop-color:#ebf9ff;stop-opacity:1"
@@ -188,10 +174,8 @@
        gradientTransform="matrix(1,0,0,0.74374999,18,264.1678)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient5062"
-       xlink:href="#linearGradient4910-4"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4910-4" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4910-4">
       <stop
          style="stop-color:#ffffff;stop-opacity:0"
@@ -210,11 +194,9 @@
        gradientUnits="userSpaceOnUse"
        id="linearGradient4975-2"
        xlink:href="#linearGradient4994-4"
-       inkscape:collect="always"
        gradientTransform="matrix(0.79999998,0,0,1,15,-3.000037)" />
     <linearGradient
-       id="linearGradient4994-4"
-       inkscape:collect="always">
+       id="linearGradient4994-4">
       <stop
          id="stop4996-5"
          offset="0"
@@ -225,7 +207,6 @@
          style="stop-color:#ffffff;stop-opacity:0;" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4211"
        id="linearGradient4217"
        x1="6.875"
@@ -234,31 +215,6 @@
        y2="1048.1904"
        gradientUnits="userSpaceOnUse" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7.9999996"
-     inkscape:cx="5.2021011"
-     inkscape:cy="10.449757"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1303"
-     inkscape:window-height="858"
-     inkscape:window-x="1000"
-     inkscape:window-y="655"
-     inkscape:window-maximized="0"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid8762" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -272,8 +228,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
@@ -291,12 +245,10 @@
            id="path3800-3-8"
            transform="matrix(0.02510115,0,0,0.02510115,31.108567,1031.644)" />
         <path
-           inkscape:connector-curvature="0"
            id="path3800-3-8-0-8"
            d="m 9.066013,1039.3313 c -0.08358,-10e-5 -0.146685,0.025 0,0.045 0.101849,0.014 -0.05818,0.061 0.09032,0.045 0.07519,-0.065 -0.01658,-0.09 -0.09032,-0.09 z m -1.806342,0.045 c -0.08085,0.016 -0.146193,0.071 -0.225793,0.09 0.167199,-0.042 0.324172,-0.063 0.496744,-0.09 -0.08865,0.014 -0.183662,-0.017 -0.270951,0 z m 0.722537,0 c -0.100838,0.019 -0.125577,0.038 0,0.045 0.08577,-0.039 0.08961,-0.048 0.135475,-0.045 -0.05026,0 -0.09312,-0.014 -0.135475,0 z m 1.625708,0 c -0.0091,-8e-4 -0.03685,0.046 -0.04516,0.045 -0.01605,0.03 -0.129334,0.049 0.04516,0.045 0.0048,0.019 0.01431,0.067 0.04516,0.045 0.01156,-0.019 0.01983,-0.077 0.04516,-0.09 -0.03183,0 -0.05829,-0.039 -0.09032,-0.045 z m -1.128964,0.045 c -0.02416,6e-4 -0.03418,0.051 -0.04516,0.09 -0.09662,-0.065 -0.29735,-0.055 -0.361269,-0.045 -0.05552,0.027 -0.05,0.055 0.135476,0.045 0.103958,0 -0.01496,0.032 -0.09032,0.045 0.02251,0 0.01773,10e-4 0.09032,0 0.09883,0 0.621851,-0.055 0.31611,-0.09 0.02353,-0.04 -0.02653,-0.045 -0.04516,-0.045 z m 0.722537,0 c -0.01127,0.014 0.02183,0.048 0.135475,0.045 0.03143,-0.042 0.03666,-0.046 0,-0.045 -0.03753,5e-4 -0.12416,-0.014 -0.135475,0 z m -0.451586,0.045 c -0.01501,6e-4 8e-5,0.039 0,0.045 0,0 0.04516,0 0.04516,0 0,0 -0.04516,-0.045 -0.04516,-0.045 z m 0.04516,0.045 c -0.04631,0.014 -0.04368,0.033 0.09032,0.045 -0.03234,0 -0.123857,0.062 0.04516,0.045 0.132571,-0.04 0.176165,-0.1373 0.04516,-0.1358 -0.01358,10e-5 -0.02783,0.043 -0.04516,0.045 0.01672,0.017 -0.08916,-0.014 -0.135476,0 z m 1.128964,-0.045 c -0.01387,0.017 -0.03883,0.027 -0.04516,0.045 -0.009,0.026 0.01026,0.077 0,0.09 -0.0072,0 -0.03152,0 -0.04516,0 -0.05439,-3e-4 -0.162088,0.014 -0.180634,0 -0.153773,-0.014 -0.07519,0.025 -0.04516,0.045 0.138264,0.014 0.297103,0.08 0.31611,0.09 0.136704,0.014 0.03662,-0.1584 0.270951,-0.09 -0.0059,-0.024 0.0011,-0.039 0.04516,-0.045 -0.105129,-0.035 -0.208457,-0.1069 -0.316109,-0.1358 z m -0.722537,0.045 c 0.01559,0.014 0.002,0.033 0.04516,0.045 0.06509,-0.037 0.0069,-0.045 -0.04516,-0.045 z m -1.625708,0.045 c -0.253349,0.1142 -0.426184,0.1817 -0.406427,0.271 0.180027,-0.019 0.371333,-0.1717 0.587061,-0.1807 0.223903,-0.075 -0.05272,-0.085 -0.180634,-0.09 z m 1.445074,0.045 c -0.0409,0.016 -0.01728,0.074 0.09032,0.09 0.02965,-0.053 -0.0091,-0.091 -0.04516,-0.09 -0.01504,2e-4 -0.03153,0 -0.04516,0 z m -0.677379,0.045 c -0.04481,0 -0.05671,0.036 0,0.09 0.172461,-0.032 0.0655,-0.091 0,-0.09 z m 0.31611,0.045 c -0.137831,0.038 0.04928,0.025 -0.09032,0.09 -0.207472,-0.068 -0.03163,0.1658 0,0.1807 0.04266,0 0.131011,-0.088 0.180635,-0.1359 -0.03626,-0.026 0.01566,-0.071 0.04516,-0.09 3.77e-4,-0.014 -0.01069,-0.04 -0.04516,-0.045 -0.0196,0 -0.06061,9e-4 -0.09032,0 z m 1.716025,0 c -0.004,0 -0.01945,0.029 0,0.045 0.07818,0.033 0.02507,0.035 0.04516,0.045 0.03601,0.071 0.313666,0.1649 0.180634,0.1359 0.135678,0.027 0.416206,0.3372 0.361268,0.2257 0.04163,0.069 0.111546,0.3245 0.09032,0.2258 0.0104,0 0.09364,0.062 0.09032,0.09 0.07303,0.017 0.09192,0.066 0.09032,0.09 0.01387,0 0.03951,0.059 0,0.045 0,0 -0.04516,0 -0.04516,0 0.0066,0 -0.0061,0.043 0,0.045 0.123612,0.045 0.0056,0.1286 0.04516,0.1359 -0.04496,4e-4 -0.04601,0.036 -0.04516,0.045 0.0078,0 -0.0058,0.042 0,0.045 0.01988,0 -0.03053,0.046 0.09032,0.045 -0.02273,-9e-4 -0.102253,0.014 -0.135475,0 0.01098,0 0.0066,0.027 0.04516,0.045 -0.05684,0.014 -0.08789,0.068 -0.09032,0.09 0.156122,-0.053 0.09485,0.022 0.04516,0.045 0.04858,0 0.08897,0.019 0.09032,0.045 0.01497,0 0.03866,0.033 0,0.045 -0.0022,0 0.004,0.039 0,0.045 0.0072,0 -0.0046,0.041 0,0.045 -0.08747,0.03 -0.03464,0.1041 0,0.1359 -0.002,7e-4 0.0424,0.014 0.04516,0 -0.0084,0.09 0.04516,0.2208 0.04516,0.1806 0.08871,0.084 0.176136,0.1171 0.180634,0.09 0.02958,0 0.141039,0.071 0.135476,0.09 0.04514,0.014 0.07444,0 0.04516,-0.045 0.0042,-0.02 -0.0097,-0.055 0,-0.09 0.01272,-0.048 0.01607,-0.066 0,-0.045 -0.04244,-0.038 0.08587,-0.075 0.04516,-0.09 0.04006,-0.039 0.02247,-0.3081 0.04516,-0.1806 0.124681,-0.045 0.167427,0.042 0.180635,-0.045 3.52e-4,0.069 0.06373,0.014 0.09032,0 0.0064,0 0.04063,0 0.04516,0 0.03445,-0.027 -0.01487,-0.1848 0.04516,-0.1359 0.07386,0.1171 0.333387,0.12 0.406427,0.045 -0.06679,-0.035 -0.100563,-0.071 -0.135476,-0.09 -0.05608,-0.02 -0.07516,-0.078 -0.09032,-0.09 0.0149,0 0.03384,0.029 0.09032,0.045 0.02376,0.022 0.03107,-0.014 0.04516,0 -0.04337,-0.059 -0.08394,-0.1445 -0.09032,-0.1358 -0.04805,-0.045 -0.05874,-0.053 -0.04516,-0.045 -0.07471,-0.052 -0.0069,-0.071 0.09032,0 -0.503631,-0.4665 -1.072016,-0.862 -1.716025,-1.1289 -0.03867,0 -0.236008,-0.039 -0.31611,-0.045 z m -2.619196,0.045 c -0.05805,0.035 -0.103164,0.066 -0.180634,0.09 0.08266,0 -0.436024,0.1185 0.04516,0.09 -0.06329,0.036 -0.540547,0.059 -0.180634,0.1806 -0.12825,0.2039 0.586882,-0.068 0.406427,0 0.06181,-0.017 0.09822,0.091 0.225793,0.09 0.162503,-0.03 0.129551,-0.1228 0.09032,-0.1358 0.0322,-0.02 0.06892,-0.048 0.09032,-0.045 -0.05185,-0.059 -0.08393,-0.087 0,-0.1806 -0.05951,0.04 -0.194185,0.088 -0.180634,0 0.0082,-0.059 0.01776,-0.1739 -0.04516,-0.09 -0.09198,0.024 -0.17661,0.014 -0.225793,0 -0.0104,0 -0.04373,0 -0.04516,0 z m 1.535391,0.09 c -0.107831,0.033 -0.344638,0.2215 -0.09032,0.271 -0.04356,-0.014 -0.07185,0 -0.09032,0 0.04418,0.037 0.112152,0.1069 0.09032,0.09 0.04681,0.014 0.147535,0.032 0.225793,0.045 0.105317,0.019 0.193436,0.033 0.135476,0.045 0.130201,0.058 0.05777,-0.1893 0.135475,0.045 0.128077,0.02 0.27517,0.1141 0.135476,0.1358 -0.0069,10e-5 -0.01567,0.081 0,0.045 0.0402,0.062 0.150499,0.1579 0.135476,0.09 0.08315,0.065 -0.110548,0.1569 -0.180635,0.1806 0.0177,0.059 -0.03884,0.1113 -0.09032,0.1359 0.06264,-0.014 0.246448,0.246 0.180635,0.1806 -0.02867,0.014 -0.02299,0.022 0,0.045 -0.0098,0 0.02185,0.061 0.04516,0.045 0.097426,0.065 0.245697,0.1257 0.270951,0.1358 0.01,-0.036 -0.04431,-0.1257 -0.09032,-0.1806 0.01185,0 0.02392,-0.014 0.04516,0 0.04767,0.014 0.146999,0.027 0.135476,0.09 0.04169,-0.036 -0.0049,-0.1807 0,-0.1807 -0.1151,-0.1611 -0.108568,-0.098 -0.135476,-0.2257 -0.02711,-0.023 0.167583,-0.014 0.135476,0 0.02048,0.032 0.0404,0.062 0.04516,0.09 -0.01575,0 0.140056,-0.068 0.135475,0.045 0.03637,-0.023 0.03461,-0.061 0.04516,-0.09 0.168702,0 -0.05389,-0.052 0,-0.045 0.01402,-0.1011 -0.11841,-0.053 -0.09032,-0.1358 -0.04477,-0.051 -0.130837,-0.1156 -0.09032,-0.045 -0.01753,0 -0.07007,-0.058 -0.09032,-0.09 0.0078,-0.02 -0.0017,-0.058 0.135476,-0.045 -0.05561,-0.017 -0.08386,-0.032 -0.09032,-0.045 0.01798,-0.016 0.03208,-0.055 -0.09032,-0.045 -0.0299,-0.03 0.01838,-0.038 0.04516,-0.045 -6.12e-4,-0.014 -0.01171,-0.02 -0.04516,-0.045 -0.109146,0.048 -0.0098,-0.017 -0.04516,-0.045 -0.02155,0.014 -0.04663,0.014 -0.04516,0 0.09383,-0.043 0.01718,-0.1055 -0.04516,-0.09 0.02032,-0.019 -0.02958,-0.066 -0.090317,-0.045 -0.106357,-0.024 0.01585,0 -0.09032,-0.09 -0.01676,-0.038 -0.01501,-0.09 -0.04516,-0.09 -0.05507,2e-4 -0.07881,0.043 -0.09032,0.045 -0.01653,-0.046 -0.0349,-0.062 -0.04516,-0.045 0.0046,-0.056 -0.03548,-0.1055 -0.180634,-0.045 -0.07579,0.02 -0.05127,0.1577 -0.09032,0.09 -0.0397,-0.032 -0.06827,-0.027 -0.09032,0 -0.02205,0.028 -0.02562,0.071 0,0.09 -0.08386,0.017 -0.04658,-0.035 0,-0.09 0.06987,-0.084 0.144175,-0.1831 0.04516,-0.1806 -0.02027,4e-4 -0.04897,-0.014 -0.09032,0 z m -2.528879,0.09 c -0.04168,0.016 -0.138857,0.061 -0.225793,0.09 -0.08448,0.02 -0.177462,0.014 -0.135476,0 -0.03442,-0.014 -0.225251,0.104 -0.31611,-0.045 -0.15475,0.014 -0.22998,0 -0.316109,0 -0.01172,0 -0.03348,0 -0.04516,0 -0.51809,0.2744 -0.988949,0.6277 -1.399916,1.0387 -0.05146,0.048 -0.09312,0.1229 -0.135475,0.1807 -0.06051,0.084 -0.07162,0.1445 0,0.09 -0.08021,0.088 -0.106752,0.2593 0.04516,0.1358 -0.127771,0.1948 -0.324817,0.3604 -0.451586,0.4968 0.207116,-0.1689 0.390662,-0.3587 0.587061,-0.5419 0.01575,-0.084 0.1341,-0.1329 0.225793,-0.1806 -0.09124,0.084 -0.180188,0.2231 -0.09032,0.1358 0.0882,-0.035 0.212553,-0.1668 0.270951,-0.2257 -0.0011,0 0.04432,0 0.04516,0 0.01399,-4e-4 0.02171,0 0,0.045 0.04249,0.014 0.1853,0.077 0.225793,0.09 0.04562,-0.023 0.147873,0.085 0.135476,0.1358 0.0124,-0.014 0.03244,-0.022 0.04516,-0.09 0.0099,-0.039 -0.03141,0.2057 0,0.1807 -0.01275,0.029 -0.0353,0.061 -0.04516,0.09 0,0 -0.04516,0.045 -0.04516,0.045 -0.0081,0.019 -0.0064,0.039 0,0.045 0,0 0.04516,-0.045 0.04516,-0.045 -0.0034,0.014 -0.0015,0.035 0,0.045 -0.005,5e-4 -0.02389,0.059 0,0.045 0.0046,0 0.03764,-4e-4 0.04516,0 -0.02653,0.027 -0.01638,0.036 0,0.045 0.01488,0.014 5.5e-5,0.041 -0.04516,0.09 -0.01454,0.014 0.02371,0.025 0,0.045 -0.02886,0.095 0.01342,0.1359 0.04516,0.1359 -0.01798,0.079 -0.01867,0.1579 0,0.1806 -0.0415,0.059 -0.07669,0.1416 -0.04516,0.09 0.07378,-0.014 0.0011,0.1257 -0.04516,0.1806 0.02834,-0.014 0.07674,-0.026 0.180634,-0.09 -0.0082,0.025 0.123813,0.082 0.04516,0.1359 0.03263,0.051 0.02895,0.1286 0,0.1806 -0.01908,0.033 -0.0424,0.038 -0.04516,0.045 -0.05049,-0.2244 -0.182126,0.3601 -0.180634,0.2257 -0.09281,0.2171 -0.184077,0.401 -0.225793,0.6322 -0.08139,0.1739 -0.02076,0.4711 0.04516,0.4065 0.04001,0.1529 0.01708,0.3703 0.180634,0.4064 0.155322,0.152 0.10817,0.4311 0.270952,0.5871 0.02048,0.12 -0.128768,0.1931 0.04516,0.2258 0.113208,0.2501 0.133117,0.4109 0.270951,0.3612 -0.09169,-0.1055 -0.25631,-0.5183 -0.225793,-0.4966 -0.07931,-0.1287 -0.173621,-0.4827 0,-0.3613 0.07233,0.1521 0.132911,0.363 0.270952,0.4967 0.0043,0.1563 0.22556,0.3085 0.270951,0.5419 -0.03782,0.1572 0.02529,0.2692 0.180634,0.3612 0.218358,0.061 0.436111,0.2914 0.677379,0.1807 0.156357,-0.027 0.289166,0.3063 0.496744,0.2709 0.229001,0.023 0.220627,0.081 0.361268,0.271 -0.01156,0.1828 0.112181,-0.048 0.135476,0.1806 0.07209,-0.014 0.307461,0.062 0.361268,0.09 0.008,-0.1884 0.269413,-0.1286 0.225793,0.045 0.0747,0.1574 0.06241,0.3712 -0.09032,0.4967 -0.101184,0.04 -0.200609,0.2345 -0.225793,0.3161 0.227877,-0.024 0.131112,0.3285 0.04516,0.3613 0.205709,0.1171 0.276077,0.371 0.406427,0.5419 0.08621,0.1857 0.388537,0.1857 0.496745,0.3613 0.02814,0.2003 -0.01387,0.35 0,0.5419 -0.08689,0.1501 0.0177,0.3206 -0.04516,0.4516 -0.07473,0.1185 -0.115361,0.3503 0.04516,0.3612 -0.0084,0.039 -0.07266,0.092 -0.09032,0.1359 -0.0056,0.014 0,0.037 0,0.045 -0.112398,0 -0.08498,0.022 -0.04516,0.045 0,0 0.04516,0.045 0.04516,0.045 0.01329,5e-4 0.02896,0.014 0.04516,0 0.01402,0.014 -0.01,0.038 0,0.045 0.136082,-0.014 0.273318,-0.022 0.406427,-0.045 -0.182325,-0.026 0.237626,-0.1416 0,-0.1807 0.0987,-0.026 0.0774,-0.091 0.180634,-0.1358 0.0084,-0.042 0.196108,-0.2228 0.361268,-0.2257 0.411132,-0.071 -0.203677,-0.3353 0.180634,-0.2259 0.116964,0.065 0.29323,-0.1387 0.361268,-0.2257 -0.05939,0.1585 0.281741,-0.3464 0.270952,-0.3613 0.152708,-0.1141 0.609512,-0.2704 0.451585,-0.2709 0.207422,-0.1445 0.281629,-0.4255 0.31611,-0.6775 0.174726,-0.1458 0.295933,-0.4276 0.31611,-0.4967 -0.03568,-0.1242 -0.504442,-0.2372 -0.361268,-0.2258 -0.09757,-0.046 -0.233604,-0.068 -0.270952,0 -0.0094,-0.091 -0.304507,-0.12 -0.225792,-0.09 -0.04999,0.036 -0.06761,0.019 -0.09032,0.045 -0.08046,0.091 -0.03829,0.1402 -0.135475,0.045 0.07592,-0.014 0.116516,-0.022 0.135475,-0.045 0.02843,-0.035 0.0011,-0.084 -0.04516,-0.09 -0.0077,6e-4 -0.04117,0 -0.04516,0 -0.0056,0 -0.0429,0 -0.04516,0 -0.03051,0.014 -0.06114,0.051 -0.09032,0.09 -0.08452,-0.025 -0.05975,-0.4036 0.09032,-0.3162 -0.04208,-0.1644 -0.180697,-0.2458 -0.361269,-0.2709 -0.226956,0.053 -0.267778,-0.088 -0.406428,-0.2258 -0.12468,0.029 -0.226532,-0.1741 -0.225792,-0.1806 -0.170932,0.1199 -0.602057,-0.014 -0.677378,-0.045 -0.07045,0 -0.113251,0.051 -0.09032,0.1806 -0.206379,0.081 0.108481,-0.3398 -0.09032,-0.2257 -0.128959,0.162 -0.280423,0.02 -0.31611,0.2257 -0.133785,0.2002 -0.09785,0.082 -0.31611,0 -0.251648,0.1373 -0.45284,-0.023 -0.406427,-0.1806 0.05422,-0.1344 -0.01026,-0.3454 0,-0.3613 -0.06094,-0.014 -0.195335,-0.087 -0.361269,-0.045 -0.246457,0.08 0.06764,-0.1517 0,-0.2258 -0.01619,-0.075 -0.120895,-0.3133 0.04516,-0.3161 -0.247612,-0.039 -0.264447,0.1746 -0.361268,0.3161 -0.0863,-0.074 -0.302964,0.075 -0.406427,-0.09 -0.179455,-0.1674 -0.16357,-0.4262 -0.09032,-0.6322 0.0687,-0.079 -0.0041,-0.3479 0.180634,-0.3613 0.172498,-0.097 0.118395,-0.1272 0.361268,-0.09 0.05499,0.014 0.126242,-0.1012 0.225793,0 0.0094,-0.1448 0.439329,-0.085 0.31611,-0.09 0.08587,0.1098 0.246796,0.014 0.270952,0.2259 -0.01344,0.075 0.142137,0.2426 0.180634,0.316 0.169985,-0.2103 -0.187016,-0.5442 0.09032,-0.7225 0.159459,-0.107 0.428687,-0.2989 0.406427,-0.3161 0.01301,0 0.026,-0.042 0.04516,-0.045 -0.01344,-0.014 -0.01026,-0.03 -0.04516,-0.045 0.08519,-0.064 0.01448,-0.2354 0,-0.2709 0.0055,0 0.101155,-0.1952 0.09032,0.045 0.03461,0.2464 0.06759,-0.1026 0.09032,-0.1807 0.0452,-0.03 0.08222,-0.074 0.135475,-0.1358 0.0077,-0.014 0.03254,0 0.04516,0 0.04512,-0.043 0.102095,-0.1084 0.180635,-0.09 0.166978,-0.014 0.07412,-0.014 0.09032,-0.1806 0.113308,-0.133 0.258747,-0.1768 0.31611,-0.1807 -0.0461,-0.072 0.156313,-0.014 0.225792,-0.045 -0.07598,0.039 -0.223603,0.1755 -0.04516,0.2259 0.03367,-0.1416 0.343512,-0.1402 0.31611,-0.2259 -0.0039,-0.014 -0.02468,0.019 -0.04516,0 -0.210821,0.091 -0.329963,-0.2102 -0.270952,-0.2257 -0.212243,-0.046 0.384506,-0.1315 0,-0.1806 -0.317741,0.091 -0.597593,0.3519 -0.225793,0 0.177503,-0.055 0.196233,-0.2214 0.406428,-0.1358 0.136068,0.02 0.347227,0.1156 0.451585,-0.045 0.104349,0.029 0.233393,-0.082 0.180635,-0.1359 0.05896,-0.08 -0.02912,-0.1657 -0.04516,-0.1358 -0.01055,-0.074 -0.115635,-0.035 -0.180634,0 0.0053,-0.014 -0.01857,-0.025 0,-0.045 0.05017,-0.03 0.248185,-0.045 0.04516,-0.1359 -0.06626,0.025 -0.157196,-0.052 -0.09032,-0.045 -0.132657,-0.084 -0.07231,-0.2902 -0.09032,-0.2258 0.04756,-0.069 0.08129,-0.1875 0,-0.1358 -0.116054,0.016 0.0048,-0.069 -0.09032,-0.1806 -0.0026,-0.03 -0.03958,-0.036 -0.04516,-0.045 -0.02613,0.046 -0.09116,0.1199 -0.09032,0.09 -0.0039,0.071 -0.174478,0.1098 -0.180634,0.09 -0.07276,0.03 0.034436,-0.071 -0.135476,-0.09 -0.01477,-0.026 -0.01754,-0.1055 -0.04516,-0.1359 0.15668,0.065 0.206565,-0.1513 0.04516,-0.1358 -0.05439,-0.042 -0.357893,-0.1402 -0.225793,-0.1807 -0.200677,-0.1069 -0.247223,-0.014 -0.31611,0.1359 0.06246,0 -0.06841,0.1228 0,0.1358 -0.09434,0.1315 -0.02214,0.3989 0,0.4516 -0.0052,0.1041 -0.239914,0.361 -0.316109,0.2257 -0.04092,0.1041 -0.103554,0.3613 -0.04516,0.271 0.03178,0.1185 -0.08633,0.03 -0.135476,0.045 -0.119681,-0.1 -0.109262,-0.2182 -0.04516,-0.4065 -0.03478,-0.1704 -0.223877,-0.029 -0.31611,-0.2257 -0.07438,-0.097 -0.278593,-0.1869 -0.361269,-0.1807 0.0474,-0.2799 -0.188827,-0.027 -0.09032,-0.2258 0.03785,-0.1539 0.16659,-0.2857 0.270952,-0.3613 0.07663,-0.055 0.137267,-0.014 0.09032,-0.1358 0.182851,0.1758 0.08571,-0.023 0.09032,-0.045 0.168566,0.097 0.129536,-0.09 0.270951,0 0.06816,-0.014 0.115606,-0.027 0.135476,-0.045 0.03516,-0.033 -0.0032,-0.098 -0.04516,-0.1359 0.178419,0.092 0.196885,-0.2188 0.31611,-0.09 0.0051,0 0.02697,-0.042 0.04516,0 0.17381,0.029 0.142296,-0.2815 0.180634,-0.1806 0.01484,0 -0.0064,-0.043 0,-0.045 -0.03571,-0.032 -0.07068,-0.065 -0.09032,-0.09 -0.06392,0.051 -0.170448,0.1286 -0.225793,0.1806 -0.03445,0.017 -0.054,0.058 -0.04516,0.045 -0.08305,-0.014 0.07733,-0.3585 -0.09032,-0.2257 -0.03918,0.032 -0.06835,0.045 -0.09032,0.045 -0.0104,-0.035 -0.009,-0.1127 0.04516,-0.1358 -0.11984,-0.059 0.102268,-0.061 0,-0.2259 -0.06704,-0.068 -0.211871,0.1629 -0.180634,0.09 -0.20411,0.072 0.216982,0.151 -0.04516,0.1806 0.186072,0.035 -0.11247,0.2885 -0.135476,0.1807 -0.09621,0.092 0.08105,-0.2178 0,-0.1359 -0.02632,0 -0.09958,0 -0.135476,0 -0.0012,0 -0.02827,0.02 0,0.045 0.0055,0.038 -0.330384,-0.037 -0.406427,-0.045 -0.05374,-0.052 -0.06724,-0.093 -0.135475,-0.09 -0.124204,0 -0.150668,0.1496 -0.180634,0.1807 -0.111517,0.1214 -0.13773,-0.097 -0.04516,-0.09 -0.134609,-0.023 -0.225598,-0.061 -0.270952,-0.09 -0.0033,-0.017 -0.02208,-0.075 -0.04516,-0.09 -0.114594,-0.1513 -0.229456,-0.2437 -0.31611,-0.1358 -0.159354,0.1621 -0.08913,-0.049 -0.135475,-0.045 -0.0085,5e-4 -0.02415,-0.019 -0.04516,0 z m 1.716025,0.3613 0.04516,0 c 0.08851,0.022 0.01697,-0.1791 -0.04516,-0.1807 -0.01011,-2e-4 -0.03498,0.035 -0.04516,0.045 -0.11364,0.051 -0.160962,0.023 0,0.09 l 0.04516,0.045 z m 0.361269,0.5419 c -0.0079,0.014 -0.0117,0.072 0,0.045 0.0048,0.035 0.08076,0.1112 0.09032,0.09 0.15424,-0.195 0.164664,0.046 0.31611,0 -0.03415,-0.04 -0.227202,-0.261 -0.225793,-0.271 -0.05786,-3e-4 -0.156921,0.1055 -0.180634,0.1359 z m 1.399914,2.3933 c 0.0016,0.014 0.01286,0 0.04516,0 0.02961,-0.048 0.103626,0.014 0.04516,-0.1358 -0.0038,0.014 -0.09519,0.098 -0.09032,0.1358 z m -5.102916,-0.7676 c 0.02219,0.046 0.01172,0.1141 0,0.09 0.06356,0.033 0.08657,0.1257 0.180634,0.09 0.02836,-0.081 -0.112878,-0.1272 -0.180634,-0.1807 z m 4.651331,-1.9419 c -0.06072,-10e-5 -0.231662,0.094 -0.04516,0.09 0.06634,-0.065 0.07481,-0.09 0.04516,-0.09 z m 1.309598,0.09 c -0.05374,-2e-4 -0.06829,0.1402 0.09032,0.1358 -0.04105,-0.09 -0.06407,-0.1358 -0.09032,-0.1358 z m 1.535391,0.9484 c 0.02032,0.016 0.02788,0.074 0.04516,0.09 -0.03007,-0.041 -0.02595,-0.091 -0.04516,-0.09 z m 0.04516,0.09 c 0.07977,0.068 -0.03724,0.1199 0.135475,0.1806 l 0.04516,0.045 c 0.104508,0.014 0.05055,-0.1823 0.04516,-0.2257 -0.08876,-0.014 -0.177523,0.071 -0.180634,0 -0.01127,-0.019 -0.03513,0.014 -0.04516,0 z m -3.612685,0.1806 c -0.02996,0 -0.110215,0.1185 0,0.09 0.03486,-0.04 0.01272,-0.091 0,-0.09 z m -0.316109,0.4064 c -0.04649,4e-4 -0.0422,0.065 0.09032,0.045 -0.01562,-0.035 -0.07069,-0.045 -0.09032,-0.045 z m 4.922282,0.3162 c 0.02285,0.065 0.03779,0.117 0.09032,0.2257 0.01546,0 0.02498,0.026 0.04516,0.045 -0.04052,-0.092 -0.09033,-0.1807 -0.135475,-0.271 z m -0.180634,0.045 c -0.0026,0.088 0.04016,0.2547 0.09032,0.3612 0.0082,0.017 -0.0074,0.03 0,0.045 -0.0045,6e-4 -0.01373,0.049 0,0.045 0.003,0 0.04264,0 0.04516,0 -0.04351,0.1471 0.05649,0.1713 0,0.2259 0.201321,0.042 0.08532,-0.2345 0.04516,-0.3162 -0.05098,-0.1669 -0.167239,-0.3111 -0.180635,-0.3613 z m -3.386892,0.1358 c -0.05487,10e-5 -0.03402,0.081 0.180634,0.1358 -0.05527,-0.082 -0.140591,-0.1358 -0.180634,-0.1358 z m 0.541903,0 c -0.04708,0.08 -0.09808,0.1676 -0.180635,0.1806 -0.05662,0.074 0.103049,0.181 0.270952,0.1359 -0.0013,0.042 -0.06347,0.117 0.09032,0.045 0.01597,-0.038 -0.0059,-0.046 0,-0.045 0,0 0.04516,0.045 0.04516,0.045 0.0055,0.04 0.01156,0.097 0.04516,0.09 0.121487,-0.1185 -0.04139,-0.094 -0.04516,-0.1359 -0.0013,-0.014 0.0012,-0.055 0.04516,-0.09 -0.145799,0.081 -0.211123,-0.059 -0.09032,-0.09 -0.19025,-0.016 -0.02279,-0.03 -0.09032,-0.09 -0.103309,0.062 -0.115679,0.014 -0.09032,-0.045 z m 2.79983,0.09 c -0.01468,9e-4 -0.03501,0.014 -0.04516,0.045 -0.01171,0.058 0.02377,0.2852 0.04516,0.2259 0.01494,0.014 0.01387,0.062 0.04516,0.045 0.141545,-0.022 0.02559,-0.3205 -0.04516,-0.316 z m 0.406427,0.1358 c 0.01685,0.1416 -0.002,0.3213 0,0.3613 -0.05686,0.077 -0.144873,0.1199 -0.180634,0.1358 0.07341,0.08 -0.01626,0.3265 0.04516,0.4064 -0.122759,-0.016 -0.140562,0.2322 -0.135475,0.3162 -0.01455,0.2338 0.150043,0.3205 0.180634,0.316 0.165256,0 0.194273,-0.4905 0.180634,-0.3613 0.02171,-0.2263 0.177348,-0.2855 0.225793,0 -0.07153,-0.4133 -0.162611,-0.7953 -0.31611,-1.1741 z m 0,1.5354 c -0.07381,0.019 -0.108785,0.056 -0.04516,0.09 -0.155097,-0.022 -0.26964,0.6838 -0.270952,0.5419 -0.174871,0.1601 -0.273942,0.3996 -0.31611,0.6322 0.09247,0.1928 0.04996,0.7639 0,0.6775 0.04069,0.117 0.14247,0.4104 0.135476,0.2709 0.05247,0.159 0.220336,0.3128 0.361268,0.1359 0.196646,-0.1599 0.3696,-0.1979 0.225793,0.1358 0.200782,-0.5907 0.361269,-1.193 0.361269,-1.8516 0,-0.063 -0.04318,-0.1185 -0.04516,-0.1806 -0.126574,-0.1431 -0.353445,-0.4402 -0.180634,-0.4516 -0.06779,-0.02 -0.151984,-0.019 -0.225793,0 z m -5.735136,1.1291 c -0.07149,-6e-4 -0.109219,0.043 -0.180635,0.089 -0.04014,0.049 0.02093,0.055 0.09032,0.045 0,0 0.04516,0 0.04516,0 0.04747,-0.014 0.08867,-0.036 0.09032,-0.045 0.009,0.014 0.613981,0.2571 0.361269,0.1807 0.02809,0.02 0.04955,0.032 0.04516,0.045 0.0053,0.014 0.03601,0.049 0.180634,0.045 0.208289,-0.065 -0.190365,-0.1866 -0.180634,-0.1807 -0.01957,-0.014 -0.02504,-0.035 -0.04516,-0.045 -0.02554,-0.038 -0.03158,-0.045 -0.04516,-0.045 -0.105924,-0.053 -0.248041,-0.089 -0.361268,-0.089 z m -5.148076,0.089 c -0.01985,0 -0.05147,0.056 0,0.09 0.0185,-0.063 0.01358,-0.091 0,-0.09 z m 6.006088,0.2258 c -0.03209,5e-4 -0.05499,0.033 -0.04516,0.045 0.02298,0.016 -0.01,0.033 0,0.045 -0.0094,-2e-4 -0.01896,0.059 0,0.045 -0.02114,0 -0.02792,0.043 -0.04516,0.045 0.12221,-0.067 0.110953,0.078 0.180635,0.045 0.02858,-0.095 0.375135,-0.032 0.270951,-0.1359 -0.02182,-0.051 -0.264998,-0.092 -0.361268,-0.09 z m 0.587062,0.1358 c -0.05835,0 -0.187045,0.1171 0,0.09 0.01783,-0.039 0.02464,-0.091 0,-0.09 z m -1.083806,0.045 c 0.0097,0.014 0.01912,0.032 0.04516,0.045 l 0.04516,0 c 0.172535,-0.016 -0.01402,-0.046 -0.09032,-0.045 z m -1.219281,1.6257 c -0.0163,0 -0.0011,0.1185 0.04516,0.09 -0.0078,-0.061 -0.03802,-0.09 -0.04516,-0.09 z"
            style="display:inline;fill:url(#linearGradient7603);fill-opacity:1;stroke:#767554;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
         <path
-           inkscape:connector-curvature="0"
            id="path3800-3-8-0"
            d="m 9.066013,1039.0813 c -0.08358,-10e-5 -0.146685,0.025 0,0.045 0.101849,0.014 -0.05818,0.061 0.09032,0.045 0.07519,-0.065 -0.01658,-0.09 -0.09032,-0.09 z m -1.806342,0.045 c -0.08085,0.016 -0.146193,0.071 -0.225793,0.09 0.167199,-0.042 0.324172,-0.063 0.496744,-0.09 -0.08865,0.014 -0.183662,-0.017 -0.270951,0 z m 0.722537,0 c -0.100838,0.019 -0.125577,0.038 0,0.045 0.08577,-0.039 0.08961,-0.048 0.135475,-0.045 -0.05026,0 -0.09312,-0.014 -0.135475,0 z m 1.625708,0 c -0.0091,-8e-4 -0.03685,0.046 -0.04516,0.045 -0.01605,0.03 -0.129334,0.049 0.04516,0.045 0.0048,0.019 0.01431,0.067 0.04516,0.045 0.01156,-0.019 0.01983,-0.077 0.04516,-0.09 -0.03183,0 -0.05829,-0.039 -0.09032,-0.045 z m -1.128964,0.045 c -0.02416,6e-4 -0.03418,0.051 -0.04516,0.09 -0.09662,-0.065 -0.29735,-0.055 -0.361269,-0.045 -0.05552,0.027 -0.05,0.055 0.135476,0.045 0.103958,0 -0.01496,0.032 -0.09032,0.045 0.02251,0 0.01773,10e-4 0.09032,0 0.09883,0 0.621851,-0.055 0.31611,-0.09 0.02353,-0.04 -0.02653,-0.045 -0.04516,-0.045 z m 0.722537,0 c -0.01127,0.014 0.02183,0.048 0.135475,0.045 0.03143,-0.042 0.03666,-0.046 0,-0.045 -0.03753,5e-4 -0.12416,-0.014 -0.135475,0 z m -0.451586,0.045 c -0.01501,6e-4 8e-5,0.039 0,0.045 0,0 0.04516,0 0.04516,0 0,0 -0.04516,-0.045 -0.04516,-0.045 z m 0.04516,0.045 c -0.04631,0.014 -0.04368,0.033 0.09032,0.045 -0.03234,0 -0.123857,0.062 0.04516,0.045 0.132571,-0.04 0.176165,-0.1373 0.04516,-0.1358 -0.01358,10e-5 -0.02783,0.043 -0.04516,0.045 0.01672,0.017 -0.08916,-0.014 -0.135476,0 z m 1.128964,-0.045 c -0.01387,0.017 -0.03883,0.027 -0.04516,0.045 -0.009,0.026 0.01026,0.077 0,0.09 -0.0072,0 -0.03152,0 -0.04516,0 -0.05439,-3e-4 -0.162088,0.014 -0.180634,0 -0.153773,-0.014 -0.07519,0.025 -0.04516,0.045 0.138264,0.014 0.297103,0.08 0.31611,0.09 0.136704,0.014 0.03662,-0.1584 0.270951,-0.09 -0.0059,-0.024 0.0011,-0.039 0.04516,-0.045 -0.105129,-0.035 -0.208457,-0.1069 -0.316109,-0.1358 z m -0.722537,0.045 c 0.01559,0.014 0.002,0.033 0.04516,0.045 0.06509,-0.037 0.0069,-0.045 -0.04516,-0.045 z m -1.625708,0.045 c -0.253349,0.1142 -0.426184,0.1817 -0.406427,0.271 0.180027,-0.019 0.371333,-0.1717 0.587061,-0.1807 0.223903,-0.075 -0.05272,-0.085 -0.180634,-0.09 z m 1.445074,0.045 c -0.0409,0.016 -0.01728,0.074 0.09032,0.09 0.02965,-0.053 -0.0091,-0.091 -0.04516,-0.09 -0.01504,2e-4 -0.03153,0 -0.04516,0 z m -0.677379,0.045 c -0.04481,0 -0.05671,0.036 0,0.09 0.172461,-0.032 0.0655,-0.091 0,-0.09 z m 0.31611,0.045 c -0.137831,0.038 0.04928,0.025 -0.09032,0.09 -0.207472,-0.068 -0.03163,0.1658 0,0.1807 0.04266,0 0.131011,-0.088 0.180635,-0.1359 -0.03626,-0.026 0.01566,-0.071 0.04516,-0.09 3.77e-4,-0.014 -0.01069,-0.04 -0.04516,-0.045 -0.0196,0 -0.06061,9e-4 -0.09032,0 z m 1.716025,0 c -0.004,0 -0.01945,0.029 0,0.045 0.07818,0.033 0.02507,0.035 0.04516,0.045 0.03601,0.071 0.313666,0.1649 0.180634,0.1359 0.135678,0.027 0.416206,0.3372 0.361268,0.2257 0.04163,0.069 0.111546,0.3245 0.09032,0.2258 0.0104,0 0.09364,0.062 0.09032,0.09 0.07303,0.017 0.09192,0.066 0.09032,0.09 0.01387,0 0.03951,0.059 0,0.045 0,0 -0.04516,0 -0.04516,0 0.0066,0 -0.0061,0.043 0,0.045 0.123612,0.045 0.0056,0.1286 0.04516,0.1359 -0.04496,4e-4 -0.04601,0.036 -0.04516,0.045 0.0078,0 -0.0058,0.042 0,0.045 0.01988,0 -0.03053,0.046 0.09032,0.045 -0.02273,-9e-4 -0.102253,0.014 -0.135475,0 0.01098,0 0.0066,0.027 0.04516,0.045 -0.05684,0.014 -0.08789,0.068 -0.09032,0.09 0.156122,-0.053 0.09485,0.022 0.04516,0.045 0.04858,0 0.08897,0.019 0.09032,0.045 0.01497,0 0.03866,0.033 0,0.045 -0.0022,0 0.004,0.039 0,0.045 0.0072,0 -0.0046,0.041 0,0.045 -0.08747,0.03 -0.03464,0.1041 0,0.1359 -0.002,7e-4 0.0424,0.014 0.04516,0 -0.0084,0.09 0.04516,0.2208 0.04516,0.1806 0.08871,0.084 0.176136,0.1171 0.180634,0.09 0.02958,0 0.141039,0.071 0.135476,0.09 0.04514,0.014 0.07444,0 0.04516,-0.045 0.0042,-0.02 -0.0097,-0.055 0,-0.09 0.01272,-0.048 0.01607,-0.066 0,-0.045 -0.04244,-0.038 0.08587,-0.075 0.04516,-0.09 0.04006,-0.039 0.02247,-0.3081 0.04516,-0.1806 0.124681,-0.045 0.167427,0.042 0.180635,-0.045 3.52e-4,0.069 0.06373,0.014 0.09032,0 0.0064,0 0.04063,0 0.04516,0 0.03445,-0.027 -0.01487,-0.1848 0.04516,-0.1359 0.07386,0.1171 0.333387,0.12 0.406427,0.045 -0.06679,-0.035 -0.100563,-0.071 -0.135476,-0.09 -0.05608,-0.02 -0.07516,-0.078 -0.09032,-0.09 0.0149,0 0.03384,0.029 0.09032,0.045 0.02376,0.022 0.03107,-0.014 0.04516,0 -0.04337,-0.059 -0.08394,-0.1445 -0.09032,-0.1358 -0.04805,-0.045 -0.05874,-0.053 -0.04516,-0.045 -0.07471,-0.052 -0.0069,-0.071 0.09032,0 -0.503631,-0.4665 -1.072016,-0.862 -1.716025,-1.1289 -0.03867,0 -0.236008,-0.039 -0.31611,-0.045 z m -2.619196,0.045 c -0.05805,0.035 -0.103164,0.066 -0.180634,0.09 0.08266,0 -0.436024,0.1185 0.04516,0.09 -0.06329,0.036 -0.540547,0.059 -0.180634,0.1806 -0.12825,0.2039 0.586882,-0.068 0.406427,0 0.06181,-0.017 0.09822,0.091 0.225793,0.09 0.162503,-0.03 0.129551,-0.1228 0.09032,-0.1358 0.0322,-0.02 0.06892,-0.048 0.09032,-0.045 -0.05185,-0.059 -0.08393,-0.087 0,-0.1806 -0.05951,0.04 -0.194185,0.088 -0.180634,0 0.0082,-0.059 0.01776,-0.1739 -0.04516,-0.09 -0.09198,0.024 -0.17661,0.014 -0.225793,0 -0.0104,0 -0.04373,0 -0.04516,0 z m 1.535391,0.09 c -0.107831,0.033 -0.344638,0.2215 -0.09032,0.271 -0.04356,-0.014 -0.07185,-10e-4 -0.09032,0 0.04418,0.037 0.112152,0.1069 0.09032,0.09 0.04681,0.014 0.147535,0.032 0.225793,0.045 0.105317,0.019 0.193436,0.033 0.135476,0.045 0.130201,0.058 0.05777,-0.1893 0.135475,0.045 0.128077,0.02 0.27517,0.1141 0.135476,0.1358 -0.0069,10e-5 -0.01567,0.081 0,0.045 0.0402,0.062 0.150499,0.1579 0.135476,0.09 0.08315,0.065 -0.110548,0.1569 -0.180635,0.1806 0.0177,0.059 -0.03884,0.1113 -0.09032,0.1359 0.06264,-0.014 0.246448,0.246 0.180635,0.1806 -0.02867,0.014 -0.02299,0.022 0,0.045 -0.0098,0 0.02185,0.061 0.04516,0.045 0.097426,0.065 0.245697,0.1257 0.270951,0.1358 0.01,-0.036 -0.04431,-0.1257 -0.09032,-0.1806 0.01185,0 0.02392,-0.014 0.04516,0 0.04767,0.014 0.146999,0.027 0.135476,0.09 0.04169,-0.036 -0.0049,-0.1807 0,-0.1807 -0.1151,-0.1611 -0.108568,-0.098 -0.135476,-0.2257 -0.02711,-0.023 0.167583,-0.014 0.135476,0 0.02048,0.032 0.0404,0.062 0.04516,0.09 -0.01575,0 0.140056,-0.068 0.135475,0.045 0.03637,-0.023 0.03461,-0.061 0.04516,-0.09 0.168702,0 -0.05389,-0.052 0,-0.045 0.01402,-0.1011 -0.11841,-0.053 -0.09032,-0.1358 -0.04477,-0.051 -0.130837,-0.1156 -0.09032,-0.045 -0.01753,0 -0.07007,-0.058 -0.09032,-0.09 0.0078,-0.02 -0.0017,-0.058 0.135476,-0.045 -0.05561,-0.017 -0.08386,-0.032 -0.09032,-0.045 0.01798,-0.016 0.03208,-0.055 -0.09032,-0.045 -0.0299,-0.03 0.01838,-0.038 0.04516,-0.045 -6.12e-4,-0.014 -0.01171,-0.02 -0.04516,-0.045 -0.109146,0.048 -0.0098,-0.017 -0.04516,-0.045 -0.02155,0.014 -0.04663,0.014 -0.04516,0 0.09383,-0.043 0.01718,-0.1055 -0.04516,-0.09 0.02032,-0.019 -0.02958,-0.066 -0.090317,-0.045 -0.106357,-0.024 0.01585,0 -0.09032,-0.09 -0.01676,-0.038 -0.01501,-0.09 -0.04516,-0.09 -0.05507,2e-4 -0.07881,0.043 -0.09032,0.045 -0.01653,-0.046 -0.0349,-0.062 -0.04516,-0.045 0.0046,-0.056 -0.03548,-0.1055 -0.180634,-0.045 -0.07579,0.02 -0.05127,0.1577 -0.09032,0.09 -0.0397,-0.032 -0.06827,-0.027 -0.09032,0 -0.02205,0.028 -0.02562,0.071 0,0.09 -0.08386,0.017 -0.04658,-0.035 0,-0.09 0.06987,-0.084 0.144175,-0.1831 0.04516,-0.1806 -0.02027,4e-4 -0.04897,-0.014 -0.09032,0 z m -2.528879,0.09 c -0.04168,0.016 -0.138857,0.061 -0.225793,0.09 -0.08448,0.02 -0.177462,0.014 -0.135476,0 -0.03442,-0.014 -0.225251,0.104 -0.31611,-0.045 -0.15475,0.014 -0.22998,0 -0.316109,0 -0.01172,0 -0.03348,0 -0.04516,0 -0.51809,0.2744 -0.988949,0.6277 -1.399916,1.0387 -0.05146,0.048 -0.09312,0.1229 -0.135475,0.1807 -0.06051,0.084 -0.07162,0.1445 0,0.09 -0.08021,0.088 -0.106752,0.2593 0.04516,0.1358 -0.127771,0.1948 -0.324817,0.3604 -0.451586,0.4968 0.207116,-0.1689 0.390662,-0.3587 0.587061,-0.5419 0.01575,-0.084 0.1341,-0.1329 0.225793,-0.1806 -0.09124,0.084 -0.180188,0.2231 -0.09032,0.1358 0.0882,-0.035 0.212553,-0.1668 0.270951,-0.2257 -0.0011,0 0.04432,0 0.04516,0 0.01399,-4e-4 0.02171,0 0,0.045 0.04249,0.014 0.1853,0.077 0.225793,0.09 0.04562,-0.023 0.147873,0.085 0.135476,0.1358 0.0124,-0.014 0.03244,-0.022 0.04516,-0.09 0.0099,-0.039 -0.03141,0.2057 0,0.1807 -0.01275,0.029 -0.0353,0.061 -0.04516,0.09 0,0 -0.04516,0.045 -0.04516,0.045 -0.0081,0.019 -0.0064,0.039 0,0.045 0,0 0.04516,-0.045 0.04516,-0.045 -0.0034,0.014 -0.0015,0.035 0,0.045 -0.005,5e-4 -0.02389,0.059 0,0.045 0.0046,0 0.03764,-4e-4 0.04516,0 -0.02653,0.027 -0.01638,0.036 0,0.045 0.01488,0.014 5.5e-5,0.041 -0.04516,0.09 -0.01454,0.014 0.02371,0.025 0,0.045 -0.02886,0.095 0.01342,0.1359 0.04516,0.1359 -0.01798,0.079 -0.01867,0.1579 0,0.1806 -0.0415,0.059 -0.07669,0.1416 -0.04516,0.09 0.07378,-0.014 0.0011,0.1257 -0.04516,0.1806 0.02834,-0.014 0.07674,-0.026 0.180634,-0.09 -0.0082,0.025 0.123813,0.082 0.04516,0.1359 0.03263,0.051 0.02895,0.1286 0,0.1806 -0.01908,0.033 -0.0424,0.038 -0.04516,0.045 -0.05049,-0.2244 -0.182126,0.3601 -0.180634,0.2257 -0.09281,0.2171 -0.184077,0.401 -0.225793,0.6322 -0.08139,0.1739 -0.02076,0.4711 0.04516,0.4065 0.04001,0.1529 0.01708,0.3703 0.180634,0.4064 0.155322,0.152 0.10817,0.4311 0.270952,0.5871 0.02048,0.12 -0.128768,0.1931 0.04516,0.2258 0.113208,0.2501 0.133117,0.4109 0.270951,0.3612 -0.09169,-0.1055 -0.25631,-0.5183 -0.225793,-0.4966 -0.07931,-0.1287 -0.173621,-0.4827 0,-0.3613 0.07233,0.1521 0.132911,0.363 0.270952,0.4967 0.0043,0.1563 0.22556,0.3085 0.270951,0.5419 -0.03782,0.1572 0.02529,0.2692 0.180634,0.3612 0.218358,0.061 0.436111,0.2914 0.677379,0.1807 0.156357,-0.027 0.289166,0.3063 0.496744,0.2709 0.229001,0.023 0.220627,0.081 0.361268,0.271 -0.01156,0.1828 0.112181,-0.048 0.135476,0.1806 0.07209,-0.014 0.307461,0.062 0.361268,0.09 0.008,-0.1884 0.269413,-0.1286 0.225793,0.045 0.0747,0.1574 0.06241,0.3712 -0.09032,0.4967 -0.101184,0.04 -0.200609,0.2345 -0.225793,0.3161 0.227877,-0.024 0.131112,0.3285 0.04516,0.3613 0.205709,0.1171 0.276077,0.371 0.406427,0.5419 0.08621,0.1857 0.388537,0.1857 0.496745,0.3613 0.02814,0.2003 -0.01387,0.35 0,0.5419 -0.08689,0.1501 0.0177,0.3206 -0.04516,0.4516 -0.07473,0.1185 -0.115361,0.3503 0.04516,0.3612 -0.0084,0.039 -0.07266,0.092 -0.09032,0.1359 -0.0056,0.014 0,0.037 0,0.045 -0.112398,0 -0.08498,0.022 -0.04516,0.045 0,0 0.04516,0.045 0.04516,0.045 0.01329,5e-4 0.02896,0.014 0.04516,0 0.01402,0.014 -0.01,0.038 0,0.045 0.136082,-0.014 0.273318,-0.022 0.406427,-0.045 -0.182325,-0.026 0.237626,-0.1416 0,-0.1807 0.0987,-0.026 0.0774,-0.091 0.180634,-0.1358 0.0084,-0.042 0.196108,-0.2228 0.361268,-0.2257 0.411132,-0.071 -0.203677,-0.3353 0.180634,-0.2259 0.116964,0.065 0.29323,-0.1387 0.361268,-0.2257 -0.05939,0.1585 0.281741,-0.3464 0.270952,-0.3613 0.152708,-0.1141 0.609512,-0.2704 0.451585,-0.2709 0.207422,-0.1445 0.281629,-0.4255 0.31611,-0.6775 0.174726,-0.1458 0.295933,-0.4276 0.31611,-0.4967 -0.03568,-0.1242 -0.504442,-0.2372 -0.361268,-0.2258 -0.09757,-0.046 -0.233604,-0.068 -0.270952,0 -0.0094,-0.091 -0.304507,-0.12 -0.225792,-0.09 -0.04999,0.036 -0.06761,0.019 -0.09032,0.045 -0.08046,0.091 -0.03829,0.1402 -0.135475,0.045 0.07592,-0.014 0.116516,-0.022 0.135475,-0.045 0.02843,-0.035 0.0011,-0.084 -0.04516,-0.09 -0.0077,6e-4 -0.04117,0 -0.04516,0 -0.0056,0 -0.0429,0 -0.04516,0 -0.03051,0.014 -0.06114,0.051 -0.09032,0.09 -0.08452,-0.025 -0.05975,-0.4036 0.09032,-0.3162 -0.04208,-0.1644 -0.180697,-0.2458 -0.361269,-0.2709 -0.226956,0.053 -0.267778,-0.088 -0.406428,-0.2258 -0.12468,0.029 -0.226532,-0.1741 -0.225792,-0.1806 -0.170932,0.1199 -0.602057,-0.014 -0.677378,-0.045 -0.07045,0 -0.113251,0.051 -0.09032,0.1806 -0.206379,0.081 0.108481,-0.3398 -0.09032,-0.2257 -0.128959,0.162 -0.280423,0.02 -0.31611,0.2257 -0.133785,0.2002 -0.09785,0.082 -0.31611,0 -0.251648,0.1373 -0.45284,-0.023 -0.406427,-0.1806 0.05422,-0.1344 -0.01026,-0.3454 0,-0.3613 -0.06094,-0.014 -0.195335,-0.087 -0.361269,-0.045 -0.246457,0.08 0.06764,-0.1517 0,-0.2258 -0.01619,-0.075 -0.120895,-0.3133 0.04516,-0.3161 -0.247612,-0.039 -0.264447,0.1746 -0.361268,0.3161 -0.0863,-0.074 -0.302964,0.075 -0.406427,-0.09 -0.179455,-0.1674 -0.16357,-0.4262 -0.09032,-0.6322 0.0687,-0.079 -0.0041,-0.3479 0.180634,-0.3613 0.172498,-0.097 0.118395,-0.1272 0.361268,-0.09 0.05499,0.014 0.126242,-0.1012 0.225793,0 0.0094,-0.1448 0.439329,-0.085 0.31611,-0.09 0.08587,0.1098 0.246796,0.014 0.270952,0.2259 -0.01344,0.075 0.142137,0.2426 0.180634,0.316 0.169985,-0.2103 -0.187016,-0.5442 0.09032,-0.7225 0.159459,-0.107 0.428687,-0.2989 0.406427,-0.3161 0.01301,0 0.026,-0.042 0.04516,-0.045 -0.01344,-0.014 -0.01026,-0.03 -0.04516,-0.045 0.08519,-0.064 0.01448,-0.2354 0,-0.2709 0.0055,0 0.101155,-0.1952 0.09032,0.045 0.03461,0.2464 0.06759,-0.1026 0.09032,-0.1807 0.0452,-0.03 0.08222,-0.074 0.135475,-0.1358 0.0077,-0.014 0.03254,0 0.04516,0 0.04512,-0.043 0.102095,-0.1084 0.180635,-0.09 0.166978,-0.014 0.07412,-0.014 0.09032,-0.1806 0.113308,-0.133 0.258747,-0.1768 0.31611,-0.1807 -0.0461,-0.072 0.156313,-0.014 0.225792,-0.045 -0.07598,0.039 -0.223603,0.1755 -0.04516,0.2259 0.03367,-0.1416 0.343512,-0.1402 0.31611,-0.2259 -0.0039,-0.014 -0.02468,0.019 -0.04516,0 -0.210821,0.091 -0.329963,-0.2102 -0.270952,-0.2257 -0.212243,-0.046 0.384506,-0.1315 0,-0.1806 -0.317741,0.091 -0.597593,0.3519 -0.225793,0 0.177503,-0.055 0.196233,-0.2214 0.406428,-0.1358 0.136068,0.02 0.347227,0.1156 0.451585,-0.045 0.104349,0.029 0.233393,-0.082 0.180635,-0.1359 0.05896,-0.08 -0.02912,-0.1657 -0.04516,-0.1358 -0.01055,-0.074 -0.115635,-0.035 -0.180634,0 0.0053,-0.014 -0.01857,-0.025 0,-0.045 0.05017,-0.03 0.248185,-0.045 0.04516,-0.1359 -0.06626,0.025 -0.157196,-0.052 -0.09032,-0.045 -0.132657,-0.084 -0.07231,-0.2902 -0.09032,-0.2258 0.04756,-0.069 0.08129,-0.1875 0,-0.1358 -0.116054,0.016 0.0048,-0.069 -0.09032,-0.1806 -0.0026,-0.03 -0.03958,-0.036 -0.04516,-0.045 -0.02613,0.046 -0.09116,0.1199 -0.09032,0.09 -0.0039,0.071 -0.174478,0.1098 -0.180634,0.09 -0.07276,0.03 0.034436,-0.071 -0.135476,-0.09 -0.01477,-0.026 -0.01754,-0.1055 -0.04516,-0.1359 0.15668,0.065 0.206565,-0.1513 0.04516,-0.1358 -0.05439,-0.042 -0.357893,-0.1402 -0.225793,-0.1807 -0.200677,-0.1069 -0.247223,-0.014 -0.31611,0.1359 0.06246,0 -0.06841,0.1228 0,0.1358 -0.09434,0.1315 -0.02214,0.3989 0,0.4516 -0.0052,0.1041 -0.239914,0.361 -0.316109,0.2257 -0.04092,0.1041 -0.103554,0.3613 -0.04516,0.271 0.03178,0.1185 -0.08633,0.03 -0.135476,0.045 -0.119681,-0.1 -0.109262,-0.2182 -0.04516,-0.4065 -0.03478,-0.1704 -0.223877,-0.029 -0.31611,-0.2257 -0.07438,-0.097 -0.278593,-0.1869 -0.361269,-0.1807 0.0474,-0.2799 -0.188827,-0.027 -0.09032,-0.2258 0.03785,-0.1539 0.16659,-0.2857 0.270952,-0.3613 0.07663,-0.055 0.137267,-0.014 0.09032,-0.1358 0.182851,0.1758 0.08571,-0.023 0.09032,-0.045 0.168566,0.097 0.129536,-0.09 0.270951,0 0.06816,-0.014 0.115606,-0.027 0.135476,-0.045 0.03516,-0.033 -0.0032,-0.098 -0.04516,-0.1359 0.178419,0.092 0.196885,-0.2188 0.31611,-0.09 0.0051,0 0.02697,-0.042 0.04516,0 0.17381,0.029 0.142296,-0.2815 0.180634,-0.1806 0.01484,0 -0.0064,-0.043 0,-0.045 -0.03571,-0.032 -0.07068,-0.065 -0.09032,-0.09 -0.06392,0.051 -0.170448,0.1286 -0.225793,0.1806 -0.03445,0.017 -0.054,0.058 -0.04516,0.045 -0.08305,-0.014 0.07733,-0.3585 -0.09032,-0.2257 -0.03918,0.032 -0.06835,0.045 -0.09032,0.045 -0.0104,-0.035 -0.009,-0.1127 0.04516,-0.1358 -0.11984,-0.059 0.102268,-0.061 0,-0.2259 -0.06704,-0.068 -0.211871,0.1629 -0.180634,0.09 -0.20411,0.072 0.216982,0.151 -0.04516,0.1806 0.186072,0.035 -0.11247,0.2885 -0.135476,0.1807 -0.09621,0.092 0.08105,-0.2178 0,-0.1359 -0.02632,0 -0.09958,0 -0.135476,0 -0.0012,0 -0.02827,0.02 0,0.045 0.0055,0.038 -0.330384,-0.037 -0.406427,-0.045 -0.05374,-0.052 -0.06724,-0.093 -0.135475,-0.09 -0.124204,0 -0.150668,0.1496 -0.180634,0.1807 -0.111517,0.1214 -0.13773,-0.097 -0.04516,-0.09 -0.134609,-0.023 -0.225598,-0.061 -0.270952,-0.09 -0.0033,-0.017 -0.02208,-0.075 -0.04516,-0.09 -0.114594,-0.1513 -0.229456,-0.2437 -0.31611,-0.1358 -0.159354,0.1621 -0.08913,-0.049 -0.135475,-0.045 -0.0085,5e-4 -0.02415,-0.019 -0.04516,0 z m 1.716025,0.3613 0.04516,0 c 0.08851,0.022 0.01697,-0.1791 -0.04516,-0.1807 -0.01011,-2e-4 -0.03498,0.035 -0.04516,0.045 -0.11364,0.051 -0.160962,0.023 0,0.09 l 0.04516,0.045 z m 0.361269,0.5419 c -0.0079,0.014 -0.0117,0.072 0,0.045 0.0048,0.035 0.08076,0.1112 0.09032,0.09 0.15424,-0.195 0.164664,0.046 0.31611,0 -0.03415,-0.04 -0.227202,-0.261 -0.225793,-0.271 -0.05786,-3e-4 -0.156921,0.1055 -0.180634,0.1359 z m 1.399914,2.3933 c 0.0016,0.014 0.01286,0 0.04516,0 0.02961,-0.048 0.103626,0.014 0.04516,-0.1358 -0.0038,0.014 -0.09519,0.098 -0.09032,0.1358 z m -5.102916,-0.7676 c 0.02219,0.046 0.01172,0.1141 0,0.09 0.06356,0.033 0.08657,0.1257 0.180634,0.09 0.02836,-0.081 -0.112878,-0.1272 -0.180634,-0.1807 z m 4.651331,-1.9419 c -0.06072,-10e-5 -0.231662,0.094 -0.04516,0.09 0.06634,-0.065 0.07481,-0.09 0.04516,-0.09 z m 1.309598,0.09 c -0.05374,-2e-4 -0.06829,0.1402 0.09032,0.1358 -0.04105,-0.09 -0.06407,-0.1358 -0.09032,-0.1358 z m 1.535391,0.9484 c 0.02032,0.016 0.02788,0.074 0.04516,0.09 -0.03007,-0.041 -0.02595,-0.091 -0.04516,-0.09 z m 0.04516,0.09 c 0.07977,0.068 -0.03724,0.1199 0.135475,0.1806 l 0.04516,0.045 c 0.104508,0.014 0.05055,-0.1823 0.04516,-0.2257 -0.08876,-0.014 -0.177523,0.071 -0.180634,0 -0.01127,-0.019 -0.03513,0.014 -0.04516,0 z m -3.612685,0.1806 c -0.02996,0 -0.110215,0.1185 0,0.09 0.03486,-0.04 0.01272,-0.091 0,-0.09 z m -0.316109,0.4064 c -0.04649,4e-4 -0.0422,0.065 0.09032,0.045 -0.01562,-0.035 -0.07069,-0.045 -0.09032,-0.045 z m 4.922282,0.3162 c 0.02285,0.065 0.03779,0.117 0.09032,0.2257 0.01546,0 0.02498,0.026 0.04516,0.045 -0.04052,-0.092 -0.09033,-0.1807 -0.135475,-0.271 z m -0.180634,0.045 c -0.0026,0.088 0.04016,0.2547 0.09032,0.3612 0.0082,0.017 -0.0074,0.03 0,0.045 -0.0045,6e-4 -0.01373,0.049 0,0.045 0.003,0 0.04264,0 0.04516,0 -0.04351,0.1471 0.05649,0.1713 0,0.2259 0.201321,0.042 0.08532,-0.2345 0.04516,-0.3162 -0.05098,-0.1669 -0.167239,-0.3111 -0.180635,-0.3613 z m -3.386892,0.1358 c -0.05487,10e-5 -0.03402,0.081 0.180634,0.1358 -0.05527,-0.082 -0.140591,-0.1358 -0.180634,-0.1358 z m 0.541903,0 c -0.04708,0.08 -0.09808,0.1676 -0.180635,0.1806 -0.05662,0.074 0.103049,0.181 0.270952,0.1359 -0.0013,0.042 -0.06347,0.117 0.09032,0.045 0.01597,-0.038 -0.0059,-0.046 0,-0.045 0,0 0.04516,0.045 0.04516,0.045 0.0055,0.04 0.01156,0.097 0.04516,0.09 0.121487,-0.1185 -0.04139,-0.094 -0.04516,-0.1359 -0.0013,-0.014 0.0012,-0.055 0.04516,-0.09 -0.145799,0.081 -0.211123,-0.059 -0.09032,-0.09 -0.19025,-0.016 -0.02279,-0.03 -0.09032,-0.09 -0.103309,0.062 -0.115679,0.014 -0.09032,-0.045 z m 2.79983,0.09 c -0.01468,9e-4 -0.03501,0.014 -0.04516,0.045 -0.01171,0.058 0.02377,0.2852 0.04516,0.2259 0.01494,0.014 0.01387,0.062 0.04516,0.045 0.141545,-0.022 0.02559,-0.3205 -0.04516,-0.316 z m 0.406427,0.1358 c 0.01685,0.1416 -0.002,0.3213 0,0.3613 -0.05686,0.077 -0.144873,0.1199 -0.180634,0.1358 0.07341,0.08 -0.01626,0.3265 0.04516,0.4064 -0.122759,-0.016 -0.140562,0.2322 -0.135475,0.3162 -0.01455,0.2338 0.150043,0.3205 0.180634,0.316 0.165256,0 0.194273,-0.4905 0.180634,-0.3613 0.02171,-0.2263 0.177348,-0.2855 0.225793,0 -0.07153,-0.4133 -0.162611,-0.7953 -0.31611,-1.1741 z m 0,1.5354 c -0.07381,0.019 -0.108785,0.056 -0.04516,0.09 -0.155097,-0.022 -0.26964,0.6838 -0.270952,0.5419 -0.174871,0.1601 -0.273942,0.3996 -0.31611,0.6322 0.09247,0.1928 0.04996,0.7639 0,0.6775 0.04069,0.117 0.14247,0.4104 0.135476,0.2709 0.05247,0.159 0.220336,0.3128 0.361268,0.1359 0.196646,-0.1599 0.3696,-0.1979 0.225793,0.1358 0.200782,-0.5907 0.361269,-1.193 0.361269,-1.8516 0,-0.063 -0.04318,-0.1185 -0.04516,-0.1806 -0.126574,-0.1431 -0.353445,-0.4402 -0.180634,-0.4516 -0.06779,-0.02 -0.151984,-0.019 -0.225793,0 z m -5.735136,1.1291 c -0.07149,-6e-4 -0.109219,0.043 -0.180635,0.089 -0.04014,0.049 0.02093,0.055 0.09032,0.045 0,0 0.04516,0 0.04516,0 0.04747,-0.014 0.08867,-0.036 0.09032,-0.045 0.009,0.014 0.613981,0.2571 0.361269,0.1807 0.02809,0.02 0.04955,0.032 0.04516,0.045 0.0053,0.014 0.03601,0.049 0.180634,0.045 0.208289,-0.065 -0.190365,-0.1866 -0.180634,-0.1807 -0.01957,-0.014 -0.02504,-0.035 -0.04516,-0.045 -0.02554,-0.038 -0.03158,-0.045 -0.04516,-0.045 -0.105924,-0.053 -0.248041,-0.089 -0.361268,-0.089 z m -5.148076,0.089 c -0.01985,0 -0.05147,0.056 0,0.09 0.0185,-0.063 0.01358,-0.091 0,-0.09 z m 6.006088,0.2258 c -0.03209,5e-4 -0.05499,0.033 -0.04516,0.045 0.02298,0.016 -0.01,0.033 0,0.045 -0.0094,-2e-4 -0.01896,0.059 0,0.045 -0.02114,0 -0.02792,0.043 -0.04516,0.045 0.12221,-0.067 0.110953,0.078 0.180635,0.045 0.02858,-0.095 0.375135,-0.032 0.270951,-0.1359 -0.02182,-0.051 -0.264998,-0.092 -0.361268,-0.09 z m 0.587062,0.1358 c -0.05835,0 -0.187045,0.1171 0,0.09 0.01783,-0.039 0.02464,-0.091 0,-0.09 z m -1.083806,0.045 c 0.0097,0.014 0.01912,0.032 0.04516,0.045 l 0.04516,0 c 0.172535,-0.016 -0.01402,-0.046 -0.09032,-0.045 z m -1.219281,1.6257 c -0.0163,0 -0.0011,0.1185 0.04516,0.09 -0.0078,-0.061 -0.03802,-0.09 -0.04516,-0.09 z"
            style="display:inline;fill:url(#linearGradient7571);fill-opacity:1;stroke:none" />
@@ -320,42 +272,30 @@
          id="g4163"
          transform="translate(4.0625001,-0.9705898)">
         <path
-           inkscape:export-ydpi="90"
-           inkscape:export-xdpi="90"
-           inkscape:export-filename="C:\Users\jmietling\Documents\rect3997-9-1.png"
-           sodipodi:nodetypes="cccccccccc"
-           inkscape:connector-curvature="0"
            id="rect3997-9-1"
            d="m 2,1038.3622 0.03125,10.0313 9.90625,0 -0.03125,-10.0313 z m 1,1 7.90625,0 0.03125,8.0313 -7.90625,0 z"
            style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient4217);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" />
         <path
-           inkscape:connector-curvature="0"
            id="rect3997-9-1-1"
            d="m 3,1039.3622 7.96875,0 0.03125,8.0313 -7.96875,0 z"
-           style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient4889);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate"
-           sodipodi:nodetypes="ccccc" />
+           style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient4889);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" />
         <g
            id="g4219"
            transform="matrix(-1,0,0,-1,13.96875,2086.7869)">
           <path
              style="display:inline;fill:url(#linearGradient5062);fill-opacity:1;stroke:none"
              d="m 5,1040.9122 0,6.5125 -2,0 0,-8 z"
-             id="rect4853-82-7"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccc" />
+             id="rect4853-82-7" />
           <path
              style="display:inline;fill:url(#linearGradient4975-2);fill-opacity:1;stroke:none"
              d="m 4.6,1041.3622 6.4,0 0,-2 -8,0 z"
-             id="rect4853-82-0"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccc" />
+             id="rect4853-82-0" />
         </g>
         <g
            id="text4162"
            style="font-style:normal;font-weight:normal;font-size:11.40601158px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#113d95;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
            transform="matrix(0.94407479,0,0,0.94379727,-0.11682239,-28.782637)">
           <path
-             inkscape:connector-curvature="0"
              id="path4167"
              style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:'Droid Serif';fill:#113d95;fill-opacity:1"
              d="m 7.5330622,1133.6321 q -0.4789633,0 -0.7629997,0.4734 -0.2784671,0.4734 -0.3063138,1.3868 l 1.9715469,0 q 0,-0.4344 -0.050124,-0.7797 -0.050124,-0.3453 -0.1615109,-0.5848 -0.1058175,-0.2395 -0.2784671,-0.3676 -0.1670802,-0.1281 -0.4121313,-0.1281 z m 0.1058175,5.6307 q -0.7240144,0 -1.2809485,-0.2117 -0.5513648,-0.2116 -0.9245107,-0.6126 -0.3731459,-0.401 -0.5625035,-0.9802 -0.1893576,-0.5848 -0.1893576,-1.3311 0,-0.802 0.1893576,-1.409 0.1893576,-0.6071 0.5513648,-1.0136 0.3620072,-0.4066 0.8855253,-0.6071 0.5290875,-0.2061 1.2029778,-0.2061 0.6181969,0 1.1138683,0.1782 0.4956714,0.1727 0.8409706,0.518 0.3452992,0.3453 0.5290874,0.8577 0.1837888,0.5124 0.1837888,1.1918 l 0,0.5848 -3.7370287,0 q 0.016708,0.5736 0.1225255,0.9858 0.1113868,0.4121 0.3007445,0.6794 0.1949269,0.2674 0.4678247,0.3954 0.278467,0.1281 0.6349049,0.1281 0.2951751,0 0.5457955,-0.067 0.2506203,-0.072 0.4511166,-0.1949 0.2060657,-0.1281 0.3564379,-0.2952 0.1559416,-0.1726 0.2561897,-0.3676 0.3063138,0.1671 0.3063138,0.557 0,0.245 -0.1336642,0.4678 -0.1336642,0.2172 -0.4121313,0.3843 -0.2784671,0.1671 -0.701737,0.2673 -0.4177006,0.1003 -0.9969122,0.1003 z" />
diff --git a/ui/org.eclipse.pde.ui/icons/obj16/generic_xml_obj.svg b/ui/org.eclipse.pde.ui/icons/obj16/generic_xml_obj.svg
index 2d788b0ba55..9cf6c85b51b 100644
--- a/ui/org.eclipse.pde.ui/icons/obj16/generic_xml_obj.svg
+++ b/ui/org.eclipse.pde.ui/icons/obj16/generic_xml_obj.svg
@@ -2,24 +2,19 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="generic_xml_obj.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4902-3"
        id="linearGradient4908-2"
        x1="10.544736"
@@ -29,7 +24,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-1.977903,-1.044194)" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4902-3">
       <stop
          style="stop-color:#bfb688;stop-opacity:1"
@@ -41,7 +35,6 @@
          id="stop4906-2" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4894-6"
        id="linearGradient4900-1"
        x1="7.9987183"
@@ -51,7 +44,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(2.022097,-1.044194)" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4894-6">
       <stop
          style="stop-color:#e0c88f;stop-opacity:1"
@@ -63,7 +55,6 @@
          id="stop4898-5" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4994-6">
       <stop
          style="stop-color:#f9fafc;stop-opacity:1;"
@@ -82,34 +73,8 @@
        gradientUnits="userSpaceOnUse"
        id="linearGradient4101"
        xlink:href="#linearGradient4994-6"
-       inkscape:collect="always"
        gradientTransform="translate(-1.977903,-1.044194)" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="16.000001"
-     inkscape:cx="5.8220143"
-     inkscape:cy="8.3539678"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="816"
-     inkscape:window-height="903"
-     inkscape:window-x="1644"
-     inkscape:window-y="563"
-     inkscape:window-maximized="0"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3999" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -123,40 +88,31 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
     <path
        style="fill:url(#linearGradient4101);fill-opacity:1;stroke:none;display:inline"
        d="m 3.5193795,1037.8597 7.0096695,0 3.062057,3.0066 0,9.9546 -10.0717265,0 z"
-       id="rect4001-3"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccc" />
+       id="rect4001-3" />
     <path
        style="fill:url(#linearGradient4900-1);fill-opacity:1;stroke:none;display:inline"
        d="m 9.998718,1037.397 0,3.9112 3.977478,0 z"
-       id="path4884"
-       inkscape:connector-curvature="0" />
+       id="path4884" />
     <path
        style="fill:none;stroke:url(#linearGradient4908-2);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;display:inline"
        d="m 3.5193795,1037.8597 7.0096695,0 3.062057,3.0066 0,9.9546 -10.0717265,0 z"
-       id="rect4001"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccc" />
+       id="rect4001" />
     <text
        xml:space="preserve"
-       style="font-style:normal;font-weight:normal;font-size:10.17852211px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#29486b;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       style="font-style:normal;font-weight:normal;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#29486b;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
        x="6.9627018"
        y="889.83661"
        id="text3385"
-       sodipodi:linespacing="125%"
        transform="scale(0.84878782,1.1781507)"><tspan
-         sodipodi:role="line"
          id="tspan3387"
          x="6.9627018"
          y="889.83661"
-         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:TlwgTypewriter;fill:#29486b;fill-opacity:1">X</tspan></text>
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:10.1785px;line-height:1.25;font-family:TlwgTypewriter;fill:#29486b;fill-opacity:1">X</tspan></text>
   </g>
 </svg>
diff --git a/ui/org.eclipse.pde.ui/icons/obj16/group_sc_obj.svg b/ui/org.eclipse.pde.ui/icons/obj16/group_sc_obj.svg
index 6f3ad0c0f34..697ccdb03ea 100644
--- a/ui/org.eclipse.pde.ui/icons/obj16/group_sc_obj.svg
+++ b/ui/org.eclipse.pde.ui/icons/obj16/group_sc_obj.svg
@@ -2,25 +2,20 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="group_sc_obj.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
        gradientTransform="translate(-3.9962417,-4.0111639)"
-       inkscape:collect="always"
        xlink:href="#linearGradient4163"
        id="linearGradient4169-4"
        x1="-6.6594658"
@@ -29,7 +24,6 @@
        y2="1042.0311"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4163">
       <stop
          style="stop-color:#f9fafc;stop-opacity:1"
@@ -42,7 +36,6 @@
     </linearGradient>
     <linearGradient
        gradientTransform="translate(-3.9962417,-4.0111639)"
-       inkscape:collect="always"
        xlink:href="#linearGradient4171"
        id="linearGradient4177-0"
        x1="-8.5156212"
@@ -51,7 +44,6 @@
        y2="1041.9427"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4171">
       <stop
          style="stop-color:#606f8d;stop-opacity:1;"
@@ -63,7 +55,6 @@
          id="stop4175" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4163"
        id="linearGradient4169"
        x1="-6.6594658"
@@ -72,7 +63,6 @@
        y2="1042.0311"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4171"
        id="linearGradient4177"
        x1="-8.5156212"
@@ -81,31 +71,6 @@
        y2="1041.9427"
        gradientUnits="userSpaceOnUse" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="15.999999"
-     inkscape:cx="16.441723"
-     inkscape:cy="20.467779"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1241"
-     inkscape:window-height="814"
-     inkscape:window-x="1023"
-     inkscape:window-y="465"
-     inkscape:window-maximized="0"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3999" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -119,8 +84,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
diff --git a/ui/org.eclipse.pde.ui/icons/obj16/image_application.svg b/ui/org.eclipse.pde.ui/icons/obj16/image_application.svg
index 4f28414e2f5..c074ae3121a 100644
--- a/ui/org.eclipse.pde.ui/icons/obj16/image_application.svg
+++ b/ui/org.eclipse.pde.ui/icons/obj16/image_application.svg
@@ -2,33 +2,19 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="New document 1">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient18598"
-       id="linearGradient18604"
-       x1="2"
-       y1="1040.3622"
-       x2="2"
-       y2="1046.3622"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
        id="linearGradient18598">
       <stop
          style="stop-color:#b0843d;stop-opacity:1;"
@@ -40,7 +26,6 @@
          id="stop18602" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4910-4-0-6"
        id="linearGradient17825"
        gradientUnits="userSpaceOnUse"
@@ -50,8 +35,7 @@
        x2="-15"
        y2="1047.3622" />
     <linearGradient
-       id="linearGradient4910-4-0-6"
-       inkscape:collect="always">
+       id="linearGradient4910-4-0-6">
       <stop
          id="stop4912-8-5-7"
          offset="0"
@@ -62,7 +46,6 @@
          style="stop-color:#c5dff4;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4994-4-5-3"
        id="linearGradient17822"
        gradientUnits="userSpaceOnUse"
@@ -72,7 +55,6 @@
        x2="-11"
        y2="1044.3622" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4994-4-5-3">
       <stop
          style="stop-color:#c5dff4;stop-opacity:1"
@@ -84,7 +66,6 @@
          id="stop4998-5-0-9" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient8287-6"
        id="linearGradient17817"
        gradientUnits="userSpaceOnUse"
@@ -94,8 +75,7 @@
        x2="-4.9919548"
        y2="1038.8951" />
     <linearGradient
-       id="linearGradient8287-6"
-       inkscape:collect="always">
+       id="linearGradient8287-6">
       <stop
          id="stop8289-6"
          offset="0"
@@ -106,7 +86,6 @@
          style="stop-color:#d3e5f4;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4082-3-1"
        id="linearGradient17819"
        gradientUnits="userSpaceOnUse"
@@ -134,37 +113,34 @@
        maskUnits="userSpaceOnUse"
        id="mask18689">
       <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
          id="path18691"
          d="m 1.495586,1036.8977 12.004414,0 0,10.0292 -12.004414,0 z"
          style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;display:inline" />
     </mask>
     <filter
        color-interpolation-filters="sRGB"
-       inkscape:collect="always"
        id="filter18648"
-       x="-0.23950206"
-       width="1.4790041"
-       y="-0.24050002"
-       height="1.4809999">
+       x="-0.33945793"
+       width="1.6789159"
+       y="-0.3408724"
+       height="1.6817448">
       <feGaussianBlur
-         inkscape:collect="always"
          stdDeviation="0.9983657"
          id="feGaussianBlur18650" />
     </filter>
     <filter
        color-interpolation-filters="sRGB"
-       inkscape:collect="always"
-       id="filter3809">
+       id="filter3809"
+       x="-0.021501703"
+       y="-0.02715518"
+       width="1.0430034"
+       height="1.0543104">
       <feGaussianBlur
-         inkscape:collect="always"
          stdDeviation="1.7520611"
          id="feGaussianBlur3811" />
     </filter>
     <linearGradient
        gradientTransform="matrix(0.08320777,0,0,0.08320777,-25.132681,985.34583)"
-       inkscape:collect="always"
        xlink:href="#linearGradient3820"
        id="linearGradient3826"
        x1="641.42853"
@@ -173,7 +149,6 @@
        y2="437.8479"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3820">
       <stop
          style="stop-color:#4291fa;stop-opacity:1;"
@@ -186,7 +161,6 @@
     </linearGradient>
     <linearGradient
        gradientTransform="matrix(0.08320777,0,0,0.08320777,-25.132681,985.34583)"
-       inkscape:collect="always"
        xlink:href="#linearGradient3864"
        id="linearGradient3870"
        x1="663.49005"
@@ -195,7 +169,6 @@
        y2="439.7843"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3864">
       <stop
          style="stop-color:#d1f7fe;stop-opacity:1;"
@@ -207,7 +180,6 @@
          id="stop3868" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient3834"
        id="linearGradient3840"
        x1="413.07144"
@@ -217,7 +189,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(0.08320777,0,0,0.08320777,-6.826971,985.34583)" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3834">
       <stop
          style="stop-color:#92c2ef;stop-opacity:1"
@@ -230,7 +201,6 @@
     </linearGradient>
     <linearGradient
        gradientTransform="matrix(0.08320777,0,0,0.08320777,-25.132681,985.34583)"
-       inkscape:collect="always"
        xlink:href="#linearGradient3842"
        id="linearGradient3848"
        x1="573.99994"
@@ -239,7 +209,6 @@
        y2="412.30148"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3842">
       <stop
          style="stop-color:#294844;stop-opacity:1;"
@@ -252,7 +221,6 @@
     </linearGradient>
     <linearGradient
        gradientTransform="matrix(0.08320777,0,0,0.08320777,-25.132681,985.34583)"
-       inkscape:collect="always"
        xlink:href="#linearGradient3852"
        id="linearGradient3858"
        x1="589.55371"
@@ -261,7 +229,6 @@
        y2="440.92401"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3852">
       <stop
          style="stop-color:#316493;stop-opacity:1"
@@ -274,7 +241,6 @@
     </linearGradient>
     <linearGradient
        gradientTransform="matrix(0.08320777,0,0,0.08320777,-25.132681,985.34583)"
-       inkscape:collect="always"
        xlink:href="#linearGradient3872"
        id="linearGradient3878"
        x1="683.38342"
@@ -283,7 +249,6 @@
        y2="371.16574"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3872">
       <stop
          style="stop-color:#e5fdfa;stop-opacity:1;"
@@ -296,7 +261,6 @@
     </linearGradient>
     <linearGradient
        gradientTransform="matrix(0.08320777,0,0,0.08320777,-25.132681,985.34583)"
-       inkscape:collect="always"
        xlink:href="#linearGradient3880"
        id="linearGradient3886"
        x1="716.55231"
@@ -305,7 +269,6 @@
        y2="376.95331"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3880">
       <stop
          style="stop-color:#ffffff;stop-opacity:1;"
@@ -317,7 +280,6 @@
          id="stop3884" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient3820-4"
        id="linearGradient18917"
        gradientUnits="userSpaceOnUse"
@@ -327,7 +289,6 @@
        x2="641.42853"
        y2="437.8479" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3820-4">
       <stop
          style="stop-color:#4291fa;stop-opacity:1;"
@@ -339,7 +300,6 @@
          id="stop3824-6" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient3864-0"
        id="linearGradient18919"
        gradientUnits="userSpaceOnUse"
@@ -349,7 +309,6 @@
        x2="663.49005"
        y2="439.7843" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3864-0">
       <stop
          style="stop-color:#d1f7fe;stop-opacity:1;"
@@ -361,7 +320,6 @@
          id="stop3868-3" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient3834-4"
        id="linearGradient18921"
        gradientUnits="userSpaceOnUse"
@@ -371,7 +329,6 @@
        x2="508.35715"
        y2="427.22427" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3834-4">
       <stop
          style="stop-color:#92c2ef;stop-opacity:1"
@@ -383,7 +340,6 @@
          id="stop3838-7" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient3842-5"
        id="linearGradient18923"
        gradientUnits="userSpaceOnUse"
@@ -393,7 +349,6 @@
        x2="578.35712"
        y2="412.30148" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3842-5">
       <stop
          style="stop-color:#294844;stop-opacity:1;"
@@ -405,7 +360,6 @@
          id="stop3846-9" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient3852-0"
        id="linearGradient18925"
        gradientUnits="userSpaceOnUse"
@@ -415,7 +369,6 @@
        x2="739.09076"
        y2="440.92401" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3852-0">
       <stop
          style="stop-color:#316493;stop-opacity:1"
@@ -427,7 +380,6 @@
          id="stop3856-8" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient3872-3"
        id="linearGradient18927"
        gradientUnits="userSpaceOnUse"
@@ -437,7 +389,6 @@
        x2="683.38342"
        y2="371.16574" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3872-3">
       <stop
          style="stop-color:#e5fdfa;stop-opacity:1;"
@@ -449,7 +400,6 @@
          id="stop3876-0" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient3880-7"
        id="linearGradient18929"
        gradientUnits="userSpaceOnUse"
@@ -459,7 +409,6 @@
        x2="716.55231"
        y2="376.95331" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3880-7">
       <stop
          style="stop-color:#ffffff;stop-opacity:1;"
@@ -471,7 +420,6 @@
          id="stop3884-5" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4810-5-87-7"
        id="linearGradient17765"
        gradientUnits="userSpaceOnUse"
@@ -481,7 +429,6 @@
        x2="8.0137892"
        y2="1050.0707" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4810-5-87-7">
       <stop
          style="stop-color:#a79c68;stop-opacity:1"
@@ -500,11 +447,9 @@
        gradientTransform="translate(20.998645,-7.0373696)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient17787"
-       xlink:href="#linearGradient4910-4-0-6-1"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4910-4-0-6-1" />
     <linearGradient
-       id="linearGradient4910-4-0-6-1"
-       inkscape:collect="always">
+       id="linearGradient4910-4-0-6-1">
       <stop
          id="stop4912-8-5-7-89"
          offset="0"
@@ -522,10 +467,8 @@
        gradientTransform="translate(20.070568,-1.0061696)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient8881-0-1"
-       xlink:href="#linearGradient4994-4-5-3-6"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4994-4-5-3-6" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4994-4-5-3-6">
       <stop
          style="stop-color:#c5dff4;stop-opacity:1"
@@ -544,35 +487,8 @@
        x1="2"
        gradientUnits="userSpaceOnUse"
        id="linearGradient18054"
-       xlink:href="#linearGradient18598"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient18598" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="11.2"
-     inkscape:cx="15.719033"
-     inkscape:cy="7.6347918"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="463"
-     inkscape:window-height="453"
-     inkscape:window-x="1507"
-     inkscape:window-y="736"
-     inkscape:window-maximized="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3011"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -581,36 +497,26 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      transform="translate(0,-1036.3622)">
     <path
-       sodipodi:nodetypes="ccccc"
-       inkscape:connector-curvature="0"
        id="rect3997-9"
        d="m 1.495586,1036.8977 12.004414,0 0,10.0292 -12.004414,0 z"
        style="fill:#f4fcff;fill-opacity:1;stroke:url(#linearGradient18054);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;display:inline" />
     <path
-       sodipodi:nodetypes="ccccc"
-       inkscape:connector-curvature="0"
        id="rect4853-82-7"
        d="m 2.998646,1040.355 0,6 -1,0 0,-7 z"
        style="fill:url(#linearGradient17825);fill-opacity:1;stroke:none;display:inline" />
     <path
-       sodipodi:nodetypes="ccccc"
-       inkscape:connector-curvature="0"
        id="rect4853-82-0"
        d="m 2.998646,1040.355 10,0 0,-1 -11,0 z"
        style="fill:url(#linearGradient17822);fill-opacity:1;stroke:none;display:inline" />
     <path
-       sodipodi:nodetypes="ccccc"
-       inkscape:connector-curvature="0"
        id="rect3997-9-9"
        d="m 1.499533,1036.8622 11.998914,0 0,2.0053 -11.998914,0 z"
        style="fill:url(#linearGradient17817);fill-opacity:1;stroke:url(#linearGradient17819);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;display:inline" />
@@ -622,9 +528,7 @@
       <path
          style="opacity:0.5;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline;filter:url(#filter18648)"
          d="m 5.495586,1040.8977 10.004414,0 0,9.9629 -10.004414,0 z"
-         id="rect3997-9-2-7"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
+         id="rect3997-9-2-7" />
     </g>
     <rect
        style="opacity:0.5;fill:#000000;fill-opacity:0.73936169;stroke:none;display:inline;filter:url(#filter3809)"
@@ -644,24 +548,19 @@
     <path
        style="fill:url(#linearGradient3870);fill-opacity:1;stroke:#ffffff;stroke-width:0.16641554;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
        d="m 36.351917,1017.6665 c -0.59434,-0.416 -0.683492,-0.6835 -1.30755,-0.6835 -0.624058,0 -0.713209,-0.1189 -0.980663,0 -0.267453,0.1189 -0.475473,0.2675 -0.861795,0.2675 -0.386322,0 -0.683493,-0.03 -0.950946,-0.03 -0.267454,0 -0.237736,-0.1783 -0.683492,0.089 -0.445756,0.2675 -0.594341,0.3863 -1.040098,0.4755 -0.445755,0.089 -0.267453,0.03 -0.832077,-0.1486 -0.564624,-0.1783 -0.653775,-0.2378 -1.010381,-0.6538 -0.356604,-0.416 -0.624058,-0.416 -1.129247,-0.3863 -0.505191,0.03 -0.564625,0.208 -0.683493,0.208 -0.118868,0 -0.20802,0.03 -0.594342,-0.2377 -0.386321,-0.2675 -0.564623,-0.1189 -0.534907,-0.3566 0.02972,-0.2378 -0.267453,-0.3864 -0.653775,-0.3566 -0.386322,0.03 -0.416039,0 -0.802361,0.089 -0.386322,0.089 -0.534907,-0.1189 -0.891511,0.1486 -0.356605,0.2674 0.237736,-0.089 -0.71321,0.416 -0.950945,0.5052 -1.069814,0.3566 -1.01038,0.5647 0.05944,0.208 0.05944,0.6537 0.05944,1.0995 0,0.4457 0,4.3387 0,4.3387 l 14.947682,0 z"
-       id="path3862"
-       inkscape:connector-curvature="0" />
+       id="path3862" />
     <path
        style="fill:url(#linearGradient3840);fill-opacity:1;stroke:#bbe4f7;stroke-width:0.08320777px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
        d="m 27.674536,1021.0097 c 0.08915,-0.06 0.861794,-0.5944 0.995521,-0.7132 0.133727,-0.1189 0.04458,-0.4161 0.267454,-0.4458 0.222878,-0.03 0.71321,-0.074 0.832078,0.015 0.118868,0.089 0.193161,0.1634 0.326887,0.089 0.133727,-0.074 0.460615,-0.1931 0.579483,-0.104 0.118868,0.089 0.178302,0.1783 0.312029,0.1932 0.133727,0.015 0.282312,-0.03 0.416039,-0.104 0.133727,-0.074 0.282312,-0.1189 0.445756,-0.1189 0.163444,0 0.312029,0.074 0.430897,0.1783 0.118868,0.104 0.297171,0.2377 0.430897,0.2229 0.133728,-0.015 0.193161,-0.059 0.31203,0.045 0.118868,0.1041 0.356605,0.3121 0.594341,0.3566 0.237736,0.045 0.683493,0.1041 0.787503,0.1635 0.104009,0.059 0.19316,0.1337 0.297169,0.1932 0.10401,0.059 0.549767,0.416 0.549767,0.416 l 0.178301,0.2229 c 0,0 -1.322408,0.2823 -1.456136,0.2823 -0.133726,0 -5.631383,0.074 -5.690816,0.074 -0.05944,0 -0.698352,-0.4161 -0.698352,-0.4161 z"
-       id="path3832"
-       inkscape:connector-curvature="0" />
+       id="path3832" />
     <path
        style="fill:#537c7b;fill-opacity:1;stroke:#649093;stroke-width:0.08320777px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
        d="m 21.671689,1017.8151 c 0,0 1.456136,0.5052 1.753307,0.4755 0.297171,-0.03 0.445756,-0.535 0.921229,-0.2675 0.475472,0.2675 0.742926,1.0104 1.277833,1.159 0.534907,0.1486 0.326888,-0.089 0.832078,0.1783 0.50519,0.2674 0.683493,0.3269 0.891512,0.3269 0.20802,0 0.276907,-9e-4 0.549766,0.2526 0.208018,0.1931 0.29717,0.2674 0.386322,0.4754 0.08915,0.208 0.401179,0.2229 0.609199,0.3715 0.775064,0.4976 2.162717,0.4304 2.94199,0.3566 0.475472,0 1.753306,0.1486 2.139627,0.1783 0.386322,0.03 0.594342,0.03 0.980664,0.03 0.386322,0 0.475472,-0.03 0.772643,0 0.297171,0.03 0.832078,0.03 0.832078,0.03 l 0.148586,0.4755 -0.832078,0.5646 -14.204756,0 z"
-       id="path3830"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="csssssssccsssccccc" />
+       id="path3830" />
     <path
        style="fill:url(#linearGradient3848);fill-opacity:1;stroke:#5e8f71;stroke-width:0.08320777px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
        d="m 22.028294,1019.6873 c 0.445756,0 0.80236,0.208 1.01038,0.1783 0.208019,-0.03 1.01038,-0.4755 1.634438,-0.2378 0.624059,0.2378 1.188683,0.7727 1.485853,0.8321 0.297171,0.059 1.158966,0.208 1.693873,0.208 0.534907,0 1.01038,-0.3269 1.456136,-0.2971 0.445756,0.03 0.772644,0.2377 1.040097,0.2971 0.267454,0.06 0.564625,-0.1188 0.772644,-0.059 0.208019,0.059 0.475473,0.3269 0.475473,0.3269 0,0 1.129248,-0.3269 1.396702,-0.1783 0.267454,0.1486 0.594341,0.416 1.069814,0.416 0.475473,0 0.416039,-0.208 0.832077,-0.03 0.416039,0.1783 0.891513,0.6835 0.891513,0.6835 l 0.118868,0.3269 c 0,0 -3.655199,0 -3.774067,0.03 -0.118868,0.03 -6.953792,0.1783 -7.132095,0.1783 -0.178303,0 -2.02076,-0.03 -2.169346,-0.059 -0.148585,-0.03 -1.188682,-0.1486 -1.188682,-0.1486 0,0 -0.29717,-2.2882 -0.148585,-2.2882 0.148585,0 0.534907,-0.1783 0.534907,-0.1783 z"
-       id="path3828"
-       inkscape:connector-curvature="0" />
+       id="path3828" />
     <rect
        style="fill:url(#linearGradient3858);fill-opacity:1;stroke:#316493;stroke-width:0.08320777;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline"
        id="rect3850"
@@ -672,13 +571,11 @@
     <path
        style="fill:url(#linearGradient3878);fill-opacity:1;stroke:url(#linearGradient3886);stroke-width:0.16641554;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
        d="m 32.696719,1016.4778 c -0.297171,0.208 -0.71321,0.3566 -1.129248,0.3269 -0.416039,-0.03 -1.010381,0.1783 -1.069814,-0.2674 -0.05944,-0.4458 -0.267454,-0.2675 -0.416039,-0.6241 -0.148586,-0.3566 -0.237736,-0.5646 -0.118868,-0.7726 0.118868,-0.2081 0.356604,-0.1784 0.50519,-0.3566 0.148585,-0.1784 0.267453,-0.535 0.534907,-0.5647 0.267453,-0.03 0.50519,0 0.653775,-0.03 0.148586,-0.03 0.534907,-0.4457 0.772644,-0.2674 0.237736,0.1783 0.178302,0.5349 0.416039,0.5646 0.237736,0.03 0.208019,0.1486 0.534907,-0.1783 0.326887,-0.3269 0.475472,-0.5646 0.832077,-0.6835 0.356605,-0.1189 0.71321,-0.208 1.040098,-0.1189 0.326887,0.089 0.475472,0.1189 0.742926,0.2378 0.267453,0.1188 -0.08915,0.624 -0.594341,0.7726 -0.505191,0.1486 -0.505191,0.089 -0.891512,0.416 -0.386322,0.3269 -1.040097,0.4161 -0.950946,0.5944 0.08915,0.1783 0,0.1783 0.326888,0.1783 0.326887,0 0.861794,-0.03 0.653775,0.2377 -0.208019,0.2675 0.08915,0.4458 -0.386322,0.5349 -0.475472,0.089 -0.594341,-0.1486 -0.594341,0.089 0,0.2377 -0.148585,0.624 -0.326888,0.2377 -0.178302,-0.3863 -0.534907,-0.3269 -0.534907,-0.3269 z"
-       id="path3860"
-       inkscape:connector-curvature="0" />
+       id="path3860" />
     <path
        style="fill:#ffffff;fill-opacity:1;stroke:none;display:inline"
        d="m 21.047631,1012.6146 0,12.957 16.285321,0 0,-12.957 -16.285321,0 z m 1.011494,1.0166 14.262333,0 0,10.9237 -14.262333,0 0,-10.9237 z"
-       id="rect2996"
-       inkscape:connector-curvature="0" />
+       id="rect2996" />
     <g
        style="display:inline"
        id="g18908"
@@ -691,23 +588,18 @@
          id="rect2996-1-3-2"
          style="fill:url(#linearGradient18917);fill-opacity:1;stroke:none;display:inline" />
       <path
-         inkscape:connector-curvature="0"
          id="path3862-9"
          d="m 21.351917,1047.6665 c -0.59434,-0.416 -0.683492,-0.6835 -1.30755,-0.6835 -0.624058,0 -0.713209,-0.1189 -0.980663,0 -0.267453,0.1189 -0.475473,0.2675 -0.861795,0.2675 -0.386322,0 -0.683493,-0.03 -0.950946,-0.03 -0.267454,0 -0.237736,-0.1783 -0.683492,0.089 -0.445756,0.2675 -0.594341,0.3863 -1.040098,0.4755 -0.445755,0.089 -0.267453,0.03 -0.832077,-0.1486 -0.564624,-0.1783 -0.653775,-0.2378 -1.010381,-0.6538 -0.356604,-0.416 -0.624058,-0.416 -1.129247,-0.3863 -0.505191,0.03 -0.564625,0.208 -0.683493,0.208 -0.118868,0 -0.20802,0.03 -0.594342,-0.2377 -0.386321,-0.2675 -0.564623,-0.1189 -0.534907,-0.3566 0.02972,-0.2378 -0.267453,-0.3864 -0.653775,-0.3566 -0.3863215,0.03 -0.4160385,0 -0.8023605,0.089 -0.386322,0.089 -0.534907,-0.1189 -0.891511,0.1486 -0.356605,0.2674 0.237736,-0.089 -0.71321,0.416 -0.950945,0.5052 -1.0698141,0.3566 -1.0103801,0.5647 0.05944,0.208 0.05944,0.6537 0.05944,1.0995 0,0.4457 0,4.3387 0,4.3387 l 14.9476816,0 z"
          style="fill:url(#linearGradient18919);fill-opacity:1;stroke:#ffffff;stroke-width:0.16641554;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
       <path
-         inkscape:connector-curvature="0"
          id="path3832-1"
          d="m 12.674536,1051.0097 c 0.08915,-0.06 0.861794,-0.5944 0.995521,-0.7132 0.133727,-0.1189 0.04458,-0.4161 0.267454,-0.4458 0.222878,-0.03 0.71321,-0.074 0.832078,0.015 0.118868,0.089 0.193161,0.1634 0.326887,0.089 0.133727,-0.074 0.460615,-0.1931 0.579483,-0.104 0.118868,0.089 0.178302,0.1783 0.312029,0.1932 0.133727,0.015 0.282312,-0.03 0.416039,-0.104 0.133727,-0.074 0.282312,-0.1189 0.445756,-0.1189 0.163444,0 0.312029,0.074 0.430897,0.1783 0.118868,0.104 0.297171,0.2377 0.430897,0.2229 0.133728,-0.015 0.193161,-0.059 0.31203,0.045 0.118868,0.1041 0.356605,0.3121 0.594341,0.3566 0.237736,0.045 0.683493,0.1041 0.787503,0.1635 0.104009,0.059 0.19316,0.1337 0.297169,0.1932 0.10401,0.059 0.549767,0.416 0.549767,0.416 l 0.178301,0.2229 c 0,0 -1.322408,0.2823 -1.456136,0.2823 -0.133726,0 -5.631383,0.074 -5.690816,0.074 -0.05944,0 -0.698352,-0.4161 -0.698352,-0.4161 z"
          style="fill:url(#linearGradient18921);fill-opacity:1;stroke:#bbe4f7;stroke-width:0.08320777px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline" />
       <path
-         sodipodi:nodetypes="csssssssccsssccccc"
-         inkscape:connector-curvature="0"
          id="path3830-2"
          d="m 6.6716894,1047.8151 c 0,0 1.4561361,0.5052 1.7533071,0.4755 0.297171,-0.03 0.445756,-0.535 0.921229,-0.2675 0.475472,0.2675 0.7429255,1.0104 1.2778325,1.159 0.534907,0.1486 0.326888,-0.089 0.832078,0.1783 0.50519,0.2674 0.683493,0.3269 0.891512,0.3269 0.20802,0 0.276907,-9e-4 0.549766,0.2526 0.208018,0.1931 0.29717,0.2674 0.386322,0.4754 0.08915,0.208 0.401179,0.2229 0.609199,0.3715 0.775064,0.4976 2.162717,0.4304 2.94199,0.3566 0.475472,0 1.753306,0.1486 2.139627,0.1783 0.386322,0.03 0.594342,0.03 0.980664,0.03 0.386322,0 0.475472,-0.03 0.772643,0 0.297171,0.03 0.832078,0.03 0.832078,0.03 l 0.148586,0.4755 -0.832078,0.5646 -14.2047556,0 z"
          style="fill:#537c7b;fill-opacity:1;stroke:#649093;stroke-width:0.08320777px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline" />
       <path
-         inkscape:connector-curvature="0"
          id="path3828-4"
          d="m 7.0282945,1049.6873 c 0.445756,0 0.80236,0.208 1.01038,0.1783 0.208019,-0.03 1.01038,-0.4755 1.634438,-0.2378 0.6240585,0.2378 1.1886825,0.7727 1.4858525,0.8321 0.297171,0.059 1.158966,0.208 1.693873,0.208 0.534907,0 1.01038,-0.3269 1.456136,-0.2971 0.445756,0.03 0.772644,0.2377 1.040097,0.2971 0.267454,0.06 0.564625,-0.1188 0.772644,-0.059 0.208019,0.059 0.475473,0.3269 0.475473,0.3269 0,0 1.129248,-0.3269 1.396702,-0.1783 0.267454,0.1486 0.594341,0.416 1.069814,0.416 0.475473,0 0.416039,-0.208 0.832077,-0.03 0.416039,0.1783 0.891513,0.6835 0.891513,0.6835 l 0.118868,0.3269 c 0,0 -3.655199,0 -3.774067,0.03 -0.118868,0.03 -6.953792,0.1783 -7.132095,0.1783 -0.1783025,0 -2.0207595,-0.03 -2.1693455,-0.059 -0.148585,-0.03 -1.1886821,-0.1486 -1.1886821,-0.1486 0,0 -0.29717,-2.2882 -0.148585,-2.2882 0.148585,0 0.5349071,-0.1783 0.5349071,-0.1783 z"
          style="fill:url(#linearGradient18923);fill-opacity:1;stroke:#5e8f71;stroke-width:0.08320777px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline" />
@@ -719,33 +611,25 @@
          id="rect3850-9"
          style="fill:url(#linearGradient18925);fill-opacity:1;stroke:#316493;stroke-width:0.08320777;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline" />
       <path
-         inkscape:connector-curvature="0"
          id="path3860-9"
          d="m 17.696719,1046.4778 c -0.297171,0.208 -0.71321,0.3566 -1.129248,0.3269 -0.416039,-0.03 -1.010381,0.1783 -1.069814,-0.2674 -0.05944,-0.4458 -0.267454,-0.2675 -0.416039,-0.6241 -0.148586,-0.3566 -0.237736,-0.5646 -0.118868,-0.7726 0.118868,-0.2081 0.356604,-0.1784 0.50519,-0.3566 0.148585,-0.1784 0.267453,-0.535 0.534907,-0.5647 0.267453,-0.03 0.50519,0 0.653775,-0.03 0.148586,-0.03 0.534907,-0.4457 0.772644,-0.2674 0.237736,0.1783 0.178302,0.5349 0.416039,0.5646 0.237736,0.03 0.208019,0.1486 0.534907,-0.1783 0.326887,-0.3269 0.475472,-0.5646 0.832077,-0.6835 0.356605,-0.1189 0.71321,-0.208 1.040098,-0.1189 0.326887,0.089 0.475472,0.1189 0.742926,0.2378 0.267453,0.1188 -0.08915,0.624 -0.594341,0.7726 -0.505191,0.1486 -0.505191,0.089 -0.891512,0.416 -0.386322,0.3269 -1.040097,0.4161 -0.950946,0.5944 0.08915,0.1783 0,0.1783 0.326888,0.1783 0.326887,0 0.861794,-0.03 0.653775,0.2377 -0.208019,0.2675 0.08915,0.4458 -0.386322,0.5349 -0.475472,0.089 -0.594341,-0.1486 -0.594341,0.089 0,0.2377 -0.148585,0.624 -0.326888,0.2377 -0.178302,-0.3863 -0.534907,-0.3269 -0.534907,-0.3269 z"
          style="fill:url(#linearGradient18927);fill-opacity:1;stroke:url(#linearGradient18929);stroke-width:0.16641554;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
     </g>
     <path
-       inkscape:connector-curvature="0"
        style="fill:#f4fcff;fill-opacity:1;stroke:none;display:inline"
        d="m 6,1041.3934 0,8.9688 9,0 0,-8.9688 -9,0 z m 0.96875,0.9688 7.0625,0 0,7.0312 -7.0625,0 0,-7.0312 z"
        id="rect3997-9-2-8-1" />
     <path
-       sodipodi:nodetypes="ccccc"
-       inkscape:connector-curvature="0"
        id="rect3997-9-2"
        d="m 5.495586,1040.8977 10.004414,0 0,9.9629 -10.004414,0 z"
        style="fill:none;stroke:url(#linearGradient17765);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;display:inline" />
     <path
        style="fill:url(#linearGradient17787);fill-opacity:1;stroke:none;display:inline"
        d="m 6.998646,1042.355 0.00135,8.0072 -1,0 -0.00135,-9.0072 z"
-       id="rect4853-82-7-7"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+       id="rect4853-82-7-7" />
     <path
        style="fill:url(#linearGradient8881-0-1);fill-opacity:1;stroke:none;display:inline"
        d="m 6.998646,1042.355 8.001354,0.01 0,-1 -9.001354,-0.01 z"
-       id="rect4853-82-0-9"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+       id="rect4853-82-0-9" />
   </g>
 </svg>
diff --git a/ui/org.eclipse.pde.ui/icons/obj16/incomplete_tsk.svg b/ui/org.eclipse.pde.ui/icons/obj16/incomplete_tsk.svg
index 3026ea2de8b..01e05da6dbd 100644
--- a/ui/org.eclipse.pde.ui/icons/obj16/incomplete_tsk.svg
+++ b/ui/org.eclipse.pde.ui/icons/obj16/incomplete_tsk.svg
@@ -2,20 +2,16 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.48.0 r9654"
-   sodipodi:docname="incomplete_tsk.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
@@ -26,11 +22,9 @@
        gradientUnits="userSpaceOnUse"
        id="linearGradient4975-2-1"
        xlink:href="#linearGradient4994-4-7"
-       inkscape:collect="always"
        gradientTransform="translate(18,-3)" />
     <linearGradient
-       id="linearGradient4994-4-7"
-       inkscape:collect="always">
+       id="linearGradient4994-4-7">
       <stop
          id="stop4996-5-4"
          offset="0"
@@ -48,10 +42,8 @@
        gradientTransform="translate(18,-3)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient5062-9"
-       xlink:href="#linearGradient4910-4-4"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4910-4-4" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4910-4-4">
       <stop
          style="stop-color:#ffffff;stop-opacity:0"
@@ -63,7 +55,6 @@
          id="stop4914-8-8" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4883-4"
        id="linearGradient4889-2"
        x1="28"
@@ -73,7 +64,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-20,0)" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4883-4">
       <stop
          style="stop-color:#ebf9ff;stop-opacity:1"
@@ -85,31 +75,6 @@
          id="stop4887-5" />
     </linearGradient>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="15.999999"
-     inkscape:cx="0.27032891"
-     inkscape:cy="2.6239973"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="1241"
-     inkscape:window-height="814"
-     inkscape:window-x="225"
-     inkscape:window-y="225"
-     inkscape:window-maximized="0"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3999" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -123,36 +88,24 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
     <path
        style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#8b96ab;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
        d="m 2,1038.3622 0.03125,12 11.96875,0 -0.03125,-12 z m 1,1 9.96875,0 0.03125,10 -9.96875,0 z"
-       id="rect3997-9-1"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccccccc"
-       inkscape:export-filename="C:\Users\jmietling\Documents\rect3997-9-1.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
+       id="rect3997-9-1" />
     <path
        style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:url(#linearGradient4889-2);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
        d="m 3,1039.3622 9.96875,0 0.03125,10 -9.96875,0 z"
-       id="rect3997-9-1-1"
-       inkscape:connector-curvature="0" />
+       id="rect3997-9-1-1" />
     <path
        style="fill:url(#linearGradient5062-9);fill-opacity:1;stroke:none;display:inline"
        d="m 5,1041.3622 0,8 -2,0 0,-10 z"
-       id="rect4853-82-7"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+       id="rect4853-82-7" />
     <path
        style="fill:url(#linearGradient4975-2-1);fill-opacity:1;stroke:none;display:inline"
        d="m 5,1041.3622 8,0 0,-2 -10,0 z"
-       id="rect4853-82-0"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+       id="rect4853-82-0" />
   </g>
 </svg>
diff --git a/ui/org.eclipse.pde.ui/icons/obj16/info_st_obj.svg b/ui/org.eclipse.pde.ui/icons/obj16/info_st_obj.svg
index 824b709115e..63cae54cb48 100644
--- a/ui/org.eclipse.pde.ui/icons/obj16/info_st_obj.svg
+++ b/ui/org.eclipse.pde.ui/icons/obj16/info_st_obj.svg
@@ -2,20 +2,16 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.48.0 r9654"
-   sodipodi:docname="info_tsk.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
@@ -30,7 +26,6 @@
          id="stop4894" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4996-4">
       <stop
          style="stop-color:#02468c;stop-opacity:1"
@@ -49,10 +44,8 @@
        gradientTransform="translate(38.469436,55.035191)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient5028"
-       xlink:href="#linearGradient4996-4"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4996-4" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4890"
        id="linearGradient4896"
        x1="14.256123"
@@ -61,7 +54,6 @@
        y2="1056.5471"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4890"
        id="linearGradient4898"
        gradientUnits="userSpaceOnUse"
@@ -70,31 +62,6 @@
        x2="16.307018"
        y2="1060.6793" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="45.254832"
-     inkscape:cx="4.4561136"
-     inkscape:cy="6.7876447"
-     inkscape:document-units="px"
-     inkscape:current-layer="text4140-1-8"
-     showgrid="true"
-     inkscape:window-width="1171"
-     inkscape:window-height="959"
-     inkscape:window-x="1387"
-     inkscape:window-y="399"
-     inkscape:window-maximized="0"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid4099" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -108,8 +75,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
@@ -124,21 +89,18 @@
         <path
            d="m 16.245657,1050.9177 c -0.355456,0.01 -0.65062,0.1291 -0.885494,0.3674 -0.234876,0.2383 -0.35671,0.5529 -0.365501,0.9439 0.0088,0.3981 0.130625,0.7172 0.365502,0.9571 0.234873,0.2399 0.530037,0.363 0.885493,0.3692 0.362672,-0.01 0.662232,-0.1293 0.898681,-0.3692 0.236442,-0.2399 0.358903,-0.559 0.367386,-0.9571 -0.0057,-0.3778 -0.122466,-0.6886 -0.35043,-0.9326 -0.227971,-0.244 -0.533183,-0.3702 -0.915637,-0.3787 z m 0.94955,3.3912 c -1.039986,0.4346 -2.019679,0.6808 -2.939084,0.7386 l 0,0.6029 c 0.435838,-0.02 0.70965,0.039 0.821436,0.1771 0.111784,0.1381 0.159513,0.476 0.143187,1.0136 l 0,3.4515 c 0.01539,0.5401 -0.03423,0.888 -0.148838,1.0438 -0.114613,0.1557 -0.386541,0.2248 -0.815785,0.2072 l 0,0.633 4.084573,0 0,-0.633 c -0.386544,0.017 -0.634608,-0.051 -0.744192,-0.2054 -0.109591,-0.1541 -0.157947,-0.4977 -0.145069,-1.0305 l 0,-5.8631 z"
            style="fill:url(#linearGradient4898);fill-opacity:1"
-           id="path5058"
-           inkscape:connector-curvature="0" />
+           id="path5058" />
       </g>
       <text
          xml:space="preserve"
-         style="font-size:15.07241726px;font-style:normal;font-variant:normal;font-weight:900;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:url(#linearGradient5028);fill-opacity:1;stroke:none;display:inline;font-family:Kozuka Mincho Pr6N H;-inkscape-font-specification:Kozuka Mincho Pr6N H Heavy"
+         style="font-style:normal;font-variant:normal;font-weight:900;font-stretch:normal;line-height:0%;font-family:'Kozuka Mincho Pr6N H';-inkscape-font-specification:'Kozuka Mincho Pr6N H Heavy';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;display:inline;fill:url(#linearGradient5028);fill-opacity:1;stroke:none"
          x="50.288464"
          y="1117.2119"
-         id="text4140-1-8-1"
-         sodipodi:linespacing="125%"><tspan
-           sodipodi:role="line"
+         id="text4140-1-8-1"><tspan
            id="tspan4142-7-8-7"
            x="50.288464"
            y="1117.2119"
-           style="fill:url(#linearGradient5028);fill-opacity:1">Kozuka Mincho Pr6N H</tspan></text>
+           style="font-size:15.0724px;line-height:1.25;fill:url(#linearGradient5028);fill-opacity:1">Kozuka Mincho Pr6N H</tspan></text>
     </g>
   </g>
 </svg>
diff --git a/ui/org.eclipse.pde.ui/icons/obj16/jar_l_obj.svg b/ui/org.eclipse.pde.ui/icons/obj16/jar_l_obj.svg
index dbf53e028ee..b742504a365 100644
--- a/ui/org.eclipse.pde.ui/icons/obj16/jar_l_obj.svg
+++ b/ui/org.eclipse.pde.ui/icons/obj16/jar_l_obj.svg
@@ -2,20 +2,16 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="jar_l_obj.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
@@ -72,7 +68,6 @@
          id="stop4851" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4825">
       <stop
          style="stop-color:#c7a229;stop-opacity:1"
@@ -84,7 +79,6 @@
          id="stop4829" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4817">
       <stop
          style="stop-color:#fefdef;stop-opacity:1;"
@@ -96,7 +90,6 @@
          id="stop4821" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4817"
        id="linearGradient4823"
        x1="25.082857"
@@ -106,7 +99,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(0.9732223,0,0,0.91423911,-19.244016,89.084937)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4825"
        id="linearGradient4831"
        x1="27.425272"
@@ -116,7 +108,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(0.9732223,0,0,0.91423911,-19.244016,89.084937)" />
     <radialGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4847"
        id="radialGradient4853"
        cx="28.538633"
@@ -134,10 +125,8 @@
        gradientUnits="userSpaceOnUse"
        id="linearGradient4882"
        xlink:href="#linearGradient4968"
-       inkscape:collect="always"
        gradientTransform="matrix(0.99680256,0,0,1,-19.916228,-0.0416)" />
     <radialGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4960"
        id="radialGradient4958"
        cx="28.552979"
@@ -148,95 +137,6 @@
        gradientTransform="matrix(0.88536081,0.01424168,-0.02077996,1.2918258,4.947957,-305.15187)"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4738"
-       id="linearGradient4744"
-       x1="-13.936629"
-       y1="1049.9579"
-       x2="-13.936629"
-       y2="1040.053"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(20,0)" />
-    <linearGradient
-       id="linearGradient4738">
-      <stop
-         style="stop-color:#8cc861;stop-opacity:1"
-         offset="0"
-         id="stop4740" />
-      <stop
-         id="stop4746"
-         offset="0.43753415"
-         style="stop-color:#4aa766;stop-opacity:1" />
-      <stop
-         style="stop-color:#c2dd97;stop-opacity:1"
-         offset="1"
-         id="stop4742" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4741"
-       id="linearGradient4747"
-       x1="11.0625"
-       y1="1038.5497"
-       x2="11.0625"
-       y2="1049.912"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-1.314993,0)" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient4741">
-      <stop
-         style="stop-color:#30825a;stop-opacity:1"
-         offset="0"
-         id="stop4743" />
-      <stop
-         style="stop-color:#106643;stop-opacity:1"
-         offset="1"
-         id="stop4745" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4738"
-       id="linearGradient6032"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(15.825436,0)"
-       x1="-13.936629"
-       y1="1049.9579"
-       x2="-13.936629"
-       y2="1040.053" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4741"
-       id="linearGradient6034"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-5.4895565,0)"
-       x1="11.0625"
-       y1="1038.5497"
-       x2="11.0625"
-       y2="1049.912" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4939-8-1"
-       id="linearGradient4178"
-       gradientUnits="userSpaceOnUse"
-       x1="1.4333301"
-       y1="6.4610124"
-       x2="3.0734024"
-       y2="8.1045008" />
-    <linearGradient
-       id="linearGradient4939-8-1"
-       inkscape:collect="always">
-      <stop
-         id="stop4941-8-7"
-         offset="0"
-         style="stop-color:#d5f3ff;stop-opacity:1;" />
-      <stop
-         id="stop4943-2-4"
-         offset="1"
-         style="stop-color:#fcffff;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4907-9"
        id="linearGradient26910"
        gradientUnits="userSpaceOnUse"
@@ -257,7 +157,6 @@
          id="stop4911-0" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4747-9"
        id="linearGradient26912"
        gradientUnits="userSpaceOnUse"
@@ -267,7 +166,6 @@
        x2="3.1875"
        y2="1046.3622" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4747-9">
       <stop
          style="stop-color:#1b844b;stop-opacity:1;"
@@ -279,7 +177,6 @@
          id="stop4751" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4790"
        id="linearGradient26914"
        gradientUnits="userSpaceOnUse"
@@ -289,8 +186,7 @@
        x2="3.1875"
        y2="1046.3622" />
     <linearGradient
-       id="linearGradient4790"
-       inkscape:collect="always">
+       id="linearGradient4790">
       <stop
          id="stop4792"
          offset="0"
@@ -301,7 +197,6 @@
          style="stop-color:#40a5da;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4830"
        id="linearGradient26916"
        gradientUnits="userSpaceOnUse"
@@ -311,7 +206,6 @@
        x2="938.37811"
        y2="473.21918" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4830">
       <stop
          style="stop-color:#e0a010;stop-opacity:1"
@@ -322,89 +216,7 @@
          offset="1"
          id="stop4834" />
     </linearGradient>
-    <linearGradient
-       id="linearGradient4918-5">
-      <stop
-         id="stop4920-9"
-         offset="0"
-         style="stop-color:#d48a4b;stop-opacity:1;" />
-      <stop
-         id="stop4922-9"
-         offset="1"
-         style="stop-color:#b1623a;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4907-9-2">
-      <stop
-         id="stop4909-5-3"
-         offset="0"
-         style="stop-color:#b86c44;stop-opacity:1;" />
-      <stop
-         id="stop4911-0-1"
-         offset="1"
-         style="stop-color:#8f4017;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4928-4">
-      <stop
-         id="stop4930-9"
-         offset="0"
-         style="stop-color:#4dac81;stop-opacity:1;" />
-      <stop
-         id="stop4932-8"
-         offset="1"
-         style="stop-color:#058048;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4938-8">
-      <stop
-         id="stop4940-4"
-         offset="0"
-         style="stop-color:#8bc7d7;stop-opacity:1;" />
-      <stop
-         id="stop4942-8"
-         offset="1"
-         style="stop-color:#17477c;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4961-6">
-      <stop
-         id="stop4963-0"
-         offset="0"
-         style="stop-color:#df9a39;stop-opacity:1;" />
-      <stop
-         id="stop4965-3"
-         offset="1"
-         style="stop-color:#b55829;stop-opacity:1;" />
-    </linearGradient>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="42.142805"
-     inkscape:cx="7.5"
-     inkscape:cy="8.0000087"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1440"
-     inkscape:window-height="855"
-     inkscape:window-x="0"
-     inkscape:window-y="1"
-     inkscape:window-maximized="1"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="true"
-     inkscape:snap-bbox="true"
-     inkscape:bbox-nodes="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid4042" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -418,29 +230,21 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
     <path
        style="fill:url(#radialGradient4853);fill-opacity:1;stroke:none"
        d="m 6.253476,1039.2695 4.507805,0 c 0.453044,1.6907 2.762136,2.5911 2.762136,5.1157 l 0,3.7565 c 0,1.5302 -1.231912,2.7621 -2.762136,2.7621 l -4.507805,0 c -1.530224,0 -2.762136,-1.2319 -2.762136,-2.7621 l 0,-3.7565 c 0,-2.5909 2.334749,-3.5207 2.762136,-5.1157 z"
-       id="rect4044"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccssssssc" />
+       id="rect4044" />
     <path
        style="fill:url(#radialGradient4958);fill-opacity:1;stroke:none;display:inline"
        d="m 6.253476,1039.2695 4.507805,0 c 0.453044,1.6907 2.762136,2.5911 2.762136,5.1157 l 0,3.7565 c 0,1.5302 -1.231912,2.7621 -2.762136,2.7621 l -4.507805,0 c -1.530224,0 -2.762136,-1.2319 -2.762136,-2.7621 l 0,-3.7565 c 0,-2.5909 2.334749,-3.5207 2.762136,-5.1157 z"
-       id="rect4044-7"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccssssssc" />
+       id="rect4044-7" />
     <path
        style="display:inline;fill:none;stroke:url(#linearGradient4882);stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        d="m 6.2533042,1039.2279 4.4933918,0 c 0.451595,1.6907 2.753304,2.5911 2.753304,5.1157 l 0,3.7565 c 0,1.5302 -1.227973,2.7621 -2.753304,2.7621 l -4.4933918,0 C 4.727973,1050.8622 3.5,1049.6303 3.5,1048.1001 l 0,-3.7565 c 0,-2.5909 2.3272838,-3.5207 2.7533042,-5.1157 z"
-       id="rect4044-1"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccssssssc" />
+       id="rect4044-1" />
     <rect
        style="fill:url(#linearGradient4823);fill-opacity:1;stroke:url(#linearGradient4831);stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        id="rect4815"
diff --git a/ui/org.eclipse.pde.ui/icons/obj16/jar_obj.svg b/ui/org.eclipse.pde.ui/icons/obj16/jar_obj.svg
index 671b9c7ebe4..d390e1c723e 100644
--- a/ui/org.eclipse.pde.ui/icons/obj16/jar_obj.svg
+++ b/ui/org.eclipse.pde.ui/icons/obj16/jar_obj.svg
@@ -2,20 +2,16 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.48.0 r9654"
-   sodipodi:docname="jar_obj.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
@@ -72,7 +68,6 @@
          id="stop4851" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4825">
       <stop
          style="stop-color:#c7a229;stop-opacity:1"
@@ -84,7 +79,6 @@
          id="stop4829" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4817">
       <stop
          style="stop-color:#fefdef;stop-opacity:1;"
@@ -96,7 +90,6 @@
          id="stop4821" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4817"
        id="linearGradient4823"
        x1="25.082857"
@@ -106,7 +99,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-20,0)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4825"
        id="linearGradient4831"
        x1="27.425272"
@@ -116,7 +108,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-20,0)" />
     <radialGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4847"
        id="radialGradient4853"
        cx="28.538633"
@@ -134,10 +125,8 @@
        gradientUnits="userSpaceOnUse"
        id="linearGradient4882"
        xlink:href="#linearGradient4968"
-       inkscape:collect="always"
        gradientTransform="translate(-20,0)" />
     <radialGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4960"
        id="radialGradient4958"
        cx="28.552979"
@@ -148,31 +137,6 @@
        gradientTransform="matrix(0.88536081,0.01424168,-0.02077996,1.2918258,4.947957,-305.15187)"
        gradientUnits="userSpaceOnUse" />
   </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="33.004068"
-     inkscape:cy="-10.60689"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1882"
-     inkscape:window-height="1174"
-     inkscape:window-x="22"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid4042" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -186,29 +150,21 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
     <path
        style="fill:url(#radialGradient4853);fill-opacity:1;stroke:none"
        d="m 6.253476,1039.2695 4.507805,0 c 0.453044,1.6907 2.762136,2.5911 2.762136,5.1157 l 0,3.7565 c 0,1.5302 -1.231912,2.7621 -2.762136,2.7621 l -4.507805,0 c -1.530224,0 -2.762136,-1.2319 -2.762136,-2.7621 l 0,-3.7565 c 0,-2.5909 2.334749,-3.5207 2.762136,-5.1157 z"
-       id="rect4044"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccssssssc" />
+       id="rect4044" />
     <path
        style="fill:url(#radialGradient4958);fill-opacity:1;stroke:none;display:inline"
        d="m 6.253476,1039.2695 4.507805,0 c 0.453044,1.6907 2.762136,2.5911 2.762136,5.1157 l 0,3.7565 c 0,1.5302 -1.231912,2.7621 -2.762136,2.7621 l -4.507805,0 c -1.530224,0 -2.762136,-1.2319 -2.762136,-2.7621 l 0,-3.7565 c 0,-2.5909 2.334749,-3.5207 2.762136,-5.1157 z"
-       id="rect4044-7"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccssssssc" />
+       id="rect4044-7" />
     <path
        style="fill:none;stroke:url(#linearGradient4882);stroke-width:0.75;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;display:inline"
        d="m 6.253476,1039.2695 4.507805,0 c 0.453044,1.6907 2.762136,2.5911 2.762136,5.1157 l 0,3.7565 c 0,1.5302 -1.231912,2.7621 -2.762136,2.7621 l -4.507805,0 c -1.530224,0 -2.762136,-1.2319 -2.762136,-2.7621 l 0,-3.7565 c 0,-2.5909 2.334749,-3.5207 2.762136,-5.1157 z"
-       id="rect4044-1"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccssssssc" />
+       id="rect4044-1" />
     <rect
        style="fill:url(#linearGradient4823);fill-opacity:1;stroke:url(#linearGradient4831);stroke-width:0.75;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
        id="rect4815"
diff --git a/ui/org.eclipse.pde.ui/icons/obj16/java_lib_obj.svg b/ui/org.eclipse.pde.ui/icons/obj16/java_lib_obj.svg
index 428952820ce..a14533133f5 100644
--- a/ui/org.eclipse.pde.ui/icons/obj16/java_lib_obj.svg
+++ b/ui/org.eclipse.pde.ui/icons/obj16/java_lib_obj.svg
@@ -2,24 +2,19 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="java_lib_obj.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4918-5"
        id="linearGradient4975-9"
        gradientUnits="userSpaceOnUse"
@@ -40,7 +35,6 @@
          id="stop4922-9" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4907-9"
        id="linearGradient4977-3"
        gradientUnits="userSpaceOnUse"
@@ -61,7 +55,6 @@
          id="stop4911-0" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4928-4"
        id="linearGradient4979-8"
        gradientUnits="userSpaceOnUse"
@@ -104,17 +97,6 @@
          id="stop4965-3" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4961-6"
-       id="linearGradient9855"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-4.625,0)"
-       x1="15.073242"
-       y1="1040.0764"
-       x2="18.744612"
-       y2="1049.2014" />
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4938-8"
        id="linearGradient9955"
        x1="-0.81249988"
@@ -131,36 +113,8 @@
        gradientTransform="matrix(0.99991713,0,0,1,-4.3453016,0.18909977)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient5020-3"
-       xlink:href="#linearGradient4961-6"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4961-6" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="36.875"
-     inkscape:cx="8"
-     inkscape:cy="8"
-     inkscape:document-units="px"
-     inkscape:current-layer="g4969"
-     showgrid="true"
-     inkscape:window-width="1440"
-     inkscape:window-height="855"
-     inkscape:window-x="0"
-     inkscape:window-y="1"
-     inkscape:window-maximized="1"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-bbox="true"
-     inkscape:bbox-nodes="true"
-     inkscape:snap-global="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3948" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -174,8 +128,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
@@ -212,7 +164,6 @@
          id="rect4161"
          style="fill:#0595d3;fill-opacity:1;stroke:none;stroke-width:0.83589131;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
       <path
-         inkscape:connector-curvature="0"
          id="path4949-4"
          d="m 9.9142586,1039.7792 c 0.088382,-0.044 1.5695284,-0.9063 1.5695284,-0.9063 l 3.976381,10.3859 -1.956272,0.5243 z"
          style="display:inline;fill:#f0c028;fill-opacity:1;stroke:url(#linearGradient5020-3);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
diff --git a/ui/org.eclipse.pde.ui/icons/obj16/julaunchpgn.svg b/ui/org.eclipse.pde.ui/icons/obj16/julaunchpgn.svg
index 28a6664eb6c..108f09e77ba 100644
--- a/ui/org.eclipse.pde.ui/icons/obj16/julaunchpgn.svg
+++ b/ui/org.eclipse.pde.ui/icons/obj16/julaunchpgn.svg
@@ -2,304 +2,19 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="julaunchpgn.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient5103-3-7">
-      <stop
-         style="stop-color:#c1ebca;stop-opacity:1"
-         offset="0"
-         id="stop5105-5-4" />
-      <stop
-         id="stop7550-07-0"
-         offset="0.26694915"
-         style="stop-color:#b3dac7;stop-opacity:1" />
-      <stop
-         id="stop7548-6-9"
-         offset="0.51694918"
-         style="stop-color:#9ec2c3;stop-opacity:1" />
-      <stop
-         style="stop-color:#7a99bb;stop-opacity:1"
-         offset="1"
-         id="stop5107-7-48" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3955-1">
-      <stop
-         id="stop3957-4"
-         offset="0"
-         style="stop-color:#c38536;stop-opacity:1" />
-      <stop
-         style="stop-color:#f2dc91;stop-opacity:1"
-         offset="0.15381166"
-         id="stop3959-2" />
-      <stop
-         style="stop-color:#fbdc8b;stop-opacity:1"
-         offset="0.5"
-         id="stop3961-1" />
-      <stop
-         id="stop3963-4"
-         offset="0.75"
-         style="stop-color:#e6bd7a;stop-opacity:1" />
-      <stop
-         id="stop3965-5"
-         offset="1"
-         style="stop-color:#ba772f;stop-opacity:1" />
-    </linearGradient>
-    <mask
-       maskUnits="userSpaceOnUse"
-       id="mask5159">
-      <g
-         style="font-size:11.05178356px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:0.24860173;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline;font-family:AustralianFlyingCorpsStencil;-inkscape-font-specification:AustralianFlyingCorpsStencil"
-         transform="matrix(0.33025863,0,0,0.33025863,-142.45111,929.04872)"
-         id="g5161">
-        <rect
-           style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:3.02792978;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline"
-           id="rect5163"
-           width="15"
-           height="16.625"
-           x="463.74335"
-           y="368.49503"
-           rx="2.625"
-           ry="2.625" />
-        <path
-           style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:3.02792978;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
-           d="m 463.24874,374.64819 31.13385,0 c 1.45425,0 2.625,1.17075 2.625,2.625 l 0,19.0178 c 0,1.45425 -1.17076,2.63221 -2.625,2.625 l -31.13385,-0.15421 c -1.45423,-0.007 -2.625,-1.17075 -2.625,-2.625 l 0,-18.86359 c 0,-1.45425 1.17075,-2.625 2.625,-2.625 z"
-           id="path5165"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="sssssssss" />
-        <path
-           style="fill:#ffffff;stroke:#ffffff;stroke-width:3.02792978;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-           d="m 462.26171,374.64819 20.09375,0"
-           id="path5167"
-           inkscape:connector-curvature="0" />
-      </g>
-    </mask>
-    <mask
-       maskUnits="userSpaceOnUse"
-       id="mask5153">
-      <g
-         id="g5155"
-         style="display:inline"
-         transform="matrix(0.84489245,0,0,0.84489245,66.961974,62.982434)">
-        <path
-           transform="matrix(1.1835826,0,0,1.1835826,-79.255026,-74.544902)"
-           sodipodi:nodetypes="sssssssss"
-           inkscape:connector-curvature="0"
-           id="path5157"
-           d="m 462.77563,373.22885 29.11636,0 c 1.45425,0 2.625,1.17075 2.625,2.625 l 0,18.76896 c 0,1.45425 -1.17412,2.52598 -2.625,2.625 l -29.11636,1.98708 c -1.45088,0.099 -2.625,-1.17075 -2.625,-2.625 l 0,-20.75604 c 0,-1.45425 1.17075,-2.625 2.625,-2.625 z"
-           style="display:inline;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1" />
-      </g>
-    </mask>
-    <linearGradient
-       id="linearGradient11146-4-4-3-4">
-      <stop
-         style="stop-color:#faefba;stop-opacity:1"
-         offset="0"
-         id="stop11150-4-72-2-0" />
-      <stop
-         id="stop11152-9-0-2-9"
-         offset="1"
-         style="stop-color:#9e6542;stop-opacity:1" />
-    </linearGradient>
-    <mask
-       maskUnits="userSpaceOnUse"
-       id="mask5153-1">
-      <g
-         id="g5155-0"
-         style="display:inline"
-         transform="matrix(0.84489245,0,0,0.84489245,66.961974,62.982434)">
-        <path
-           transform="matrix(1.1835826,0,0,1.1835826,-79.255026,-74.544902)"
-           sodipodi:nodetypes="sssssssss"
-           inkscape:connector-curvature="0"
-           id="path5157-4"
-           d="m 462.77563,373.22885 29.11636,0 c 1.45425,0 2.625,1.17075 2.625,2.625 l 0,18.76896 c 0,1.45425 -1.17412,2.52598 -2.625,2.625 l -29.11636,1.98708 c -1.45088,0.099 -2.625,-1.17075 -2.625,-2.625 l 0,-20.75604 c 0,-1.45425 1.17075,-2.625 2.625,-2.625 z"
-           style="display:inline;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1" />
-      </g>
-    </mask>
-    <linearGradient
-       id="linearGradient4284">
-      <stop
-         style="stop-color:#6588c1;stop-opacity:0"
-         offset="0"
-         id="stop4286" />
-      <stop
-         id="stop4288"
-         offset="0.49999967"
-         style="stop-color:#becce3;stop-opacity:1" />
-      <stop
-         style="stop-color:#809dcb;stop-opacity:0"
-         offset="1"
-         id="stop4290" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10448-9-7-0-5">
-      <stop
-         id="stop10450-3-5-6-7"
-         offset="0"
-         style="stop-color:#cf9307;stop-opacity:1" />
-      <stop
-         style="stop-color:#f7d87b;stop-opacity:1"
-         offset="0.5"
-         id="stop10456-4-1-5-3" />
-      <stop
-         id="stop10452-22-7-8-4"
-         offset="1"
-         style="stop-color:#ebb313;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10440-1-0-0-3">
-      <stop
-         id="stop10442-43-2-0-9"
-         offset="0"
-         style="stop-color:#ae7603;stop-opacity:1;" />
-      <stop
-         style="stop-color:#e8d8a3;stop-opacity:1"
-         offset="0.5"
-         id="stop10521-1-2-5-3" />
-      <stop
-         id="stop10444-3-4-0-4"
-         offset="1"
-         style="stop-color:#bb9221;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10748-8">
-      <stop
-         style="stop-color:#ecac18;stop-opacity:1"
-         offset="0"
-         id="stop10750-5" />
-      <stop
-         id="stop10752-8"
-         offset="0.25"
-         style="stop-color:#f1ce66;stop-opacity:1" />
-      <stop
-         id="stop10754-8"
-         offset="0.5"
-         style="stop-color:#f6e5a6;stop-opacity:1" />
-      <stop
-         style="stop-color:#f1cf6c;stop-opacity:1"
-         offset="0.75"
-         id="stop10756-4" />
-      <stop
-         style="stop-color:#e5b630;stop-opacity:1"
-         offset="1"
-         id="stop10758-7" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10448-90">
-      <stop
-         id="stop10450-0"
-         offset="0"
-         style="stop-color:#ecac18;stop-opacity:1" />
-      <stop
-         style="stop-color:#ffe38d;stop-opacity:1"
-         offset="0.25"
-         id="stop10458-2" />
-      <stop
-         style="stop-color:#fdf5d2;stop-opacity:1"
-         offset="0.5"
-         id="stop10456-96" />
-      <stop
-         id="stop10460-3"
-         offset="0.75"
-         style="stop-color:#ffeba7;stop-opacity:1" />
-      <stop
-         id="stop10452-1"
-         offset="1"
-         style="stop-color:#e5b630;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10414-9">
-      <stop
-         id="stop10416-3"
-         offset="0"
-         style="stop-color:#5078b9;stop-opacity:1;" />
-      <stop
-         style="stop-color:#6d8cbd;stop-opacity:1"
-         offset="0.5"
-         id="stop10422-8" />
-      <stop
-         id="stop10418-4"
-         offset="1"
-         style="stop-color:#5f88c9;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10432-3">
-      <stop
-         style="stop-color:#1f4d9a;stop-opacity:1"
-         offset="0"
-         id="stop10434-4" />
-      <stop
-         id="stop10436-2"
-         offset="0.5"
-         style="stop-color:#4e6da1;stop-opacity:1" />
-      <stop
-         style="stop-color:#567ebc;stop-opacity:1"
-         offset="1"
-         id="stop10438-9" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10157-6">
-      <stop
-         id="stop10159-5"
-         offset="0"
-         style="stop-color:#6588c1;stop-opacity:1" />
-      <stop
-         style="stop-color:#becce3;stop-opacity:1"
-         offset="0.5"
-         id="stop10165-9" />
-      <stop
-         id="stop10161-55"
-         offset="1"
-         style="stop-color:#809dcb;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10396-5">
-      <stop
-         id="stop10398-7"
-         offset="0"
-         style="stop-color:#1b3e79;stop-opacity:1;" />
-      <stop
-         style="stop-color:#728fbf;stop-opacity:1"
-         offset="0.5"
-         id="stop10404-9" />
-      <stop
-         id="stop10400-9"
-         offset="1"
-         style="stop-color:#1f4d9a;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10149-6-5-4">
-      <stop
-         id="stop10151-5-7-2"
-         offset="0"
-         style="stop-color:#1f4d9a;stop-opacity:1" />
-      <stop
-         style="stop-color:#b9c7df;stop-opacity:1"
-         offset="0.5"
-         id="stop10394-3" />
-      <stop
-         id="stop10153-8-1-2"
-         offset="1"
-         style="stop-color:#567ebc;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4317"
        id="linearGradient4323"
        x1="19.792524"
@@ -308,7 +23,6 @@
        y2="1064.6748"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4317">
       <stop
          style="stop-color:#f8e8a8;stop-opacity:1"
@@ -328,7 +42,6 @@
          id="stop4321" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4311"
        id="linearGradient4307"
        gradientUnits="userSpaceOnUse"
@@ -337,8 +50,7 @@
        x2="18.92688"
        y2="1065.5569" />
     <linearGradient
-       id="linearGradient4311"
-       inkscape:collect="always">
+       id="linearGradient4311">
       <stop
          id="stop4313"
          offset="0"
@@ -349,7 +61,6 @@
          style="stop-color:#a87000;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4311"
        id="linearGradient4309"
        gradientUnits="userSpaceOnUse"
@@ -358,7 +69,6 @@
        x2="17.04467"
        y2="1063.8405" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4258"
        id="linearGradient4264"
        x1="17.04467"
@@ -367,7 +77,6 @@
        y2="1063.8405"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4258">
       <stop
          style="stop-color:#5888c8;stop-opacity:1"
@@ -379,7 +88,6 @@
          id="stop4262" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4250"
        id="linearGradient4256"
        x1="18.92688"
@@ -388,7 +96,6 @@
        y2="1065.5569"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4250">
       <stop
          style="stop-color:#7090c0;stop-opacity:1"
@@ -400,31 +107,6 @@
          id="stop4254" />
     </linearGradient>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="5.6568543"
-     inkscape:cx="3.3251661"
-     inkscape:cy="-6.5658793"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1-4"
-     showgrid="true"
-     inkscape:window-width="1086"
-     inkscape:window-height="787"
-     inkscape:window-x="908"
-     inkscape:window-y="755"
-     inkscape:window-maximized="0"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid4092" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -438,8 +120,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
@@ -450,8 +130,7 @@
       <g
          transform="matrix(0.73056116,0,0,0.72750345,11.535974,295.24315)"
          style="display:inline"
-         id="layer1-4"
-         inkscape:label="Layer 1">
+         id="layer1-4">
         <g
            transform="scale(1.0565022,0.94651957)"
            style="font-style:normal;font-weight:normal;font-size:20.8505249px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#21844f;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
@@ -459,9 +138,7 @@
           <path
              d="m 5.6273186,1103.2213 c -0.1425329,0.013 -0.2511294,0.068 -0.3257895,0.1629 -0.07466,0.095 -0.1119901,0.1935 -0.1119901,0.2953 l 0,5.8673 c 0,0.8688 -0.081447,1.6494 -0.2443421,2.3417 -0.1628947,0.6923 -0.424205,1.2794 -0.7839309,1.7613 -0.3597258,0.4819 -0.8314418,0.8552 -1.4151479,1.1199 -0.5837061,0.2579 -2.04072776,0.3868 -2.88235048,0.3868 -0.33936401,0 -0.85413537,-0.031 -1.17992482,-0.092 -0.3257894,-0.054 -0.6176425,-0.1185 -0.8755591,-0.1934 -0.2579167,-0.068 -0.4751097,-0.1324 -0.6515789,-0.1935 -0.169682,-0.061 -0.2680976,-0.099 -0.2952467,-0.112 l 0,-3.5633 1.2522532,0 0.4581414,2.5452 c 0.020362,0.1019 0.061086,0.1901 0.122171,0.2647 0.067873,0.068 0.1459266,0.1222 0.2341612,0.1629 0.0882346,0.041 0.18325656,0.071 0.28506577,0.092 0.10859648,0.013 0.21379932,0.02 0.31560853,0.02 0.47510961,0 0.87895279,-0.092 1.21152952,-0.2749 0.33257668,-0.1832 0.60406788,-0.4581 0.81447368,-0.8246 0.2104056,-0.3665 0.3631194,-0.8247 0.4581414,-1.3744 0.095022,-0.5498 0.1425329,-1.1912 0.1425329,-1.9242 l 0,-6.0099 c 0,-0.1018 -0.03733,-0.2002 -0.1119902,-0.2953 -0.067873,-0.095 -0.1764693,-0.1493 -0.3257894,-0.1629 l -1.31333875,-0.081 0,-0.8959 6.25223515,0 0,0.8959 -1.0293349,0.081 z"
              style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Abyssinica SIL';fill:#21844f;fill-opacity:1"
-             id="path4283"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccsscccsccccccccscscscsscccccccc" />
+             id="path4283" />
         </g>
         <g
            transform="scale(0.9979051,1.0020993)"
@@ -470,9 +147,7 @@
           <path
              d="m 14.784451,1044.6623 c -0.0953,0.01 -0.166775,0.043 -0.214425,0.104 -0.04332,0.061 -0.06498,0.1235 -0.06498,0.1884 l 0,5.0553 c 0,0.5458 -0.07364,1.018 -0.220922,1.4165 -0.147282,0.3985 -0.366039,0.7277 -0.65627,0.9876 -0.2859,0.2599 -0.643275,0.4527 -1.072124,0.5783 -0.424518,0.1257 -0.914013,0.1885 -1.468485,0.1885 -1.1002807,0 -2.8564448,-0.2664 -3.3892579,-0.7993 -0.5328131,-0.5328 -0.7992196,-1.3233 -0.7992196,-2.3716 l 0,-5.0553 c 0,-0.065 -0.023825,-0.1275 -0.071475,-0.1884 -0.043318,-0.061 -0.112627,-0.095 -0.2079271,-0.104 l -0.7082516,-0.052 0,-0.5718 4.6249862,0 0,0.5718 -0.760234,0.052 c -0.0953,0.01 -0.1667748,0.043 -0.2144248,0.104 -0.043318,0.061 -0.064977,0.1235 -0.064977,0.1884 l 0,4.7109 c 0,0.3899 0.030323,0.7472 0.090968,1.0721 0.060645,0.3205 0.1732725,0.5956 0.3378815,0.8252 0.1646093,0.2296 0.3920293,0.4094 0.6822603,0.5393 0.294563,0.1257 0.373541,0.1885 0.837046,0.1885 0.459172,0 0.385956,-0.067 0.680519,-0.2015 0.294563,-0.1343 0.526315,-0.3184 0.695256,-0.5523 0.168941,-0.2382 0.2859,-0.5176 0.350877,-0.8382 0.06498,-0.3205 0.09747,-0.6649 0.09747,-1.0331 l 0,-4.7109 c 0,-0.065 -0.02599,-0.1275 -0.07797,-0.1884 -0.04765,-0.061 -0.119128,-0.095 -0.214425,-0.104 l -0.760233,-0.052 0,-0.5718 3.34157,0 0,0.5718 z"
              style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Abyssinica SIL';-inkscape-font-specification:'Abyssinica SIL';fill:#d8424f;fill-opacity:1"
-             id="path4286"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccsssccscssccccccccsscscscccssccccccc" />
+             id="path4286" />
         </g>
         <g
            style="display:inline"
@@ -485,8 +160,6 @@
                id="g4266-0"
                style="display:inline">
               <path
-                 sodipodi:nodetypes="ssssccs"
-                 inkscape:connector-curvature="0"
                  id="path4242-9"
                  d="m 19.520119,1060.4831 c 0.341806,-0.3409 1.0254,0.4474 1.0254,0.9295 l 0,2.9581 c 0,0.5003 -0.709328,1.5082 -1.063991,1.1545 -1.323187,-1.3197 -1.935031,-2.0399 -1.935031,-2.0399 l 0,-0.9787 c 0,0 0.739057,-0.7922 1.973622,-2.0235 z"
                  style="fill:url(#linearGradient4323);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4307);stroke-width:0.89697278;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
@@ -511,9 +184,7 @@
             <path
                style="fill:#a8c0d8;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4256);stroke-width:0.89697278;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
                d="m 19.520119,1060.4831 c 0.341806,-0.3409 1.0254,1.0466 1.0254,1.5287 l 0,2.4522 c 0,0.5003 -0.709328,1.4149 -1.063991,1.0612 -1.323187,-1.3197 -1.935031,-2.0399 -1.935031,-2.0399 l 0,-0.9787 c 0,0 0.739057,-0.7922 1.973622,-2.0235 z"
-               id="path4242"
-               inkscape:connector-curvature="0"
-               sodipodi:nodetypes="ssssccs" />
+               id="path4242" />
           </g>
         </g>
       </g>
diff --git a/ui/org.eclipse.pde.ui/icons/obj16/keygroups_obj.svg b/ui/org.eclipse.pde.ui/icons/obj16/keygroups_obj.svg
index 14b99f9d7c7..77e8b898c02 100644
--- a/ui/org.eclipse.pde.ui/icons/obj16/keygroups_obj.svg
+++ b/ui/org.eclipse.pde.ui/icons/obj16/keygroups_obj.svg
@@ -2,803 +2,19 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="keygroups_obj.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
-    <linearGradient
-       id="linearGradient3869">
-      <stop
-         style="stop-color:#7090b0;stop-opacity:1;"
-         offset="0"
-         id="stop3871" />
-      <stop
-         style="stop-color:#5d4886;stop-opacity:1;"
-         offset="1"
-         id="stop3873" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3861">
-      <stop
-         style="stop-color:#4b87ac;stop-opacity:1;"
-         offset="0"
-         id="stop3863" />
-      <stop
-         style="stop-color:#4b87ac;stop-opacity:0;"
-         offset="1"
-         id="stop3865" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3853">
-      <stop
-         style="stop-color:#698ba5;stop-opacity:1"
-         offset="0"
-         id="stop3855" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop3857" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient10359">
-      <stop
-         style="stop-color:#4a77a8;stop-opacity:1;"
-         offset="0"
-         id="stop10361" />
-      <stop
-         style="stop-color:#2266a0;stop-opacity:1"
-         offset="1"
-         id="stop10363" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient10351">
-      <stop
-         style="stop-color:#849abe;stop-opacity:1;"
-         offset="0"
-         id="stop10353" />
-      <stop
-         style="stop-color:#677da9;stop-opacity:1"
-         offset="1"
-         id="stop10355" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient10593">
-      <stop
-         style="stop-color:#1b639e;stop-opacity:1;"
-         offset="0"
-         id="stop10595" />
-      <stop
-         style="stop-color:#6f8db9;stop-opacity:1"
-         offset="1"
-         id="stop10597" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient9610">
-      <stop
-         style="stop-color:#c7b571;stop-opacity:1"
-         offset="0"
-         id="stop9612" />
-      <stop
-         id="stop9614"
-         offset="1"
-         style="stop-color:#9a9990;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient15990"
-       inkscape:collect="always">
-      <stop
-         id="stop15992"
-         offset="0"
-         style="stop-color:#f9fafc;stop-opacity:1" />
-      <stop
-         id="stop15994"
-         offset="1"
-         style="stop-color:#e0eaf8;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient9610"
-       id="linearGradient9568"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-6.074384,3.9704772)"
-       x1="8.0137892"
-       y1="1035.9741"
-       x2="8.0137892"
-       y2="1051.0103" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient15990"
-       id="linearGradient9571"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.8474583,0,0,0.67963192,9.9008257,358.14455)"
-       x1="-3.1651151"
-       y1="1030.4418"
-       x2="-3.1651151"
-       y2="1041.0583" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient10593"
-       id="linearGradient10599"
-       x1="10"
-       y1="10"
-       x2="10"
-       y2="5"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-3.8153447,1050.371)" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient10653-6">
-      <stop
-         style="stop-color:#130d08;stop-opacity:1"
-         offset="0"
-         id="stop10655-1" />
-      <stop
-         style="stop-color:#654628;stop-opacity:0;"
-         offset="1"
-         id="stop10657-8" />
-    </linearGradient>
-    <linearGradient
-       y2="1038.3622"
-       x2="14"
-       y1="1041.3622"
-       x1="14"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient10676"
-       xlink:href="#linearGradient10653-6"
-       inkscape:collect="always"
-       gradientTransform="matrix(1,0,0,-1,-20.299911,2088.3986)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient10351"
-       id="linearGradient10357"
-       x1="5"
-       y1="1037.8622"
-       x2="11"
-       y2="1037.8622"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-19.268661,0.67417473)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient10359"
-       id="linearGradient10365"
-       x1="9"
-       y1="1043.8622"
-       x2="14"
-       y2="1043.8622"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-19.268661,-1.3258253)" />
-    <linearGradient
-       gradientTransform="translate(-19.268661,0.67417473)"
-       inkscape:collect="always"
-       xlink:href="#linearGradient10359-9"
-       id="linearGradient10365-7"
-       x1="9"
-       y1="1043.8622"
-       x2="14"
-       y2="1043.8622"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient10359-9">
-      <stop
-         style="stop-color:#4a77a8;stop-opacity:1;"
-         offset="0"
-         id="stop10361-8" />
-      <stop
-         style="stop-color:#2266a0;stop-opacity:1"
-         offset="1"
-         id="stop10363-6" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient10351-2">
-      <stop
-         style="stop-color:#849abe;stop-opacity:1;"
-         offset="0"
-         id="stop10353-6" />
-      <stop
-         style="stop-color:#677da9;stop-opacity:1"
-         offset="1"
-         id="stop10355-9" />
-    </linearGradient>
-    <linearGradient
-       y2="1037.8622"
-       x2="11"
-       y1="1037.8622"
-       x1="5"
-       gradientTransform="translate(-19.268661,10.674175)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient10490"
-       xlink:href="#linearGradient10351-2"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient9610-6">
-      <stop
-         style="stop-color:#c7b571;stop-opacity:1"
-         offset="0"
-         id="stop9612-8" />
-      <stop
-         id="stop9614-2"
-         offset="1"
-         style="stop-color:#9a9990;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       y2="1051.0103"
-       x2="8.0137892"
-       y1="1035.9741"
-       x1="8.0137892"
-       gradientTransform="translate(-8.9053941,21.029495)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient9594"
-       xlink:href="#linearGradient9610-6"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient10359-8">
-      <stop
-         style="stop-color:#4a77a8;stop-opacity:1;"
-         offset="0"
-         id="stop10361-2" />
-      <stop
-         style="stop-color:#2266a0;stop-opacity:1"
-         offset="1"
-         id="stop10363-3" />
-    </linearGradient>
-    <linearGradient
-       y2="1043.8622"
-       x2="14"
-       y1="1043.8622"
-       x1="9"
-       gradientTransform="translate(-7.1250006,11.937509)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient9628"
-       xlink:href="#linearGradient10359-8"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient10351-2-3">
-      <stop
-         style="stop-color:#849abe;stop-opacity:1;"
-         offset="0"
-         id="stop10353-6-3" />
-      <stop
-         style="stop-color:#677da9;stop-opacity:1"
-         offset="1"
-         id="stop10355-9-7" />
-    </linearGradient>
-    <linearGradient
-       y2="1037.8622"
-       x2="11"
-       y1="1037.8622"
-       x1="5"
-       gradientTransform="translate(-3.0000004,22.062509)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient9662"
-       xlink:href="#linearGradient10351-2-3"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient10351-2-3-1">
-      <stop
-         style="stop-color:#849abe;stop-opacity:1;"
-         offset="0"
-         id="stop10353-6-3-8" />
-      <stop
-         style="stop-color:#677da9;stop-opacity:1"
-         offset="1"
-         id="stop10355-9-7-7" />
-    </linearGradient>
-    <linearGradient
-       y2="1037.8622"
-       x2="11"
-       y1="1037.8622"
-       x1="5"
-       gradientTransform="translate(-3.0000004,24.0625)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient9696"
-       xlink:href="#linearGradient10351-2-3-1"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient10351-2-3-1-1">
-      <stop
-         style="stop-color:#849abe;stop-opacity:1;"
-         offset="0"
-         id="stop10353-6-3-8-2" />
-      <stop
-         style="stop-color:#677da9;stop-opacity:1"
-         offset="1"
-         id="stop10355-9-7-7-1" />
-    </linearGradient>
-    <linearGradient
-       y2="1037.8622"
-       x2="11"
-       y1="1037.8622"
-       x1="5"
-       gradientTransform="translate(-3.0000004,25.9375)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient9730"
-       xlink:href="#linearGradient10351-2-3-1-1"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient10351-2-3-1-1-5">
-      <stop
-         style="stop-color:#849abe;stop-opacity:1;"
-         offset="0"
-         id="stop10353-6-3-8-2-7" />
-      <stop
-         style="stop-color:#677da9;stop-opacity:1"
-         offset="1"
-         id="stop10355-9-7-7-1-6" />
-    </linearGradient>
-    <linearGradient
-       y2="1037.8622"
-       x2="11"
-       y1="1037.8622"
-       x1="5"
-       gradientTransform="translate(-3.0000004,28.0625)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient9764"
-       xlink:href="#linearGradient10351-2-3-1-1-5"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient15990"
-       id="linearGradient9793"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.8474583,0,0,0.67963192,9.9008257,358.14455)"
-       x1="-3.1651151"
-       y1="1030.4418"
-       x2="-3.1651151"
-       y2="1041.0583" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient9610-6"
-       id="linearGradient9795"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-8.9053941,21.029495)"
-       x1="8.0137892"
-       y1="1035.9741"
-       x2="8.0137892"
-       y2="1051.0103" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient10593"
-       id="linearGradient9797"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-3.8153447,1050.371)"
-       x1="10"
-       y1="10"
-       x2="10"
-       y2="5" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient10359-8"
-       id="linearGradient9799"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-7.1250006,11.937509)"
-       x1="9"
-       y1="1043.8622"
-       x2="14"
-       y2="1043.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient10351-2-3"
-       id="linearGradient9801"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-3.0000004,22.062509)"
-       x1="5"
-       y1="1037.8622"
-       x2="11"
-       y2="1037.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient10351-2-3-1"
-       id="linearGradient9803"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-3.0000004,24.0625)"
-       x1="5"
-       y1="1037.8622"
-       x2="11"
-       y2="1037.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient10351-2-3-1-1"
-       id="linearGradient9805"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-3.0000004,25.9375)"
-       x1="5"
-       y1="1037.8622"
-       x2="11"
-       y2="1037.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient10351-2-3-1-1-5"
-       id="linearGradient9807"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-3.0000004,28.0625)"
-       x1="5"
-       y1="1037.8622"
-       x2="11"
-       y2="1037.8622" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3853"
-       id="radialGradient3859"
-       cx="9.166254"
-       cy="2.788337"
-       fx="9.166254"
-       fy="2.788337"
-       r="3.3394759"
-       gradientTransform="matrix(-1.8167088,-4.120454e-8,3.3433294e-8,-1.4740744,26.981502,5.6508693)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3869"
-       id="linearGradient3875"
-       x1="7.8512411"
-       y1="2.6097209"
-       x2="7.8512411"
-       y2="6.3611164"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3853-6"
-       id="radialGradient3859-5"
-       cx="9.166254"
-       cy="2.788337"
-       fx="9.166254"
-       fy="2.788337"
-       r="3.3394759"
-       gradientTransform="matrix(-1.8167088,-4.120454e-8,3.3433294e-8,-1.4740744,26.981502,5.6508693)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient3853-6">
-      <stop
-         style="stop-color:#698ba5;stop-opacity:1"
-         offset="0"
-         id="stop3855-9" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop3857-6" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3869-7"
-       id="linearGradient3875-5"
-       x1="7.8512411"
-       y1="2.6097209"
-       x2="7.8512411"
-       y2="6.3611164"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient3869-7">
-      <stop
-         style="stop-color:#7090b0;stop-opacity:1;"
-         offset="0"
-         id="stop3871-2" />
-      <stop
-         style="stop-color:#5d4886;stop-opacity:1;"
-         offset="1"
-         id="stop3873-2" />
-    </linearGradient>
-    <radialGradient
-       r="3.3394759"
-       fy="2.788337"
-       fx="9.166254"
-       cy="2.788337"
-       cx="9.166254"
-       gradientTransform="matrix(-1.8167088,-4.120454e-8,3.3433294e-8,-1.4740744,26.981502,1042.0131)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient3919"
-       xlink:href="#linearGradient3853-6"
-       inkscape:collect="always" />
-    <linearGradient
-       gradientTransform="translate(0,1036.3622)"
-       y2="6.3611164"
-       x2="7.8512411"
-       y1="2.6097209"
-       x1="7.8512411"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3921"
-       xlink:href="#linearGradient3869-7"
-       inkscape:collect="always" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3853"
-       id="radialGradient3977"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.6467056,-3.734872e-8,3.0304688e-8,-1.3361341,25.191739,1041.8786)"
-       cx="9.166254"
-       cy="2.788337"
-       fx="9.166254"
-       fy="2.788337"
-       r="3.3394759" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3869"
-       id="linearGradient3979"
-       gradientUnits="userSpaceOnUse"
-       x1="7.8512411"
-       y1="2.6097209"
-       x2="7.8512411"
-       y2="6.3611164"
-       gradientTransform="matrix(0.90642244,0,0,0.90642244,0.73509994,1036.7566)" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3853-4"
-       id="radialGradient3977-1"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.6467056,-3.734872e-8,3.0304688e-8,-1.3361341,25.191739,1041.8786)"
-       cx="9.166254"
-       cy="2.788337"
-       fx="9.166254"
-       fy="2.788337"
-       r="3.3394759" />
-    <linearGradient
-       id="linearGradient3853-4">
-      <stop
-         style="stop-color:#698ba5;stop-opacity:1"
-         offset="0"
-         id="stop3855-0" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop3857-2" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3869-5"
-       id="linearGradient3979-3"
-       gradientUnits="userSpaceOnUse"
-       x1="7.8512411"
-       y1="2.6097209"
-       x2="7.8512411"
-       y2="6.3611164"
-       gradientTransform="matrix(0.90642244,0,0,0.90642244,0.73509994,1036.7566)" />
-    <linearGradient
-       id="linearGradient3869-5">
-      <stop
-         style="stop-color:#7090b0;stop-opacity:1;"
-         offset="0"
-         id="stop3871-6" />
-      <stop
-         style="stop-color:#5d4886;stop-opacity:1;"
-         offset="1"
-         id="stop3873-6" />
-    </linearGradient>
     <radialGradient
-       r="3.3394759"
-       fy="2.788337"
-       fx="9.166254"
-       cy="2.788337"
-       cx="9.166254"
-       gradientTransform="matrix(-1.6467056,-3.734872e-8,3.0304688e-8,-1.3361341,20.285489,1049.066)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient4000"
-       xlink:href="#linearGradient3853-4"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="6.3611164"
-       x2="7.8512411"
-       y1="2.6097209"
-       x1="7.8512411"
-       gradientTransform="matrix(0.90642244,0,0,0.90642244,-4.1711503,1043.944)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4002"
-       xlink:href="#linearGradient3869-5"
-       inkscape:collect="always" />
-    <radialGradient
-       r="3.3394759"
-       fy="2.788337"
-       fx="9.166254"
-       cy="2.788337"
-       cx="9.166254"
-       gradientTransform="matrix(-1.6467056,-3.734872e-8,3.0304688e-8,-1.3361341,20.285489,1049.066)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient4000-6"
-       xlink:href="#linearGradient3853-4-3"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient3853-4-3">
-      <stop
-         style="stop-color:#698ba5;stop-opacity:1"
-         offset="0"
-         id="stop3855-0-0" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop3857-2-9" />
-    </linearGradient>
-    <linearGradient
-       y2="6.3611164"
-       x2="7.8512411"
-       y1="2.6097209"
-       x1="7.8512411"
-       gradientTransform="matrix(0.90642244,0,0,0.90642244,-4.1711503,1043.944)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4002-4"
-       xlink:href="#linearGradient3869-5-6"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient3869-5-6">
-      <stop
-         style="stop-color:#7090b0;stop-opacity:1;"
-         offset="0"
-         id="stop3871-6-4" />
-      <stop
-         style="stop-color:#5d4886;stop-opacity:1;"
-         offset="1"
-         id="stop3873-6-6" />
-    </linearGradient>
-    <radialGradient
-       r="3.3394759"
-       fy="2.788337"
-       fx="9.166254"
-       cy="2.788337"
-       cx="9.166254"
-       gradientTransform="matrix(-1.6467056,-3.734872e-8,3.0304688e-8,-1.3361341,20.285489,1049.0659)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient4050"
-       xlink:href="#linearGradient3853-4-3"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="6.3611164"
-       x2="7.8512411"
-       y1="2.6097209"
-       x1="7.8512411"
-       gradientTransform="matrix(0.90642244,0,0,0.90642244,-4.1711503,1043.9439)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4052"
-       xlink:href="#linearGradient3869-5-6"
-       inkscape:collect="always" />
-    <radialGradient
-       r="3.3394759"
-       fy="2.788337"
-       fx="9.166254"
-       cy="2.788337"
-       cx="9.166254"
-       gradientTransform="matrix(-1.6467056,-3.734872e-8,3.0304688e-8,-1.3361341,20.285489,1049.066)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient4000-3"
-       xlink:href="#linearGradient3853-4-1"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient3853-4-1">
-      <stop
-         style="stop-color:#698ba5;stop-opacity:1"
-         offset="0"
-         id="stop3855-0-1" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop3857-2-5" />
-    </linearGradient>
-    <linearGradient
-       y2="6.3611164"
-       x2="7.8512411"
-       y1="2.6097209"
-       x1="7.8512411"
-       gradientTransform="matrix(0.90642244,0,0,0.90642244,-4.1711503,1043.944)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4002-45"
-       xlink:href="#linearGradient3869-5-8"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient3869-5-8">
-      <stop
-         style="stop-color:#7090b0;stop-opacity:1;"
-         offset="0"
-         id="stop3871-6-9" />
-      <stop
-         style="stop-color:#5d4886;stop-opacity:1;"
-         offset="1"
-         id="stop3873-6-1" />
-    </linearGradient>
-    <radialGradient
-       r="3.3394759"
-       fy="2.788337"
-       fx="9.166254"
-       cy="2.788337"
-       cx="9.166254"
-       gradientTransform="matrix(-1.6467056,-3.734872e-8,3.0304688e-8,-1.3361341,25.36782,1049.0659)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient4169"
-       xlink:href="#linearGradient3853-4-1"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="6.3611164"
-       x2="7.8512411"
-       y1="2.6097209"
-       x1="7.8512411"
-       gradientTransform="matrix(0.90642244,0,0,0.90642244,0.91118001,1043.9439)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4171"
-       xlink:href="#linearGradient3869-5-8"
-       inkscape:collect="always" />
-    <radialGradient
-       r="3.3394759"
-       fy="2.788337"
-       fx="9.166254"
-       cy="2.788337"
-       cx="9.166254"
-       gradientTransform="matrix(-1.6467056,-3.734872e-8,3.0304688e-8,-1.3361341,25.36782,1049.0659)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient4169-7"
-       xlink:href="#linearGradient3853-4-1-7"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient3853-4-1-7">
-      <stop
-         style="stop-color:#698ba5;stop-opacity:1"
-         offset="0"
-         id="stop3855-0-1-2" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop3857-2-5-3" />
-    </linearGradient>
-    <linearGradient
-       y2="6.3611164"
-       x2="7.8512411"
-       y1="2.6097209"
-       x1="7.8512411"
-       gradientTransform="matrix(0.90642244,0,0,0.90642244,0.91118001,1043.9439)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4171-2"
-       xlink:href="#linearGradient3869-5-8-4"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient3869-5-8-4">
-      <stop
-         style="stop-color:#7090b0;stop-opacity:1;"
-         offset="0"
-         id="stop3871-6-9-2" />
-      <stop
-         style="stop-color:#5d4886;stop-opacity:1;"
-         offset="1"
-         id="stop3873-6-1-7" />
-    </linearGradient>
-    <radialGradient
-       r="3.3394759"
-       fy="2.788337"
-       fx="9.166254"
-       cy="2.788337"
-       cx="9.166254"
-       gradientTransform="matrix(-1.6467056,-3.734872e-8,3.0304688e-8,-1.3361341,30.405956,1049.0658)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient4219"
-       xlink:href="#linearGradient3853-4-1-7"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="6.3611164"
-       x2="7.8512411"
-       y1="2.6097209"
-       x1="7.8512411"
-       gradientTransform="matrix(0.90642244,0,0,0.90642244,5.9493161,1043.9438)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4221"
-       xlink:href="#linearGradient3869-5-8-4"
-       inkscape:collect="always" />
-    <radialGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient3853-5"
        id="radialGradient3977-7"
        gradientUnits="userSpaceOnUse"
@@ -820,7 +36,6 @@
          id="stop3857-3" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient3869-3"
        id="linearGradient3979-6"
        gradientUnits="userSpaceOnUse"
@@ -849,8 +64,7 @@
        gradientTransform="matrix(-1.6384328,-3.7364668e-8,3.0152441e-8,-1.3367046,20.096033,1049.0668)"
        gradientUnits="userSpaceOnUse"
        id="radialGradient4000-9"
-       xlink:href="#linearGradient3853-4-9"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient3853-4-9" />
     <linearGradient
        id="linearGradient3853-4-9">
       <stop
@@ -870,8 +84,7 @@
        gradientTransform="matrix(0.9018687,0,0,0.90680948,-4.2377403,1043.9426)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient4002-3"
-       xlink:href="#linearGradient3869-5-7"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient3869-5-7" />
     <linearGradient
        id="linearGradient3869-5-7">
       <stop
@@ -892,8 +105,7 @@
        gradientTransform="matrix(-1.6384328,-3.7364668e-8,3.0152441e-8,-1.3367046,25.121581,1049.0667)"
        gradientUnits="userSpaceOnUse"
        id="radialGradient4169-78"
-       xlink:href="#linearGradient3853-4-1-8"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient3853-4-1-8" />
     <linearGradient
        id="linearGradient3853-4-1-8">
       <stop
@@ -913,8 +125,7 @@
        gradientTransform="matrix(0.9018687,0,0,0.90680948,0.78780711,1043.9425)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient4171-5"
-       xlink:href="#linearGradient3869-5-8-7"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient3869-5-8-7" />
     <linearGradient
        id="linearGradient3869-5-8-7">
       <stop
@@ -926,17 +137,6 @@
          offset="1"
          id="stop3873-6-1-71" />
     </linearGradient>
-    <radialGradient
-       r="3.3394759"
-       fy="2.788337"
-       fx="9.166254"
-       cy="2.788337"
-       cx="9.166254"
-       gradientTransform="matrix(-1.6467056,-3.734872e-8,3.0304688e-8,-1.3361341,30.405956,1049.0658)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient4219-2"
-       xlink:href="#linearGradient3853-4-1-7-6"
-       inkscape:collect="always" />
     <linearGradient
        id="linearGradient3853-4-1-7-6">
       <stop
@@ -948,16 +148,6 @@
          offset="1"
          id="stop3857-2-5-3-1" />
     </linearGradient>
-    <linearGradient
-       y2="6.3611164"
-       x2="7.8512411"
-       y1="2.6097209"
-       x1="7.8512411"
-       gradientTransform="matrix(0.90642244,0,0,0.90642244,5.9493161,1043.9438)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4221-1"
-       xlink:href="#linearGradient3869-5-8-4-5"
-       inkscape:collect="always" />
     <linearGradient
        id="linearGradient3869-5-8-4-5">
       <stop
@@ -978,8 +168,7 @@
        gradientTransform="matrix(-1.6384328,-3.7364668e-8,3.0152441e-8,-1.3367046,30.165656,1049.0666)"
        gradientUnits="userSpaceOnUse"
        id="radialGradient4303"
-       xlink:href="#linearGradient3853-4-1-7-6"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient3853-4-1-7-6" />
     <linearGradient
        y2="6.3611164"
        x2="7.8512411"
@@ -988,38 +177,8 @@
        gradientTransform="matrix(0.9018687,0,0,0.90680948,5.8318823,1043.9424)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient4305"
-       xlink:href="#linearGradient3869-5-8-4-5"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient3869-5-8-4-5" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7.9999997"
-     inkscape:cx="21.037215"
-     inkscape:cy="-1.0835148"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1287"
-     inkscape:window-height="835"
-     inkscape:window-x="845"
-     inkscape:window-y="553"
-     inkscape:window-maximized="0"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3999"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -1033,8 +192,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
diff --git a/ui/org.eclipse.pde.ui/icons/obj16/license_obj.svg b/ui/org.eclipse.pde.ui/icons/obj16/license_obj.svg
index 51392092ae2..96dee4bfb7c 100644
--- a/ui/org.eclipse.pde.ui/icons/obj16/license_obj.svg
+++ b/ui/org.eclipse.pde.ui/icons/obj16/license_obj.svg
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <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"
    version="1.1"
    id="svg2"
    height="16"
-   width="16">
+   width="16"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
@@ -175,17 +175,6 @@
        gradientUnits="userSpaceOnUse"
        id="radialGradient4975-4"
        xlink:href="#linearGradient4234" />
-    <linearGradient
-       id="linearGradient4887-7-5">
-      <stop
-         style="stop-color:#edf1f8;stop-opacity:1"
-         offset="0"
-         id="stop4889-4-5" />
-      <stop
-         style="stop-color:#647ead;stop-opacity:1"
-         offset="1"
-         id="stop4891-0-1" />
-    </linearGradient>
     <linearGradient
        y2="1053.8477"
        x2="-6.6929808"
@@ -206,36 +195,6 @@
          offset="1"
          style="stop-color:#28457e;stop-opacity:1" />
     </linearGradient>
-    <radialGradient
-       xlink:href="#linearGradient4887-7-5"
-       id="radialGradient5007"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.70271359,-0.1516947,0.23949168,0.71870848,18.81602,1050.3033)"
-       cx="3.1762719"
-       cy="2.2273648"
-       fx="3.1762719"
-       fy="2.2273648"
-       r="1.2899568" />
-    <linearGradient
-       gradientTransform="matrix(1.5427927,0,0,1.1586978,16.606532,1048.8933)"
-       xlink:href="#linearGradient4901-2"
-       id="linearGradient5009"
-       gradientUnits="userSpaceOnUse"
-       x1="2.2013831"
-       y1="2.5428731"
-       x2="4.6034589"
-       y2="1.5320059" />
-    <linearGradient
-       id="linearGradient4901-2">
-      <stop
-         id="stop4903-3"
-         offset="0"
-         style="stop-color:#4d6ea5;stop-opacity:1" />
-      <stop
-         id="stop4905-2"
-         offset="1"
-         style="stop-color:#21397c;stop-opacity:1" />
-    </linearGradient>
     <linearGradient
        gradientUnits="userSpaceOnUse"
        y2="1042.929"
@@ -262,7 +221,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -331,7 +290,6 @@
              style="display:inline;fill:url(#radialGradient4975-4);fill-opacity:1;stroke:url(#linearGradient4977-7);stroke-width:0.87769961;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
              d="m 24.43334,1055.7796 0,-0.6237 c 0,-1.0229 -0.772969,-1.3689 -1.848973,-1.3689 l -1.184113,0 c -1.076004,0 -1.871864,0.3677 -1.871864,1.3906 l 0,0.602"
              id="rect4875-2-1" />
-  
         </g>
       </g>
     </g>
diff --git a/ui/org.eclipse.pde.ui/icons/obj16/link_obj.svg b/ui/org.eclipse.pde.ui/icons/obj16/link_obj.svg
index 620f5f5cd82..2ea64e2c6a4 100644
--- a/ui/org.eclipse.pde.ui/icons/obj16/link_obj.svg
+++ b/ui/org.eclipse.pde.ui/icons/obj16/link_obj.svg
@@ -2,24 +2,19 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="link_obj.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4405">
       <stop
          style="stop-color:#fdf2db;stop-opacity:1"
@@ -39,8 +34,7 @@
          id="stop4413" />
     </linearGradient>
     <linearGradient
-       id="linearGradient4395"
-       inkscape:collect="always">
+       id="linearGradient4395">
       <stop
          id="stop4397"
          offset="0"
@@ -59,7 +53,6 @@
          style="stop-color:#cda254;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4395"
        id="linearGradient4164"
        x1="16.818924"
@@ -69,7 +62,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(2.0329319,9.8994943)" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4158">
       <stop
          style="stop-color:#fdf2db;stop-opacity:1"
@@ -89,7 +81,6 @@
          id="stop4162" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4208"
        id="linearGradient4206"
        x1="21.305658"
@@ -98,8 +89,7 @@
        y2="1042.3016"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       id="linearGradient4208"
-       inkscape:collect="always">
+       id="linearGradient4208">
       <stop
          id="stop4210"
          offset="0"
@@ -119,7 +109,6 @@
     </linearGradient>
     <linearGradient
        gradientTransform="matrix(-1,0,0,-1,45.18778,2087.7177)"
-       inkscape:collect="always"
        xlink:href="#linearGradient4405"
        id="linearGradient4206-9"
        x1="20.478258"
@@ -128,7 +117,6 @@
        y2="1043.0978"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4158"
        id="linearGradient4164-2"
        x1="16.678299"
@@ -138,31 +126,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(9.7779604,2.287104)" />
   </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="5.5049424"
-     inkscape:cy="6.647394"
-     inkscape:document-units="px"
-     inkscape:current-layer="g4274"
-     showgrid="false"
-     inkscape:window-width="1440"
-     inkscape:window-height="900"
-     inkscape:window-x="1097"
-     inkscape:window-y="568"
-     inkscape:window-maximized="0"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3999" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -176,8 +139,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
@@ -192,25 +153,17 @@
           <path
              style="fill:url(#linearGradient4206);fill-opacity:1;fill-rule:evenodd;stroke:#7d5e13;stroke-width:0.8;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
              d="m 25.624998,1038.9872 c 0,0 -2.065883,-0.9653 -2.875,-0.1562 -1.851155,1.851 -3.156669,3.0629 -5.093749,5 -0.928535,0.9286 -0.09375,2.9687 -0.09375,2.9687"
-             id="path4198"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="cssc" />
+             id="path4198" />
           <path
              style="display:inline;fill:url(#linearGradient4206-9);fill-opacity:1;fill-rule:evenodd;stroke:#806013;stroke-width:0.80000001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
              d="m 19.341811,1048.6862 c 0,0 2.286853,1.0095 3.095971,0.2004 1.851154,-1.851 3.156669,-3.0629 5.093749,-5 0.928535,-0.9286 0.07165,-3.1897 0.07165,-3.1897"
-             id="path4198-2"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="cssc" />
+             id="path4198-2" />
           <path
              style="display:inline;fill:url(#linearGradient4164-2);fill-opacity:1;fill-rule:evenodd;stroke:#7d5f13;stroke-width:0.8;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
              d="m 23.624851,1041.9342 c -0.260698,-0.4515 -0.229154,-0.8756 0,-1.1048 1.791234,-1.7912 2.127486,-2.1275 3.822796,-3.8228 0.234375,-0.2344 0.728522,-0.198 0.994369,0 0.662845,0.4937 0.434429,0.3192 1.06066,0.9502 0.238668,0.2405 0.239568,0.7768 0,1.0164 -1.535394,1.5354 -2.423774,2.4238 -4.02167,4.0217 -0.239583,0.2396 -0.710522,0.3059 -1.016466,0 -0.318866,-0.3189 -0.614217,-0.6702 -0.839689,-1.0607 z"
-             id="path4156-5"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="sssssssss" />
+             id="path4156-5" />
         </g>
         <path
-           sodipodi:nodetypes="sssssssss"
-           inkscape:connector-curvature="0"
            id="path4156"
            d="m 15.879822,1049.5467 c -0.260698,-0.4515 -0.229154,-0.8756 0,-1.1048 1.791234,-1.7912 2.127486,-2.1275 3.822796,-3.8228 0.234375,-0.2344 0.728522,-0.198 0.994369,0 0.662845,0.4937 0.434429,0.3192 1.06066,0.9502 0.238668,0.2405 0.239568,0.7768 0,1.0164 -1.535394,1.5354 -2.423774,2.4238 -4.02167,4.0217 -0.239583,0.2396 -0.710522,0.3059 -1.016466,0 -0.318866,-0.3189 -0.614217,-0.6702 -0.839689,-1.0607 z"
            style="fill:url(#linearGradient4164);fill-opacity:1;fill-rule:evenodd;stroke:#765911;stroke-width:0.8;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none" />
@@ -218,13 +171,11 @@
       <path
          style="fill:none;fill-rule:evenodd;stroke:#806013;stroke-width:0.30000001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
          d="m 23.203124,1041.2529 -3.242187,3.2422"
-         id="path4165"
-         inkscape:connector-curvature="0" />
+         id="path4165" />
       <path
          style="display:inline;fill:none;fill-rule:evenodd;stroke:#826214;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
          d="m 25.100221,1042.956 -3.242187,3.2422"
-         id="path4165-5"
-         inkscape:connector-curvature="0" />
+         id="path4165-5" />
     </g>
   </g>
 </svg>
diff --git a/ui/org.eclipse.pde.ui/icons/obj16/links_obj.svg b/ui/org.eclipse.pde.ui/icons/obj16/links_obj.svg
index 8dfbae1a058..655a53a775c 100644
--- a/ui/org.eclipse.pde.ui/icons/obj16/links_obj.svg
+++ b/ui/org.eclipse.pde.ui/icons/obj16/links_obj.svg
@@ -2,25 +2,20 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="links_obj.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient4208"
-       inkscape:collect="always">
+       id="linearGradient4208">
       <stop
          id="stop4210"
          offset="0"
@@ -39,7 +34,6 @@
          style="stop-color:#cda254;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4158"
        id="linearGradient4164-2"
        x1="16.678299"
@@ -49,7 +43,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-10.366989,2.2353236)" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4158">
       <stop
          style="stop-color:#fdf2db;stop-opacity:1"
@@ -69,7 +62,6 @@
          id="stop4162" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4158"
        id="linearGradient4164-2-9"
        x1="16.678299"
@@ -80,7 +72,6 @@
        gradientTransform="translate(-15.241989,7.1415497)" />
     <linearGradient
        gradientTransform="translate(-4.8872192,-0.78994263)"
-       inkscape:collect="always"
        xlink:href="#linearGradient4208"
        id="linearGradient4206-5"
        x1="21.305658"
@@ -90,7 +81,6 @@
        gradientUnits="userSpaceOnUse" />
     <linearGradient
        gradientTransform="matrix(-0.99981228,-0.01937546,0.01937546,-0.99981228,22.808608,2083.623)"
-       inkscape:collect="always"
        xlink:href="#linearGradient4208"
        id="linearGradient4206-5-6"
        x1="21.305658"
@@ -98,29 +88,8 @@
        x2="22.122337"
        y2="1042.3016"
        gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       gradientTransform="matrix(-0.99981228,-0.01937546,0.01937546,-0.99981228,22.808608,2083.623)"
-       inkscape:collect="always"
-       xlink:href="#linearGradient4208"
-       id="linearGradient4397"
-       x1="21.305658"
-       y1="1041.485"
-       x2="22.122337"
-       y2="1042.3016"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4158"
-       id="linearGradient4399"
-       x1="16.678299"
-       y1="1036.9733"
-       x2="17.619822"
-       y2="1037.9148"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-15.241989,7.1415497)" />
     <linearGradient
        gradientTransform="translate(-4.8872192,-0.78994263)"
-       inkscape:collect="always"
        xlink:href="#linearGradient4208"
        id="linearGradient4206-5-67"
        x1="21.305658"
@@ -129,27 +98,6 @@
        y2="1042.3016"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       gradientTransform="matrix(-0.99981228,-0.01937546,0.01937546,-0.99981228,22.808608,2083.623)"
-       inkscape:collect="always"
-       xlink:href="#linearGradient4208"
-       id="linearGradient4530"
-       x1="21.305658"
-       y1="1041.485"
-       x2="22.122337"
-       y2="1042.3016"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4158"
-       id="linearGradient4532"
-       x1="16.678299"
-       y1="1036.9733"
-       x2="17.619822"
-       y2="1037.9148"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-15.241989,7.1415497)" />
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4208"
        id="linearGradient4542"
        gradientUnits="userSpaceOnUse"
@@ -159,7 +107,6 @@
        x2="22.122337"
        y2="1042.3016" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4158"
        id="linearGradient4544"
        gradientUnits="userSpaceOnUse"
@@ -169,7 +116,6 @@
        x2="17.619822"
        y2="1037.9148" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4158"
        id="linearGradient4546"
        gradientUnits="userSpaceOnUse"
@@ -179,31 +125,6 @@
        x2="17.619822"
        y2="1037.9148" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1"
-     inkscape:cx="151.62704"
-     inkscape:cy="-95.444491"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="1440"
-     inkscape:window-height="900"
-     inkscape:window-x="1097"
-     inkscape:window-y="568"
-     inkscape:window-maximized="0"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3999" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -217,8 +138,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
@@ -236,36 +155,26 @@
              transform="translate(-14.156249,0.0312)"
              style="display:inline;fill:url(#linearGradient4206-5);fill-opacity:1;fill-rule:evenodd;stroke:#957016;stroke-width:0.80000001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
              d="m 20.362129,1037.9762 c 0,0 -1.690233,-0.7443 -2.49935,0.065 -1.851155,1.851 -0.03167,0.063 -1.968749,2 -0.928535,0.9286 -0.09375,2.9687 -0.09375,2.9687"
-             id="path4198-5"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="cssc" />
+             id="path4198-5" />
           <path
              transform="translate(-14.156249,0.0312)"
              style="display:inline;fill:url(#linearGradient4206-5-6);fill-opacity:1;fill-rule:evenodd;stroke:#957016;stroke-width:0.80000001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
              d="m 17.690575,1044.5627 c 0,0 1.675494,0.7769 2.50014,-0.017 1.886672,-1.8148 0.03289,-0.062 2.007131,-1.9615 0.946352,-0.9104 0.151252,-2.9663 0.151252,-2.9663"
-             id="path4198-5-8"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="cssc" />
+             id="path4198-5-8" />
           <path
              style="display:inline;fill:url(#linearGradient4164-2);fill-opacity:1;fill-rule:evenodd;stroke:#957016;stroke-width:0.80000001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
              d="m 5.3861521,1039.7262 c -0.260698,-0.4515 -0.2291792,-0.8756 0,-1.1048 0.7599745,-0.76 0.8774667,-0.846 1.916546,-1.6665 0.2601489,-0.2054 0.728522,-0.198 0.994369,0 0.662845,0.4937 0.434429,0.3192 1.06066,0.9502 0.2386679,0.2405 0.2541276,0.7923 0,1.0164 l -2.11542,1.8654 c -0.2541356,0.2242 -0.710522,0.3059 -1.016466,0 -0.318866,-0.3189 -0.614217,-0.6702 -0.839689,-1.0607 z"
-             id="path4156-5"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="sssssssss" />
+             id="path4156-5" />
           <path
              style="display:inline;fill:url(#linearGradient4164-2-9);fill-opacity:1;fill-rule:evenodd;stroke:#957016;stroke-width:0.80000001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
              d="m 0.51115209,1044.6325 c -0.260698,-0.4515 -0.2291792,-0.8756 0,-1.1048 0.75997451,-0.76 0.87746671,-0.846 1.91654601,-1.6665 0.2601489,-0.2054 0.728522,-0.198 0.994369,0 0.662845,0.4937 0.434429,0.3192 1.06066,0.9502 0.2386679,0.2405 0.2541276,0.7923 0,1.0164 l -2.11542,1.8654 c -0.2541356,0.2242 -0.710522,0.3059 -1.016466,0 -0.318866,-0.3189 -0.61421701,-0.6702 -0.83968901,-1.0607 z"
-             id="path4156-5-2"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="sssssssss" />
+             id="path4156-5-2" />
         </g>
         <path
-           inkscape:connector-curvature="0"
            id="path4412-6"
            d="m 0.85546771,1036.0355 -2.21875001,2.5"
            style="display:inline;fill:none;fill-rule:evenodd;stroke:#957016;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
         <path
-           inkscape:connector-curvature="0"
            id="path4412"
            d="m -0.8789073,1034.2543 -2.21875,2.5"
            style="fill:none;fill-rule:evenodd;stroke:#957016;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none" />
@@ -282,36 +191,26 @@
              transform="translate(-14.156249,0.0312)"
              style="display:inline;fill:url(#linearGradient4206-5-67);fill-opacity:1;fill-rule:evenodd;stroke:#957016;stroke-width:0.80000001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
              d="m 20.362129,1037.9762 c 0,0 -1.690233,-0.7443 -2.49935,0.065 -1.851155,1.851 -0.03167,0.063 -1.968749,2 -0.928535,0.9286 -0.09375,2.9687 -0.09375,2.9687"
-             id="path4198-5-4"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="cssc" />
+             id="path4198-5-4" />
           <path
              transform="translate(-14.156249,0.0312)"
              style="display:inline;fill:url(#linearGradient4542);fill-opacity:1;fill-rule:evenodd;stroke:#957016;stroke-width:0.80000001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
              d="m 17.690575,1044.5627 c 0,0 1.675494,0.7769 2.50014,-0.017 1.886672,-1.8148 0.03289,-0.062 2.007131,-1.9615 0.946352,-0.9104 0.151252,-2.9663 0.151252,-2.9663"
-             id="path4198-5-8-8"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="cssc" />
+             id="path4198-5-8-8" />
           <path
              style="display:inline;fill:url(#linearGradient4544);fill-opacity:1;fill-rule:evenodd;stroke:#957016;stroke-width:0.80000001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
              d="m 5.3861521,1039.7262 c -0.260698,-0.4515 -0.2291792,-0.8756 0,-1.1048 0.7599745,-0.76 0.8774667,-0.846 1.916546,-1.6665 0.2601489,-0.2054 0.728522,-0.198 0.994369,0 0.662845,0.4937 0.434429,0.3192 1.06066,0.9502 0.2386679,0.2405 0.2541276,0.7923 0,1.0164 l -2.11542,1.8654 c -0.2541356,0.2242 -0.710522,0.3059 -1.016466,0 -0.318866,-0.3189 -0.614217,-0.6702 -0.839689,-1.0607 z"
-             id="path4156-5-1"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="sssssssss" />
+             id="path4156-5-1" />
           <path
              style="display:inline;fill:url(#linearGradient4546);fill-opacity:1;fill-rule:evenodd;stroke:#957016;stroke-width:0.80000001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
              d="m 0.51115209,1044.6325 c -0.260698,-0.4515 -0.2291792,-0.8756 0,-1.1048 0.75997451,-0.76 0.87746671,-0.846 1.91654601,-1.6665 0.2601489,-0.2054 0.728522,-0.198 0.994369,0 0.662845,0.4937 0.434429,0.3192 1.06066,0.9502 0.2386679,0.2405 0.2541276,0.7923 0,1.0164 l -2.11542,1.8654 c -0.2541356,0.2242 -0.710522,0.3059 -1.016466,0 -0.318866,-0.3189 -0.61421701,-0.6702 -0.83968901,-1.0607 z"
-             id="path4156-5-2-5"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="sssssssss" />
+             id="path4156-5-2-5" />
         </g>
         <path
-           inkscape:connector-curvature="0"
            id="path4412-6-7"
            d="m 0.85546771,1036.0355 -2.21875001,2.5"
            style="display:inline;fill:none;fill-rule:evenodd;stroke:#957016;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
         <path
-           inkscape:connector-curvature="0"
            id="path4412-7"
            d="m -0.8789073,1034.2543 -2.21875,2.5"
            style="fill:none;fill-rule:evenodd;stroke:#957016;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
diff --git a/ui/org.eclipse.pde.ui/icons/obj16/loop_node_obj.svg b/ui/org.eclipse.pde.ui/icons/obj16/loop_node_obj.svg
index 95bd83f6ee5..df63b7f0e5d 100644
--- a/ui/org.eclipse.pde.ui/icons/obj16/loop_node_obj.svg
+++ b/ui/org.eclipse.pde.ui/icons/obj16/loop_node_obj.svg
@@ -2,24 +2,19 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.48.0 r9654"
-   sodipodi:docname="loop_node_obj.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4879">
       <stop
          style="stop-color:#edd1a6;stop-opacity:1"
@@ -31,7 +26,6 @@
          id="stop4883" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4871">
       <stop
          style="stop-color:#d0a17f;stop-opacity:1;"
@@ -43,7 +37,6 @@
          id="stop4875" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4871"
        id="linearGradient4877"
        x1="8.3496704"
@@ -53,7 +46,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(2,0)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4879"
        id="linearGradient4885"
        x1="10.454525"
@@ -63,31 +55,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(2,0)" />
   </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="-2.7012316"
-     inkscape:cy="1.3449077"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1241"
-     inkscape:window-height="814"
-     inkscape:window-x="379"
-     inkscape:window-y="250"
-     inkscape:window-maximized="0"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3999" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -101,23 +68,17 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
     <path
        style="fill:#005596;fill-opacity:1;stroke:#005596;stroke-width:0.93913352px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
        d="m 9.360192,1043.8154 4.279616,0 -2.139808,2.0608 z"
-       id="path4097"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccc" />
+       id="path4097" />
     <path
        style="fill:none;stroke:#005596;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
        d="m 11.483266,1044.366 c 0,-3.9753 -1.506698,-4.5038 -4.483266,-4.5038"
-       id="path4867"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc" />
+       id="path4867" />
     <rect
        style="fill:url(#linearGradient4885);fill-opacity:1;stroke:url(#linearGradient4877);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
        id="rect4869"
diff --git a/ui/org.eclipse.pde.ui/icons/obj16/loop_obj.svg b/ui/org.eclipse.pde.ui/icons/obj16/loop_obj.svg
index d8d17597ac2..236c90e0521 100644
--- a/ui/org.eclipse.pde.ui/icons/obj16/loop_obj.svg
+++ b/ui/org.eclipse.pde.ui/icons/obj16/loop_obj.svg
@@ -2,24 +2,19 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.48.0 r9654"
-   sodipodi:docname="loop_obj.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4879">
       <stop
          style="stop-color:#edd1a6;stop-opacity:1"
@@ -31,7 +26,6 @@
          id="stop4883" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4871">
       <stop
          style="stop-color:#d0a17f;stop-opacity:1;"
@@ -43,7 +37,6 @@
          id="stop4875" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4871"
        id="linearGradient4877"
        x1="8.3496704"
@@ -53,7 +46,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(3,-1)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4879"
        id="linearGradient4885"
        x1="10.454525"
@@ -63,7 +55,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(3,-1)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4879-7"
        id="linearGradient4885-1"
        x1="10.454525"
@@ -73,7 +64,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-5,-8.03125)" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4879-7">
       <stop
          style="stop-color:#edd1a6;stop-opacity:1"
@@ -85,7 +75,6 @@
          id="stop4883-0" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4871-4"
        id="linearGradient4877-9"
        x1="8.3496704"
@@ -95,7 +84,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-5,-8.03125)" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4871-4">
       <stop
          style="stop-color:#d0a17f;stop-opacity:1;"
@@ -107,31 +95,6 @@
          id="stop4875-8" />
     </linearGradient>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="15.999999"
-     inkscape:cx="4.3191212"
-     inkscape:cy="5.6383852"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1241"
-     inkscape:window-height="814"
-     inkscape:window-x="620"
-     inkscape:window-y="386"
-     inkscape:window-maximized="0"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3999" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -145,23 +108,17 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
     <path
        style="fill:#005596;fill-opacity:1;stroke:#005596;stroke-width:0.93913352px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
        d="m 10.360192,1042.8138 4.279616,0 -2.139808,2.0608 z"
-       id="path4097"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccc" />
+       id="path4097" />
     <path
        style="fill:none;stroke:#005596;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
        d="m 12.483266,1043.3644 c 0,-3.9753 -1.506698,-4.5038 -4.483266,-4.5038"
-       id="path4867"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc" />
+       id="path4867" />
     <rect
        style="fill:url(#linearGradient4885);fill-opacity:1;stroke:url(#linearGradient4877);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
        id="rect4869"
@@ -172,15 +129,11 @@
     <path
        style="fill:#005596;fill-opacity:1;stroke:#005596;stroke-width:0.93913352px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;display:inline"
        d="m 6.6554328,1045.8581 -4.279616,0 2.139808,-2.0608 z"
-       id="path4097-2"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccc" />
+       id="path4097-2" />
     <path
        style="fill:none;stroke:#005596;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
        d="m 4.5323588,1045.3075 c 0,3.9753 1.506698,4.5038 4.4832662,4.5038"
-       id="path4867-4"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc" />
+       id="path4867-4" />
     <rect
        style="fill:url(#linearGradient4885-1);fill-opacity:1;stroke:url(#linearGradient4877-9);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline"
        id="rect4869-5"
diff --git a/ui/org.eclipse.pde.ui/icons/obj16/main_tab.svg b/ui/org.eclipse.pde.ui/icons/obj16/main_tab.svg
index 23c3d411c46..7fea24d0e8a 100644
--- a/ui/org.eclipse.pde.ui/icons/obj16/main_tab.svg
+++ b/ui/org.eclipse.pde.ui/icons/obj16/main_tab.svg
@@ -2,24 +2,19 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.48.0 r9654"
-   sodipodi:docname="main_tab.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4927">
       <stop
          style="stop-color:#e8f8f8;stop-opacity:1;"
@@ -31,8 +26,7 @@
          id="stop4933" />
     </linearGradient>
     <linearGradient
-       id="linearGradient4940"
-       inkscape:collect="always">
+       id="linearGradient4940">
       <stop
          id="stop4943"
          offset="0"
@@ -43,8 +37,7 @@
          style="stop-color:#8898c0;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       id="linearGradient4934"
-       inkscape:collect="always">
+       id="linearGradient4934">
       <stop
          id="stop4936"
          offset="0"
@@ -55,7 +48,6 @@
          style="stop-color:#8898c0;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4917">
       <stop
          style="stop-color:#a8b8d0;stop-opacity:1;"
@@ -67,8 +59,7 @@
          id="stop4923" />
     </linearGradient>
     <linearGradient
-       id="linearGradient5105"
-       inkscape:collect="always">
+       id="linearGradient5105">
       <stop
          id="stop5107"
          offset="0"
@@ -79,7 +70,6 @@
          style="stop-color:#295189;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient5063">
       <stop
          style="stop-color:#4f9cd2;stop-opacity:1;"
@@ -91,8 +81,7 @@
          id="stop5067" />
     </linearGradient>
     <linearGradient
-       id="linearGradient5039"
-       inkscape:collect="always">
+       id="linearGradient5039">
       <stop
          id="stop5041"
          offset="0"
@@ -103,8 +92,7 @@
          style="stop-color:#80b8e0;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       id="linearGradient5033"
-       inkscape:collect="always">
+       id="linearGradient5033">
       <stop
          id="stop5035"
          offset="0"
@@ -115,7 +103,6 @@
          style="stop-color:#d0f0f8;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4925">
       <stop
          style="stop-color:#285088;stop-opacity:1;"
@@ -127,7 +114,6 @@
          id="stop4929" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4916">
       <stop
          style="stop-color:#4898d0;stop-opacity:1"
@@ -139,7 +125,6 @@
          id="stop4921" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4845">
       <stop
          style="stop-color:#96792f;stop-opacity:1"
@@ -151,8 +136,7 @@
          id="stop4849" />
     </linearGradient>
     <linearGradient
-       id="linearGradient4994-4-7"
-       inkscape:collect="always">
+       id="linearGradient4994-4-7">
       <stop
          id="stop4996-5-4"
          offset="0"
@@ -163,7 +147,6 @@
          style="stop-color:#ffffff;stop-opacity:0;" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4910-4-4">
       <stop
          style="stop-color:#ffffff;stop-opacity:0"
@@ -175,7 +158,6 @@
          id="stop4914-8-8" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4910-4-4-7">
       <stop
          style="stop-color:#ffffff;stop-opacity:0"
@@ -187,8 +169,7 @@
          id="stop4914-8-8-0" />
     </linearGradient>
     <linearGradient
-       id="linearGradient4994-4-7-4"
-       inkscape:collect="always">
+       id="linearGradient4994-4-7-4">
       <stop
          id="stop4996-5-4-8"
          offset="0"
@@ -199,7 +180,6 @@
          style="stop-color:#ffffff;stop-opacity:0;" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4916-4">
       <stop
          style="stop-color:#4898d0;stop-opacity:1"
@@ -211,7 +191,6 @@
          id="stop4921-0" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient5063"
        id="linearGradient4177"
        gradientUnits="userSpaceOnUse"
@@ -221,7 +200,6 @@
        x2="16"
        y2="1039.0999" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4845"
        id="linearGradient4179"
        gradientUnits="userSpaceOnUse"
@@ -231,7 +209,6 @@
        x2="9"
        y2="1051.3622" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4927"
        id="linearGradient4181"
        gradientUnits="userSpaceOnUse"
@@ -240,7 +217,6 @@
        x2="12"
        y2="1050.3622" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4910-4-4"
        id="linearGradient4183"
        gradientUnits="userSpaceOnUse"
@@ -250,7 +226,6 @@
        x2="-15"
        y2="1047.3622" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4994-4-7"
        id="linearGradient4185"
        gradientUnits="userSpaceOnUse"
@@ -260,7 +235,6 @@
        x2="-11"
        y2="1046.3622" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4910-4-4-7"
        id="linearGradient4187"
        gradientUnits="userSpaceOnUse"
@@ -270,7 +244,6 @@
        x2="-15"
        y2="1047.3622" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4994-4-7-4"
        id="linearGradient4189"
        gradientUnits="userSpaceOnUse"
@@ -280,7 +253,6 @@
        x2="-11"
        y2="1045.3622" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient5033"
        id="linearGradient4191"
        gradientUnits="userSpaceOnUse"
@@ -290,7 +262,6 @@
        x2="-10.239074"
        y2="1.5153586" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient5039"
        id="linearGradient4193"
        gradientUnits="userSpaceOnUse"
@@ -300,7 +271,6 @@
        x2="-15.924768"
        y2="1034.677" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4916"
        id="linearGradient4195"
        gradientUnits="userSpaceOnUse"
@@ -310,7 +280,6 @@
        x2="-10.239074"
        y2="1.5153586" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4925"
        id="linearGradient4197"
        gradientUnits="userSpaceOnUse"
@@ -320,7 +289,6 @@
        x2="-8.0294761"
        y2="1035.8776" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4916-4"
        id="linearGradient4199"
        gradientUnits="userSpaceOnUse"
@@ -330,7 +298,6 @@
        x2="-10.239074"
        y2="1.5153586" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient5105"
        id="linearGradient4201"
        gradientUnits="userSpaceOnUse"
@@ -340,7 +307,6 @@
        x2="16"
        y2="1039.0999" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4934"
        id="linearGradient4203"
        gradientUnits="userSpaceOnUse"
@@ -350,7 +316,6 @@
        x2="-7"
        y2="1041.8622" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4917"
        id="linearGradient4205"
        gradientUnits="userSpaceOnUse"
@@ -360,7 +325,6 @@
        x2="-11"
        y2="1045.8622" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4940"
        id="linearGradient4207"
        gradientUnits="userSpaceOnUse"
@@ -370,31 +334,6 @@
        x2="-7"
        y2="1043.8622" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="15.999999"
-     inkscape:cx="0.79311012"
-     inkscape:cy="4.9751802"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1241"
-     inkscape:window-height="814"
-     inkscape:window-x="25"
-     inkscape:window-y="25"
-     inkscape:window-maximized="0"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3999" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -408,8 +347,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
@@ -417,71 +354,46 @@
        id="g4161"
        transform="translate(0,-1.0024)">
       <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
          id="rect3997-9-1-1-5"
          d="m 16,1039.8911 -15,-0.052 0,0.5248 15,0 z"
          style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:url(#linearGradient4177);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" />
       <path
-         inkscape:export-ydpi="90"
-         inkscape:export-xdpi="90"
-         inkscape:export-filename="C:\Users\jmietling\Documents\rect3997-9-1.png"
-         sodipodi:nodetypes="cccccccccc"
-         inkscape:connector-curvature="0"
          id="rect3997-9-1"
          d="m 1,1040.3638 0,12 15,0 0,-12 z m 1,1 13,0 0,10 -13,0 z"
          style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:url(#linearGradient4179);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" />
       <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
          id="rect3997-9-1-1"
          d="m 2,1040.3638 13,0 0,11 -12.96875,0 z"
          style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:url(#linearGradient4181);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" />
       <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
          id="rect4853-82-7"
          d="m 4,1042.3638 0,9 -2,0 0,-11 z"
          style="fill:url(#linearGradient4183);fill-opacity:1;stroke:none;display:inline" />
       <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
          id="rect4853-82-0"
          d="m 3,1042.3638 12,0 0,-2 -13,0 z"
          style="fill:url(#linearGradient4185);fill-opacity:1;stroke:none;display:inline" />
       <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
          id="rect4853-82-7-2"
          d="m 13,1049.3638 0,-7 2,-2 0,11 z"
          style="opacity:0.25;fill:url(#linearGradient4187);fill-opacity:1;stroke:none;display:inline" />
       <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
          id="rect4853-82-0-4"
          d="m 13,1049.3638 -9,0 -2,2 13,0 z"
          style="opacity:0.25;fill:url(#linearGradient4189);fill-opacity:1;stroke:none;display:inline" />
       <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
          id="path4914-9"
          d="m 15.498145,1039.8625 -0.469563,-1.9667 -3.535107,-0.022 -2.032932,1.9888 z"
          style="fill:url(#linearGradient4191);fill-opacity:1;stroke:url(#linearGradient4193);stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;display:inline" />
       <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
          id="path4914"
          d="m 1.4996055,1039.8534 0.9553065,-1.9888 6.98268,0.01 2.060553,1.9888 z"
          style="fill:url(#linearGradient4195);fill-opacity:1;stroke:url(#linearGradient4197);stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
       <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
          id="path4914-0"
          d="m 1.1764988,1039.367 0.4948965,-1 7.6102357,0 0.994369,1 z"
          style="fill:url(#linearGradient4199);fill-opacity:1;stroke:none;display:inline" />
       <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
          id="rect3997-9-1-1-5-6"
          d="m 12,1039.8911 -11,-0.052 0,0.5248 11,0 z"
          style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:url(#linearGradient4201);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" />
diff --git a/ui/org.eclipse.pde.ui/icons/obj16/metadata_repo_obj.svg b/ui/org.eclipse.pde.ui/icons/obj16/metadata_repo_obj.svg
index e79ae242212..2cdafb73015 100644
--- a/ui/org.eclipse.pde.ui/icons/obj16/metadata_repo_obj.svg
+++ b/ui/org.eclipse.pde.ui/icons/obj16/metadata_repo_obj.svg
@@ -2,20 +2,16 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="metadata_repo_obj.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
@@ -30,856 +26,6 @@
          id="stop5645" />
     </linearGradient>
     <linearGradient
-       id="linearGradient5411">
-      <stop
-         style="stop-color:#72828e;stop-opacity:1;"
-         offset="0"
-         id="stop5413" />
-      <stop
-         style="stop-color:#003358;stop-opacity:1;"
-         offset="1"
-         id="stop5415" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5630">
-      <stop
-         style="stop-color:#d8bc68;stop-opacity:1;"
-         offset="0"
-         id="stop5632" />
-      <stop
-         style="stop-color:#fff0c2;stop-opacity:1;"
-         offset="1"
-         id="stop5634" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4972">
-      <stop
-         style="stop-color:#c7e3e7;stop-opacity:1;"
-         offset="0"
-         id="stop4974" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop4976" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient6893-5-8-8">
-      <stop
-         style="stop-color:#7795b6;stop-opacity:1;"
-         offset="0"
-         id="stop6895-8-7-0" />
-      <stop
-         style="stop-color:#7795b6;stop-opacity:1;"
-         offset="1"
-         id="stop6897-2-6-5" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient6893-5-8-0-5">
-      <stop
-         style="stop-color:#7795b6;stop-opacity:1;"
-         offset="0"
-         id="stop6895-8-7-7-5" />
-      <stop
-         style="stop-color:#7795b6;stop-opacity:1;"
-         offset="1"
-         id="stop6897-2-6-9-8" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient6893-5-8-0-4-9">
-      <stop
-         style="stop-color:#7795b6;stop-opacity:1;"
-         offset="0"
-         id="stop6895-8-7-7-0-1" />
-      <stop
-         style="stop-color:#7795b6;stop-opacity:1;"
-         offset="1"
-         id="stop6897-2-6-9-2-4" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4972-4-1">
-      <stop
-         style="stop-color:#daedef;stop-opacity:1;"
-         offset="0"
-         id="stop4974-6-9" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop4976-2-4" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient6799-4-3">
-      <stop
-         style="stop-color:#c89840;stop-opacity:1;"
-         offset="0"
-         id="stop6801-4-0" />
-      <stop
-         style="stop-color:#798da2;stop-opacity:1;"
-         offset="1"
-         id="stop6803-5-7" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient6893-5-8-8-8">
-      <stop
-         style="stop-color:#7795b6;stop-opacity:1;"
-         offset="0"
-         id="stop6895-8-7-0-7" />
-      <stop
-         style="stop-color:#7795b6;stop-opacity:1;"
-         offset="1"
-         id="stop6897-2-6-5-3" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient6893-5-8-0-4-9-2">
-      <stop
-         style="stop-color:#7795b6;stop-opacity:1;"
-         offset="0"
-         id="stop6895-8-7-7-0-1-2" />
-      <stop
-         style="stop-color:#7795b6;stop-opacity:1;"
-         offset="1"
-         id="stop6897-2-6-9-2-4-3" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4972-6">
-      <stop
-         style="stop-color:#c7e3e7;stop-opacity:1;"
-         offset="0"
-         id="stop4974-71" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop4976-5" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4972-4-1-2">
-      <stop
-         style="stop-color:#daedef;stop-opacity:1;"
-         offset="0"
-         id="stop4974-6-9-4" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop4976-2-4-6" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient6799-4-3-3">
-      <stop
-         style="stop-color:#c89840;stop-opacity:1;"
-         offset="0"
-         id="stop6801-4-0-8" />
-      <stop
-         style="stop-color:#798da2;stop-opacity:1;"
-         offset="1"
-         id="stop6803-5-7-9" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4972-5-7">
-      <stop
-         style="stop-color:#85c2cb;stop-opacity:1;"
-         offset="0"
-         id="stop4974-7-4" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop4976-1-3" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient6893-5-8-8-9">
-      <stop
-         style="stop-color:#7795b6;stop-opacity:1;"
-         offset="0"
-         id="stop6895-8-7-0-5" />
-      <stop
-         style="stop-color:#7795b6;stop-opacity:1;"
-         offset="1"
-         id="stop6897-2-6-5-5" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient6893-5-8-0-5-7">
-      <stop
-         style="stop-color:#7795b6;stop-opacity:1;"
-         offset="0"
-         id="stop6895-8-7-7-5-6" />
-      <stop
-         style="stop-color:#7795b6;stop-opacity:1;"
-         offset="1"
-         id="stop6897-2-6-9-8-6" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient6893-5-8-0-4-9-7">
-      <stop
-         style="stop-color:#7795b6;stop-opacity:1;"
-         offset="0"
-         id="stop6895-8-7-7-0-1-0" />
-      <stop
-         style="stop-color:#7795b6;stop-opacity:1;"
-         offset="1"
-         id="stop6897-2-6-9-2-4-33" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4972-5-2-6">
-      <stop
-         style="stop-color:#85c2cb;stop-opacity:1;"
-         offset="0"
-         id="stop4974-7-3-0" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop4976-1-9-5" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient6893-5-8-8-8-8">
-      <stop
-         style="stop-color:#7795b6;stop-opacity:1;"
-         offset="0"
-         id="stop6895-8-7-0-7-9" />
-      <stop
-         style="stop-color:#7795b6;stop-opacity:1;"
-         offset="1"
-         id="stop6897-2-6-5-3-2" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient6893-5-8-0-4-9-2-0">
-      <stop
-         style="stop-color:#7795b6;stop-opacity:1;"
-         offset="0"
-         id="stop6895-8-7-7-0-1-2-1" />
-      <stop
-         style="stop-color:#7795b6;stop-opacity:1;"
-         offset="1"
-         id="stop6897-2-6-9-2-4-3-6" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4972-6"
-       id="linearGradient5572"
-       gradientUnits="userSpaceOnUse"
-       x1="5.1146584"
-       y1="1044.7372"
-       x2="12.520393"
-       y2="1044.7372" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4972"
-       id="linearGradient4283"
-       gradientUnits="userSpaceOnUse"
-       x1="5.1146582"
-       y1="1044.7372"
-       x2="12.520393"
-       y2="1044.7372" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4972"
-       id="linearGradient4288"
-       gradientUnits="userSpaceOnUse"
-       x1="5.1146582"
-       y1="1044.7372"
-       x2="12.520393"
-       y2="1044.7372" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4972"
-       id="linearGradient4321"
-       gradientUnits="userSpaceOnUse"
-       x1="5.1146582"
-       y1="1044.7372"
-       x2="12.520393"
-       y2="1044.7372" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4972-4-1"
-       id="linearGradient4382"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.6238641,0,0,1.6285353,-5.817902,-657.26294)"
-       x1="5.1146584"
-       y1="1044.7372"
-       x2="12.520393"
-       y2="1044.7372" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6799-4-3"
-       id="linearGradient4384"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.6238641,0,0,1.6285353,-5.817902,-662.30115)"
-       x1="11.977677"
-       y1="1042.1279"
-       x2="5.926301"
-       y2="1051.2535" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6893-5-8-0-4-9"
-       id="linearGradient4390"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2820342,0,0,0.26192632,-2.8911185,1046.2126)"
-       x1="9.2662354"
-       y1="5.3933983"
-       x2="5.8030186"
-       y2="5.3933983" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6893-5-8-8-8"
-       id="linearGradient4392"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.96301391,0,0,0.30750995,-1.0449584,-1044.537)"
-       x1="9.2662354"
-       y1="5.3933983"
-       x2="5.8030186"
-       y2="5.3933983" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6893-5-8-0-4-9-2"
-       id="linearGradient4394"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2784768,0,0,0.27549242,-2.8370137,-1046.8387)"
-       x1="9.2662354"
-       y1="5.3933983"
-       x2="5.8030186"
-       y2="5.3933983" />
-    <linearGradient
-       id="linearGradient6893-5-8-0-4-9-2-5">
-      <stop
-         style="stop-color:#7795b6;stop-opacity:1;"
-         offset="0"
-         id="stop6895-8-7-7-0-1-2-3" />
-      <stop
-         style="stop-color:#7795b6;stop-opacity:1;"
-         offset="1"
-         id="stop6897-2-6-9-2-4-3-0" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient6893-5-8-8-8-0">
-      <stop
-         style="stop-color:#7795b6;stop-opacity:1;"
-         offset="0"
-         id="stop6895-8-7-0-7-7" />
-      <stop
-         style="stop-color:#7795b6;stop-opacity:1;"
-         offset="1"
-         id="stop6897-2-6-5-3-7" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient6893-5-8-0-4-9-0">
-      <stop
-         style="stop-color:#7795b6;stop-opacity:1;"
-         offset="0"
-         id="stop6895-8-7-7-0-1-8" />
-      <stop
-         style="stop-color:#7795b6;stop-opacity:1;"
-         offset="1"
-         id="stop6897-2-6-9-2-4-1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4972-4-1-4"
-       id="linearGradient4382-7"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.6960825,0,0,1.7009614,-4.9210482,-731.7352)"
-       x1="5.1146584"
-       y1="1044.7372"
-       x2="12.520393"
-       y2="1044.7372" />
-    <linearGradient
-       id="linearGradient4972-4-1-4">
-      <stop
-         style="stop-color:#daedef;stop-opacity:1;"
-         offset="0"
-         id="stop4974-6-9-9" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop4976-2-4-0" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6799-4-3-7"
-       id="linearGradient4384-4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.6960825,0,0,1.7009614,-4.9210482,-736.99747)"
-       x1="11.977677"
-       y1="1042.1279"
-       x2="5.926301"
-       y2="1051.2535" />
-    <linearGradient
-       id="linearGradient6799-4-3-7">
-      <stop
-         style="stop-color:#c89840;stop-opacity:1;"
-         offset="0"
-         id="stop6801-4-0-9" />
-      <stop
-         style="stop-color:#798da2;stop-opacity:1;"
-         offset="1"
-         id="stop6803-5-7-7" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4972-4-1-9"
-       id="linearGradient4382-3"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.6960825,0,0,1.7009614,-6.197689,-731.7678)"
-       x1="5.1146584"
-       y1="1044.7372"
-       x2="12.520393"
-       y2="1044.7372" />
-    <linearGradient
-       id="linearGradient4972-4-1-9">
-      <stop
-         style="stop-color:#daedef;stop-opacity:1;"
-         offset="0"
-         id="stop4974-6-9-8" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop4976-2-4-9" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6799-4-3-9"
-       id="linearGradient4384-1"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.6960825,0,0,1.7009614,-6.197689,-737.03007)"
-       x1="11.977677"
-       y1="1042.1279"
-       x2="5.926301"
-       y2="1051.2535" />
-    <linearGradient
-       id="linearGradient6799-4-3-9">
-      <stop
-         style="stop-color:#c89840;stop-opacity:1;"
-         offset="0"
-         id="stop6801-4-0-7" />
-      <stop
-         style="stop-color:#798da2;stop-opacity:1;"
-         offset="1"
-         id="stop6803-5-7-74" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6893-5-8-0-4-9-2-1"
-       id="linearGradient4394-7"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.3892048,0,0,0.27549241,-31.899058,-1052.4756)"
-       x1="9.2662354"
-       y1="5.3933983"
-       x2="5.8030186"
-       y2="5.3933983" />
-    <linearGradient
-       id="linearGradient6893-5-8-0-4-9-2-1">
-      <stop
-         style="stop-color:#7795b6;stop-opacity:1;"
-         offset="0"
-         id="stop6895-8-7-7-0-1-2-2" />
-      <stop
-         style="stop-color:#7795b6;stop-opacity:1;"
-         offset="1"
-         id="stop6897-2-6-9-2-4-3-7" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6893-5-8-8-8-07"
-       id="linearGradient4392-0"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0464198,0,0,0.30750995,-29.951794,-1049.0796)"
-       x1="9.2662354"
-       y1="5.3933983"
-       x2="5.8030186"
-       y2="5.3933983" />
-    <linearGradient
-       id="linearGradient6893-5-8-8-8-07">
-      <stop
-         style="stop-color:#7795b6;stop-opacity:1;"
-         offset="0"
-         id="stop6895-8-7-0-7-0" />
-      <stop
-         style="stop-color:#7795b6;stop-opacity:1;"
-         offset="1"
-         id="stop6897-2-6-5-3-1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6893-5-8-0-4-9-4"
-       id="linearGradient4390-4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.3930703,0,0,0.26192631,-31.957849,1053.1869)"
-       x1="9.2662354"
-       y1="5.3933983"
-       x2="5.8030186"
-       y2="5.3933983" />
-    <linearGradient
-       id="linearGradient6893-5-8-0-4-9-4">
-      <stop
-         style="stop-color:#7795b6;stop-opacity:1;"
-         offset="0"
-         id="stop6895-8-7-7-0-1-26" />
-      <stop
-         style="stop-color:#7795b6;stop-opacity:1;"
-         offset="1"
-         id="stop6897-2-6-9-2-4-0" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4972-4-1-5"
-       id="linearGradient4382-9"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.623864,0.69032316,0,1.6285353,32.3374,-665.37304)"
-       x1="5.1146584"
-       y1="1044.7372"
-       x2="12.520393"
-       y2="1044.7372" />
-    <linearGradient
-       id="linearGradient4972-4-1-5">
-      <stop
-         style="stop-color:#daedef;stop-opacity:1;"
-         offset="0"
-         id="stop4974-6-9-97" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop4976-2-4-60" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6799-4-3-0"
-       id="linearGradient4384-0"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.623864,0.69032316,0,1.6285353,32.3374,-670.41122)"
-       x1="11.977677"
-       y1="1042.1279"
-       x2="5.926301"
-       y2="1051.2535" />
-    <linearGradient
-       id="linearGradient6799-4-3-0">
-      <stop
-         style="stop-color:#c89840;stop-opacity:1;"
-         offset="0"
-         id="stop6801-4-0-90" />
-      <stop
-         style="stop-color:#798da2;stop-opacity:1;"
-         offset="1"
-         id="stop6803-5-7-1" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5411"
-       id="radialGradient5417"
-       cx="13.94572"
-       cy="1045.8255"
-       fx="13.94572"
-       fy="1045.8255"
-       r="10.779004"
-       gradientTransform="matrix(1,0,0,0.98529514,0,15.378714)"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5411"
-       id="radialGradient5419"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.8121447,-1.9541983,0.96980008,0.27977302,-1035.1855,788.68965)"
-       cx="16.494715"
-       cy="1050.2904"
-       fx="16.494715"
-       fy="1050.2904"
-       r="10.779004" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6893-5-8-0-4-9"
-       id="linearGradient5426"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2820342,0,0,0.26192632,-2.8911185,1046.2126)"
-       x1="9.2662354"
-       y1="5.3933983"
-       x2="5.8030186"
-       y2="5.3933983" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6893-5-8-8-8"
-       id="linearGradient5428"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.96301391,0,0,0.30750995,-1.0449584,-1044.537)"
-       x1="9.2662354"
-       y1="5.3933983"
-       x2="5.8030186"
-       y2="5.3933983" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6893-5-8-0-4-9-2"
-       id="linearGradient5430"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2784768,0,0,0.27549242,-2.8370137,-1046.8387)"
-       x1="9.2662354"
-       y1="5.3933983"
-       x2="5.8030186"
-       y2="5.3933983" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6893-5-8-0-4-9-2-6"
-       id="linearGradient5430-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2784768,0,0,0.27549242,-2.8370137,-1046.8387)"
-       x1="9.2662354"
-       y1="5.3933983"
-       x2="5.8030186"
-       y2="5.3933983" />
-    <linearGradient
-       id="linearGradient6893-5-8-0-4-9-2-6">
-      <stop
-         style="stop-color:#7795b6;stop-opacity:1;"
-         offset="0"
-         id="stop6895-8-7-7-0-1-2-35" />
-      <stop
-         style="stop-color:#7795b6;stop-opacity:1;"
-         offset="1"
-         id="stop6897-2-6-9-2-4-3-9" />
-    </linearGradient>
-    <linearGradient
-       y2="5.3933983"
-       x2="5.8030186"
-       y1="5.3933983"
-       x1="9.2662354"
-       gradientTransform="matrix(1.2784768,0,0,0.27549241,-2.8370135,-1044.4678)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient5475"
-       xlink:href="#linearGradient6893-5-8-0-4-9-2-6"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6893-5-8-0-4-9-9"
-       id="linearGradient5426-4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2820342,0,0,0.26192632,-2.8911185,1046.2126)"
-       x1="9.2662354"
-       y1="5.3933983"
-       x2="5.8030186"
-       y2="5.3933983" />
-    <linearGradient
-       id="linearGradient6893-5-8-0-4-9-9">
-      <stop
-         style="stop-color:#7795b6;stop-opacity:1;"
-         offset="0"
-         id="stop6895-8-7-7-0-1-80" />
-      <stop
-         style="stop-color:#7795b6;stop-opacity:1;"
-         offset="1"
-         id="stop6897-2-6-9-2-4-6" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6893-5-8-0-4-9-2-66"
-       id="linearGradient5430-1"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2784768,0,0,0.27549242,-2.8370137,-1046.8387)"
-       x1="9.2662354"
-       y1="5.3933983"
-       x2="5.8030186"
-       y2="5.3933983" />
-    <linearGradient
-       id="linearGradient6893-5-8-0-4-9-2-66">
-      <stop
-         style="stop-color:#7795b6;stop-opacity:1;"
-         offset="0"
-         id="stop6895-8-7-7-0-1-2-23" />
-      <stop
-         style="stop-color:#7795b6;stop-opacity:1;"
-         offset="1"
-         id="stop6897-2-6-9-2-4-3-8" />
-    </linearGradient>
-    <linearGradient
-       y2="5.3933983"
-       x2="5.8030186"
-       y1="5.3933983"
-       x1="9.2662354"
-       gradientTransform="matrix(1.2784768,0,0,0.27549241,-2.8370135,-1044.4678)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient5475-9"
-       xlink:href="#linearGradient6893-5-8-0-4-9-2-6-9"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient6893-5-8-0-4-9-2-6-9">
-      <stop
-         style="stop-color:#7795b6;stop-opacity:1;"
-         offset="0"
-         id="stop6895-8-7-7-0-1-2-35-8" />
-      <stop
-         style="stop-color:#7795b6;stop-opacity:1;"
-         offset="1"
-         id="stop6897-2-6-9-2-4-3-9-1" />
-    </linearGradient>
-    <linearGradient
-       y2="5.3933983"
-       x2="5.8030186"
-       y1="5.3933983"
-       x1="9.2662354"
-       gradientTransform="matrix(1.2784768,0,0,0.27549241,-2.8370135,-1044.4678)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient5525"
-       xlink:href="#linearGradient6893-5-8-0-4-9-2-6-9"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6893-5-8-0-4-9-9-2"
-       id="linearGradient5426-4-0"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2820342,0,0,0.26192632,-2.8911185,1046.2126)"
-       x1="9.2662354"
-       y1="5.3933983"
-       x2="5.8030186"
-       y2="5.3933983" />
-    <linearGradient
-       id="linearGradient6893-5-8-0-4-9-9-2">
-      <stop
-         style="stop-color:#7795b6;stop-opacity:1;"
-         offset="0"
-         id="stop6895-8-7-7-0-1-80-0" />
-      <stop
-         style="stop-color:#7795b6;stop-opacity:1;"
-         offset="1"
-         id="stop6897-2-6-9-2-4-6-1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6893-5-8-0-4-9-2-66-1"
-       id="linearGradient5430-1-7"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2784768,0,0,0.27549242,-2.8370137,-1046.8387)"
-       x1="9.2662354"
-       y1="5.3933983"
-       x2="5.8030186"
-       y2="5.3933983" />
-    <linearGradient
-       id="linearGradient6893-5-8-0-4-9-2-66-1">
-      <stop
-         style="stop-color:#7795b6;stop-opacity:1;"
-         offset="0"
-         id="stop6895-8-7-7-0-1-2-23-1" />
-      <stop
-         style="stop-color:#7795b6;stop-opacity:1;"
-         offset="1"
-         id="stop6897-2-6-9-2-4-3-8-6" />
-    </linearGradient>
-    <linearGradient
-       y2="5.3933983"
-       x2="5.8030186"
-       y1="5.3933983"
-       x1="9.2662354"
-       gradientTransform="matrix(1.2784768,0,0,0.27549241,-2.8370135,-1044.4678)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient5525-6"
-       xlink:href="#linearGradient6893-5-8-0-4-9-2-6-9-6"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient6893-5-8-0-4-9-2-6-9-6">
-      <stop
-         style="stop-color:#7795b6;stop-opacity:1;"
-         offset="0"
-         id="stop6895-8-7-7-0-1-2-35-8-5" />
-      <stop
-         style="stop-color:#7795b6;stop-opacity:1;"
-         offset="1"
-         id="stop6897-2-6-9-2-4-3-9-1-1" />
-    </linearGradient>
-    <linearGradient
-       y2="5.3933983"
-       x2="5.8030186"
-       y1="5.3933983"
-       x1="9.2662354"
-       gradientTransform="matrix(1.2784768,0,0,0.27549241,-2.8370135,-1044.4678)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient5592"
-       xlink:href="#linearGradient6893-5-8-0-4-9-2-6-9-6"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5641"
-       id="linearGradient5647"
-       x1="30.45603"
-       y1="1028.9988"
-       x2="30.45603"
-       y2="1033.8717"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-12.948786,22.935422)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5641-4"
-       id="linearGradient5647-2"
-       x1="30.45603"
-       y1="1028.9988"
-       x2="30.45603"
-       y2="1033.8717"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-12.948786,22.935422)" />
-    <linearGradient
-       id="linearGradient5641-4">
-      <stop
-         style="stop-color:#1e6cbe;stop-opacity:1;"
-         offset="0"
-         id="stop5643-1" />
-      <stop
-         style="stop-color:#104276;stop-opacity:1;"
-         offset="1"
-         id="stop5645-2" />
-    </linearGradient>
-    <linearGradient
-       y2="1033.8717"
-       x2="30.45603"
-       y1="1028.9988"
-       x1="30.45603"
-       gradientTransform="matrix(0.71554797,0.15002359,0,0.70580829,-11.070338,316.74005)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient5664"
-       xlink:href="#linearGradient5641-4"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6893-5-8-0-4-9"
-       id="linearGradient5695"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2820342,0,0,0.26192632,-2.8911185,1046.2126)"
-       x1="9.2662354"
-       y1="5.3933983"
-       x2="5.8030186"
-       y2="5.3933983" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6893-5-8-0-4-9-2"
-       id="linearGradient5697"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2784768,0,0,0.27549242,-2.8370137,-1046.8387)"
-       x1="9.2662354"
-       y1="5.3933983"
-       x2="5.8030186"
-       y2="5.3933983" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6893-5-8-0-4-9-2-6"
-       id="linearGradient5699"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2784768,0,0,0.27549241,-2.8370135,-1044.4678)"
-       x1="9.2662354"
-       y1="5.3933983"
-       x2="5.8030186"
-       y2="5.3933983" />
-    <linearGradient
-       y2="1033.8717"
-       x2="30.45603"
-       y1="1028.9988"
-       x1="30.45603"
-       gradientTransform="matrix(0.71554797,0.15002359,0,0.70580829,-11.070338,316.74005)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient5664-4"
-       xlink:href="#linearGradient5641-4-8"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient5641-4-8">
-      <stop
-         style="stop-color:#1e6cbe;stop-opacity:1;"
-         offset="0"
-         id="stop5643-1-4" />
-      <stop
-         style="stop-color:#104276;stop-opacity:1;"
-         offset="1"
-         id="stop5645-2-3" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4204"
        id="linearGradient4210"
        x1="-708.08484"
@@ -889,7 +35,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(0.26814319,16.7129)" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4204">
       <stop
          style="stop-color:#8e6aae;stop-opacity:1"
@@ -901,7 +46,6 @@
          id="stop4208" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4229"
        id="linearGradient4235"
        x1="44.955429"
@@ -910,7 +54,6 @@
        y2="1042.4124"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4229">
       <stop
          style="stop-color:#713e9d;stop-opacity:1;"
@@ -922,7 +65,6 @@
          id="stop4233" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4276"
        id="linearGradient4235-4"
        x1="44.955429"
@@ -932,8 +74,7 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(-1,0,0,1,83.988875,0)" />
     <linearGradient
-       id="linearGradient4276"
-       inkscape:collect="always">
+       id="linearGradient4276">
       <stop
          id="stop4278"
          offset="0"
@@ -952,225 +93,6 @@
          style="stop-color:#ffffff;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       y2="1044.7372"
-       x2="12.520393"
-       y1="1044.7372"
-       x1="5.1146584"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4507"
-       xlink:href="#linearGradient4972"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="1044.7372"
-       x2="12.520393"
-       y1="1044.7372"
-       x1="5.1146582"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4509"
-       xlink:href="#linearGradient4972"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="1044.7372"
-       x2="12.520393"
-       y1="1044.7372"
-       x1="5.1146582"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4511"
-       xlink:href="#linearGradient4972"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="1044.7372"
-       x2="12.520393"
-       y1="1044.7372"
-       x1="5.1146582"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4513"
-       xlink:href="#linearGradient4972"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="1044.7372"
-       x2="12.520393"
-       y1="1044.7372"
-       x1="5.1146584"
-       gradientTransform="matrix(1.6238641,0,0,1.6285353,-5.817902,-657.26294)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4515"
-       xlink:href="#linearGradient4972-4-1"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="1051.2535"
-       x2="5.926301"
-       y1="1042.1279"
-       x1="11.977677"
-       gradientTransform="matrix(1.6238641,0,0,1.6285353,-5.817902,-662.30115)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4517"
-       xlink:href="#linearGradient6799-4-3"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="5.3933983"
-       x2="5.8030186"
-       y1="5.3933983"
-       x1="9.2662354"
-       gradientTransform="matrix(1.2820342,0,0,0.26192632,-2.8911185,1046.2126)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4519"
-       xlink:href="#linearGradient6893-5-8-8"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="5.3933983"
-       x2="5.8030186"
-       y1="5.3933983"
-       x1="9.2662354"
-       gradientTransform="matrix(0.96301391,0,0,0.30750995,-1.0449584,-1044.537)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4521"
-       xlink:href="#linearGradient6893-5-8-8"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="5.3933983"
-       x2="5.8030186"
-       y1="5.3933983"
-       x1="9.2662354"
-       gradientTransform="matrix(1.2784768,0,0,0.27549242,-2.8370137,-1046.8387)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4523"
-       xlink:href="#linearGradient6893-5-8-8"
-       inkscape:collect="always" />
-    <radialGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.98529514,0,15.378714)"
-       r="10.779004"
-       fy="1045.8255"
-       fx="13.94572"
-       cy="1045.8255"
-       cx="13.94572"
-       id="radialGradient5417-3"
-       xlink:href="#linearGradient5411"
-       inkscape:collect="always" />
-    <radialGradient
-       r="10.779004"
-       fy="1050.2904"
-       fx="16.494715"
-       cy="1050.2904"
-       cx="16.494715"
-       gradientTransform="matrix(1.8121447,-1.9541983,0.96980008,0.27977302,-1035.1855,788.68965)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient5419-5"
-       xlink:href="#linearGradient5411"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="5.3933983"
-       x2="5.8030186"
-       y1="5.3933983"
-       x1="9.2662354"
-       gradientTransform="matrix(1.2820342,0,0,0.26192632,-2.8911185,1046.2126)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4527"
-       xlink:href="#linearGradient6893-5-8-8"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="5.3933983"
-       x2="5.8030186"
-       y1="5.3933983"
-       x1="9.2662354"
-       gradientTransform="matrix(0.96301391,0,0,0.30750995,-1.0449584,-1044.537)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4529"
-       xlink:href="#linearGradient6893-5-8-8"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="5.3933983"
-       x2="5.8030186"
-       y1="5.3933983"
-       x1="9.2662354"
-       gradientTransform="matrix(1.2784768,0,0,0.27549242,-2.8370137,-1046.8387)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4531"
-       xlink:href="#linearGradient6893-5-8-8"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6893-5-8-8"
-       id="linearGradient4533"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2784768,0,0,0.27549241,-2.8370135,-1044.4678)"
-       x1="9.2662354"
-       y1="5.3933983"
-       x2="5.8030186"
-       y2="5.3933983" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6893-5-8-8"
-       id="linearGradient4535"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2784768,0,0,0.27549241,-2.8370135,-1044.4678)"
-       x1="9.2662354"
-       y1="5.3933983"
-       x2="5.8030186"
-       y2="5.3933983" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6893-5-8-8"
-       id="linearGradient4537"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2784768,0,0,0.27549241,-2.8370135,-1044.4678)"
-       x1="9.2662354"
-       y1="5.3933983"
-       x2="5.8030186"
-       y2="5.3933983" />
-    <linearGradient
-       gradientTransform="translate(-12.948786,22.935422)"
-       gradientUnits="userSpaceOnUse"
-       y2="1033.8717"
-       x2="30.45603"
-       y1="1028.9988"
-       x1="30.45603"
-       id="linearGradient4539"
-       xlink:href="#linearGradient5641"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5641"
-       id="linearGradient4541"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.71554797,0.15002359,0,0.70580829,-11.070338,316.74005)"
-       x1="30.45603"
-       y1="1028.9988"
-       x2="30.45603"
-       y2="1033.8717" />
-    <linearGradient
-       y2="5.3933983"
-       x2="5.8030186"
-       y1="5.3933983"
-       x1="9.2662354"
-       gradientTransform="matrix(1.2820342,0,0,0.26192632,-2.8911185,1046.2126)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4543"
-       xlink:href="#linearGradient6893-5-8-8"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="5.3933983"
-       x2="5.8030186"
-       y1="5.3933983"
-       x1="9.2662354"
-       gradientTransform="matrix(1.2784768,0,0,0.27549242,-2.8370137,-1046.8387)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4545"
-       xlink:href="#linearGradient6893-5-8-8"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="5.3933983"
-       x2="5.8030186"
-       y1="5.3933983"
-       x1="9.2662354"
-       gradientTransform="matrix(1.2784768,0,0,0.27549241,-2.8370135,-1044.4678)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4547"
-       xlink:href="#linearGradient6893-5-8-8"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient5641"
        id="linearGradient3174"
        gradientUnits="userSpaceOnUse"
@@ -1180,31 +102,6 @@
        x2="30.45603"
        y2="1033.8717" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1"
-     inkscape:cx="-13.356199"
-     inkscape:cy="21.356415"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="1171"
-     inkscape:window-height="959"
-     inkscape:window-x="1120"
-     inkscape:window-y="437"
-     inkscape:window-maximized="0"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid4250" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -1218,19 +115,14 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
     <g
        style="display:inline"
        id="layer1-2"
-       inkscape:label="Layer 1"
        transform="translate(2.9003389,-0.07065217)">
       <path
-         sodipodi:nodetypes="csccccscc"
-         inkscape:connector-curvature="0"
          id="path5639"
          d="m 8.4740656,1038.0944 c 0,0 0.826498,-1.0382 1.8269964,-1.1241 1.000497,-0.085 2.305493,-0.045 2.305493,-0.045 l 0,14.4475 -2.087994,-2.2428 -0.9569985,2.7578 c 0,0 -1.0004969,-0.944 -1.0439973,-1.7595 -0.043498,-0.8151 -0.043498,-12.0333 -0.043498,-12.0333 z"
          style="display:inline;fill:#71baff;fill-opacity:1;stroke:url(#linearGradient3174);stroke-width:0.97756845px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
@@ -1250,26 +142,18 @@
          id="rect3394"
          style="opacity:1;fill:#f2aaf1;fill-opacity:1;stroke:url(#linearGradient4210);stroke-width:1;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
       <path
-         sodipodi:nodetypes="cccc"
-         inkscape:connector-curvature="0"
          id="path4212"
          d="m 46.545386,1043.3647 -4.540397,4.6029 -0.0095,-4.5977 z"
          style="fill:#8861aa;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
       <path
-         sodipodi:nodetypes="cccc"
-         inkscape:connector-curvature="0"
          id="path4212-4"
          d="m 46.545386,1043.3659 -4.540397,-4.6029 -0.0095,4.5977 z"
          style="display:inline;fill:url(#linearGradient4235);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
       <path
-         sodipodi:nodetypes="cccc"
-         inkscape:connector-curvature="0"
          id="path4212-9"
          d="m 37.44617,1043.3647 4.540397,4.6029 0.0095,-4.5977 z"
          style="display:inline;fill:#ad86cf;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
       <path
-         sodipodi:nodetypes="cccc"
-         inkscape:connector-curvature="0"
          id="path4212-4-2"
          d="m 37.443489,1043.3659 4.540397,-4.6029 0.0095,4.5977 z"
          style="display:inline;fill:url(#linearGradient4235-4);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
diff --git a/ui/org.eclipse.pde.ui/icons/obj16/noref_feature_obj.svg b/ui/org.eclipse.pde.ui/icons/obj16/noref_feature_obj.svg
index 604707d1680..01db791399c 100644
--- a/ui/org.eclipse.pde.ui/icons/obj16/noref_feature_obj.svg
+++ b/ui/org.eclipse.pde.ui/icons/obj16/noref_feature_obj.svg
@@ -2,55 +2,18 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="noref_feature_obj.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
-    <linearGradient
-       id="linearGradient3955">
-      <stop
-         id="stop3957"
-         offset="0"
-         style="stop-color:#7d7d7d;stop-opacity:1" />
-      <stop
-         style="stop-color:#c1c1c1;stop-opacity:1"
-         offset="0.15381166"
-         id="stop3959" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0.5"
-         id="stop3961" />
-      <stop
-         id="stop3963"
-         offset="0.75"
-         style="stop-color:#b0b0b0;stop-opacity:1" />
-      <stop
-         id="stop3965"
-         offset="1"
-         style="stop-color:#757575;stop-opacity:1" />
-    </linearGradient>
-    <mask
-       maskUnits="userSpaceOnUse"
-       id="mask4917">
-      <path
-         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;display:inline"
-         d="m 462.77563,373.22885 29.11636,0 c 1.45425,0 2.625,1.17075 2.625,2.625 l 0,18.76896 c 0,1.45425 -1.17412,2.52598 -2.625,2.625 l -29.11636,1.98708 c -1.45088,0.099 -2.625,-1.17075 -2.625,-2.625 l 0,-20.75604 c 0,-1.45425 1.17075,-2.625 2.625,-2.625 z"
-         id="path4919"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="sssssssss" />
-    </mask>
     <linearGradient
        id="linearGradient4284">
       <stop
@@ -67,113 +30,6 @@
          style="stop-color:#809dcb;stop-opacity:0" />
     </linearGradient>
     <linearGradient
-       id="linearGradient10157-2-5">
-      <stop
-         style="stop-color:#6588c1;stop-opacity:1"
-         offset="0"
-         id="stop10159-8-3" />
-      <stop
-         id="stop10165-3-9"
-         offset="0.5"
-         style="stop-color:#becce3;stop-opacity:1" />
-      <stop
-         style="stop-color:#809dcb;stop-opacity:1"
-         offset="1"
-         id="stop10161-5-0" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10414-9">
-      <stop
-         style="stop-color:#5078b9;stop-opacity:1;"
-         offset="0"
-         id="stop10416-3" />
-      <stop
-         id="stop10422-8"
-         offset="0.5"
-         style="stop-color:#6d8cbd;stop-opacity:1" />
-      <stop
-         style="stop-color:#5f88c9;stop-opacity:1"
-         offset="1"
-         id="stop10418-4" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10432-3">
-      <stop
-         id="stop10434-4"
-         offset="0"
-         style="stop-color:#1f4d9a;stop-opacity:1" />
-      <stop
-         style="stop-color:#4e6da1;stop-opacity:1"
-         offset="0.5"
-         id="stop10436-2" />
-      <stop
-         id="stop10438-9"
-         offset="1"
-         style="stop-color:#567ebc;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10448-90">
-      <stop
-         style="stop-color:#ecac18;stop-opacity:1"
-         offset="0"
-         id="stop10450-0" />
-      <stop
-         id="stop10458-2"
-         offset="0.25"
-         style="stop-color:#ffe38d;stop-opacity:1" />
-      <stop
-         id="stop10456-96"
-         offset="0.5"
-         style="stop-color:#fdf5d2;stop-opacity:1" />
-      <stop
-         style="stop-color:#ffeba7;stop-opacity:1"
-         offset="0.75"
-         id="stop10460-3" />
-      <stop
-         style="stop-color:#e5b630;stop-opacity:1"
-         offset="1"
-         id="stop10452-1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10748-8">
-      <stop
-         id="stop10750-5"
-         offset="0"
-         style="stop-color:#ecac18;stop-opacity:1" />
-      <stop
-         style="stop-color:#f1ce66;stop-opacity:1"
-         offset="0.25"
-         id="stop10752-8" />
-      <stop
-         style="stop-color:#f6e5a6;stop-opacity:1"
-         offset="0.5"
-         id="stop10754-8" />
-      <stop
-         id="stop10756-4"
-         offset="0.75"
-         style="stop-color:#f1cf6c;stop-opacity:1" />
-      <stop
-         id="stop10758-7"
-         offset="1"
-         style="stop-color:#e5b630;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10448-9-7-0-5">
-      <stop
-         style="stop-color:#cf9307;stop-opacity:1"
-         offset="0"
-         id="stop10450-3-5-6-7" />
-      <stop
-         id="stop10456-4-1-5-3"
-         offset="0.5"
-         style="stop-color:#f7d87b;stop-opacity:1" />
-      <stop
-         style="stop-color:#ebb313;stop-opacity:1"
-         offset="1"
-         id="stop10452-22-7-8-4" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4284"
        id="linearGradient10790-8-2-0"
        gradientUnits="userSpaceOnUse"
@@ -183,29 +39,6 @@
        x2="305"
        y2="545.35248" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="22.627418"
-     inkscape:cx="9.5241063"
-     inkscape:cy="13.704277"
-     inkscape:document-units="px"
-     inkscape:current-layer="g13813"
-     showgrid="true"
-     inkscape:window-width="1540"
-     inkscape:window-height="1021"
-     inkscape:window-x="998"
-     inkscape:window-y="462"
-     inkscape:window-maximized="0"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3947" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -219,8 +52,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
@@ -243,9 +74,7 @@
         <path
            style="fill:#ffffff;fill-opacity:1;stroke:#959595;stroke-width:3.02792978;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
            d="m 478.74042,374.64819 12.58383,0 c 1.45425,0 2.625,1.17075 2.625,2.625 l 0,11.29376 c 0,1.45425 -1.22088,2.24642 -2.625,2.625 l -28.07551,7.56983 c -1.40411,0.37858 -2.625,-1.17075 -2.625,-2.625 l 0,-18.86359 c 0,-1.45425 1.59655,-2.625 3.0508,-2.625"
-           id="rect13693"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="csssssssc" />
+           id="rect13693" />
       </g>
       <g
          style="display:inline"
@@ -261,18 +90,14 @@
            id="rect10007-0-74-2-7-6-9"
            style="display:inline;fill:#f2f2f2;fill-opacity:1;stroke:none;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
         <path
-           inkscape:connector-curvature="0"
            id="path4313-8-8-2"
            d="m 495.775,379.74012 0,3.02793 10.14829,0 0,-3.02793 -10.14829,0 z"
            style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#7d7d7d;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
         <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
            id="path4313-8-8-7-6"
            d="m 496.78442,379.72256 0,9.14284 3.0749,0 0,-9.14284 z"
            style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#616161;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.94926554px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
         <path
-           inkscape:connector-curvature="0"
            id="path4313-5-1-8-2"
            d="m 505.89964,385.78417 -10.17196,0.0939 0.0297,3.02793 10.17195,-0.0939 -0.0297,-3.02793 z"
            style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#7d7d7d;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
@@ -286,12 +111,10 @@
            id="rect10007-0-74-2-7-5"
            style="display:inline;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
         <path
-           inkscape:connector-curvature="0"
            id="path4313-5-1-5"
            d="m 496.85724,388.84178 -10.17195,0.0939 0.0296,3.02793 10.17195,-0.0939 -0.0297,-3.02793 z"
            style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#4f4f4f;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
         <path
-           inkscape:connector-curvature="0"
            id="path4313-8-9"
            d="m 496.82768,376.70644 -10.17196,0.0939 0.0296,3.02793 10.17195,-0.0939 -0.0297,-3.02793 z"
            style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#616161;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
@@ -332,12 +155,10 @@
            id="rect10007-0-74-5"
            style="display:inline;fill:#f5f5f5;fill-opacity:1;stroke:none;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
         <path
-           inkscape:connector-curvature="0"
            id="path4313-6"
            d="m 490.77182,373.67245 -10.17196,0.0939 0.0296,3.02793 10.17195,-0.0939 -0.0297,-3.02793 z"
            style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#616161;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
         <path
-           inkscape:connector-curvature="0"
            id="path4313-5-8"
            d="m 490.78956,391.84003 -10.17195,0.0939 0.0296,3.02793 10.17195,-0.0939 -0.0297,-3.02793 z"
            style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#4f4f4f;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
@@ -357,8 +178,6 @@
            id="rect10007-6-6-4"
            style="display:inline;fill:url(#linearGradient10790-8-2-0);fill-opacity:1;stroke:none;stroke-width:3.58380508;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
         <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
            id="path4313-8-8-7-8-7"
            d="m 490.79463,379.73861 0,9.11407 3.02877,0 0,-9.11407 z"
            style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#787878;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.97351193px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
diff --git a/ui/org.eclipse.pde.ui/icons/obj16/ok_st_obj.svg b/ui/org.eclipse.pde.ui/icons/obj16/ok_st_obj.svg
index 260928401ef..9d89fa9a7db 100644
--- a/ui/org.eclipse.pde.ui/icons/obj16/ok_st_obj.svg
+++ b/ui/org.eclipse.pde.ui/icons/obj16/ok_st_obj.svg
@@ -2,24 +2,19 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.48.0 r9654"
-   sodipodi:docname="ok_st_obj.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4883">
       <stop
          style="stop-color:#ebf9ff;stop-opacity:1"
@@ -38,10 +33,8 @@
        gradientTransform="translate(18,-3.000037)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient5062"
-       xlink:href="#linearGradient4910-4"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4910-4" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4910-4">
       <stop
          style="stop-color:#ffffff;stop-opacity:0"
@@ -60,11 +53,9 @@
        gradientUnits="userSpaceOnUse"
        id="linearGradient4975-2"
        xlink:href="#linearGradient4994-4"
-       inkscape:collect="always"
        gradientTransform="translate(18,-3.000037)" />
     <linearGradient
-       id="linearGradient4994-4"
-       inkscape:collect="always">
+       id="linearGradient4994-4">
       <stop
          id="stop4996-5"
          offset="0"
@@ -75,7 +66,6 @@
          style="stop-color:#ffffff;stop-opacity:0;" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4883"
        id="linearGradient4889"
        x1="28"
@@ -85,31 +75,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-20,0)" />
   </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="-5.6436176"
-     inkscape:cy="1.709725"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="1241"
-     inkscape:window-height="814"
-     inkscape:window-x="379"
-     inkscape:window-y="250"
-     inkscape:window-maximized="0"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3999" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -123,41 +88,28 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
     <path
        style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#8b96ab;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
        d="m 2,1038.3622 0.03125,12 11.96875,0 -0.03125,-12 z m 1,1 9.96875,0 0.03125,10 -9.96875,0 z"
-       id="rect3997-9-1"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccccccc"
-       inkscape:export-filename="C:\Users\jmietling\Documents\rect3997-9-1.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
+       id="rect3997-9-1" />
     <path
        style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:url(#linearGradient4889);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
        d="m 3,1039.3622 9.96875,0 0.03125,10 -9.96875,0 z"
-       id="rect3997-9-1-1"
-       inkscape:connector-curvature="0" />
+       id="rect3997-9-1-1" />
     <path
        style="fill:url(#linearGradient5062);fill-opacity:1;stroke:none;display:inline"
        d="m 5,1041.3622 0,8 -2,0 0,-10 z"
-       id="rect4853-82-7"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+       id="rect4853-82-7" />
     <path
        style="fill:url(#linearGradient4975-2);fill-opacity:1;stroke:none;display:inline"
        d="m 5,1041.3622 8,0 0,-2 -10,0 z"
-       id="rect4853-82-0"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+       id="rect4853-82-0" />
     <path
        style="fill:none;stroke:#334e6f;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
        d="m 3.9687503,1044.3309 2.5000001,2.5313 5.5000006,-5.4375"
-       id="path4065"
-       inkscape:connector-curvature="0" />
+       id="path4065" />
   </g>
 </svg>
diff --git a/ui/org.eclipse.pde.ui/icons/obj16/open_artifact_obj.svg b/ui/org.eclipse.pde.ui/icons/obj16/open_artifact_obj.svg
index b65dcde137a..cb48f544826 100644
--- a/ui/org.eclipse.pde.ui/icons/obj16/open_artifact_obj.svg
+++ b/ui/org.eclipse.pde.ui/icons/obj16/open_artifact_obj.svg
@@ -2,41 +2,18 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="open_artifact_obj.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
-    <linearGradient
-       id="linearGradient5103-3-7">
-      <stop
-         style="stop-color:#c1ebca;stop-opacity:1"
-         offset="0"
-         id="stop5105-5-4" />
-      <stop
-         id="stop7550-07-0"
-         offset="0.26694915"
-         style="stop-color:#b3dac7;stop-opacity:1" />
-      <stop
-         id="stop7548-6-9"
-         offset="0.51694918"
-         style="stop-color:#9ec2c3;stop-opacity:1" />
-      <stop
-         style="stop-color:#7a99bb;stop-opacity:1"
-         offset="1"
-         id="stop5107-7-48" />
-    </linearGradient>
     <linearGradient
        id="linearGradient3955-1">
       <stop
@@ -60,64 +37,7 @@
          offset="1"
          style="stop-color:#ba772f;stop-opacity:1" />
     </linearGradient>
-    <mask
-       maskUnits="userSpaceOnUse"
-       id="mask5159">
-      <g
-         style="font-size:11.05178356px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:0.24860173;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline;font-family:AustralianFlyingCorpsStencil;-inkscape-font-specification:AustralianFlyingCorpsStencil"
-         transform="matrix(0.33025863,0,0,0.33025863,-142.45111,929.04872)"
-         id="g5161">
-        <rect
-           style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:3.02792978;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline"
-           id="rect5163"
-           width="15"
-           height="16.625"
-           x="463.74335"
-           y="368.49503"
-           rx="2.625"
-           ry="2.625" />
-        <path
-           style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:3.02792978;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
-           d="m 463.24874,374.64819 31.13385,0 c 1.45425,0 2.625,1.17075 2.625,2.625 l 0,19.0178 c 0,1.45425 -1.17076,2.63221 -2.625,2.625 l -31.13385,-0.15421 c -1.45423,-0.007 -2.625,-1.17075 -2.625,-2.625 l 0,-18.86359 c 0,-1.45425 1.17075,-2.625 2.625,-2.625 z"
-           id="path5165"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="sssssssss" />
-        <path
-           style="fill:#ffffff;stroke:#ffffff;stroke-width:3.02792978;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-           d="m 462.26171,374.64819 20.09375,0"
-           id="path5167"
-           inkscape:connector-curvature="0" />
-      </g>
-    </mask>
-    <mask
-       maskUnits="userSpaceOnUse"
-       id="mask5153">
-      <g
-         id="g5155"
-         style="display:inline"
-         transform="matrix(0.84489245,0,0,0.84489245,66.961974,62.982434)">
-        <path
-           transform="matrix(1.1835826,0,0,1.1835826,-79.255026,-74.544902)"
-           sodipodi:nodetypes="sssssssss"
-           inkscape:connector-curvature="0"
-           id="path5157"
-           d="m 462.77563,373.22885 29.11636,0 c 1.45425,0 2.625,1.17075 2.625,2.625 l 0,18.76896 c 0,1.45425 -1.17412,2.52598 -2.625,2.625 l -29.11636,1.98708 c -1.45088,0.099 -2.625,-1.17075 -2.625,-2.625 l 0,-20.75604 c 0,-1.45425 1.17075,-2.625 2.625,-2.625 z"
-           style="display:inline;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1" />
-      </g>
-    </mask>
-    <linearGradient
-       id="linearGradient11146-4-4-3-4">
-      <stop
-         style="stop-color:#faefba;stop-opacity:1"
-         offset="0"
-         id="stop11150-4-72-2-0" />
-      <stop
-         id="stop11152-9-0-2-9"
-         offset="1"
-         style="stop-color:#9e6542;stop-opacity:1" />
-    </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient3967-5"
        id="linearGradient4299"
        gradientUnits="userSpaceOnUse"
@@ -127,8 +47,7 @@
        x2="531.09253"
        y2="371.17883" />
     <linearGradient
-       id="linearGradient3967-5"
-       inkscape:collect="always">
+       id="linearGradient3967-5">
       <stop
          id="stop3969-3"
          offset="0"
@@ -139,7 +58,6 @@
          style="stop-color:#ad6c24;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient3973-6"
        id="linearGradient4301"
        gradientUnits="userSpaceOnUse"
@@ -149,8 +67,7 @@
        x2="538.00562"
        y2="374.21222" />
     <linearGradient
-       id="linearGradient3973-6"
-       inkscape:collect="always">
+       id="linearGradient3973-6">
       <stop
          id="stop3975-0"
          offset="0"
@@ -161,7 +78,6 @@
          style="stop-color:#f8f0c8;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient3949-4"
        id="linearGradient4303"
        gradientUnits="userSpaceOnUse"
@@ -171,7 +87,6 @@
        x2="548.45923"
        y2="373.77069" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3949-4">
       <stop
          style="stop-color:#9e6627;stop-opacity:1"
@@ -183,7 +98,6 @@
          id="stop3953-6" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient3955-1"
        id="linearGradient4305"
        gradientUnits="userSpaceOnUse"
@@ -201,8 +115,6 @@
          transform="matrix(0.84489245,0,0,0.84489245,66.961974,62.982434)">
         <path
            transform="matrix(1.1835826,0,0,1.1835826,-79.255026,-74.544902)"
-           sodipodi:nodetypes="sssssssss"
-           inkscape:connector-curvature="0"
            id="path5157-4"
            d="m 462.77563,373.22885 29.11636,0 c 1.45425,0 2.625,1.17075 2.625,2.625 l 0,18.76896 c 0,1.45425 -1.17412,2.52598 -2.625,2.625 l -29.11636,1.98708 c -1.45088,0.099 -2.625,-1.17075 -2.625,-2.625 l 0,-20.75604 c 0,-1.45425 1.17075,-2.625 2.625,-2.625 z"
            style="display:inline;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1" />
@@ -210,183 +122,15 @@
     </mask>
     <filter
        style="color-interpolation-filters:sRGB"
-       inkscape:collect="always"
        id="filter4929-6"
-       x="-0.13757156"
-       width="1.2751431"
-       y="-0.37744918"
-       height="1.7548983">
+       x="-0.33426729"
+       width="1.6685346"
+       y="-0.42999801"
+       height="1.859996">
       <feGaussianBlur
-         inkscape:collect="always"
          stdDeviation="3.5620748"
          id="feGaussianBlur4931-9" />
     </filter>
-    <linearGradient
-       id="linearGradient4284">
-      <stop
-         style="stop-color:#6588c1;stop-opacity:0"
-         offset="0"
-         id="stop4286" />
-      <stop
-         id="stop4288"
-         offset="0.49999967"
-         style="stop-color:#becce3;stop-opacity:1" />
-      <stop
-         style="stop-color:#809dcb;stop-opacity:0"
-         offset="1"
-         id="stop4290" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10448-9-7-0-5">
-      <stop
-         id="stop10450-3-5-6-7"
-         offset="0"
-         style="stop-color:#cf9307;stop-opacity:1" />
-      <stop
-         style="stop-color:#f7d87b;stop-opacity:1"
-         offset="0.5"
-         id="stop10456-4-1-5-3" />
-      <stop
-         id="stop10452-22-7-8-4"
-         offset="1"
-         style="stop-color:#ebb313;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10440-1-0-0-3">
-      <stop
-         id="stop10442-43-2-0-9"
-         offset="0"
-         style="stop-color:#ae7603;stop-opacity:1;" />
-      <stop
-         style="stop-color:#e8d8a3;stop-opacity:1"
-         offset="0.5"
-         id="stop10521-1-2-5-3" />
-      <stop
-         id="stop10444-3-4-0-4"
-         offset="1"
-         style="stop-color:#bb9221;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10748-8">
-      <stop
-         style="stop-color:#ecac18;stop-opacity:1"
-         offset="0"
-         id="stop10750-5" />
-      <stop
-         id="stop10752-8"
-         offset="0.25"
-         style="stop-color:#f1ce66;stop-opacity:1" />
-      <stop
-         id="stop10754-8"
-         offset="0.5"
-         style="stop-color:#f6e5a6;stop-opacity:1" />
-      <stop
-         style="stop-color:#f1cf6c;stop-opacity:1"
-         offset="0.75"
-         id="stop10756-4" />
-      <stop
-         style="stop-color:#e5b630;stop-opacity:1"
-         offset="1"
-         id="stop10758-7" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10448-90">
-      <stop
-         id="stop10450-0"
-         offset="0"
-         style="stop-color:#ecac18;stop-opacity:1" />
-      <stop
-         style="stop-color:#ffe38d;stop-opacity:1"
-         offset="0.25"
-         id="stop10458-2" />
-      <stop
-         style="stop-color:#fdf5d2;stop-opacity:1"
-         offset="0.5"
-         id="stop10456-96" />
-      <stop
-         id="stop10460-3"
-         offset="0.75"
-         style="stop-color:#ffeba7;stop-opacity:1" />
-      <stop
-         id="stop10452-1"
-         offset="1"
-         style="stop-color:#e5b630;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10414-9">
-      <stop
-         id="stop10416-3"
-         offset="0"
-         style="stop-color:#5078b9;stop-opacity:1;" />
-      <stop
-         style="stop-color:#6d8cbd;stop-opacity:1"
-         offset="0.5"
-         id="stop10422-8" />
-      <stop
-         id="stop10418-4"
-         offset="1"
-         style="stop-color:#5f88c9;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10432-3">
-      <stop
-         style="stop-color:#1f4d9a;stop-opacity:1"
-         offset="0"
-         id="stop10434-4" />
-      <stop
-         id="stop10436-2"
-         offset="0.5"
-         style="stop-color:#4e6da1;stop-opacity:1" />
-      <stop
-         style="stop-color:#567ebc;stop-opacity:1"
-         offset="1"
-         id="stop10438-9" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10157-6">
-      <stop
-         id="stop10159-5"
-         offset="0"
-         style="stop-color:#6588c1;stop-opacity:1" />
-      <stop
-         style="stop-color:#becce3;stop-opacity:1"
-         offset="0.5"
-         id="stop10165-9" />
-      <stop
-         id="stop10161-55"
-         offset="1"
-         style="stop-color:#809dcb;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10396-5">
-      <stop
-         id="stop10398-7"
-         offset="0"
-         style="stop-color:#1b3e79;stop-opacity:1;" />
-      <stop
-         style="stop-color:#728fbf;stop-opacity:1"
-         offset="0.5"
-         id="stop10404-9" />
-      <stop
-         id="stop10400-9"
-         offset="1"
-         style="stop-color:#1f4d9a;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10149-6-5-4">
-      <stop
-         id="stop10151-5-7-2"
-         offset="0"
-         style="stop-color:#1f4d9a;stop-opacity:1" />
-      <stop
-         style="stop-color:#b9c7df;stop-opacity:1"
-         offset="0.5"
-         id="stop10394-3" />
-      <stop
-         id="stop10153-8-1-2"
-         offset="1"
-         style="stop-color:#567ebc;stop-opacity:1" />
-    </linearGradient>
     <linearGradient
        y2="381.57214"
        x2="538.83301"
@@ -395,8 +139,7 @@
        gradientTransform="matrix(0.45206159,0,0,0.64171901,818.19706,1235.4935)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient6107"
-       xlink:href="#linearGradient3973-6"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient3973-6" />
     <linearGradient
        y2="381.19754"
        x2="548.01556"
@@ -405,11 +148,9 @@
        gradientTransform="matrix(0.45206159,0,0,0.64171901,818.19706,1235.4935)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient6109"
-       xlink:href="#linearGradient4807-2-8"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4807-2-8" />
     <linearGradient
-       id="linearGradient4807-2-8"
-       inkscape:collect="always">
+       id="linearGradient4807-2-8">
       <stop
          id="stop4809-7-5"
          offset="0"
@@ -420,7 +161,6 @@
          style="stop-color:#bc8532;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4368"
        id="linearGradient4374"
        x1="494.33554"
@@ -429,7 +169,6 @@
        y2="358.83438"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4368">
       <stop
          style="stop-color:#fbdf89;stop-opacity:1"
@@ -449,7 +188,6 @@
          id="stop4372" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4344"
        id="linearGradient4350"
        x1="505.37363"
@@ -459,7 +197,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1.0106162,0,0,0.96711322,-26.641878,12.017452)" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4344">
       <stop
          style="stop-color:#7e9cca;stop-opacity:1"
@@ -483,7 +220,6 @@
          id="stop4348" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4336"
        id="linearGradient4342"
        x1="509.96674"
@@ -493,7 +229,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1.0106162,0,0,0.96711322,-26.641878,12.017452)" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4336">
       <stop
          style="stop-color:#3461ab;stop-opacity:1"
@@ -505,31 +240,6 @@
          id="stop4340" />
     </linearGradient>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="16"
-     inkscape:cx="14.933638"
-     inkscape:cy="6.0666884"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="1099"
-     inkscape:window-height="883"
-     inkscape:window-x="1300"
-     inkscape:window-y="627"
-     inkscape:window-maximized="0"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid4092" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -543,8 +253,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
@@ -568,14 +276,11 @@
         <path
            style="fill:url(#linearGradient4301);fill-opacity:1;stroke:url(#linearGradient4303);stroke-width:3.02792978;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
            d="m 463.24874,374.64819 28.07551,0 c 1.45425,0 2.625,1.17075 2.625,2.625 l 0,11.29376 c 0,1.45425 -1.22088,2.24642 -2.625,2.625 l -28.07551,7.56983 c -1.40411,0.37858 -2.625,-1.17075 -2.625,-2.625 l 0,-18.86359 c 0,-1.45425 1.17075,-2.625 2.625,-2.625 z"
-           id="rect13693-1"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="sssssssss" />
+           id="rect13693-1" />
         <path
            style="fill:none;stroke:url(#linearGradient4305);stroke-width:3.02792978;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
            d="m 462.26171,374.64819 20.09375,0"
-           id="path13797-6"
-           inkscape:connector-curvature="0" />
+           id="path13797-6" />
       </g>
       <g
          transform="matrix(0.33025864,0,0,0.33025864,-143.40624,932.05059)"
@@ -601,8 +306,7 @@
       <g
          transform="matrix(0.73056116,0,0,0.72750345,11.535974,295.24315)"
          style="display:inline"
-         id="layer1-4"
-         inkscape:label="Layer 1">
+         id="layer1-4">
         <g
            style="display:inline"
            id="g4246"
@@ -614,8 +318,6 @@
                style="display:inline"
                id="g4382">
               <path
-                 sodipodi:nodetypes="ccccccccccc"
-                 inkscape:connector-curvature="0"
                  id="path4366"
                  d="m 494.79147,354.64863 3.60322,3.60323 3.60322,0 3.42504,2.52908 0,5.48733 -3.85069,2.84274 -3.69232,0 -3.34089,3.3409 -3.46959,0 -0.002,-17.81968 z"
                  style="fill:url(#linearGradient4374);fill-opacity:1;fill-rule:evenodd;stroke:#b08b21;stroke-width:3.58380508px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
@@ -624,9 +326,7 @@
                 <path
                    style="fill:url(#linearGradient4350);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4342);stroke-width:3.58380508;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
                    d="m 487.40807,351.09688 c 1.22716,-1.17433 3.68149,1.86226 3.68149,3.52302 0,5.94129 0,12.02914 0,17.4619 0,2.60379 -2.50768,4.79948 -3.76152,3.5996 -4.2413,-4.05871 -10.72434,-10.26269 -10.72434,-10.26269 l 0,-3.5996 c 0,0 6.01931,-6.14314 10.80437,-10.72223 z"
-                   id="path4326"
-                   inkscape:connector-curvature="0"
-                   sodipodi:nodetypes="ssssccs" />
+                   id="path4326" />
                 <rect
                    style="opacity:1;fill:#547fc4;fill-opacity:1;stroke:none;stroke-width:1.79190254;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
                    id="rect4358"
diff --git a/ui/org.eclipse.pde.ui/icons/obj16/open_console_obj.svg b/ui/org.eclipse.pde.ui/icons/obj16/open_console_obj.svg
index 98682ea6d96..ab68e031b19 100644
--- a/ui/org.eclipse.pde.ui/icons/obj16/open_console_obj.svg
+++ b/ui/org.eclipse.pde.ui/icons/obj16/open_console_obj.svg
@@ -2,23 +2,16 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="open_console_obj.svg"
-   inkscape:export-filename="C:\Users\jmietling\Documents\rect3997-9-1.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
@@ -55,273 +48,6 @@
          id="stop3896" />
     </linearGradient>
     <linearGradient
-       id="linearGradient3884">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop3886" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop3888" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient11290">
-      <stop
-         style="stop-color:#567ead;stop-opacity:1"
-         offset="0"
-         id="stop11292" />
-      <stop
-         style="stop-color:#35679d;stop-opacity:1"
-         offset="1"
-         id="stop11294" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4082">
-      <stop
-         id="stop4084"
-         offset="0"
-         style="stop-color:#4476aa;stop-opacity:1" />
-      <stop
-         style="stop-color:#5a9ccc;stop-opacity:1"
-         offset="0.5"
-         id="stop4864" />
-      <stop
-         id="stop4086"
-         offset="1"
-         style="stop-color:#4476aa;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       y2="1067.9872"
-       x2="14.526336"
-       y1="1067.9872"
-       x1="4.7236701"
-       id="linearGradient5838"
-       xlink:href="#linearGradient5832"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient5832">
-      <stop
-         id="stop5834"
-         offset="0"
-         style="stop-color:#7d6fba;stop-opacity:1;" />
-      <stop
-         style="stop-color:#4b3e81;stop-opacity:1;"
-         offset="0.5"
-         id="stop5840" />
-      <stop
-         id="stop5836"
-         offset="1"
-         style="stop-color:#9d93cb;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5844">
-      <stop
-         style="stop-color:#739cc6;stop-opacity:1"
-         offset="0"
-         id="stop5846" />
-      <stop
-         id="stop5848"
-         offset="0.47270355"
-         style="stop-color:#4b82b6;stop-opacity:1" />
-      <stop
-         style="stop-color:#aac2dc;stop-opacity:1"
-         offset="1"
-         id="stop5850" />
-    </linearGradient>
-    <mask
-       maskUnits="userSpaceOnUse"
-       id="mask10494">
-      <path
-         inkscape:connector-curvature="0"
-         style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-         d="m 21,1037.3622 0,0.5 0,2 0,0.5 0,8.5313 0,0.5 0.5,0 13.03125,0 0.5,0 0,-0.5 0,-11.0313 0,-0.5 -0.5,0 -13.03125,0 -0.5,0 z"
-         id="path10496" />
-    </mask>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11290"
-       id="linearGradient11296"
-       x1="12.51806"
-       y1="1037.6146"
-       x2="12.51806"
-       y2="1044.4806"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       y2="1067.9872"
-       x2="14.526336"
-       y1="1067.9872"
-       x1="4.72367"
-       id="linearGradient5838-7"
-       xlink:href="#linearGradient5832-2"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient5832-2">
-      <stop
-         id="stop5834-8"
-         offset="0"
-         style="stop-color:#7d6fba;stop-opacity:1;" />
-      <stop
-         style="stop-color:#4b3e81;stop-opacity:1;"
-         offset="0.5"
-         id="stop5840-7" />
-      <stop
-         id="stop5836-9"
-         offset="1"
-         style="stop-color:#9d93cb;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5844-9">
-      <stop
-         style="stop-color:#739cc6;stop-opacity:1"
-         offset="0"
-         id="stop5846-2" />
-      <stop
-         id="stop5848-9"
-         offset="0.47270355"
-         style="stop-color:#4b82b6;stop-opacity:1" />
-      <stop
-         style="stop-color:#aac2dc;stop-opacity:1"
-         offset="1"
-         id="stop5850-1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient11290-2">
-      <stop
-         style="stop-color:#567ead;stop-opacity:1"
-         offset="0"
-         id="stop11292-4" />
-      <stop
-         style="stop-color:#35679d;stop-opacity:1"
-         offset="1"
-         id="stop11294-75" />
-    </linearGradient>
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       y2="1067.9872"
-       x2="14.526336"
-       y1="1067.9872"
-       x1="4.72367"
-       id="linearGradient5838-0"
-       xlink:href="#linearGradient5832-7"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient5832-7">
-      <stop
-         id="stop5834-1"
-         offset="0"
-         style="stop-color:#7d6fba;stop-opacity:1;" />
-      <stop
-         style="stop-color:#4b3e81;stop-opacity:1;"
-         offset="0.5"
-         id="stop5840-6" />
-      <stop
-         id="stop5836-93"
-         offset="1"
-         style="stop-color:#9d93cb;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5844-7">
-      <stop
-         style="stop-color:#739cc6;stop-opacity:1"
-         offset="0"
-         id="stop5846-3" />
-      <stop
-         id="stop5848-0"
-         offset="0.47270355"
-         style="stop-color:#4b82b6;stop-opacity:1" />
-      <stop
-         style="stop-color:#aac2dc;stop-opacity:1"
-         offset="1"
-         id="stop5850-4" />
-    </linearGradient>
-    <linearGradient
-       y2="1044.4806"
-       x2="12.51806"
-       y1="1037.6146"
-       x1="12.51806"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient11407"
-       xlink:href="#linearGradient11290-2"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="1044.4806"
-       x2="12.51806"
-       y1="1037.6146"
-       x1="12.51806"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient11409"
-       xlink:href="#linearGradient11290-2"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="1044.4806"
-       x2="12.51806"
-       y1="1037.6146"
-       x1="12.51806"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient11413"
-       xlink:href="#linearGradient11290-2"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="1044.4806"
-       x2="12.51806"
-       y1="1037.6146"
-       x1="12.51806"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient11415"
-       xlink:href="#linearGradient11290-2"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="1044.4806"
-       x2="12.51806"
-       y1="1037.6146"
-       x1="12.51806"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient11417"
-       xlink:href="#linearGradient11290-2"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11290"
-       id="linearGradient11623"
-       gradientUnits="userSpaceOnUse"
-       x1="12.51806"
-       y1="1037.6146"
-       x2="12.51806"
-       y2="1044.4806" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11290"
-       id="linearGradient11625"
-       gradientUnits="userSpaceOnUse"
-       x1="12.51806"
-       y1="1037.6146"
-       x2="12.51806"
-       y2="1044.4806" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11290"
-       id="linearGradient11629"
-       gradientUnits="userSpaceOnUse"
-       x1="12.51806"
-       y1="1037.6146"
-       x2="12.51806"
-       y2="1044.4806" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11290"
-       id="linearGradient11631"
-       gradientUnits="userSpaceOnUse"
-       x1="12.51806"
-       y1="1037.6146"
-       x2="12.51806"
-       y2="1044.4806" />
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient3892"
        id="linearGradient3898"
        x1="22.420315"
@@ -330,7 +56,6 @@
        y2="1037.9327"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient3906"
        id="linearGradient3912"
        x1="22.994839"
@@ -339,7 +64,6 @@
        y2="1048.3184"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4008"
        id="linearGradient4014"
        x1="25.096403"
@@ -348,15 +72,6 @@
        y2="1041.8778"
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-1.0281848,0)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4008-8"
-       id="linearGradient4014-5"
-       x1="25.096403"
-       y1="1041.8778"
-       x2="19.998154"
-       y2="1041.8778"
-       gradientUnits="userSpaceOnUse" />
     <linearGradient
        id="linearGradient4008-8">
       <stop
@@ -376,10 +91,8 @@
        gradientUnits="userSpaceOnUse"
        id="linearGradient4048"
        xlink:href="#linearGradient4008-8"
-       inkscape:collect="always"
        gradientTransform="matrix(1.20625,0,0,1,-5.1479113,2.03125)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient7584-9-3-2"
        id="linearGradient7608-9-7-1"
        gradientUnits="userSpaceOnUse"
@@ -399,7 +112,6 @@
          id="stop7588-9-9-0" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient7134"
        id="linearGradient7140"
        x1="25.363291"
@@ -408,7 +120,6 @@
        y2="1037.7311"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient7134">
       <stop
          style="stop-color:#bd8416;stop-opacity:1"
@@ -420,35 +131,6 @@
          id="stop7138" />
     </linearGradient>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="16"
-     inkscape:cx="-6.1739863"
-     inkscape:cy="-1.3595258"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1357"
-     inkscape:window-height="940"
-     inkscape:window-x="1174"
-     inkscape:window-y="471"
-     inkscape:window-maximized="0"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3999"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -462,8 +144,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
@@ -568,14 +248,10 @@
        id="g7604-6"
        transform="matrix(-1,0,0,-1,34.990568,2089.3058)">
       <path
-         sodipodi:nodetypes="ccssscsscsssszcc"
-         inkscape:connector-curvature="0"
          id="path7582-7"
          d="m 23.585155,1039.3249 0,-1.591 c 0,0 -0.353553,-0.8397 -1.370019,-0.044 -1.016466,0.7955 -2.209709,2.0772 -2.386486,2.4307 -0.176776,0.3536 -0.928077,0.9723 0.08839,1.9446 1.016466,0.9722 2.121321,1.9887 2.121321,1.9887 0,0 0.404271,0.3812 0.799458,0.5707 0.37782,0.1811 0.747338,0.1871 0.747338,-0.4827 0,-1.37 0,-1.812 0,-1.812 1.366404,-0.063 1.727345,0.3446 2.039845,0.6884 0.3125,0.3437 0.8125,1.9687 1.21875,2.0937 0.40625,0.125 0.625,-2.1875 0.625,-2.625 0,-0.4375 -0.09375,-1.3125 -0.71875,-1.9687 -0.625,-0.6563 -1.006571,-0.9555 -1.53125,-1.0998 -0.524679,-0.1444 -1.633595,-0.094 -1.633595,-0.094 z"
          style="fill:url(#linearGradient7608-9-7-1);fill-opacity:1;stroke:url(#linearGradient7140);stroke-width:0.80000001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
       <path
-         sodipodi:nodetypes="ccssscc"
-         inkscape:connector-curvature="0"
          id="path7602-2"
          d="m 23.069359,1042.9731 0,0.5966 c 0,0 0.110485,0.3757 -0.220971,0.2431 -0.331456,-0.1326 -0.972272,-0.6629 -1.038563,-0.7734 -0.06629,-0.1105 -0.751301,-0.5966 -0.596622,-0.8176 0.15468,-0.221 1.458408,-0.066 1.458408,-0.066 z"
          style="opacity:0.85714285;fill:#ffffff;fill-opacity:1;stroke:none" />
diff --git a/ui/org.eclipse.pde.ui/icons/obj16/operating_system_obj.svg b/ui/org.eclipse.pde.ui/icons/obj16/operating_system_obj.svg
index 9664eb456af..aae7a425cee 100644
--- a/ui/org.eclipse.pde.ui/icons/obj16/operating_system_obj.svg
+++ b/ui/org.eclipse.pde.ui/icons/obj16/operating_system_obj.svg
@@ -2,27 +2,19 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="operation_system_obj.svg"
-   inkscape:export-filename="C:\Users\jmietling\Documents\rect3997-9-1.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4241">
       <stop
          style="stop-color:#e8e797;stop-opacity:1"
@@ -49,17 +41,6 @@
          offset="1"
          id="stop4245" />
     </linearGradient>
-    <linearGradient
-       id="linearGradient4008">
-      <stop
-         style="stop-color:#3a4e81;stop-opacity:1;"
-         offset="0"
-         id="stop4010" />
-      <stop
-         style="stop-color:#7688b7;stop-opacity:1;"
-         offset="1"
-         id="stop4012" />
-    </linearGradient>
     <linearGradient
        id="linearGradient3906">
       <stop
@@ -83,273 +64,6 @@
          id="stop3896" />
     </linearGradient>
     <linearGradient
-       id="linearGradient3884">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop3886" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop3888" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient11290">
-      <stop
-         style="stop-color:#567ead;stop-opacity:1"
-         offset="0"
-         id="stop11292" />
-      <stop
-         style="stop-color:#35679d;stop-opacity:1"
-         offset="1"
-         id="stop11294" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4082">
-      <stop
-         id="stop4084"
-         offset="0"
-         style="stop-color:#4476aa;stop-opacity:1" />
-      <stop
-         style="stop-color:#5a9ccc;stop-opacity:1"
-         offset="0.5"
-         id="stop4864" />
-      <stop
-         id="stop4086"
-         offset="1"
-         style="stop-color:#4476aa;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       y2="1067.9872"
-       x2="14.526336"
-       y1="1067.9872"
-       x1="4.7236701"
-       id="linearGradient5838"
-       xlink:href="#linearGradient5832"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient5832">
-      <stop
-         id="stop5834"
-         offset="0"
-         style="stop-color:#7d6fba;stop-opacity:1;" />
-      <stop
-         style="stop-color:#4b3e81;stop-opacity:1;"
-         offset="0.5"
-         id="stop5840" />
-      <stop
-         id="stop5836"
-         offset="1"
-         style="stop-color:#9d93cb;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5844">
-      <stop
-         style="stop-color:#739cc6;stop-opacity:1"
-         offset="0"
-         id="stop5846" />
-      <stop
-         id="stop5848"
-         offset="0.47270355"
-         style="stop-color:#4b82b6;stop-opacity:1" />
-      <stop
-         style="stop-color:#aac2dc;stop-opacity:1"
-         offset="1"
-         id="stop5850" />
-    </linearGradient>
-    <mask
-       maskUnits="userSpaceOnUse"
-       id="mask10494">
-      <path
-         inkscape:connector-curvature="0"
-         style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-         d="m 21,1037.3622 0,0.5 0,2 0,0.5 0,8.5313 0,0.5 0.5,0 13.03125,0 0.5,0 0,-0.5 0,-11.0313 0,-0.5 -0.5,0 -13.03125,0 -0.5,0 z"
-         id="path10496" />
-    </mask>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11290"
-       id="linearGradient11296"
-       x1="12.51806"
-       y1="1037.6146"
-       x2="12.51806"
-       y2="1044.4806"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       y2="1067.9872"
-       x2="14.526336"
-       y1="1067.9872"
-       x1="4.72367"
-       id="linearGradient5838-7"
-       xlink:href="#linearGradient5832-2"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient5832-2">
-      <stop
-         id="stop5834-8"
-         offset="0"
-         style="stop-color:#7d6fba;stop-opacity:1;" />
-      <stop
-         style="stop-color:#4b3e81;stop-opacity:1;"
-         offset="0.5"
-         id="stop5840-7" />
-      <stop
-         id="stop5836-9"
-         offset="1"
-         style="stop-color:#9d93cb;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5844-9">
-      <stop
-         style="stop-color:#739cc6;stop-opacity:1"
-         offset="0"
-         id="stop5846-2" />
-      <stop
-         id="stop5848-9"
-         offset="0.47270355"
-         style="stop-color:#4b82b6;stop-opacity:1" />
-      <stop
-         style="stop-color:#aac2dc;stop-opacity:1"
-         offset="1"
-         id="stop5850-1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient11290-2">
-      <stop
-         style="stop-color:#567ead;stop-opacity:1"
-         offset="0"
-         id="stop11292-4" />
-      <stop
-         style="stop-color:#35679d;stop-opacity:1"
-         offset="1"
-         id="stop11294-75" />
-    </linearGradient>
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       y2="1067.9872"
-       x2="14.526336"
-       y1="1067.9872"
-       x1="4.72367"
-       id="linearGradient5838-0"
-       xlink:href="#linearGradient5832-7"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient5832-7">
-      <stop
-         id="stop5834-1"
-         offset="0"
-         style="stop-color:#7d6fba;stop-opacity:1;" />
-      <stop
-         style="stop-color:#4b3e81;stop-opacity:1;"
-         offset="0.5"
-         id="stop5840-6" />
-      <stop
-         id="stop5836-93"
-         offset="1"
-         style="stop-color:#9d93cb;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5844-7">
-      <stop
-         style="stop-color:#739cc6;stop-opacity:1"
-         offset="0"
-         id="stop5846-3" />
-      <stop
-         id="stop5848-0"
-         offset="0.47270355"
-         style="stop-color:#4b82b6;stop-opacity:1" />
-      <stop
-         style="stop-color:#aac2dc;stop-opacity:1"
-         offset="1"
-         id="stop5850-4" />
-    </linearGradient>
-    <linearGradient
-       y2="1044.4806"
-       x2="12.51806"
-       y1="1037.6146"
-       x1="12.51806"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient11407"
-       xlink:href="#linearGradient11290-2"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="1044.4806"
-       x2="12.51806"
-       y1="1037.6146"
-       x1="12.51806"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient11409"
-       xlink:href="#linearGradient11290-2"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="1044.4806"
-       x2="12.51806"
-       y1="1037.6146"
-       x1="12.51806"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient11413"
-       xlink:href="#linearGradient11290-2"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="1044.4806"
-       x2="12.51806"
-       y1="1037.6146"
-       x1="12.51806"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient11415"
-       xlink:href="#linearGradient11290-2"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="1044.4806"
-       x2="12.51806"
-       y1="1037.6146"
-       x1="12.51806"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient11417"
-       xlink:href="#linearGradient11290-2"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11290"
-       id="linearGradient11623"
-       gradientUnits="userSpaceOnUse"
-       x1="12.51806"
-       y1="1037.6146"
-       x2="12.51806"
-       y2="1044.4806" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11290"
-       id="linearGradient11625"
-       gradientUnits="userSpaceOnUse"
-       x1="12.51806"
-       y1="1037.6146"
-       x2="12.51806"
-       y2="1044.4806" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11290"
-       id="linearGradient11629"
-       gradientUnits="userSpaceOnUse"
-       x1="12.51806"
-       y1="1037.6146"
-       x2="12.51806"
-       y2="1044.4806" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11290"
-       id="linearGradient11631"
-       gradientUnits="userSpaceOnUse"
-       x1="12.51806"
-       y1="1037.6146"
-       x2="12.51806"
-       y2="1044.4806" />
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient3892"
        id="linearGradient3898"
        x1="22.420315"
@@ -358,7 +72,6 @@
        y2="1037.9327"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient3906"
        id="linearGradient3912"
        x1="22.994839"
@@ -367,38 +80,6 @@
        y2="1048.3184"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4008-8"
-       id="linearGradient4014-5"
-       x1="25.096403"
-       y1="1041.8778"
-       x2="19.998154"
-       y2="1041.8778"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient4008-8">
-      <stop
-         style="stop-color:#3a4e81;stop-opacity:1;"
-         offset="0"
-         id="stop4010-9" />
-      <stop
-         style="stop-color:#7688b7;stop-opacity:1;"
-         offset="1"
-         id="stop4012-9" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient7584-9-3-2">
-      <stop
-         style="stop-color:#f9cd5f;stop-opacity:1;"
-         offset="0"
-         id="stop7586-6-3-6" />
-      <stop
-         style="stop-color:#ffebb7;stop-opacity:1;"
-         offset="1"
-         id="stop7588-9-9-0" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4241"
        id="linearGradient4247"
        x1="10.349669"
@@ -408,35 +89,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(4.5991674,0.020415)" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="11.313709"
-     inkscape:cx="-11.46396"
-     inkscape:cy="13.343052"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1357"
-     inkscape:window-height="940"
-     inkscape:window-x="1174"
-     inkscape:window-y="471"
-     inkscape:window-maximized="0"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3999"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -450,8 +102,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
diff --git a/ui/org.eclipse.pde.ui/icons/obj16/output_folder_attrib.svg b/ui/org.eclipse.pde.ui/icons/obj16/output_folder_attrib.svg
index 8d58e0107cb..dc165650fcd 100644
--- a/ui/org.eclipse.pde.ui/icons/obj16/output_folder_attrib.svg
+++ b/ui/org.eclipse.pde.ui/icons/obj16/output_folder_attrib.svg
@@ -2,24 +2,19 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.48.0 r9654"
-   sodipodi:docname="output_folder_attrib.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient5103-3-7"
        id="linearGradient5109-0-1"
        x1="11.718328"
@@ -48,8 +43,7 @@
          id="stop5107-7-48" />
     </linearGradient>
     <linearGradient
-       id="linearGradient6354"
-       inkscape:collect="always">
+       id="linearGradient6354">
       <stop
          id="stop6356"
          offset="0"
@@ -67,10 +61,8 @@
        gradientTransform="translate(19.773337,-20.05531)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient4235"
-       xlink:href="#linearGradient6354"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient6354" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient11290-0"
        id="linearGradient7357-5"
        gradientUnits="userSpaceOnUse"
@@ -79,7 +71,6 @@
        x2="12.51806"
        y2="1044.4806" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient11290-0">
       <stop
          style="stop-color:#567ead;stop-opacity:1"
@@ -91,7 +82,6 @@
          id="stop11294-4" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient3967-5"
        id="linearGradient3939-2"
        gradientUnits="userSpaceOnUse"
@@ -101,8 +91,7 @@
        x2="531.09253"
        y2="371.17883" />
     <linearGradient
-       id="linearGradient3967-5"
-       inkscape:collect="always">
+       id="linearGradient3967-5">
       <stop
          id="stop3969-3"
          offset="0"
@@ -113,7 +102,6 @@
          style="stop-color:#ad6c24;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient3973-6"
        id="linearGradient4933-1"
        gradientUnits="userSpaceOnUse"
@@ -123,8 +111,7 @@
        x2="538.00562"
        y2="374.21222" />
     <linearGradient
-       id="linearGradient3973-6"
-       inkscape:collect="always">
+       id="linearGradient3973-6">
       <stop
          id="stop3975-0"
          offset="0"
@@ -135,7 +122,6 @@
          style="stop-color:#f8f0c8;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient3949-4"
        id="linearGradient4935-8"
        gradientUnits="userSpaceOnUse"
@@ -145,7 +131,6 @@
        x2="548.45923"
        y2="373.77069" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3949-4">
       <stop
          style="stop-color:#9e6627;stop-opacity:1"
@@ -187,8 +172,7 @@
        gradientTransform="translate(-60.558598,1.4188)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient3072"
-       xlink:href="#linearGradient3955-1"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient3955-1" />
     <mask
        maskUnits="userSpaceOnUse"
        id="mask5159">
@@ -208,54 +192,24 @@
         <path
            style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:3.02792978;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
            d="m 463.24874,374.64819 31.13385,0 c 1.45425,0 2.625,1.17075 2.625,2.625 l 0,19.0178 c 0,1.45425 -1.17076,2.63221 -2.625,2.625 l -31.13385,-0.15421 c -1.45423,-0.007 -2.625,-1.17075 -2.625,-2.625 l 0,-18.86359 c 0,-1.45425 1.17075,-2.625 2.625,-2.625 z"
-           id="path5165"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="sssssssss" />
+           id="path5165" />
         <path
            style="fill:#ffffff;stroke:#ffffff;stroke-width:3.02792978;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
            d="m 462.26171,374.64819 20.09375,0"
-           id="path5167"
-           inkscape:connector-curvature="0" />
+           id="path5167" />
       </g>
     </mask>
     <filter
-       inkscape:collect="always"
        id="filter5173"
-       x="-0.16309389"
-       width="1.3261878"
-       y="-0.20081637"
-       height="1.4016327">
+       x="-0.21382331"
+       width="1.4528989"
+       y="-0.2632788"
+       height="1.5266017">
       <feGaussianBlur
-         inkscape:collect="always"
          stdDeviation="0.75686893"
          id="feGaussianBlur5175" />
     </filter>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="15.999999"
-     inkscape:cx="9.8516812"
-     inkscape:cy="1.8584975"
-     inkscape:document-units="px"
-     inkscape:current-layer="g8159"
-     showgrid="true"
-     inkscape:window-width="1245"
-     inkscape:window-height="967"
-     inkscape:window-x="275"
-     inkscape:window-y="195"
-     inkscape:window-maximized="0"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid4092" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -269,8 +223,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
@@ -294,14 +246,11 @@
         <path
            style="fill:url(#linearGradient4933-1);fill-opacity:1;stroke:url(#linearGradient4935-8);stroke-width:3.02792978;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
            d="m 463.24874,374.64819 31.13385,0 c 1.45425,0 2.625,1.17075 2.625,2.625 l 0,19.0178 c 0,1.45425 -1.17076,2.63221 -2.625,2.625 l -31.13385,-0.15421 c -1.45423,-0.007 -2.625,-1.17075 -2.625,-2.625 l 0,-18.86359 c 0,-1.45425 1.17075,-2.625 2.625,-2.625 z"
-           id="rect13693"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="sssssssss" />
+           id="rect13693" />
         <path
            style="fill:none;stroke:url(#linearGradient3072);stroke-width:3.02792978;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
            d="m 462.26171,374.64819 20.09375,0"
-           id="path13797"
-           inkscape:connector-curvature="0" />
+           id="path13797" />
       </g>
       <g
          id="g5153"
@@ -311,41 +260,31 @@
            style="filter:url(#filter5173)">
           <g
              transform="matrix(1.1300143,0,0,-1.1300143,-15.696637,2241.9533)"
-             inkscape:label="Layer 1"
              id="layer1-7-1-9"
              style="display:inline;fill:#ffffff;stroke:#ffffff">
             <path
                style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;display:inline"
                d="m 26.569701,1043.6509 0,2.8579 4.425981,0 0,1.2824 3.781143,-2.432 -3.781143,-3.0027 0,1.2944 z"
-               id="path4108-1-8"
-               inkscape:connector-curvature="0"
-               sodipodi:nodetypes="cccccccc" />
+               id="path4108-1-8" />
             <path
                style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;display:inline"
                d="m 30.023337,1041.7543 0,1.2944 -2.691146,0 -1,0 c -0.99185,0.9918 -0.986324,3.4738 0,4.4601 l 1,0 2.691146,0 0,1.2824 c 0,0.6519 0.740915,0.6375 1.5,0 l 3.923255,-3.4983 -3.923255,-3.5386 c -0.760225,-0.7602 -1.5,-0.5203 -1.5,0 z m 1,1 2.985755,2.5386 -2.985755,2.4983 0,-1.2824 -4.128646,0 c -0.276214,-0.2099 -0.277444,-2.1883 0,-2.4601 l 4.128646,0 z"
-               id="path4108-1-6-3"
-               inkscape:connector-curvature="0"
-               sodipodi:nodetypes="cccccccccccccccccccc" />
+               id="path4108-1-6-3" />
           </g>
         </g>
       </g>
       <g
          transform="matrix(1.1300143,0,0,-1.1300143,-15.696637,2241.9533)"
-         inkscape:label="Layer 1"
          id="layer1-7-1"
          style="display:inline">
         <path
            style="fill:url(#linearGradient5109-0-1);fill-opacity:1;stroke:none;display:inline"
            d="m 26.569701,1043.6509 0,2.8579 4.425981,0 0,1.2824 3.781143,-2.432 -3.781143,-3.0027 0,1.2944 z"
-           id="path4108-1"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccccccc" />
+           id="path4108-1" />
         <path
            style="fill:url(#linearGradient4235);fill-opacity:1;stroke:none;display:inline"
            d="m 30.023337,1041.7543 0,1.2944 -2.691146,0 -1,0 c -0.99185,0.9918 -0.986324,3.4738 0,4.4601 l 1,0 2.691146,0 0,1.2824 c 0,0.6519 0.740915,0.6375 1.5,0 l 3.923255,-3.4983 -3.923255,-3.5386 c -0.760225,-0.7602 -1.5,-0.5203 -1.5,0 z m 1,1 2.985755,2.5386 -2.985755,2.4983 0,-1.2824 -4.128646,0 c -0.276214,-0.2099 -0.277444,-2.1883 0,-2.4601 l 4.128646,0 z"
-           id="path4108-1-6"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccccccccccccccccccc" />
+           id="path4108-1-6" />
       </g>
     </g>
   </g>
diff --git a/ui/org.eclipse.pde.ui/icons/obj16/overview_obj.svg b/ui/org.eclipse.pde.ui/icons/obj16/overview_obj.svg
index 4a89e0de503..e0985634b21 100644
--- a/ui/org.eclipse.pde.ui/icons/obj16/overview_obj.svg
+++ b/ui/org.eclipse.pde.ui/icons/obj16/overview_obj.svg
@@ -2,24 +2,19 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.48.0 r9654"
-   sodipodi:docname="overview_obj.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient8441">
       <stop
          style="stop-color:#6eaddd;stop-opacity:1;"
@@ -31,8 +26,7 @@
          id="stop8445" />
     </linearGradient>
     <linearGradient
-       id="linearGradient7667"
-       inkscape:collect="always">
+       id="linearGradient7667">
       <stop
          id="stop7669"
          offset="0"
@@ -43,7 +37,6 @@
          style="stop-color:#e9f9ff;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient8287">
       <stop
          style="stop-color:#6eb6e2;stop-opacity:1;"
@@ -70,8 +63,7 @@
          id="stop4086-2" />
     </linearGradient>
     <linearGradient
-       id="linearGradient4994-4-5"
-       inkscape:collect="always">
+       id="linearGradient4994-4-5">
       <stop
          id="stop4996-5-9"
          offset="0"
@@ -82,7 +74,6 @@
          style="stop-color:#ffffff;stop-opacity:0;" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4910-4-0">
       <stop
          style="stop-color:#ffffff;stop-opacity:0"
@@ -94,8 +85,7 @@
          id="stop4914-8-1" />
     </linearGradient>
     <linearGradient
-       id="linearGradient4810-5"
-       inkscape:collect="always">
+       id="linearGradient4810-5">
       <stop
          id="stop4812-0"
          offset="0"
@@ -106,7 +96,6 @@
          style="stop-color:#687692;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4082-3"
        id="linearGradient8878"
        gradientUnits="userSpaceOnUse"
@@ -116,7 +105,6 @@
        x2="8.0137892"
        y2="1041.8765" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4994-4-5"
        id="linearGradient8881"
        gradientUnits="userSpaceOnUse"
@@ -126,7 +114,6 @@
        x2="-11"
        y2="1044.3622" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4910-4-0"
        id="linearGradient8884"
        gradientUnits="userSpaceOnUse"
@@ -136,7 +123,6 @@
        x2="-15"
        y2="1047.3622" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4810-5"
        id="linearGradient8887"
        gradientUnits="userSpaceOnUse"
@@ -146,7 +132,6 @@
        x2="8.0137892"
        y2="1050.0707" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient8287"
        id="linearGradient8293"
        x1="-16.963362"
@@ -163,10 +148,8 @@
        gradientTransform="translate(21.991756,4.9769)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient7528"
-       xlink:href="#linearGradient7667"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient7667" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient8287-7-5-4">
       <stop
          style="stop-color:#6eb6e2;stop-opacity:1;"
@@ -200,8 +183,7 @@
        gradientTransform="translate(27.019488,6.4907639)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient7634"
-       xlink:href="#linearGradient8287-7-5-4"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient8287-7-5-4" />
     <linearGradient
        y2="1041.8765"
        x2="8.0137892"
@@ -210,10 +192,8 @@
        gradientTransform="translate(6.1433187,4.5222639)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient7636"
-       xlink:href="#linearGradient4082-3-4-1-2"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4082-3-4-1-2" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient8441"
        id="linearGradient8447"
        x1="8"
@@ -222,8 +202,7 @@
        y2="1048.3622"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       id="linearGradient7667-6"
-       inkscape:collect="always">
+       id="linearGradient7667-6">
       <stop
          id="stop7669-1"
          offset="0"
@@ -234,7 +213,6 @@
          style="stop-color:#e9f9ff;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient8441-2">
       <stop
          style="stop-color:#6eaddd;stop-opacity:1;"
@@ -253,8 +231,7 @@
        gradientTransform="translate(26.983179,4.9769)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient8468"
-       xlink:href="#linearGradient7667-6"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient7667-6" />
     <linearGradient
        y2="1048.3622"
        x2="8"
@@ -263,34 +240,8 @@
        gradientUnits="userSpaceOnUse"
        id="linearGradient8470"
        xlink:href="#linearGradient8441-2"
-       inkscape:collect="always"
        gradientTransform="translate(4.9914231,0)" />
   </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="22.717667"
-     inkscape:cy="5.9957851"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1208"
-     inkscape:window-height="913"
-     inkscape:window-x="1083"
-     inkscape:window-y="526"
-     inkscape:window-maximized="0"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid8762" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -304,50 +255,34 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
     <path
-       sodipodi:nodetypes="ccccc"
-       inkscape:connector-curvature="0"
        id="rect3997-9"
        d="m 2.49694,1038.9049 12.004414,0 0,10.9667 -12.004414,0 z"
        style="fill:#f4fcff;fill-opacity:1;stroke:url(#linearGradient8887);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;display:inline" />
     <path
-       sodipodi:nodetypes="ccccc"
-       inkscape:connector-curvature="0"
        id="rect4853-82-7"
        d="m 4,1042.3622 0,7 -1,0 0,-8 z"
        style="fill:url(#linearGradient8884);fill-opacity:1;stroke:none;display:inline" />
     <path
-       sodipodi:nodetypes="ccccc"
-       inkscape:connector-curvature="0"
        id="rect4853-82-0"
        d="m 4,1042.3622 10,0 0,-1 -11,0 z"
        style="fill:url(#linearGradient8881);fill-opacity:1;stroke:none;display:inline" />
     <path
-       sodipodi:nodetypes="ccccc"
-       inkscape:connector-curvature="0"
        id="rect3997-9-9"
        d="m 2.5008868,1038.8694 11.9989142,0 0,2.0053 -11.9989142,0 z"
        style="fill:url(#linearGradient8293);fill-opacity:1;stroke:url(#linearGradient8878);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;display:inline" />
     <path
-       sodipodi:nodetypes="ccccc"
-       inkscape:connector-curvature="0"
        id="rect3997-9-9-4"
        d="m 4.5008868,1042.8694 3.0153802,0 0,4.9776 -3.0153802,0 z"
        style="fill:url(#linearGradient7528);fill-opacity:1;stroke:url(#linearGradient8447);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;display:inline" />
     <path
-       sodipodi:nodetypes="ccc"
-       inkscape:connector-curvature="0"
        id="rect3997-9-9-4-6-5"
        d="m 13,1047.876 -4,0 z"
        style="fill:url(#linearGradient7634);fill-opacity:1;stroke:url(#linearGradient7636);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;display:inline" />
     <path
-       sodipodi:nodetypes="ccccc"
-       inkscape:connector-curvature="0"
        id="rect3997-9-9-4-5"
        d="m 9.4923099,1042.8694 3.0153801,0 0,2.9776 -3.0153801,0 z"
        style="fill:url(#linearGradient8468);fill-opacity:1;stroke:url(#linearGradient8470);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;display:inline" />
diff --git a/ui/org.eclipse.pde.ui/icons/obj16/page_obj.svg b/ui/org.eclipse.pde.ui/icons/obj16/page_obj.svg
index 1bcaf42ca1d..e64f0022677 100644
--- a/ui/org.eclipse.pde.ui/icons/obj16/page_obj.svg
+++ b/ui/org.eclipse.pde.ui/icons/obj16/page_obj.svg
@@ -2,25 +2,20 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="page_obj.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient5147"
-       inkscape:collect="always">
+       id="linearGradient5147">
       <stop
          id="stop5149"
          offset="0"
@@ -31,8 +26,7 @@
          style="stop-color:#637aa7;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       id="linearGradient5141"
-       inkscape:collect="always">
+       id="linearGradient5141">
       <stop
          id="stop5143"
          offset="0"
@@ -43,8 +37,7 @@
          style="stop-color:#637aa7;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       id="linearGradient5135"
-       inkscape:collect="always">
+       id="linearGradient5135">
       <stop
          id="stop5137"
          offset="0"
@@ -55,7 +48,6 @@
          style="stop-color:#637aa7;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4994">
       <stop
          style="stop-color:#f9fafc;stop-opacity:1;"
@@ -67,7 +59,6 @@
          id="stop4998" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4902">
       <stop
          style="stop-color:#c7b571;stop-opacity:1;"
@@ -79,7 +70,6 @@
          id="stop4906" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4894">
       <stop
          style="stop-color:#e0c88f;stop-opacity:1"
@@ -91,8 +81,7 @@
          id="stop4898" />
     </linearGradient>
     <linearGradient
-       id="linearGradient4877"
-       inkscape:collect="always">
+       id="linearGradient4877">
       <stop
          id="stop4879"
          offset="0"
@@ -103,7 +92,6 @@
          style="stop-color:#5e76a3;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4861">
       <stop
          style="stop-color:#91a5c7;stop-opacity:1;"
@@ -115,7 +103,6 @@
          id="stop4865" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4877"
        id="linearGradient4867"
        x1="7.0070496"
@@ -125,7 +112,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-3.9337087,-3.9447573)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4861"
        id="linearGradient4869"
        x1="7.0070496"
@@ -135,7 +121,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-4,-4)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient5147"
        id="linearGradient4871"
        x1="7.0070496"
@@ -145,7 +130,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-3.9889515,-3.9337087)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient5135"
        id="linearGradient4873"
        x1="7.0070496"
@@ -155,7 +139,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-1.9969777,-3.9459828)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient5141"
        id="linearGradient4875"
        x1="7.0070496"
@@ -165,7 +148,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-4,-4)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4894"
        id="linearGradient4900"
        x1="7.9987183"
@@ -175,7 +157,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(0,-2)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4902"
        id="linearGradient4908"
        x1="10.544736"
@@ -185,7 +166,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-4,-2)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4994"
        id="linearGradient5000"
        x1="9.8946028"
@@ -195,113 +175,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-4,-2)" />
     <linearGradient
-       id="linearGradient4844-4-1">
-      <stop
-         id="stop4846-8-4"
-         offset="0"
-         style="stop-color:#3f3f3f;stop-opacity:1;" />
-      <stop
-         id="stop4848-8-9"
-         offset="1"
-         style="stop-color:#303030;stop-opacity:1;" />
-    </linearGradient>
-    <mask
-       maskUnits="userSpaceOnUse"
-       id="mask6204">
-      <path
-         style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-         d="m 1,1036.3935 0,0.5 0,12.9687 0,0.5 0.5,0 10.0625,0 0.5,0 0,-0.5 0,-9.9687 0,-0.2188 -0.15625,-0.125 -3.0625,-3 -0.125,-0.1562 -0.21875,0 -7,0 -0.5,0 z"
-         id="path6206"
-         inkscape:connector-curvature="0" />
-    </mask>
-    <linearGradient
-       y2="1038.5814"
-       x2="4.7528968"
-       y1="1051.0466"
-       x1="4.7528968"
-       gradientTransform="translate(1.9961442e-6,-9.9830355e-5)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient6120-1"
-       xlink:href="#linearGradient4852-7-8-1"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient4852-7-8-1"
-       inkscape:collect="always">
-      <stop
-         id="stop4854-4-1-9"
-         offset="0"
-         style="stop-color:#707070;stop-opacity:1" />
-      <stop
-         id="stop4856-0-2-1"
-         offset="1"
-         style="stop-color:#a0a0a0;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       y2="1037.7"
-       x2="8.6566515"
-       y1="1050.7386"
-       x1="8.6566515"
-       gradientTransform="translate(1.9961442e-6,-9.9830355e-5)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient6122-0"
-       xlink:href="#linearGradient4844-4-1-4"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient4844-4-1-4">
-      <stop
-         id="stop4846-8-4-2"
-         offset="0"
-         style="stop-color:#3f3f3f;stop-opacity:1;" />
-      <stop
-         id="stop4848-8-9-2"
-         offset="1"
-         style="stop-color:#303030;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       y2="1038.5814"
-       x2="4.7528968"
-       y1="1051.0466"
-       x1="4.7528968"
-       gradientTransform="translate(1.9961442e-6,-9.9830355e-5)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient6120-4"
-       xlink:href="#linearGradient4852-7-8-6"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient4852-7-8-6"
-       inkscape:collect="always">
-      <stop
-         id="stop4854-4-1-5"
-         offset="0"
-         style="stop-color:#707070;stop-opacity:1" />
-      <stop
-         id="stop4856-0-2-9"
-         offset="1"
-         style="stop-color:#a0a0a0;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       y2="1037.7"
-       x2="8.6566515"
-       y1="1050.7386"
-       x1="8.6566515"
-       gradientTransform="translate(1.9961442e-6,-9.9830355e-5)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient6122-8"
-       xlink:href="#linearGradient4844-4-1-7"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient4844-4-1-7">
-      <stop
-         id="stop4846-8-4-5"
-         offset="0"
-         style="stop-color:#3f3f3f;stop-opacity:1;" />
-      <stop
-         id="stop4848-8-9-3"
-         offset="1"
-         style="stop-color:#303030;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4877"
        id="linearGradient4867-5"
        x1="7.0070496"
@@ -311,7 +184,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-6.9554849,-3.9447649)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4877"
        id="linearGradient4867-5-4"
        x1="7.0070496"
@@ -321,7 +193,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-6.9554851,-1.9447649)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4877"
        id="linearGradient4867-5-4-0"
        x1="7.0070496"
@@ -331,7 +202,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-6.9554851,0.0552351)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4877"
        id="linearGradient4867-5-4-0-0"
        x1="7.0070496"
@@ -341,7 +211,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-6.9515788,2.0556921)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4877"
        id="linearGradient4867-5-4-0-0-2"
        x1="7.0070496"
@@ -351,31 +220,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-6.9515788,4.0557238)" />
   </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.8777903"
-     inkscape:cy="13.661815"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1542"
-     inkscape:window-height="975"
-     inkscape:window-x="1006"
-     inkscape:window-y="492"
-     inkscape:window-maximized="0"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3999" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -389,8 +233,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
@@ -398,19 +240,14 @@
        id="g4219"
        transform="translate(1.9887378,0.9539659)">
       <path
-         sodipodi:nodetypes="cccccc"
-         inkscape:connector-curvature="0"
          id="rect4001-3"
          d="m 1.4972825,1036.9037 7.0096685,0 3.062057,3.0066 0,9.9546 -10.0717255,0 z"
          style="display:inline;fill:url(#linearGradient5000);fill-opacity:1;stroke:none" />
       <path
-         inkscape:connector-curvature="0"
          id="path4884"
          d="m 7.976621,1036.441 0,3.9112 3.977476,0 z"
          style="fill:url(#linearGradient4900);fill-opacity:1;stroke:none" />
       <path
-         sodipodi:nodetypes="cccccc"
-         inkscape:connector-curvature="0"
          id="rect4001"
          d="m 1.4972825,1036.9037 7.0096685,0 3.062057,3.0066 0,9.9546 -10.0717255,0 z"
          style="fill:none;stroke:url(#linearGradient4908);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1" />
diff --git a/ui/org.eclipse.pde.ui/icons/obj16/plugin_dis_obj.svg b/ui/org.eclipse.pde.ui/icons/obj16/plugin_dis_obj.svg
index 3167ce2f792..86ac668e71d 100644
--- a/ui/org.eclipse.pde.ui/icons/obj16/plugin_dis_obj.svg
+++ b/ui/org.eclipse.pde.ui/icons/obj16/plugin_dis_obj.svg
@@ -2,20 +2,16 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="ext_plugin_obj.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
@@ -34,203 +30,6 @@
          style="stop-color:#809dcb;stop-opacity:0" />
     </linearGradient>
     <linearGradient
-       id="linearGradient10448-9-7-0-5">
-      <stop
-         style="stop-color:#cf9307;stop-opacity:1"
-         offset="0"
-         id="stop10450-3-5-6-7" />
-      <stop
-         id="stop10456-4-1-5-3"
-         offset="0.5"
-         style="stop-color:#f7d87b;stop-opacity:1" />
-      <stop
-         style="stop-color:#ebb313;stop-opacity:1"
-         offset="1"
-         id="stop10452-22-7-8-4" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10440-1-0-0-3">
-      <stop
-         style="stop-color:#ae7603;stop-opacity:1;"
-         offset="0"
-         id="stop10442-43-2-0-9" />
-      <stop
-         id="stop10521-1-2-5-3"
-         offset="0.5"
-         style="stop-color:#e8d8a3;stop-opacity:1" />
-      <stop
-         style="stop-color:#bb9221;stop-opacity:1"
-         offset="1"
-         id="stop10444-3-4-0-4" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10748-8">
-      <stop
-         id="stop10750-5"
-         offset="0"
-         style="stop-color:#ecac18;stop-opacity:1" />
-      <stop
-         style="stop-color:#f1ce66;stop-opacity:1"
-         offset="0.25"
-         id="stop10752-8" />
-      <stop
-         style="stop-color:#f6e5a6;stop-opacity:1"
-         offset="0.5"
-         id="stop10754-8" />
-      <stop
-         id="stop10756-4"
-         offset="0.75"
-         style="stop-color:#f1cf6c;stop-opacity:1" />
-      <stop
-         id="stop10758-7"
-         offset="1"
-         style="stop-color:#e5b630;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10440-1-3-4">
-      <stop
-         style="stop-color:#ae7603;stop-opacity:1;"
-         offset="0"
-         id="stop10442-43-0-5" />
-      <stop
-         id="stop10521-1-4-7"
-         offset="0.5"
-         style="stop-color:#e8d8a3;stop-opacity:1" />
-      <stop
-         style="stop-color:#bb9221;stop-opacity:1"
-         offset="1"
-         id="stop10444-3-2-0" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10448-90">
-      <stop
-         style="stop-color:#ecac18;stop-opacity:1"
-         offset="0"
-         id="stop10450-0" />
-      <stop
-         id="stop10458-2"
-         offset="0.25"
-         style="stop-color:#ffe38d;stop-opacity:1" />
-      <stop
-         id="stop10456-96"
-         offset="0.5"
-         style="stop-color:#fdf5d2;stop-opacity:1" />
-      <stop
-         style="stop-color:#ffeba7;stop-opacity:1"
-         offset="0.75"
-         id="stop10460-3" />
-      <stop
-         style="stop-color:#e5b630;stop-opacity:1"
-         offset="1"
-         id="stop10452-1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10440-18">
-      <stop
-         style="stop-color:#ae7603;stop-opacity:1;"
-         offset="0"
-         id="stop10442-8" />
-      <stop
-         id="stop10521-7"
-         offset="0.5"
-         style="stop-color:#e8d8a3;stop-opacity:1" />
-      <stop
-         style="stop-color:#bb9221;stop-opacity:1"
-         offset="1"
-         id="stop10444-0" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10414-9">
-      <stop
-         style="stop-color:#5078b9;stop-opacity:1;"
-         offset="0"
-         id="stop10416-3" />
-      <stop
-         id="stop10422-8"
-         offset="0.5"
-         style="stop-color:#6d8cbd;stop-opacity:1" />
-      <stop
-         style="stop-color:#5f88c9;stop-opacity:1"
-         offset="1"
-         id="stop10418-4" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10432-3">
-      <stop
-         id="stop10434-4"
-         offset="0"
-         style="stop-color:#1f4d9a;stop-opacity:1" />
-      <stop
-         style="stop-color:#4e6da1;stop-opacity:1"
-         offset="0.5"
-         id="stop10436-2" />
-      <stop
-         id="stop10438-9"
-         offset="1"
-         style="stop-color:#567ebc;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10157-6">
-      <stop
-         style="stop-color:#6588c1;stop-opacity:1"
-         offset="0"
-         id="stop10159-5" />
-      <stop
-         id="stop10165-9"
-         offset="0.5"
-         style="stop-color:#becce3;stop-opacity:1" />
-      <stop
-         style="stop-color:#809dcb;stop-opacity:1"
-         offset="1"
-         id="stop10161-55" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10396-5">
-      <stop
-         style="stop-color:#1b3e79;stop-opacity:1;"
-         offset="0"
-         id="stop10398-7" />
-      <stop
-         id="stop10404-9"
-         offset="0.5"
-         style="stop-color:#728fbf;stop-opacity:1" />
-      <stop
-         style="stop-color:#1f4d9a;stop-opacity:1"
-         offset="1"
-         id="stop10400-9" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10157-2-5">
-      <stop
-         style="stop-color:#6588c1;stop-opacity:1"
-         offset="0"
-         id="stop10159-8-3" />
-      <stop
-         id="stop10165-3-9"
-         offset="0.5"
-         style="stop-color:#becce3;stop-opacity:1" />
-      <stop
-         style="stop-color:#809dcb;stop-opacity:1"
-         offset="1"
-         id="stop10161-5-0" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10149-6-5-4">
-      <stop
-         style="stop-color:#1f4d9a;stop-opacity:1"
-         offset="0"
-         id="stop10151-5-7-2" />
-      <stop
-         id="stop10394-3"
-         offset="0.5"
-         style="stop-color:#b9c7df;stop-opacity:1" />
-      <stop
-         style="stop-color:#567ebc;stop-opacity:1"
-         offset="1"
-         id="stop10153-8-1-2" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4284"
        id="linearGradient10790-8-2"
        gradientUnits="userSpaceOnUse"
@@ -240,29 +39,6 @@
        x2="305"
        y2="545.35248" />
   </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.8284453"
-     inkscape:cy="7.8012775"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="905"
-     inkscape:window-height="917"
-     inkscape:window-x="1484"
-     inkscape:window-y="552"
-     inkscape:window-maximized="0"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid4210" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -276,8 +52,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
@@ -293,19 +67,15 @@
     <path
        style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#7d7d7d;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
        d="m 12.648438,1043.3652 0,1 3.351562,0 0,-1 -3.351562,0 z"
-       id="path4313-8-8"
-       inkscape:connector-curvature="0" />
+       id="path4313-8-8" />
     <path
        style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#616161;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.94926554px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
        d="m 12.981809,1043.3594 0,3.0195 1.01551,0 0,-3.0195 z"
-       id="path4313-8-8-7"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+       id="path4313-8-8-7" />
     <path
        style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#7d7d7d;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
        d="m 15.992188,1045.3613 -3.359376,0.031 0.0098,1 3.359375,-0.031 -0.0098,-1 z"
-       id="path4313-5-1-8"
-       inkscape:connector-curvature="0" />
+       id="path4313-5-1-8" />
     <rect
        style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        id="rect10007-0-74-2-7"
@@ -318,13 +88,11 @@
     <path
        style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#4f4f4f;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
        d="m 13.005859,1046.3711 -3.3593746,0.031 0.00977,1 3.359375,-0.031 -0.0098,-1 z"
-       id="path4313-5-1"
-       inkscape:connector-curvature="0" />
+       id="path4313-5-1" />
     <path
        style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#616161;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
        d="m 12.996094,1042.3633 -3.3593752,0.031 0.00977,1 3.3593746,-0.031 -0.0098,-1 z"
-       id="path4313-8"
-       inkscape:connector-curvature="0" />
+       id="path4313-8" />
     <rect
        style="fill:#ededed;fill-opacity:1;stroke:none;stroke-width:1.50161433;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        id="rect10007-0-74-2"
@@ -364,13 +132,11 @@
     <path
        style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#616161;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
        d="m 10.996094,1041.3613 -3.3593752,0.031 0.00977,1 3.3593746,-0.031 -0.0098,-1 z"
-       id="path4313"
-       inkscape:connector-curvature="0" />
+       id="path4313" />
     <path
        style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#4f4f4f;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
        d="m 11.001953,1047.3613 -3.3593749,0.031 0.00977,1 3.3593752,-0.031 -0.0098,-1 z"
-       id="path4313-5"
-       inkscape:connector-curvature="0" />
+       id="path4313-5" />
     <rect
        ry="1.4929011"
        style="fill:#f9f9f9;fill-opacity:1;stroke:#525252;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
@@ -389,8 +155,6 @@
     <path
        style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#787878;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.97351193px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
        d="m 11.003629,1043.3647 0,3.01 1.000277,0 0,-3.01 z"
-       id="path4313-8-8-7-8"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+       id="path4313-8-8-7-8" />
   </g>
 </svg>
diff --git a/ui/org.eclipse.pde.ui/icons/obj16/plugin_javasearch.svg b/ui/org.eclipse.pde.ui/icons/obj16/plugin_javasearch.svg
index 87d00106401..fbd4abad8f6 100644
--- a/ui/org.eclipse.pde.ui/icons/obj16/plugin_javasearch.svg
+++ b/ui/org.eclipse.pde.ui/icons/obj16/plugin_javasearch.svg
@@ -2,24 +2,19 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="plugin_javasearch.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4368">
       <stop
          style="stop-color:#fbdf89;stop-opacity:1"
@@ -39,7 +34,6 @@
          id="stop4372" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4344">
       <stop
          style="stop-color:#7e9cca;stop-opacity:1"
@@ -63,7 +57,6 @@
          id="stop4348" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4336">
       <stop
          style="stop-color:#3461ab;stop-opacity:1"
@@ -74,236 +67,6 @@
          offset="1"
          id="stop4340" />
     </linearGradient>
-    <linearGradient
-       id="linearGradient3955">
-      <stop
-         id="stop3957"
-         offset="0"
-         style="stop-color:#c38536;stop-opacity:1" />
-      <stop
-         style="stop-color:#f2dc91;stop-opacity:1"
-         offset="0.15381166"
-         id="stop3959" />
-      <stop
-         style="stop-color:#fbdc8b;stop-opacity:1"
-         offset="0.5"
-         id="stop3961" />
-      <stop
-         id="stop3963"
-         offset="0.75"
-         style="stop-color:#e6bd7a;stop-opacity:1" />
-      <stop
-         id="stop3965"
-         offset="1"
-         style="stop-color:#ba772f;stop-opacity:1" />
-    </linearGradient>
-    <mask
-       maskUnits="userSpaceOnUse"
-       id="mask4917">
-      <path
-         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;display:inline"
-         d="m 462.77563,373.22885 29.11636,0 c 1.45425,0 2.625,1.17075 2.625,2.625 l 0,18.76896 c 0,1.45425 -1.17412,2.52598 -2.625,2.625 l -29.11636,1.98708 c -1.45088,0.099 -2.625,-1.17075 -2.625,-2.625 l 0,-20.75604 c 0,-1.45425 1.17075,-2.625 2.625,-2.625 z"
-         id="path4919"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="sssssssss" />
-    </mask>
-    <linearGradient
-       id="linearGradient4284">
-      <stop
-         id="stop4286"
-         offset="0"
-         style="stop-color:#6588c1;stop-opacity:0" />
-      <stop
-         style="stop-color:#becce3;stop-opacity:1"
-         offset="0.49999967"
-         id="stop4288" />
-      <stop
-         id="stop4290"
-         offset="1"
-         style="stop-color:#809dcb;stop-opacity:0" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10157-2-5">
-      <stop
-         style="stop-color:#6588c1;stop-opacity:1"
-         offset="0"
-         id="stop10159-8-3" />
-      <stop
-         id="stop10165-3-9"
-         offset="0.5"
-         style="stop-color:#becce3;stop-opacity:1" />
-      <stop
-         style="stop-color:#809dcb;stop-opacity:1"
-         offset="1"
-         id="stop10161-5-0" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10414-9">
-      <stop
-         style="stop-color:#5078b9;stop-opacity:1;"
-         offset="0"
-         id="stop10416-3" />
-      <stop
-         id="stop10422-8"
-         offset="0.5"
-         style="stop-color:#6d8cbd;stop-opacity:1" />
-      <stop
-         style="stop-color:#5f88c9;stop-opacity:1"
-         offset="1"
-         id="stop10418-4" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10432-3">
-      <stop
-         id="stop10434-4"
-         offset="0"
-         style="stop-color:#1f4d9a;stop-opacity:1" />
-      <stop
-         style="stop-color:#4e6da1;stop-opacity:1"
-         offset="0.5"
-         id="stop10436-2" />
-      <stop
-         id="stop10438-9"
-         offset="1"
-         style="stop-color:#567ebc;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10448-90">
-      <stop
-         style="stop-color:#ecac18;stop-opacity:1"
-         offset="0"
-         id="stop10450-0" />
-      <stop
-         id="stop10458-2"
-         offset="0.25"
-         style="stop-color:#ffe38d;stop-opacity:1" />
-      <stop
-         id="stop10456-96"
-         offset="0.5"
-         style="stop-color:#fdf5d2;stop-opacity:1" />
-      <stop
-         style="stop-color:#ffeba7;stop-opacity:1"
-         offset="0.75"
-         id="stop10460-3" />
-      <stop
-         style="stop-color:#e5b630;stop-opacity:1"
-         offset="1"
-         id="stop10452-1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10748-8">
-      <stop
-         id="stop10750-5"
-         offset="0"
-         style="stop-color:#ecac18;stop-opacity:1" />
-      <stop
-         style="stop-color:#f1ce66;stop-opacity:1"
-         offset="0.25"
-         id="stop10752-8" />
-      <stop
-         style="stop-color:#f6e5a6;stop-opacity:1"
-         offset="0.5"
-         id="stop10754-8" />
-      <stop
-         id="stop10756-4"
-         offset="0.75"
-         style="stop-color:#f1cf6c;stop-opacity:1" />
-      <stop
-         id="stop10758-7"
-         offset="1"
-         style="stop-color:#e5b630;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10448-9-7-0-5">
-      <stop
-         style="stop-color:#cf9307;stop-opacity:1"
-         offset="0"
-         id="stop10450-3-5-6-7" />
-      <stop
-         id="stop10456-4-1-5-3"
-         offset="0.5"
-         style="stop-color:#f7d87b;stop-opacity:1" />
-      <stop
-         style="stop-color:#ebb313;stop-opacity:1"
-         offset="1"
-         id="stop10452-22-7-8-4" />
-    </linearGradient>
-    <linearGradient
-       gradientTransform="matrix(3.5838051,0,0,3.5838051,446.6247,-3372.1684)"
-       gradientUnits="userSpaceOnUse"
-       y2="1039.3397"
-       x2="8.3145638"
-       y1="1040.4003"
-       x1="8.3145638"
-       id="linearGradient4212"
-       xlink:href="#linearGradient4158" />
-    <linearGradient
-       id="linearGradient4158">
-      <stop
-         id="stop4160"
-         offset="0"
-         style="stop-color:#fdae35;stop-opacity:1;" />
-      <stop
-         id="stop4162"
-         offset="1"
-         style="stop-color:#fef0db;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10440-1-0-0-3">
-      <stop
-         id="stop10442-43-2-0-9"
-         offset="0"
-         style="stop-color:#ae7603;stop-opacity:1;" />
-      <stop
-         style="stop-color:#e8d8a3;stop-opacity:1"
-         offset="0.5"
-         id="stop10521-1-2-5-3" />
-      <stop
-         id="stop10444-3-4-0-4"
-         offset="1"
-         style="stop-color:#bb9221;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10396-5">
-      <stop
-         id="stop10398-7"
-         offset="0"
-         style="stop-color:#1b3e79;stop-opacity:1;" />
-      <stop
-         style="stop-color:#728fbf;stop-opacity:1"
-         offset="0.5"
-         id="stop10404-9" />
-      <stop
-         id="stop10400-9"
-         offset="1"
-         style="stop-color:#1f4d9a;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10149-6-5-4">
-      <stop
-         id="stop10151-5-7-2"
-         offset="0"
-         style="stop-color:#1f4d9a;stop-opacity:1" />
-      <stop
-         style="stop-color:#b9c7df;stop-opacity:1"
-         offset="0.5"
-         id="stop10394-3" />
-      <stop
-         id="stop10153-8-1-2"
-         offset="1"
-         style="stop-color:#567ebc;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4528-9-5-7-9-7">
-      <stop
-         style="stop-color:#e0c576;stop-opacity:1;"
-         offset="0"
-         id="stop4530-0-5-0-5-8" />
-      <stop
-         style="stop-color:#9e7916;stop-opacity:1"
-         offset="1"
-         id="stop4532-7-9-3-3-6" />
-    </linearGradient>
     <linearGradient
        id="linearGradient6281-8-0-1-6-6-4-2-8">
       <stop
@@ -316,7 +79,6 @@
          style="stop-color:#ffd680;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4336"
        id="linearGradient4342"
        x1="509.96674"
@@ -326,7 +88,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1.0106162,0,0,0.96711322,-26.641878,12.017452)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4344"
        id="linearGradient4350"
        x1="505.37363"
@@ -336,7 +97,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1.0106162,0,0,0.96711322,-26.641878,12.017452)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4368"
        id="linearGradient4374"
        x1="494.33554"
@@ -345,7 +105,6 @@
        y2="358.83438"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4368"
        id="linearGradient4453"
        gradientUnits="userSpaceOnUse"
@@ -354,7 +113,6 @@
        x2="494.33554"
        y2="358.83438" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4344"
        id="linearGradient4455"
        gradientUnits="userSpaceOnUse"
@@ -364,7 +122,6 @@
        x2="505.37363"
        y2="349.91144" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4336"
        id="linearGradient4457"
        gradientUnits="userSpaceOnUse"
@@ -374,7 +131,6 @@
        x2="509.96674"
        y2="350.06982" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient6281-8-0-1-6-6-4-2-8"
        id="linearGradient3093-5-2-7-0-9"
        gradientUnits="userSpaceOnUse"
@@ -384,29 +140,6 @@
        x2="0.9375"
        y2="7.549418" />
   </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="12.050613"
-     inkscape:cy="8.4734733"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1008"
-     inkscape:window-height="740"
-     inkscape:window-x="988"
-     inkscape:window-y="785"
-     inkscape:window-maximized="0"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3947" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -420,8 +153,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
@@ -436,8 +167,6 @@
       <g
          id="g4382">
         <path
-           sodipodi:nodetypes="ccccccccccc"
-           inkscape:connector-curvature="0"
            id="path4366"
            d="m 494.79147,354.64863 3.60322,3.60323 3.60322,0 3.42504,2.52908 0,5.48733 -3.85069,2.84274 -3.69232,0 -3.34089,3.3409 -3.46959,0 -0.002,-17.81968 z"
            style="fill:url(#linearGradient4374);fill-opacity:1;fill-rule:evenodd;stroke:#b08b21;stroke-width:3.58380508px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
@@ -446,9 +175,7 @@
           <path
              style="fill:url(#linearGradient4350);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4342);stroke-width:3.58380511;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
              d="m 487.40807,351.09688 c 1.22716,-1.17433 3.68149,1.86226 3.68149,3.52302 0,5.94129 0,12.02914 0,17.4619 0,2.60379 -2.50768,4.79948 -3.76152,3.5996 -4.2413,-4.05871 -10.72434,-10.26269 -10.72434,-10.26269 l 0,-3.5996 c 0,0 6.01931,-6.14314 10.80437,-10.72223 z"
-             id="path4326"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ssssccs" />
+             id="path4326" />
           <rect
              style="opacity:1;fill:#547fc4;fill-opacity:1;stroke:none;stroke-width:1.79190254;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
              id="rect4358"
@@ -470,8 +197,6 @@
          id="g4382-6"
          transform="translate(10.807413,25.086635)">
         <path
-           sodipodi:nodetypes="ccccccccccc"
-           inkscape:connector-curvature="0"
            id="path4366-6"
            d="m 494.79147,354.64863 3.60322,3.60323 3.60322,0 3.42504,2.52908 0,5.48733 -3.85069,2.84274 -3.69232,0 -3.34089,3.3409 -3.46959,0 -0.002,-17.81968 z"
            style="fill:url(#linearGradient4453);fill-opacity:1;fill-rule:evenodd;stroke:#b08b21;stroke-width:3.58380508px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
@@ -480,9 +205,7 @@
           <path
              style="fill:url(#linearGradient4455);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4457);stroke-width:3.58380511;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
              d="m 487.40807,351.09688 c 1.22716,-1.17433 3.68149,1.86226 3.68149,3.52302 0,5.94129 0,12.02914 0,17.4619 0,2.60379 -2.50768,4.79948 -3.76152,3.5996 -4.2413,-4.05871 -10.72434,-10.26269 -10.72434,-10.26269 l 0,-3.5996 c 0,0 6.01931,-6.14314 10.80437,-10.72223 z"
-             id="path4326-2"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ssssccs" />
+             id="path4326-2" />
           <rect
              style="opacity:1;fill:#547fc4;fill-opacity:1;stroke:none;stroke-width:1.79190254;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
              id="rect4358-7"
@@ -514,9 +237,7 @@
         <path
            style="display:inline;fill:url(#linearGradient3093-5-2-7-0-9);fill-opacity:1;stroke:none"
            d="m 12.471186,1054.3403 1.001133,0 0,2.0046 1.986639,0 0,0.9972 -1.986639,0 0,2.0039 -1.001133,0 0,-2.0039 -1.98664,0 0,-0.9972 1.98664,0 z"
-           id="path5581-5-5"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccccccccccc" />
+           id="path5581-5-5" />
       </g>
     </g>
   </g>
diff --git a/ui/org.eclipse.pde.ui/icons/obj16/plugin_mf_obj.svg b/ui/org.eclipse.pde.ui/icons/obj16/plugin_mf_obj.svg
index daf28857fee..d58d0b531ec 100644
--- a/ui/org.eclipse.pde.ui/icons/obj16/plugin_mf_obj.svg
+++ b/ui/org.eclipse.pde.ui/icons/obj16/plugin_mf_obj.svg
@@ -2,20 +2,16 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="plugin_mf_obj.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
@@ -34,7 +30,6 @@
          style="stop-color:#809dcb;stop-opacity:0" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10448-9-7-0-5"
        id="linearGradient10770-6"
        gradientUnits="userSpaceOnUse"
@@ -59,22 +54,6 @@
          id="stop10452-22-7-8-4" />
     </linearGradient>
     <linearGradient
-       id="linearGradient10440-1-0-0-3">
-      <stop
-         style="stop-color:#ae7603;stop-opacity:1;"
-         offset="0"
-         id="stop10442-43-2-0-9" />
-      <stop
-         id="stop10521-1-2-5-3"
-         offset="0.5"
-         style="stop-color:#e8d8a3;stop-opacity:1" />
-      <stop
-         style="stop-color:#bb9221;stop-opacity:1"
-         offset="1"
-         id="stop10444-3-4-0-4" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10748-8"
        id="linearGradient10774-5"
        gradientUnits="userSpaceOnUse"
@@ -107,22 +86,6 @@
          style="stop-color:#e5b630;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       id="linearGradient10440-1-3-4">
-      <stop
-         style="stop-color:#ae7603;stop-opacity:1;"
-         offset="0"
-         id="stop10442-43-0-5" />
-      <stop
-         id="stop10521-1-4-7"
-         offset="0.5"
-         style="stop-color:#e8d8a3;stop-opacity:1" />
-      <stop
-         style="stop-color:#bb9221;stop-opacity:1"
-         offset="1"
-         id="stop10444-3-2-0" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10448-90"
        id="linearGradient10778-6"
        gradientUnits="userSpaceOnUse"
@@ -155,22 +118,6 @@
          id="stop10452-1" />
     </linearGradient>
     <linearGradient
-       id="linearGradient10440-18">
-      <stop
-         style="stop-color:#ae7603;stop-opacity:1;"
-         offset="0"
-         id="stop10442-8" />
-      <stop
-         id="stop10521-7"
-         offset="0.5"
-         style="stop-color:#e8d8a3;stop-opacity:1" />
-      <stop
-         style="stop-color:#bb9221;stop-opacity:1"
-         offset="1"
-         id="stop10444-0" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10414-9"
        id="linearGradient10782-3"
        gradientUnits="userSpaceOnUse"
@@ -195,7 +142,6 @@
          id="stop10418-4" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10432-3"
        id="linearGradient10784-2"
        gradientUnits="userSpaceOnUse"
@@ -220,7 +166,6 @@
          style="stop-color:#567ebc;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10157-6"
        id="linearGradient10786-1"
        gradientUnits="userSpaceOnUse"
@@ -245,22 +190,6 @@
          id="stop10161-55" />
     </linearGradient>
     <linearGradient
-       id="linearGradient10396-5">
-      <stop
-         style="stop-color:#1b3e79;stop-opacity:1;"
-         offset="0"
-         id="stop10398-7" />
-      <stop
-         id="stop10404-9"
-         offset="0.5"
-         style="stop-color:#728fbf;stop-opacity:1" />
-      <stop
-         style="stop-color:#1f4d9a;stop-opacity:1"
-         offset="1"
-         id="stop10400-9" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10157-2-5"
        id="linearGradient10790-8"
        gradientUnits="userSpaceOnUse"
@@ -285,7 +214,6 @@
          id="stop10161-5-0" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10149-39-0"
        id="linearGradient10792-6"
        gradientUnits="userSpaceOnUse"
@@ -295,7 +223,6 @@
        x2="322.875"
        y2="504.44818" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient10149-39-0">
       <stop
          style="stop-color:#1d4d9d;stop-opacity:1"
@@ -307,22 +234,6 @@
          id="stop10153-72-3" />
     </linearGradient>
     <linearGradient
-       id="linearGradient10149-6-5-4">
-      <stop
-         style="stop-color:#1f4d9a;stop-opacity:1"
-         offset="0"
-         id="stop10151-5-7-2" />
-      <stop
-         id="stop10394-3"
-         offset="0.5"
-         style="stop-color:#b9c7df;stop-opacity:1" />
-      <stop
-         style="stop-color:#567ebc;stop-opacity:1"
-         offset="1"
-         id="stop10153-8-1-2" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4284"
        id="linearGradient10790-8-2"
        gradientUnits="userSpaceOnUse"
@@ -332,7 +243,6 @@
        x2="305"
        y2="545.35248" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4902-3"
        id="linearGradient4908-2"
        x1="10.544736"
@@ -342,7 +252,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-2.009153,-1.0294)" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4902-3">
       <stop
          style="stop-color:#b28a30;stop-opacity:1"
@@ -354,7 +263,6 @@
          id="stop4906-2" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4894-6"
        id="linearGradient4900-1"
        x1="7.9987183"
@@ -364,7 +272,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(1.990847,-1.0294)" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4894-6">
       <stop
          style="stop-color:#e0c88f;stop-opacity:1"
@@ -383,10 +290,8 @@
        gradientUnits="userSpaceOnUse"
        id="linearGradient4101"
        xlink:href="#linearGradient4994-6"
-       inkscape:collect="always"
        gradientTransform="translate(-2.009153,-1.0294)" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4994-6">
       <stop
          style="stop-color:#f9fafc;stop-opacity:1;"
@@ -398,29 +303,6 @@
          id="stop4998-89" />
     </linearGradient>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="32"
-     inkscape:cx="7.7751996"
-     inkscape:cy="10.228655"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="987"
-     inkscape:window-height="965"
-     inkscape:window-x="1341"
-     inkscape:window-y="519"
-     inkscape:window-maximized="0"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid4210" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -434,8 +316,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
@@ -443,19 +323,14 @@
        id="g4325"
        transform="translate(0,-1)">
       <path
-         sodipodi:nodetypes="cccccc"
-         inkscape:connector-curvature="0"
          id="rect4001-3"
          d="m 3.4881295,1037.8727 7.0096695,0 3.062057,3.0066 0,9.9546 -10.0717265,0 z"
          style="display:inline;fill:url(#linearGradient4101);fill-opacity:1;stroke:none" />
       <path
-         inkscape:connector-curvature="0"
          id="path4884"
          d="m 9.967468,1037.41 0,3.9112 3.977479,0 z"
          style="display:inline;fill:url(#linearGradient4900-1);fill-opacity:1;stroke:none" />
       <path
-         sodipodi:nodetypes="cccccc"
-         inkscape:connector-curvature="0"
          id="rect4001"
          d="m 3.4881295,1037.8727 6.9471695,0 3.062057,3.0066 0,9.9546 -10.0092265,0 z"
          style="display:inline;fill:none;stroke:url(#linearGradient4908-2);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1" />
@@ -473,18 +348,14 @@
          id="rect10007-0-74-2-7-6"
          style="fill:url(#linearGradient10770-6);fill-opacity:1;stroke:none;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
       <path
-         inkscape:connector-curvature="0"
          id="path4313-8-8"
          d="m 12.648438,1043.3652 0,1 3.351562,0 0,-1 -3.351562,0 z"
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
       <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
          id="path4313-8-8-7"
          d="m 12.981809,1043.3594 0,3.0195 1.01551,0 0,-3.0195 z"
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.94926554px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
       <path
-         inkscape:connector-curvature="0"
          id="path4313-5-1-8"
          d="m 15.992188,1045.3613 -3.359376,0.031 0.0098,1 3.359375,-0.031 -0.0098,-1 z"
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#9e7400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
@@ -498,12 +369,10 @@
          id="rect10007-0-74-2-7"
          style="fill:url(#linearGradient10774-5);fill-opacity:1;stroke:none;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
       <path
-         inkscape:connector-curvature="0"
          id="path4313-5-1"
          d="m 13.005859,1046.3711 -3.3593746,0.031 0.00977,1 3.3593746,-0.031 -0.0098,-1 z"
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#9e7400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
       <path
-         inkscape:connector-curvature="0"
          id="path4313-8"
          d="m 12.996094,1042.3633 -3.3593752,0.031 0.00977,1 3.3593742,-0.031 -0.0098,-1 z"
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
@@ -544,12 +413,10 @@
          id="rect10007-0-74"
          style="fill:url(#linearGradient10786-1);fill-opacity:1;stroke:none;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
       <path
-         inkscape:connector-curvature="0"
          id="path4313"
          d="m 10.996094,1041.3613 -3.3593752,0.031 0.00977,1 3.3593742,-0.031 -0.0098,-1 z"
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
       <path
-         inkscape:connector-curvature="0"
          id="path4313-5"
          d="m 11.001953,1047.3613 -3.3593749,0.031 0.00977,1 3.3593749,-0.031 -0.0098,-1 z"
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#9e7400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
@@ -569,8 +436,6 @@
          id="rect10007-6-6"
          style="display:inline;fill:url(#linearGradient10790-8-2);fill-opacity:1;stroke:none;stroke-width:3.58380508;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
       <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
          id="path4313-8-8-7-8"
          d="m 11.003629,1043.3647 0,3.01 1.000277,0 0,-3.01 z"
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:0.64640886;fill-rule:evenodd;stroke:none;stroke-width:0.97351193px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
diff --git a/ui/org.eclipse.pde.ui/icons/obj16/plugin_obj.svg b/ui/org.eclipse.pde.ui/icons/obj16/plugin_obj.svg
index 6741d827a52..9e20febec4f 100644
--- a/ui/org.eclipse.pde.ui/icons/obj16/plugin_obj.svg
+++ b/ui/org.eclipse.pde.ui/icons/obj16/plugin_obj.svg
@@ -2,20 +2,16 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="plugins.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
@@ -34,7 +30,6 @@
          style="stop-color:#809dcb;stop-opacity:0" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10448-9-7-0-5"
        id="linearGradient10770-6"
        gradientUnits="userSpaceOnUse"
@@ -59,22 +54,6 @@
          id="stop10452-22-7-8-4" />
     </linearGradient>
     <linearGradient
-       id="linearGradient10440-1-0-0-3">
-      <stop
-         style="stop-color:#ae7603;stop-opacity:1;"
-         offset="0"
-         id="stop10442-43-2-0-9" />
-      <stop
-         id="stop10521-1-2-5-3"
-         offset="0.5"
-         style="stop-color:#e8d8a3;stop-opacity:1" />
-      <stop
-         style="stop-color:#bb9221;stop-opacity:1"
-         offset="1"
-         id="stop10444-3-4-0-4" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10748-8"
        id="linearGradient10774-5"
        gradientUnits="userSpaceOnUse"
@@ -107,22 +86,6 @@
          style="stop-color:#e5b630;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       id="linearGradient10440-1-3-4">
-      <stop
-         style="stop-color:#ae7603;stop-opacity:1;"
-         offset="0"
-         id="stop10442-43-0-5" />
-      <stop
-         id="stop10521-1-4-7"
-         offset="0.5"
-         style="stop-color:#e8d8a3;stop-opacity:1" />
-      <stop
-         style="stop-color:#bb9221;stop-opacity:1"
-         offset="1"
-         id="stop10444-3-2-0" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10448-90"
        id="linearGradient10778-6"
        gradientUnits="userSpaceOnUse"
@@ -155,22 +118,6 @@
          id="stop10452-1" />
     </linearGradient>
     <linearGradient
-       id="linearGradient10440-18">
-      <stop
-         style="stop-color:#ae7603;stop-opacity:1;"
-         offset="0"
-         id="stop10442-8" />
-      <stop
-         id="stop10521-7"
-         offset="0.5"
-         style="stop-color:#e8d8a3;stop-opacity:1" />
-      <stop
-         style="stop-color:#bb9221;stop-opacity:1"
-         offset="1"
-         id="stop10444-0" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10414-9"
        id="linearGradient10782-3"
        gradientUnits="userSpaceOnUse"
@@ -195,7 +142,6 @@
          id="stop10418-4" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10432-3"
        id="linearGradient10784-2"
        gradientUnits="userSpaceOnUse"
@@ -220,7 +166,6 @@
          style="stop-color:#567ebc;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10157-6"
        id="linearGradient10786-1"
        gradientUnits="userSpaceOnUse"
@@ -245,22 +190,6 @@
          id="stop10161-55" />
     </linearGradient>
     <linearGradient
-       id="linearGradient10396-5">
-      <stop
-         style="stop-color:#1b3e79;stop-opacity:1;"
-         offset="0"
-         id="stop10398-7" />
-      <stop
-         id="stop10404-9"
-         offset="0.5"
-         style="stop-color:#728fbf;stop-opacity:1" />
-      <stop
-         style="stop-color:#1f4d9a;stop-opacity:1"
-         offset="1"
-         id="stop10400-9" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10157-2-5"
        id="linearGradient10790-8"
        gradientUnits="userSpaceOnUse"
@@ -285,7 +214,6 @@
          id="stop10161-5-0" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10149-39-0"
        id="linearGradient10792-6"
        gradientUnits="userSpaceOnUse"
@@ -295,7 +223,6 @@
        x2="322.875"
        y2="504.44818" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient10149-39-0">
       <stop
          style="stop-color:#1d4d9d;stop-opacity:1"
@@ -307,22 +234,6 @@
          id="stop10153-72-3" />
     </linearGradient>
     <linearGradient
-       id="linearGradient10149-6-5-4">
-      <stop
-         style="stop-color:#1f4d9a;stop-opacity:1"
-         offset="0"
-         id="stop10151-5-7-2" />
-      <stop
-         id="stop10394-3"
-         offset="0.5"
-         style="stop-color:#b9c7df;stop-opacity:1" />
-      <stop
-         style="stop-color:#567ebc;stop-opacity:1"
-         offset="1"
-         id="stop10153-8-1-2" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4284"
        id="linearGradient10790-8-2"
        gradientUnits="userSpaceOnUse"
@@ -332,29 +243,6 @@
        x2="305"
        y2="545.35248" />
   </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="47.607658"
-     inkscape:cy="-9.9169213"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1609"
-     inkscape:window-height="978"
-     inkscape:window-x="719"
-     inkscape:window-y="519"
-     inkscape:window-maximized="0"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid4210" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -368,8 +256,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
@@ -385,19 +271,15 @@
     <path
        style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
        d="m 12.648438,1043.3652 0,1 3.351562,0 0,-1 -3.351562,0 z"
-       id="path4313-8-8"
-       inkscape:connector-curvature="0" />
+       id="path4313-8-8" />
     <path
        style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.94926554px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
        d="m 12.981809,1043.3594 0,3.0195 1.01551,0 0,-3.0195 z"
-       id="path4313-8-8-7"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+       id="path4313-8-8-7" />
     <path
        style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#9e7400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
        d="m 15.992188,1045.3613 -3.359376,0.031 0.0098,1 3.359375,-0.031 -0.0098,-1 z"
-       id="path4313-5-1-8"
-       inkscape:connector-curvature="0" />
+       id="path4313-5-1-8" />
     <rect
        style="fill:url(#linearGradient10774-5);fill-opacity:1;stroke:none;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        id="rect10007-0-74-2-7"
@@ -410,13 +292,11 @@
     <path
        style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#9e7400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
        d="m 13.005859,1046.3711 -3.3593746,0.031 0.00977,1 3.359375,-0.031 -0.0098,-1 z"
-       id="path4313-5-1"
-       inkscape:connector-curvature="0" />
+       id="path4313-5-1" />
     <path
        style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
        d="m 12.996094,1042.3633 -3.3593752,0.031 0.00977,1 3.3593746,-0.031 -0.0098,-1 z"
-       id="path4313-8"
-       inkscape:connector-curvature="0" />
+       id="path4313-8" />
     <rect
        style="fill:url(#linearGradient10778-6);fill-opacity:1;stroke:none;stroke-width:1.50161433;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        id="rect10007-0-74-2"
@@ -456,13 +336,11 @@
     <path
        style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
        d="m 10.996094,1041.3613 -3.3593752,0.031 0.00977,1 3.3593746,-0.031 -0.0098,-1 z"
-       id="path4313"
-       inkscape:connector-curvature="0" />
+       id="path4313" />
     <path
        style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#9e7400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
        d="m 11.001953,1047.3613 -3.3593749,0.031 0.00977,1 3.3593752,-0.031 -0.0098,-1 z"
-       id="path4313-5"
-       inkscape:connector-curvature="0" />
+       id="path4313-5" />
     <rect
        ry="1.0288811"
        style="fill:url(#linearGradient10790-8);fill-opacity:1;stroke:url(#linearGradient10792-6);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
@@ -482,8 +360,6 @@
     <path
        style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:0.64640886;fill-rule:evenodd;stroke:none;stroke-width:0.97351193px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
        d="m 11.003629,1043.3647 0,3.01 1.000277,0 0,-3.01 z"
-       id="path4313-8-8-7-8"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+       id="path4313-8-8-7-8" />
   </g>
 </svg>
diff --git a/ui/org.eclipse.pde.ui/icons/obj16/plugins_and_fragments.svg b/ui/org.eclipse.pde.ui/icons/obj16/plugins_and_fragments.svg
index 3c142fdec1d..a94861f4076 100644
--- a/ui/org.eclipse.pde.ui/icons/obj16/plugins_and_fragments.svg
+++ b/ui/org.eclipse.pde.ui/icons/obj16/plugins_and_fragments.svg
@@ -2,20 +2,16 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="plugins_and_fragments.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
@@ -48,21 +44,6 @@
          offset="1"
          id="stop10452-22-7-8-4" />
     </linearGradient>
-    <linearGradient
-       id="linearGradient10440-1-0-0-3">
-      <stop
-         style="stop-color:#ae7603;stop-opacity:1;"
-         offset="0"
-         id="stop10442-43-2-0-9" />
-      <stop
-         id="stop10521-1-2-5-3"
-         offset="0.5"
-         style="stop-color:#e8d8a3;stop-opacity:1" />
-      <stop
-         style="stop-color:#bb9221;stop-opacity:1"
-         offset="1"
-         id="stop10444-3-4-0-4" />
-    </linearGradient>
     <linearGradient
        id="linearGradient10748-8">
       <stop
@@ -86,21 +67,6 @@
          offset="1"
          style="stop-color:#e5b630;stop-opacity:1" />
     </linearGradient>
-    <linearGradient
-       id="linearGradient10440-1-3-4">
-      <stop
-         style="stop-color:#ae7603;stop-opacity:1;"
-         offset="0"
-         id="stop10442-43-0-5" />
-      <stop
-         id="stop10521-1-4-7"
-         offset="0.5"
-         style="stop-color:#e8d8a3;stop-opacity:1" />
-      <stop
-         style="stop-color:#bb9221;stop-opacity:1"
-         offset="1"
-         id="stop10444-3-2-0" />
-    </linearGradient>
     <linearGradient
        id="linearGradient10448-90">
       <stop
@@ -124,51 +90,6 @@
          offset="1"
          id="stop10452-1" />
     </linearGradient>
-    <linearGradient
-       id="linearGradient10440-18">
-      <stop
-         style="stop-color:#ae7603;stop-opacity:1;"
-         offset="0"
-         id="stop10442-8" />
-      <stop
-         id="stop10521-7"
-         offset="0.5"
-         style="stop-color:#e8d8a3;stop-opacity:1" />
-      <stop
-         style="stop-color:#bb9221;stop-opacity:1"
-         offset="1"
-         id="stop10444-0" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10414-9">
-      <stop
-         style="stop-color:#5078b9;stop-opacity:1;"
-         offset="0"
-         id="stop10416-3" />
-      <stop
-         id="stop10422-8"
-         offset="0.5"
-         style="stop-color:#6d8cbd;stop-opacity:1" />
-      <stop
-         style="stop-color:#5f88c9;stop-opacity:1"
-         offset="1"
-         id="stop10418-4" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10432-3">
-      <stop
-         id="stop10434-4"
-         offset="0"
-         style="stop-color:#1f4d9a;stop-opacity:1" />
-      <stop
-         style="stop-color:#4e6da1;stop-opacity:1"
-         offset="0.5"
-         id="stop10436-2" />
-      <stop
-         id="stop10438-9"
-         offset="1"
-         style="stop-color:#567ebc;stop-opacity:1" />
-    </linearGradient>
     <linearGradient
        id="linearGradient10157-6">
       <stop
@@ -184,21 +105,6 @@
          offset="1"
          id="stop10161-55" />
     </linearGradient>
-    <linearGradient
-       id="linearGradient10396-5">
-      <stop
-         style="stop-color:#1b3e79;stop-opacity:1;"
-         offset="0"
-         id="stop10398-7" />
-      <stop
-         id="stop10404-9"
-         offset="0.5"
-         style="stop-color:#728fbf;stop-opacity:1" />
-      <stop
-         style="stop-color:#1f4d9a;stop-opacity:1"
-         offset="1"
-         id="stop10400-9" />
-    </linearGradient>
     <linearGradient
        id="linearGradient10157-2-5">
       <stop
@@ -215,7 +121,6 @@
          id="stop10161-5-0" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient10149-39-0">
       <stop
          style="stop-color:#6936ae;stop-opacity:1"
@@ -227,22 +132,6 @@
          id="stop10153-72-3" />
     </linearGradient>
     <linearGradient
-       id="linearGradient10149-6-5-4">
-      <stop
-         style="stop-color:#1f4d9a;stop-opacity:1"
-         offset="0"
-         id="stop10151-5-7-2" />
-      <stop
-         id="stop10394-3"
-         offset="0.5"
-         style="stop-color:#b9c7df;stop-opacity:1" />
-      <stop
-         style="stop-color:#567ebc;stop-opacity:1"
-         offset="1"
-         id="stop10153-8-1-2" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10448-9-7-0-5"
        id="linearGradient4545"
        gradientUnits="userSpaceOnUse"
@@ -252,7 +141,6 @@
        x2="323.98331"
        y2="518.28192" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10748-8"
        id="linearGradient4547"
        gradientUnits="userSpaceOnUse"
@@ -262,7 +150,6 @@
        x2="324.1601"
        y2="515.53949" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10448-90"
        id="linearGradient4549"
        gradientUnits="userSpaceOnUse"
@@ -272,7 +159,6 @@
        x2="324.1601"
        y2="511.66458" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10157-6"
        id="linearGradient4551"
        gradientUnits="userSpaceOnUse"
@@ -282,7 +168,6 @@
        x2="306.05069"
        y2="514.75818" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10157-2-5"
        id="linearGradient4553"
        gradientUnits="userSpaceOnUse"
@@ -292,7 +177,6 @@
        x2="305"
        y2="542.73901" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10149-39-0"
        id="linearGradient4555"
        gradientUnits="userSpaceOnUse"
@@ -302,7 +186,6 @@
        x2="322.875"
        y2="504.44818" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4284"
        id="linearGradient4557"
        gradientUnits="userSpaceOnUse"
@@ -311,36 +194,6 @@
        y1="513.87781"
        x2="305"
        y2="545.35248" />
-    <linearGradient
-       id="linearGradient10157-6-8">
-      <stop
-         style="stop-color:#6588c1;stop-opacity:1"
-         offset="0"
-         id="stop10159-5-1" />
-      <stop
-         id="stop10165-9-1"
-         offset="0.5"
-         style="stop-color:#becce3;stop-opacity:1" />
-      <stop
-         style="stop-color:#809dcb;stop-opacity:1"
-         offset="1"
-         id="stop10161-55-7" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4284-3">
-      <stop
-         id="stop4286-1"
-         offset="0"
-         style="stop-color:#6588c1;stop-opacity:0" />
-      <stop
-         style="stop-color:#becce3;stop-opacity:1"
-         offset="0.49999967"
-         id="stop4288-4" />
-      <stop
-         id="stop4290-4"
-         offset="1"
-         style="stop-color:#809dcb;stop-opacity:0" />
-    </linearGradient>
     <linearGradient
        id="linearGradient10748-8-5">
       <stop
@@ -388,7 +241,6 @@
          id="stop10452-1-6" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10448-9-7-0-5"
        id="linearGradient4424"
        gradientUnits="userSpaceOnUse"
@@ -398,7 +250,6 @@
        x2="323.98331"
        y2="518.28192" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10748-8-5"
        id="linearGradient4426"
        gradientUnits="userSpaceOnUse"
@@ -408,7 +259,6 @@
        x2="324.1601"
        y2="515.53949" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10448-90-9"
        id="linearGradient4428"
        gradientUnits="userSpaceOnUse"
@@ -418,7 +268,6 @@
        x2="324.1601"
        y2="511.66458" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4322"
        id="linearGradient4328"
        x1="10.003791"
@@ -428,7 +277,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(14.996209,-0.985039)" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4322">
       <stop
          style="stop-color:#a0b5d7;stop-opacity:1"
@@ -452,7 +300,6 @@
          id="stop4326" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4285"
        id="linearGradient4291"
        x1="11.923064"
@@ -462,7 +309,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(14.668084,-11.177808)" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4285">
       <stop
          style="stop-color:#a0b5d7;stop-opacity:1"
@@ -486,7 +332,6 @@
          id="stop4289" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4295"
        id="linearGradient4301"
        x1="13.425666"
@@ -496,7 +341,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(14.668084,-11.177808)" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4295">
       <stop
          style="stop-color:#7da0d5;stop-opacity:1"
@@ -508,29 +352,6 @@
          id="stop4299" />
     </linearGradient>
   </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="11.070231"
-     inkscape:cy="-3.2770944"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1349"
-     inkscape:window-height="978"
-     inkscape:window-x="979"
-     inkscape:window-y="516"
-     inkscape:window-maximized="0"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid4210" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -544,8 +365,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
@@ -563,23 +382,17 @@
          id="rect10007-0-74-2-7-6-5"
          style="fill:url(#linearGradient4545);fill-opacity:1;stroke:none;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
       <path
-         inkscape:connector-curvature="0"
          id="path4313-8-8-8"
          d="m 14.940316,1043.3652 0,1 2.886225,0 0,-1 z"
-         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-         sodipodi:nodetypes="ccccc" />
+         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
       <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
          id="path4313-8-8-7-1"
          d="m 15.273687,1043.3594 0,3.0195 1.01551,0 0,-3.0195 z"
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.94926554px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
       <path
-         inkscape:connector-curvature="0"
          id="path4313-5-1-8-1"
          d="m 17.786212,1045.3613 -2.861522,0.031 0.0053,1 2.861522,-0.031 z"
-         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#9e7400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-         sodipodi:nodetypes="ccccc" />
+         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#9e7400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
       <rect
          ry="0"
          rx="0"
@@ -590,12 +403,10 @@
          id="rect10007-0-74-2-7-7"
          style="fill:url(#linearGradient4547);fill-opacity:1;stroke:none;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
       <path
-         inkscape:connector-curvature="0"
          id="path4313-5-1-5"
          d="m 15.297737,1046.3711 -3.359374,0.031 0.0098,1 3.359374,-0.031 -0.0098,-1 z"
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#9e7400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
       <path
-         inkscape:connector-curvature="0"
          id="path4313-8-2"
          d="m 14.283082,1043.3634 -2.354485,0.028 0.0069,0.9091 2.354484,-0.028 -0.0069,-0.909 z"
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
@@ -636,18 +447,14 @@
          id="rect10007-0-74-0"
          style="fill:url(#linearGradient4551);fill-opacity:1;stroke:none;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
       <path
-         inkscape:connector-curvature="0"
          id="path4313-6"
          d="m 13.334711,1043.3647 -3.4061138,0.029 0.00991,0.9204 3.4061128,-0.028 -0.0099,-0.9205 z"
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
       <path
-         inkscape:connector-curvature="0"
          id="path4313-5-2"
          d="m 13.293831,1047.3613 -3.3593745,0.031 0.00977,1 3.3593745,-0.031 -0.0098,-1 z"
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#9e7400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
       <path
-         sodipodi:nodetypes="cssssc"
-         inkscape:connector-curvature="0"
          id="rect10007-6-5"
          d="m 8.7673916,1043.9833 c 1.0259795,0 2.0241514,-0.1891 2.0241514,0.834 l 0,3.5451 c 0,0.8271 -0.665834,1.4929 -1.4929014,1.4929 -0.8270672,0 -1.4929011,-0.6658 -1.4929011,-1.4929 l 0,-3.5537"
          style="fill:url(#linearGradient4553);fill-opacity:1;stroke:url(#linearGradient4555);stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
@@ -659,14 +466,10 @@
          id="rect10007-6-6-0"
          style="display:inline;fill:url(#linearGradient4557);fill-opacity:1;stroke:none;stroke-width:3.58380508;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
       <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
          id="path4313-8-8-7-8-4"
          d="m 13.295507,1043.3647 0,3.01 1.000277,0 0,-3.01 z"
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:0.64640886;fill-rule:evenodd;stroke:none;stroke-width:0.97351193px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
       <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
          id="path4313-8-8-7-5-5"
          d="m 14.284123,1042.3524 0,1.0351 1.01551,0 0,-1.0351 z"
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.94926554px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
@@ -686,25 +489,19 @@
          ry="0"
          transform="translate(20.125466,13.034661)" />
       <path
-         sodipodi:nodetypes="ccccc"
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ba9726;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
          d="m 10.665872,1046.3536 0,1 3.34593,0 0,-1 z"
          id="path4313-8-8-5"
-         inkscape:connector-curvature="0"
          transform="translate(20.125466,13.034661)" />
       <path
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.94926554px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
          d="m 10.999243,1046.3478 0,3.0195 1.01551,0 0,-3.0195 z"
          id="path4313-8-8-7-4"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc"
          transform="translate(20.125466,13.034661)" />
       <path
-         sodipodi:nodetypes="ccccc"
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ba9726;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
          d="m 14.005886,1048.3497 -3.35564,0.031 0.0098,1 3.355639,-0.031 z"
          id="path4313-5-1-8-9"
-         inkscape:connector-curvature="0"
          transform="translate(20.125466,13.034661)" />
       <rect
          style="display:inline;fill:url(#linearGradient4426);fill-opacity:1;stroke:none;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
@@ -720,13 +517,11 @@
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ba9726;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
          d="m 11.023293,1049.3595 -3.3593746,0.031 0.00977,1 3.3593746,-0.031 -0.0098,-1 z"
          id="path4313-5-1-2"
-         inkscape:connector-curvature="0"
          transform="translate(20.125466,13.034661)" />
       <path
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ba9726;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
          d="m 11.013528,1045.3517 -3.3593752,0.031 0.00977,1 3.3593742,-0.031 -0.0098,-1 z"
          id="path4313-8-0"
-         inkscape:connector-curvature="0"
          transform="translate(20.125466,13.034661)" />
       <rect
          style="display:inline;fill:url(#linearGradient4428);fill-opacity:1;stroke:none;stroke-width:1.50161433;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
@@ -742,38 +537,28 @@
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
          d="m 9.013528,1044.3497 -3.3593752,0.031 0.00977,1 3.3593742,-0.031 -0.0098,-1 z"
          id="path4313-54"
-         inkscape:connector-curvature="0"
          transform="translate(20.125466,13.034661)" />
       <path
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#9e7400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
          d="m 9.019387,1050.3497 -3.3593749,0.031 0.00977,1 3.3593749,-0.031 -0.0098,-1 z"
          id="path4313-5-0"
-         inkscape:connector-curvature="0"
          transform="translate(20.125466,13.034661)" />
       <path
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:0.64640886;fill-rule:evenodd;stroke:none;stroke-width:0.97351193px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
          d="m 9.021063,1046.3531 0,3.01 1.000277,0 0,-3.01 z"
          id="path4313-8-8-7-8-1"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc"
          transform="translate(20.125466,13.034661)" />
       <g
          id="g4294">
         <path
-           sodipodi:nodetypes="cccc"
-           inkscape:connector-curvature="0"
            id="rect4317-3"
            d="m 20.151278,1061.8671 5.39483,0 0,-1.9999 -5.39483,0"
            style="display:inline;opacity:1;fill:#93acd2;fill-opacity:1;stroke:#7698cf;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
         <path
-           sodipodi:nodetypes="cccc"
-           inkscape:connector-curvature="0"
            id="path4303"
            d="m 24.15468,1058.9107 2.37657,0 0,3.9871 -2.377518,0"
            style="fill:url(#linearGradient4328);fill-opacity:1;fill-rule:evenodd;stroke:#698dc5;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
         <path
-           sodipodi:nodetypes="cscssccc"
-           inkscape:connector-curvature="0"
            id="path4274"
            d="m 25.5625,1060.3052 0,-2.1494 c 0,-0.4714 1.0625,-1.2031 1.0625,-1.2031 0,0 0.96875,0.4413 0.96875,0.8906 l 0,5.9219 c 0,0.5045 -1.070312,1.0547 -1.070312,1.0547 0,0 -1.039063,-0.5336 -1.039063,-1.0234 l 0,-2.4808"
            style="fill:url(#linearGradient4291);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4301);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
diff --git a/ui/org.eclipse.pde.ui/icons/obj16/processinginst.svg b/ui/org.eclipse.pde.ui/icons/obj16/processinginst.svg
index cdc3bd6ba48..dc1dc7d4d07 100644
--- a/ui/org.eclipse.pde.ui/icons/obj16/processinginst.svg
+++ b/ui/org.eclipse.pde.ui/icons/obj16/processinginst.svg
@@ -2,46 +2,17 @@
 <!-- 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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="processing_inst.svg">
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="11.313708"
-     inkscape:cx="17.575742"
-     inkscape:cy="9.6655124"
-     inkscape:document-units="px"
-     inkscape:current-layer="g4274"
-     showgrid="true"
-     inkscape:window-width="1433"
-     inkscape:window-height="900"
-     inkscape:window-x="1104"
-     inkscape:window-y="568"
-     inkscape:window-maximized="0"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3999" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -55,8 +26,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
@@ -68,7 +37,6 @@
          style="font-style:normal;font-weight:normal;font-size:13.65991211px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;fill:#286296;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
          id="text4156">
         <path
-           inkscape:connector-curvature="0"
            d="m 16.963785,1058.2245 0,-0.4936 q 0,-0.3402 0.0667,-0.6136 0.07337,-0.2802 0.213436,-0.527 0.146737,-0.2534 0.373513,-0.4869 0.226776,-0.2401 0.54693,-0.4935 0.280135,-0.2201 0.473562,-0.3936 0.193426,-0.1734 0.313484,-0.3401 0.120058,-0.1734 0.173417,-0.3602 0.05336,-0.1868 0.05336,-0.4335 0,-0.3802 -0.260125,-0.627 -0.253456,-0.2468 -0.780376,-0.2468 -0.460222,0 -0.993812,0.1934 -0.526921,0.1935 -1.09386,0.4736 l -0.680328,-1.474 q 0.286805,-0.1668 0.620299,-0.3135 0.340164,-0.1534 0.700337,-0.2668 0.366843,-0.1201 0.740357,-0.1868 0.373513,-0.067 0.733686,-0.067 0.680328,0 1.227258,0.1668 0.54693,0.16 0.927113,0.4735 0.380183,0.3135 0.58028,0.7604 0.206766,0.4469 0.206766,1.0205 0,0.4202 -0.09338,0.7537 -0.09338,0.3268 -0.280135,0.6136 -0.180087,0.2801 -0.460222,0.5469 -0.273465,0.2602 -0.640308,0.5536 -0.280135,0.2201 -0.460222,0.3869 -0.173417,0.1601 -0.273465,0.3068 -0.100048,0.1467 -0.140067,0.3068 -0.03335,0.1534 -0.03335,0.3669 l 0,0.4002 -1.760848,0 z m -0.220106,2.2811 q 0,-0.3135 0.08671,-0.527 0.09338,-0.2201 0.253455,-0.3535 0.160077,-0.1334 0.373513,-0.1934 0.220106,-0.06 0.466892,-0.06 0.233446,0 0.440212,0.06 0.213436,0.06 0.373513,0.1934 0.160077,0.1334 0.253455,0.3535 0.09338,0.2135 0.09338,0.527 0,0.3001 -0.09338,0.5135 -0.09338,0.2135 -0.253455,0.3535 -0.160077,0.1401 -0.373513,0.2001 -0.206766,0.067 -0.440212,0.067 -0.246786,0 -0.466892,-0.067 -0.213436,-0.06 -0.373513,-0.2001 -0.160077,-0.14 -0.253455,-0.3535 -0.08671,-0.2134 -0.08671,-0.5135 z"
            style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:'Droid Sans';fill:#286296;fill-opacity:1"
            id="path4161" />
@@ -78,7 +46,6 @@
          style="font-style:normal;font-weight:normal;font-size:13.65991211px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;fill:#286296;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
          id="text4156-1">
         <path
-           inkscape:connector-curvature="0"
            d="m 16.963785,1058.2245 0,-0.4936 q 0,-0.3402 0.0667,-0.6136 0.07337,-0.2802 0.213436,-0.527 0.146737,-0.2534 0.373513,-0.4869 0.226776,-0.2401 0.54693,-0.4935 0.280135,-0.2201 0.473562,-0.3936 0.193426,-0.1734 0.313484,-0.3401 0.120058,-0.1734 0.173417,-0.3602 0.05336,-0.1868 0.05336,-0.4335 0,-0.3802 -0.260125,-0.627 -0.253456,-0.2468 -0.780376,-0.2468 -0.460222,0 -0.993812,0.1934 -0.526921,0.1935 -1.09386,0.4736 l -0.680328,-1.474 q 0.286805,-0.1668 0.620299,-0.3135 0.340164,-0.1534 0.700337,-0.2668 0.366843,-0.1201 0.740357,-0.1868 0.373513,-0.067 0.733686,-0.067 0.680328,0 1.227258,0.1668 0.54693,0.16 0.927113,0.4735 0.380183,0.3135 0.58028,0.7604 0.206766,0.4469 0.206766,1.0205 0,0.4202 -0.09338,0.7537 -0.09338,0.3268 -0.280135,0.6136 -0.180087,0.2801 -0.460222,0.5469 -0.273465,0.2602 -0.640308,0.5536 -0.280135,0.2201 -0.460222,0.3869 -0.173417,0.1601 -0.273465,0.3068 -0.100048,0.1467 -0.140067,0.3068 -0.03335,0.1534 -0.03335,0.3669 l 0,0.4002 -1.760848,0 z m -0.220106,2.2811 q 0,-0.3135 0.08671,-0.527 0.09338,-0.2201 0.253455,-0.3535 0.160077,-0.1334 0.373513,-0.1934 0.220106,-0.06 0.466892,-0.06 0.233446,0 0.440212,0.06 0.213436,0.06 0.373513,0.1934 0.160077,0.1334 0.253455,0.3535 0.09338,0.2135 0.09338,0.527 0,0.3001 -0.09338,0.5135 -0.09338,0.2135 -0.253455,0.3535 -0.160077,0.1401 -0.373513,0.2001 -0.206766,0.067 -0.440212,0.067 -0.246786,0 -0.466892,-0.067 -0.213436,-0.06 -0.373513,-0.2001 -0.160077,-0.14 -0.253455,-0.3535 -0.08671,-0.2134 -0.08671,-0.5135 z"
            style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:'Droid Sans';-inkscape-font-specification:'Droid Sans Bold';fill:#286296;fill-opacity:1"
            id="path4161-9" />
diff --git a/ui/org.eclipse.pde.ui/icons/obj16/product_xml_obj.svg b/ui/org.eclipse.pde.ui/icons/obj16/product_xml_obj.svg
index 5a58433ace6..2693b583b35 100644
--- a/ui/org.eclipse.pde.ui/icons/obj16/product_xml_obj.svg
+++ b/ui/org.eclipse.pde.ui/icons/obj16/product_xml_obj.svg
@@ -2,24 +2,19 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="product_xml_obj.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4902-3"
        id="linearGradient4908-2"
        x1="10.544736"
@@ -29,7 +24,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(0.99084683,-1.0294106)" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4902-3">
       <stop
          style="stop-color:#b28a30;stop-opacity:1"
@@ -41,7 +35,6 @@
          id="stop4906-2" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4894-6"
        id="linearGradient4900-1"
        x1="7.9987183"
@@ -51,7 +44,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(4.1783469,-1.0606606)" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4894-6">
       <stop
          style="stop-color:#e0c88f;stop-opacity:1"
@@ -63,7 +55,6 @@
          id="stop4898-5" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4994-6">
       <stop
          style="stop-color:#f9fafc;stop-opacity:1;"
@@ -82,29 +73,8 @@
        gradientUnits="userSpaceOnUse"
        id="linearGradient4101"
        xlink:href="#linearGradient4994-6"
-       inkscape:collect="always"
        gradientTransform="translate(0.83459682,-1.0294106)" />
     <linearGradient
-       id="linearGradient5103-3">
-      <stop
-         style="stop-color:#fefdef;stop-opacity:1"
-         offset="0"
-         id="stop5105-5" />
-      <stop
-         id="stop7550-07"
-         offset="0.26694915"
-         style="stop-color:#fef5d4;stop-opacity:1" />
-      <stop
-         id="stop7548-6"
-         offset="0.51694918"
-         style="stop-color:#fbe08e;stop-opacity:1" />
-      <stop
-         style="stop-color:#fbdd83;stop-opacity:1"
-         offset="1"
-         id="stop5107-7" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        id="linearGradient8287-7-5-4">
       <stop
          style="stop-color:#6eb6e2;stop-opacity:1;"
@@ -116,22 +86,6 @@
          id="stop8291-0-7-3" />
     </linearGradient>
     <linearGradient
-       id="linearGradient4082-3-4-1-2">
-      <stop
-         style="stop-color:#4476aa;stop-opacity:1"
-         offset="0"
-         id="stop4084-8-8-5-1" />
-      <stop
-         id="stop4864-7-8-2-6"
-         offset="0.5"
-         style="stop-color:#5a9ccc;stop-opacity:1" />
-      <stop
-         style="stop-color:#4476aa;stop-opacity:1"
-         offset="1"
-         id="stop4086-2-2-7-8" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient8287-7-5-4"
        id="linearGradient8293"
        x1="-16.963362"
@@ -141,7 +95,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-1.4448902,16.475551)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4994-4-5"
        id="linearGradient8881"
        gradientUnits="userSpaceOnUse"
@@ -151,8 +104,7 @@
        x2="-11"
        y2="1044.3622" />
     <linearGradient
-       id="linearGradient4994-4-5"
-       inkscape:collect="always">
+       id="linearGradient4994-4-5">
       <stop
          id="stop4996-5-9"
          offset="0"
@@ -163,7 +115,6 @@
          style="stop-color:#ffffff;stop-opacity:0;" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4910-4-0"
        id="linearGradient8884"
        gradientUnits="userSpaceOnUse"
@@ -173,7 +124,6 @@
        x2="-15"
        y2="1047.3622" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4910-4-0">
       <stop
          style="stop-color:#ffffff;stop-opacity:0"
@@ -185,7 +135,6 @@
          id="stop4914-8-1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4810-5"
        id="linearGradient8887"
        gradientUnits="userSpaceOnUse"
@@ -195,8 +144,7 @@
        x2="8.0137892"
        y2="1050.0707" />
     <linearGradient
-       id="linearGradient4810-5"
-       inkscape:collect="always">
+       id="linearGradient4810-5">
       <stop
          id="stop4812-0"
          offset="0"
@@ -207,31 +155,6 @@
          style="stop-color:#615941;stop-opacity:1" />
     </linearGradient>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1"
-     inkscape:cx="-0.88341442"
-     inkscape:cy="-1.2856107"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="1194"
-     inkscape:window-height="870"
-     inkscape:window-x="891"
-     inkscape:window-y="471"
-     inkscape:window-maximized="0"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3999" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -245,28 +168,21 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
     <path
        style="display:inline;fill:url(#linearGradient4101);fill-opacity:1;stroke:none"
        d="m 6.3318793,1037.8727 7.0096697,0 2.374557,3.0066 0,9.9546 -9.3842267,0 z"
-       id="rect4001-3"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccc" />
+       id="rect4001-3" />
     <path
        style="display:inline;fill:url(#linearGradient4900-1);fill-opacity:1;stroke:none"
        d="m 12.154968,1037.3788 0,3.9112 3.977478,0 z"
-       id="path4884"
-       inkscape:connector-curvature="0" />
+       id="path4884" />
     <path
        style="display:inline;fill:none;stroke:url(#linearGradient4908-2);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1"
        d="m 6.4881293,1037.8727 6.0632867,0 3.062057,3.0066 0,9.9546 -9.1253437,0 z"
-       id="rect4001"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccc" />
+       id="rect4001" />
     <g
        id="g4291"
        transform="translate(0.48973663,-0.33746842)">
@@ -274,42 +190,30 @@
          id="g4305"
          transform="translate(20.999999,-11.874999)">
         <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
            id="rect3997-9"
            d="m -19.005997,1054.4036 9.9813967,0 0,8.7015 -9.9813967,0 z"
            style="display:inline;fill:#f4fcff;fill-opacity:1;stroke:url(#linearGradient8887);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1" />
         <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
            id="rect4853-82-7"
            d="m -17.499146,1057.5796 0,5.0164 -1,0 0,-6.0164 z"
            style="display:inline;fill:url(#linearGradient8884);fill-opacity:1;stroke:none" />
         <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
            id="rect4853-82-0"
            d="m -17.530396,1057.6734 7.986294,0 0,-1 -8.986294,0 z"
            style="display:inline;fill:url(#linearGradient8881);fill-opacity:1;stroke:none" />
         <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
            id="rect3997-9-9"
            d="m -18.979953,1054.1029 9.9889988,0 0,1.9946 -9.9889988,0 z"
            style="display:inline;fill:url(#linearGradient8293);fill-opacity:1;stroke:#315b91;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1" />
         <path
-           inkscape:connector-curvature="0"
            id="path4299"
            d="m -14.982613,1056.6621 0,5.9687"
-           style="fill:#a79d79;fill-opacity:1;fill-rule:evenodd;stroke:#a79d79;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-           sodipodi:nodetypes="cc" />
+           style="fill:#a79d79;fill-opacity:1;fill-rule:evenodd;stroke:#a79d79;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
         <path
-           inkscape:connector-curvature="0"
            id="path4301"
            d="m -14.982613,1059.1309 5.5312495,0"
            style="fill:#a79d79;fill-opacity:1;fill-rule:evenodd;stroke:#a79d79;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
         <path
-           inkscape:connector-curvature="0"
            id="path4303"
            d="m -14.982613,1060.1309 -3.53125,0"
            style="fill:#a79d79;fill-opacity:1;fill-rule:evenodd;stroke:#a79d79;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
diff --git a/ui/org.eclipse.pde.ui/icons/obj16/profile_exc.svg b/ui/org.eclipse.pde.ui/icons/obj16/profile_exc.svg
index 9b6bcd698d7..6087662940f 100644
--- a/ui/org.eclipse.pde.ui/icons/obj16/profile_exc.svg
+++ b/ui/org.eclipse.pde.ui/icons/obj16/profile_exc.svg
@@ -2,24 +2,19 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.48.0 r9654"
-   sodipodi:docname="profile_exc.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient13922">
       <stop
          style="stop-color:#91a5c7;stop-opacity:1;"
@@ -31,7 +26,6 @@
          id="stop13926" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient13831">
       <stop
          style="stop-color:#055797;stop-opacity:1;"
@@ -77,8 +71,7 @@
          id="stop10802-1-5-3-0-2-0-9-8-4-3-4-7" />
     </linearGradient>
     <linearGradient
-       id="linearGradient9276-9"
-       inkscape:collect="always">
+       id="linearGradient9276-9">
       <stop
          id="stop9278-0"
          offset="0"
@@ -89,7 +82,6 @@
          style="stop-color:#499851;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10798-1-9-3-7-1-15-1-7-6-1-28-0"
        id="linearGradient13741"
        gradientUnits="userSpaceOnUse"
@@ -98,7 +90,6 @@
        x2="388.63736"
        y2="457.95499" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient9276-9"
        id="linearGradient13743"
        gradientUnits="userSpaceOnUse"
@@ -107,7 +98,6 @@
        x2="15.633883"
        y2="1056.2894" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient13755"
        id="linearGradient13761"
        x1="28.004765"
@@ -116,7 +106,6 @@
        y2="1.6087028"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient13831"
        id="linearGradient13837"
        x1="30.033665"
@@ -144,7 +133,6 @@
          id="stop13759-65" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient13831-8">
       <stop
          style="stop-color:#055797;stop-opacity:1;"
@@ -156,7 +144,6 @@
          id="stop13835-7" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient13755-3"
        id="linearGradient13906"
        gradientUnits="userSpaceOnUse"
@@ -165,7 +152,6 @@
        x2="28.004765"
        y2="1.6087028" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient13831-8"
        id="linearGradient13908"
        gradientUnits="userSpaceOnUse"
@@ -174,7 +160,6 @@
        x2="30.033665"
        y2="1.9089624" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient13922"
        id="linearGradient13928"
        x1="11"
@@ -183,7 +168,6 @@
        y2="8.5"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient13922-6">
       <stop
          style="stop-color:#91a5c7;stop-opacity:1;"
@@ -202,10 +186,8 @@
        x1="11"
        gradientUnits="userSpaceOnUse"
        id="linearGradient13945"
-       xlink:href="#linearGradient13922-6"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient13922-6" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient13922-5">
       <stop
          style="stop-color:#91a5c7;stop-opacity:1;"
@@ -224,10 +206,8 @@
        x1="11"
        gradientUnits="userSpaceOnUse"
        id="linearGradient13945-8"
-       xlink:href="#linearGradient13922-5"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient13922-5" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient13922-7">
       <stop
          style="stop-color:#91a5c7;stop-opacity:1;"
@@ -246,8 +226,7 @@
        x1="11"
        gradientUnits="userSpaceOnUse"
        id="linearGradient13945-1"
-       xlink:href="#linearGradient13922-7"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient13922-7" />
     <mask
        maskUnits="userSpaceOnUse"
        id="mask14146">
@@ -258,69 +237,29 @@
         <path
            transform="matrix(1.247029,0,0,1.247029,-18.103841,1064.137)"
            d="m 30,-2 c 0,2.209139 -1.790861,4 -4,4 -2.209139,0 -4,-1.790861 -4,-4 0,-2.209139 1.790861,-4 4,-4 2.209139,0 4,1.790861 4,4 z"
-           sodipodi:ry="4"
-           sodipodi:rx="4"
-           sodipodi:cy="-2"
-           sodipodi:cx="26"
            id="path14150"
-           style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:0.80190599;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-           sodipodi:type="arc" />
+           style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:0.80190599;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
         <path
-           sodipodi:nodetypes="cc"
-           inkscape:connector-curvature="0"
            id="path14152"
            d="m 14.349242,1061.6734 0,-2.0313"
            style="fill:#ffffff;stroke:#ffffff;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;display:inline" />
         <path
-           sodipodi:nodetypes="cc"
-           inkscape:connector-curvature="0"
            id="path14154"
            d="m 14.349242,1061.6734 1.458408,2.3881"
            style="fill:#ffffff;stroke:#ffffff;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;display:inline" />
       </g>
     </mask>
     <filter
-       inkscape:collect="always"
        id="filter14156"
-       x="-0.18"
-       width="1.36"
-       y="-0.18"
-       height="1.36">
+       x="-0.27759833"
+       width="1.5551967"
+       y="-0.27759833"
+       height="1.5584055">
       <feGaussianBlur
-         inkscape:collect="always"
          stdDeviation="0.99291734"
          id="feGaussianBlur14158" />
     </filter>
   </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="10.07386"
-     inkscape:cy="8.8274714"
-     inkscape:document-units="px"
-     inkscape:current-layer="g8159"
-     showgrid="true"
-     inkscape:window-width="867"
-     inkscape:window-height="637"
-     inkscape:window-x="142"
-     inkscape:window-y="77"
-     inkscape:window-maximized="0"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid4092"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -334,8 +273,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
@@ -344,49 +281,31 @@
        id="g8159"
        transform="translate(-8.2201163,-12.904699)">
       <path
-         sodipodi:type="arc"
          style="fill:url(#linearGradient13761);fill-opacity:1;stroke:url(#linearGradient13837);stroke-width:0.80190598999999985;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
          id="path13745"
-         sodipodi:cx="26"
-         sodipodi:cy="-2"
-         sodipodi:rx="4"
-         sodipodi:ry="4"
          d="m 30,-2 c 0,2.209139 -1.790861,4 -4,4 -2.209139,0 -4,-1.790861 -4,-4 0,-2.209139 1.790861,-4 4,-4 2.209139,0 4,1.790861 4,4 z"
          transform="matrix(1.247029,0,0,1.247029,21.297363,1050.2608)" />
       <path
          style="fill:none;stroke:#1f4a83;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
          d="m 53.750446,1047.7972 0,-2.0313"
-         id="path13811"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
+         id="path13811" />
       <path
          style="fill:none;stroke:#1f4a83;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;display:inline"
          d="m 53.750446,1047.7972 1.458408,2.3881"
-         id="path13811-9"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
+         id="path13811-9" />
       <g
          id="g13901"
          transform="matrix(0.73426076,0,0,0.73426076,3.6725146,281.72245)">
         <path
            transform="matrix(1.247029,0,0,1.247029,-18.103841,1064.137)"
            d="m 30,-2 c 0,2.209139 -1.790861,4 -4,4 -2.209139,0 -4,-1.790861 -4,-4 0,-2.209139 1.790861,-4 4,-4 2.209139,0 4,1.790861 4,4 z"
-           sodipodi:ry="4"
-           sodipodi:rx="4"
-           sodipodi:cy="-2"
-           sodipodi:cx="26"
            id="path13745-2"
-           style="fill:url(#linearGradient13906);fill-opacity:1;stroke:url(#linearGradient13908);stroke-width:0.80190599;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-           sodipodi:type="arc" />
+           style="fill:url(#linearGradient13906);fill-opacity:1;stroke:url(#linearGradient13908);stroke-width:0.80190599;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
         <path
-           sodipodi:nodetypes="cc"
-           inkscape:connector-curvature="0"
            id="path13811-4"
            d="m 14.349242,1061.6734 0,-2.0313"
            style="fill:none;stroke:#1f4a83;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;display:inline" />
         <path
-           sodipodi:nodetypes="cc"
-           inkscape:connector-curvature="0"
            id="path13811-9-5"
            d="m 14.349242,1061.6734 1.458408,2.3881"
            style="fill:none;stroke:#1f4a83;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;display:inline" />
@@ -426,7 +345,6 @@
         <g
            style="display:inline;fill:#ffffff;stroke:#ffffff;filter:url(#filter14156);stroke-width:2.58418837;stroke-miterlimit:4;stroke-dasharray:none"
            id="layer1-0-8-9"
-           inkscape:label="Layer 1"
            transform="matrix(0.77393739,0,0,0.77393739,7.411332,246.44575)">
           <g
              transform="translate(-8.2201167,-12.904699)"
@@ -435,35 +353,22 @@
             <path
                transform="matrix(0.62300696,0,0,0.62300696,-225.45273,765.59692)"
                d="m 398.75,468.23718 c 0,5.86803 -4.75697,10.625 -10.625,10.625 -5.86803,0 -10.625,-4.75697 -10.625,-10.625 0,-5.86802 4.75697,-10.625 10.625,-10.625 5.86803,0 10.625,4.75698 10.625,10.625 z"
-               sodipodi:ry="10.625"
-               sodipodi:rx="10.625"
-               sodipodi:cy="468.23718"
-               sodipodi:cx="388.125"
                id="path10796-2-6-0-3-1-6"
-               style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;display:inline;stroke-width:4.14792857;stroke-miterlimit:4;stroke-dasharray:none"
-               sodipodi:type="arc" />
+               style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;display:inline;stroke-width:4.14792857;stroke-miterlimit:4;stroke-dasharray:none" />
             <path
                style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:2.58418837;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
                d="m 14.039346,1052.2494 6.0625,5.1875 -6,5.0625 z"
-               id="path8117-2-7-3"
-               inkscape:connector-curvature="0"
-               sodipodi:nodetypes="cccc" />
+               id="path8117-2-7-3" />
             <path
                transform="matrix(0.62300696,0,0,0.62300696,-225.45273,765.59692)"
                d="m 398.75,468.23718 c 0,5.86803 -4.75697,10.625 -10.625,10.625 -5.86803,0 -10.625,-4.75697 -10.625,-10.625 0,-5.86802 4.75697,-10.625 10.625,-10.625 5.86803,0 10.625,4.75698 10.625,10.625 z"
-               sodipodi:ry="10.625"
-               sodipodi:rx="10.625"
-               sodipodi:cy="468.23718"
-               sodipodi:cx="388.125"
                id="path10796-2-6-0-5-3-1"
-               style="fill:#ffffff;stroke:#ffffff;stroke-width:4.14792857;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline"
-               sodipodi:type="arc" />
+               style="fill:#ffffff;stroke:#ffffff;stroke-width:4.14792857;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline" />
           </g>
         </g>
       </g>
       <g
          transform="matrix(0.77393739,0,0,0.77393739,7.411332,246.44575)"
-         inkscape:label="Layer 1"
          id="layer1-0-8"
          style="display:inline">
         <g
@@ -471,29 +376,17 @@
            id="g8159-2-9"
            transform="translate(-8.2201167,-12.904699)">
           <path
-             sodipodi:type="arc"
              style="fill:url(#linearGradient13741);fill-opacity:1;stroke:none;display:inline"
              id="path10796-2-6-0-3-1"
-             sodipodi:cx="388.125"
-             sodipodi:cy="468.23718"
-             sodipodi:rx="10.625"
-             sodipodi:ry="10.625"
              d="m 398.75,468.23718 c 0,5.86803 -4.75697,10.625 -10.625,10.625 -5.86803,0 -10.625,-4.75697 -10.625,-10.625 0,-5.86802 4.75697,-10.625 10.625,-10.625 5.86803,0 10.625,4.75698 10.625,10.625 z"
              transform="matrix(0.62300696,0,0,0.62300696,-225.45273,765.59692)" />
           <path
-             sodipodi:nodetypes="cccc"
-             inkscape:connector-curvature="0"
              id="path8117-2-7"
              d="m 14.039346,1052.2494 6.0625,5.1875 -6,5.0625 z"
              style="fill:#ffffff;fill-opacity:1;stroke:url(#linearGradient13743);stroke-width:0.64604712;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
           <path
-             sodipodi:type="arc"
              style="fill:none;stroke:#14733c;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline"
              id="path10796-2-6-0-5-3"
-             sodipodi:cx="388.125"
-             sodipodi:cy="468.23718"
-             sodipodi:rx="10.625"
-             sodipodi:ry="10.625"
              d="m 398.75,468.23718 c 0,5.86803 -4.75697,10.625 -10.625,10.625 -5.86803,0 -10.625,-4.75697 -10.625,-10.625 0,-5.86802 4.75697,-10.625 10.625,-10.625 5.86803,0 10.625,4.75698 10.625,10.625 z"
              transform="matrix(0.62300696,0,0,0.62300696,-225.45273,765.59692)" />
         </g>
diff --git a/ui/org.eclipse.pde.ui/icons/obj16/psearch_obj.svg b/ui/org.eclipse.pde.ui/icons/obj16/psearch_obj.svg
index d3fb288a8d6..8f7119d9c26 100644
--- a/ui/org.eclipse.pde.ui/icons/obj16/psearch_obj.svg
+++ b/ui/org.eclipse.pde.ui/icons/obj16/psearch_obj.svg
@@ -2,24 +2,19 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="psearch_obj.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient5448">
       <stop
          style="stop-color:#ad8e5f;stop-opacity:1"
@@ -31,7 +26,6 @@
          id="stop5452" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient5440">
       <stop
          style="stop-color:#ad8e5f;stop-opacity:1"
@@ -81,7 +75,6 @@
          style="stop-color:#eeb960;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient5351">
       <stop
          style="stop-color:#e4a239;stop-opacity:1;"
@@ -131,7 +124,6 @@
          id="stop5210" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient5109">
       <stop
          style="stop-color:#906f4e;stop-opacity:1"
@@ -143,7 +135,6 @@
          id="stop5113" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient5109"
        id="linearGradient5368"
        gradientUnits="userSpaceOnUse"
@@ -153,7 +144,6 @@
        x2="29.714636"
        y2="1039.1387" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient5378"
        id="linearGradient5370"
        gradientUnits="userSpaceOnUse"
@@ -162,7 +152,6 @@
        x2="32.176903"
        y2="1046.1316" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient5331"
        id="linearGradient5372"
        gradientUnits="userSpaceOnUse"
@@ -171,7 +160,6 @@
        x2="32.471878"
        y2="1056.9694" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient5351"
        id="linearGradient5374"
        gradientUnits="userSpaceOnUse"
@@ -180,7 +168,6 @@
        x2="33.275511"
        y2="1056.9694" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient5206"
        id="linearGradient5376"
        gradientUnits="userSpaceOnUse"
@@ -190,7 +177,6 @@
        x2="32.842041"
        y2="1052.0043" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient5428"
        id="linearGradient5434"
        x1="26.107269"
@@ -199,7 +185,6 @@
        y2="1045.9496"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient5440"
        id="linearGradient5446"
        x1="25.367371"
@@ -208,7 +193,6 @@
        y2="1051.4068"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient5448"
        id="linearGradient5454"
        x1="25.367543"
@@ -217,128 +201,6 @@
        y2="1054.8198"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       id="linearGradient4284">
-      <stop
-         style="stop-color:#6588c1;stop-opacity:0"
-         offset="0"
-         id="stop4286" />
-      <stop
-         id="stop4288"
-         offset="0.49999967"
-         style="stop-color:#becce3;stop-opacity:1" />
-      <stop
-         style="stop-color:#809dcb;stop-opacity:0"
-         offset="1"
-         id="stop4290" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10157-6">
-      <stop
-         id="stop10159-5"
-         offset="0"
-         style="stop-color:#6588c1;stop-opacity:1" />
-      <stop
-         style="stop-color:#becce3;stop-opacity:1"
-         offset="0.5"
-         id="stop10165-9" />
-      <stop
-         id="stop10161-55"
-         offset="1"
-         style="stop-color:#809dcb;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10414-9">
-      <stop
-         id="stop10416-3"
-         offset="0"
-         style="stop-color:#5078b9;stop-opacity:1;" />
-      <stop
-         style="stop-color:#6d8cbd;stop-opacity:1"
-         offset="0.5"
-         id="stop10422-8" />
-      <stop
-         id="stop10418-4"
-         offset="1"
-         style="stop-color:#5f88c9;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10432-3">
-      <stop
-         style="stop-color:#1f4d9a;stop-opacity:1"
-         offset="0"
-         id="stop10434-4" />
-      <stop
-         id="stop10436-2"
-         offset="0.5"
-         style="stop-color:#4e6da1;stop-opacity:1" />
-      <stop
-         style="stop-color:#567ebc;stop-opacity:1"
-         offset="1"
-         id="stop10438-9" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10448-90">
-      <stop
-         id="stop10450-0"
-         offset="0"
-         style="stop-color:#ecac18;stop-opacity:1" />
-      <stop
-         style="stop-color:#ffe38d;stop-opacity:1"
-         offset="0.25"
-         id="stop10458-2" />
-      <stop
-         style="stop-color:#fdf5d2;stop-opacity:1"
-         offset="0.5"
-         id="stop10456-96" />
-      <stop
-         id="stop10460-3"
-         offset="0.75"
-         style="stop-color:#ffeba7;stop-opacity:1" />
-      <stop
-         id="stop10452-1"
-         offset="1"
-         style="stop-color:#e5b630;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10748-8">
-      <stop
-         style="stop-color:#ecac18;stop-opacity:1"
-         offset="0"
-         id="stop10750-5" />
-      <stop
-         id="stop10752-8"
-         offset="0.25"
-         style="stop-color:#f1ce66;stop-opacity:1" />
-      <stop
-         id="stop10754-8"
-         offset="0.5"
-         style="stop-color:#f6e5a6;stop-opacity:1" />
-      <stop
-         style="stop-color:#f1cf6c;stop-opacity:1"
-         offset="0.75"
-         id="stop10756-4" />
-      <stop
-         style="stop-color:#e5b630;stop-opacity:1"
-         offset="1"
-         id="stop10758-7" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10448-9-7-0-5">
-      <stop
-         id="stop10450-3-5-6-7"
-         offset="0"
-         style="stop-color:#cf9307;stop-opacity:1" />
-      <stop
-         style="stop-color:#f7d87b;stop-opacity:1"
-         offset="0.5"
-         id="stop10456-4-1-5-3" />
-      <stop
-         id="stop10452-22-7-8-4"
-         offset="1"
-         style="stop-color:#ebb313;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4368"
        id="linearGradient4374"
        x1="494.33554"
@@ -347,7 +209,6 @@
        y2="358.83438"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4368">
       <stop
          style="stop-color:#fbdf89;stop-opacity:1"
@@ -367,7 +228,6 @@
          id="stop4372" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4344"
        id="linearGradient4350"
        x1="505.37363"
@@ -377,7 +237,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1.0106162,0,0,0.96711322,-26.641878,12.017452)" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4344">
       <stop
          style="stop-color:#7e9cca;stop-opacity:1"
@@ -401,7 +260,6 @@
          id="stop4348" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4336"
        id="linearGradient4342"
        x1="509.96674"
@@ -411,7 +269,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1.0106162,0,0,0.96711322,-26.641878,12.017452)" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4336">
       <stop
          style="stop-color:#3461ab;stop-opacity:1"
@@ -423,31 +280,6 @@
          id="stop4340" />
     </linearGradient>
   </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="7.1777006"
-     inkscape:cy="14.607992"
-     inkscape:document-units="px"
-     inkscape:current-layer="g4246"
-     showgrid="true"
-     inkscape:window-width="1144"
-     inkscape:window-height="953"
-     inkscape:window-x="898"
-     inkscape:window-y="378"
-     inkscape:window-maximized="0"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid4161" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -461,8 +293,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
@@ -477,35 +307,25 @@
            id="g5359"
            transform="matrix(0.70710678,0.70710678,-0.70710678,0.70710678,730.34515,280.80707)">
           <path
-             sodipodi:nodetypes="ccccc"
-             inkscape:connector-curvature="0"
              id="rect4221-4"
              d="m 28.565245,1040.0695 -1.069887,2.1398 4.279549,0 -1.069887,-2.1398 c -0.472828,-0.9477 -1.844257,-0.7625 -2.139775,0 z"
              style="fill:none;stroke:url(#linearGradient5368);stroke-width:1.06988704;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
           <path
-             sodipodi:nodetypes="ccccc"
-             inkscape:connector-curvature="0"
              id="rect4221"
              d="m 26.607269,1042.2428 c 1.259438,-1.6377 4.858466,-1.5046 6.055728,0 l 0,8.5925 -6.055728,0 z"
              style="fill:url(#linearGradient5370);fill-opacity:1;stroke:url(#linearGradient5434);stroke-opacity:1" />
           <path
-             sodipodi:nodetypes="sccccs"
-             inkscape:connector-curvature="0"
              id="rect4221-7-1"
              d="m 29.645582,1053.51 c -1.546954,0 -3.096933,0.3554 -3.778039,1.0365 l 0,0.5683 c 1.362214,1.3622 6.178977,1.3438 7.522644,0 l 0,-0.5683 c -0.671834,-0.6719 -2.197651,-1.0342 -3.744605,-1.0365 z"
              style="fill:#ffffc9;fill-opacity:1;stroke:url(#linearGradient5454);stroke-width:1;stroke-opacity:1;display:inline" />
           <path
-             sodipodi:nodetypes="ccccc"
-             inkscape:connector-curvature="0"
              id="rect4221-7-1-2"
              d="m 26.422196,1052.4196 0,12.1257 6.413338,0 0,-12.1257 z"
              style="fill:url(#linearGradient5372);fill-opacity:1;stroke:url(#linearGradient5374);stroke-width:0.87995493;stroke-opacity:1;display:inline" />
           <path
-             inkscape:connector-curvature="0"
              id="rect4221-7"
              d="m 25.867543,1050.1666 0,4.3799 c 1.778049,-1.9187 5.89609,-1.8666 7.522644,0 l 0,-4.3799 c -1.258456,-2.537 -6.051006,-2.5281 -7.522644,0 z"
-             style="fill:url(#linearGradient5376);fill-opacity:1;stroke:url(#linearGradient5446);stroke-width:1.0003444;stroke-linejoin:round;stroke-miterlimit:3;stroke-opacity:1;stroke-dasharray:none;display:inline"
-             sodipodi:nodetypes="ccccc" />
+             style="fill:url(#linearGradient5376);fill-opacity:1;stroke:url(#linearGradient5446);stroke-width:1.0003444;stroke-linejoin:round;stroke-miterlimit:3;stroke-opacity:1;stroke-dasharray:none;display:inline" />
         </g>
       </g>
       <g
@@ -522,14 +342,10 @@
             <path
                style="fill:url(#linearGradient4374);fill-opacity:1;fill-rule:evenodd;stroke:#b08b21;stroke-width:3.58380508px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
                d="m 494.79147,354.64863 3.60322,3.54745 3.60322,0 3.42504,2.58486 0,5.48733 -3.85069,2.64751 -3.69232,0 -3.34089,3.53613 -3.46959,0 -0.002,-17.81968 z"
-               id="path4366"
-               inkscape:connector-curvature="0"
-               sodipodi:nodetypes="ccccccccccc" />
+               id="path4366" />
             <g
                id="g4360">
               <path
-                 sodipodi:nodetypes="ssssccs"
-                 inkscape:connector-curvature="0"
                  id="path4326"
                  d="m 487.40807,351.09688 c 1.22716,-1.17433 3.68149,1.86226 3.68149,3.52302 0,5.94129 0,12.02914 0,17.4619 0,2.60379 -2.50768,4.79948 -3.76152,3.5996 -4.2413,-4.05871 -10.72434,-10.26269 -10.72434,-10.26269 l 0,-3.5996 c 0,0 6.01931,-6.14314 10.80437,-10.72223 z"
                  style="fill:url(#linearGradient4350);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4342);stroke-width:3.54304099px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
diff --git a/ui/org.eclipse.pde.ui/icons/obj16/req_plugin_obj.svg b/ui/org.eclipse.pde.ui/icons/obj16/req_plugin_obj.svg
index ca091f7b04c..57d6c83d18e 100644
--- a/ui/org.eclipse.pde.ui/icons/obj16/req_plugin_obj.svg
+++ b/ui/org.eclipse.pde.ui/icons/obj16/req_plugin_obj.svg
@@ -2,20 +2,16 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="req_plugin_obj.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
@@ -34,7 +30,6 @@
          style="stop-color:#809dcb;stop-opacity:0" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10448-9-7-0-5"
        id="linearGradient10770-6"
        gradientUnits="userSpaceOnUse"
@@ -59,22 +54,6 @@
          id="stop10452-22-7-8-4" />
     </linearGradient>
     <linearGradient
-       id="linearGradient10440-1-0-0-3">
-      <stop
-         style="stop-color:#ae7603;stop-opacity:1;"
-         offset="0"
-         id="stop10442-43-2-0-9" />
-      <stop
-         id="stop10521-1-2-5-3"
-         offset="0.5"
-         style="stop-color:#e8d8a3;stop-opacity:1" />
-      <stop
-         style="stop-color:#bb9221;stop-opacity:1"
-         offset="1"
-         id="stop10444-3-4-0-4" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10748-8"
        id="linearGradient10774-5"
        gradientUnits="userSpaceOnUse"
@@ -107,22 +86,6 @@
          style="stop-color:#e5b630;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       id="linearGradient10440-1-3-4">
-      <stop
-         style="stop-color:#ae7603;stop-opacity:1;"
-         offset="0"
-         id="stop10442-43-0-5" />
-      <stop
-         id="stop10521-1-4-7"
-         offset="0.5"
-         style="stop-color:#e8d8a3;stop-opacity:1" />
-      <stop
-         style="stop-color:#bb9221;stop-opacity:1"
-         offset="1"
-         id="stop10444-3-2-0" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10448-90"
        id="linearGradient10778-6"
        gradientUnits="userSpaceOnUse"
@@ -155,22 +118,6 @@
          id="stop10452-1" />
     </linearGradient>
     <linearGradient
-       id="linearGradient10440-18">
-      <stop
-         style="stop-color:#ae7603;stop-opacity:1;"
-         offset="0"
-         id="stop10442-8" />
-      <stop
-         id="stop10521-7"
-         offset="0.5"
-         style="stop-color:#e8d8a3;stop-opacity:1" />
-      <stop
-         style="stop-color:#bb9221;stop-opacity:1"
-         offset="1"
-         id="stop10444-0" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10414-9"
        id="linearGradient10782-3"
        gradientUnits="userSpaceOnUse"
@@ -195,7 +142,6 @@
          id="stop10418-4" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10432-3"
        id="linearGradient10784-2"
        gradientUnits="userSpaceOnUse"
@@ -220,7 +166,6 @@
          style="stop-color:#567ebc;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10157-6"
        id="linearGradient10786-1"
        gradientUnits="userSpaceOnUse"
@@ -245,22 +190,6 @@
          id="stop10161-55" />
     </linearGradient>
     <linearGradient
-       id="linearGradient10396-5">
-      <stop
-         style="stop-color:#1b3e79;stop-opacity:1;"
-         offset="0"
-         id="stop10398-7" />
-      <stop
-         id="stop10404-9"
-         offset="0.5"
-         style="stop-color:#728fbf;stop-opacity:1" />
-      <stop
-         style="stop-color:#1f4d9a;stop-opacity:1"
-         offset="1"
-         id="stop10400-9" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10157-2-5"
        id="linearGradient10790-8"
        gradientUnits="userSpaceOnUse"
@@ -285,7 +214,6 @@
          id="stop10161-5-0" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10149-39-0"
        id="linearGradient10792-6"
        gradientUnits="userSpaceOnUse"
@@ -295,7 +223,6 @@
        x2="322.875"
        y2="504.44818" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient10149-39-0">
       <stop
          style="stop-color:#1d4d9d;stop-opacity:1"
@@ -307,22 +234,6 @@
          id="stop10153-72-3" />
     </linearGradient>
     <linearGradient
-       id="linearGradient10149-6-5-4">
-      <stop
-         style="stop-color:#1f4d9a;stop-opacity:1"
-         offset="0"
-         id="stop10151-5-7-2" />
-      <stop
-         id="stop10394-3"
-         offset="0.5"
-         style="stop-color:#b9c7df;stop-opacity:1" />
-      <stop
-         style="stop-color:#567ebc;stop-opacity:1"
-         offset="1"
-         id="stop10153-8-1-2" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4284"
        id="linearGradient10790-8-2"
        gradientUnits="userSpaceOnUse"
@@ -352,29 +263,6 @@
          style="stop-color:#fef0db;stop-opacity:1" />
     </linearGradient>
   </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="7.9335324"
-     inkscape:cy="11.29823"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="828"
-     inkscape:window-height="900"
-     inkscape:window-x="1633"
-     inkscape:window-y="607"
-     inkscape:window-maximized="0"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid4210" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -388,8 +276,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
@@ -406,18 +292,14 @@
          id="rect10007-0-74-2-7-6"
          style="fill:url(#linearGradient10770-6);fill-opacity:1;stroke:none;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
       <path
-         inkscape:connector-curvature="0"
          id="path4313-8-8"
          d="m 12.648438,1045.3027 0,1 3.351562,0 0,-1 -3.351562,0 z"
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
       <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
          id="path4313-8-8-7"
          d="m 12.981809,1045.2969 0,3.0195 1.01551,0 0,-3.0195 z"
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.94926554px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
       <path
-         inkscape:connector-curvature="0"
          id="path4313-5-1-8"
          d="m 15.992188,1047.2988 -3.359376,0.031 0.0098,1 3.359375,-0.031 -0.0098,-1 z"
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#9e7400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
@@ -431,12 +313,10 @@
          id="rect10007-0-74-2-7"
          style="fill:url(#linearGradient10774-5);fill-opacity:1;stroke:none;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
       <path
-         inkscape:connector-curvature="0"
          id="path4313-5-1"
          d="m 13.005859,1048.3086 -3.3593746,0.031 0.00977,1 3.3593746,-0.031 -0.0098,-1 z"
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#9e7400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
       <path
-         inkscape:connector-curvature="0"
          id="path4313-8"
          d="m 12.996094,1044.3008 -3.3593752,0.031 0.00977,1 3.3593742,-0.031 -0.0098,-1 z"
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
@@ -477,12 +357,10 @@
          id="rect10007-0-74"
          style="fill:url(#linearGradient10786-1);fill-opacity:1;stroke:none;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
       <path
-         inkscape:connector-curvature="0"
          id="path4313"
          d="m 10.996094,1043.2988 -3.3593752,0.031 0.00977,1 3.3593742,-0.031 -0.0098,-1 z"
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
       <path
-         inkscape:connector-curvature="0"
          id="path4313-5"
          d="m 11.001953,1049.2988 -3.3593749,0.031 0.00977,1 3.3593749,-0.031 -0.0098,-1 z"
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#9e7400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
@@ -502,8 +380,6 @@
          id="rect10007-6-6"
          style="display:inline;fill:url(#linearGradient10790-8-2);fill-opacity:1;stroke:none;stroke-width:3.58380508;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
       <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
          id="path4313-8-8-7-8"
          d="m 11.003629,1045.3022 0,3.01 1.000277,0 0,-3.01 z"
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:0.64640886;fill-rule:evenodd;stroke:none;stroke-width:0.97351193px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
diff --git a/ui/org.eclipse.pde.ui/icons/obj16/req_plugins_obj.svg b/ui/org.eclipse.pde.ui/icons/obj16/req_plugins_obj.svg
index 1c5f3682de6..e7884bc193e 100644
--- a/ui/org.eclipse.pde.ui/icons/obj16/req_plugins_obj.svg
+++ b/ui/org.eclipse.pde.ui/icons/obj16/req_plugins_obj.svg
@@ -2,176 +2,18 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="req_plugins_obj.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
-    <linearGradient
-       id="linearGradient3955">
-      <stop
-         id="stop3957"
-         offset="0"
-         style="stop-color:#c38536;stop-opacity:1" />
-      <stop
-         style="stop-color:#f2dc91;stop-opacity:1"
-         offset="0.15381166"
-         id="stop3959" />
-      <stop
-         style="stop-color:#fbdc8b;stop-opacity:1"
-         offset="0.5"
-         id="stop3961" />
-      <stop
-         id="stop3963"
-         offset="0.75"
-         style="stop-color:#e6bd7a;stop-opacity:1" />
-      <stop
-         id="stop3965"
-         offset="1"
-         style="stop-color:#ba772f;stop-opacity:1" />
-    </linearGradient>
-    <mask
-       maskUnits="userSpaceOnUse"
-       id="mask4917">
-      <path
-         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;display:inline"
-         d="m 462.77563,373.22885 29.11636,0 c 1.45425,0 2.625,1.17075 2.625,2.625 l 0,18.76896 c 0,1.45425 -1.17412,2.52598 -2.625,2.625 l -29.11636,1.98708 c -1.45088,0.099 -2.625,-1.17075 -2.625,-2.625 l 0,-20.75604 c 0,-1.45425 1.17075,-2.625 2.625,-2.625 z"
-         id="path4919"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="sssssssss" />
-    </mask>
-    <linearGradient
-       id="linearGradient4284">
-      <stop
-         id="stop4286"
-         offset="0"
-         style="stop-color:#6588c1;stop-opacity:0" />
-      <stop
-         style="stop-color:#becce3;stop-opacity:1"
-         offset="0.49999967"
-         id="stop4288" />
-      <stop
-         id="stop4290"
-         offset="1"
-         style="stop-color:#809dcb;stop-opacity:0" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10157-2-5">
-      <stop
-         style="stop-color:#6588c1;stop-opacity:1"
-         offset="0"
-         id="stop10159-8-3" />
-      <stop
-         id="stop10165-3-9"
-         offset="0.5"
-         style="stop-color:#becce3;stop-opacity:1" />
-      <stop
-         style="stop-color:#809dcb;stop-opacity:1"
-         offset="1"
-         id="stop10161-5-0" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10414-9">
-      <stop
-         style="stop-color:#5078b9;stop-opacity:1;"
-         offset="0"
-         id="stop10416-3" />
-      <stop
-         id="stop10422-8"
-         offset="0.5"
-         style="stop-color:#6d8cbd;stop-opacity:1" />
-      <stop
-         style="stop-color:#5f88c9;stop-opacity:1"
-         offset="1"
-         id="stop10418-4" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10432-3">
-      <stop
-         id="stop10434-4"
-         offset="0"
-         style="stop-color:#1f4d9a;stop-opacity:1" />
-      <stop
-         style="stop-color:#4e6da1;stop-opacity:1"
-         offset="0.5"
-         id="stop10436-2" />
-      <stop
-         id="stop10438-9"
-         offset="1"
-         style="stop-color:#567ebc;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10448-90">
-      <stop
-         style="stop-color:#ecac18;stop-opacity:1"
-         offset="0"
-         id="stop10450-0" />
-      <stop
-         id="stop10458-2"
-         offset="0.25"
-         style="stop-color:#ffe38d;stop-opacity:1" />
-      <stop
-         id="stop10456-96"
-         offset="0.5"
-         style="stop-color:#fdf5d2;stop-opacity:1" />
-      <stop
-         style="stop-color:#ffeba7;stop-opacity:1"
-         offset="0.75"
-         id="stop10460-3" />
-      <stop
-         style="stop-color:#e5b630;stop-opacity:1"
-         offset="1"
-         id="stop10452-1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10748-8">
-      <stop
-         id="stop10750-5"
-         offset="0"
-         style="stop-color:#ecac18;stop-opacity:1" />
-      <stop
-         style="stop-color:#f1ce66;stop-opacity:1"
-         offset="0.25"
-         id="stop10752-8" />
-      <stop
-         style="stop-color:#f6e5a6;stop-opacity:1"
-         offset="0.5"
-         id="stop10754-8" />
-      <stop
-         id="stop10756-4"
-         offset="0.75"
-         style="stop-color:#f1cf6c;stop-opacity:1" />
-      <stop
-         id="stop10758-7"
-         offset="1"
-         style="stop-color:#e5b630;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10448-9-7-0-5">
-      <stop
-         style="stop-color:#cf9307;stop-opacity:1"
-         offset="0"
-         id="stop10450-3-5-6-7" />
-      <stop
-         id="stop10456-4-1-5-3"
-         offset="0.5"
-         style="stop-color:#f7d87b;stop-opacity:1" />
-      <stop
-         style="stop-color:#ebb313;stop-opacity:1"
-         offset="1"
-         id="stop10452-22-7-8-4" />
-    </linearGradient>
     <linearGradient
        gradientTransform="matrix(3.5838051,0,0,3.5838051,446.6247,-3372.1684)"
        gradientUnits="userSpaceOnUse"
@@ -193,52 +35,6 @@
          style="stop-color:#fef0db;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       id="linearGradient10440-1-0-0-3">
-      <stop
-         id="stop10442-43-2-0-9"
-         offset="0"
-         style="stop-color:#ae7603;stop-opacity:1;" />
-      <stop
-         style="stop-color:#e8d8a3;stop-opacity:1"
-         offset="0.5"
-         id="stop10521-1-2-5-3" />
-      <stop
-         id="stop10444-3-4-0-4"
-         offset="1"
-         style="stop-color:#bb9221;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10396-5">
-      <stop
-         id="stop10398-7"
-         offset="0"
-         style="stop-color:#1b3e79;stop-opacity:1;" />
-      <stop
-         style="stop-color:#728fbf;stop-opacity:1"
-         offset="0.5"
-         id="stop10404-9" />
-      <stop
-         id="stop10400-9"
-         offset="1"
-         style="stop-color:#1f4d9a;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10149-6-5-4">
-      <stop
-         id="stop10151-5-7-2"
-         offset="0"
-         style="stop-color:#1f4d9a;stop-opacity:1" />
-      <stop
-         style="stop-color:#b9c7df;stop-opacity:1"
-         offset="0.5"
-         id="stop10394-3" />
-      <stop
-         id="stop10153-8-1-2"
-         offset="1"
-         style="stop-color:#567ebc;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4368"
        id="linearGradient4453"
        gradientUnits="userSpaceOnUse"
@@ -247,7 +43,6 @@
        x2="494.33554"
        y2="358.83438" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4368">
       <stop
          style="stop-color:#fbdf89;stop-opacity:1"
@@ -267,7 +62,6 @@
          id="stop4372" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4344"
        id="linearGradient4455"
        gradientUnits="userSpaceOnUse"
@@ -277,7 +71,6 @@
        x2="505.37363"
        y2="349.91144" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4344">
       <stop
          style="stop-color:#7e9cca;stop-opacity:1"
@@ -301,7 +94,6 @@
          id="stop4348" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4336"
        id="linearGradient4457"
        gradientUnits="userSpaceOnUse"
@@ -311,7 +103,6 @@
        x2="509.96674"
        y2="350.06982" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4336">
       <stop
          style="stop-color:#3461ab;stop-opacity:1"
@@ -323,7 +114,6 @@
          id="stop4340" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4368"
        id="linearGradient4432"
        gradientUnits="userSpaceOnUse"
@@ -332,7 +122,6 @@
        x2="494.33554"
        y2="358.83438" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4344"
        id="linearGradient4434"
        gradientUnits="userSpaceOnUse"
@@ -342,7 +131,6 @@
        x2="505.37363"
        y2="349.91144" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4336"
        id="linearGradient4436"
        gradientUnits="userSpaceOnUse"
@@ -352,29 +140,6 @@
        x2="509.96674"
        y2="350.06982" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1"
-     inkscape:cx="26.736968"
-     inkscape:cy="15.54714"
-     inkscape:document-units="px"
-     inkscape:current-layer="g4262-8"
-     showgrid="false"
-     inkscape:window-width="1324"
-     inkscape:window-height="686"
-     inkscape:window-x="1214"
-     inkscape:window-y="797"
-     inkscape:window-maximized="0"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3947" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -388,8 +153,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
@@ -406,8 +169,6 @@
            style="display:inline"
            id="g4382">
           <path
-             sodipodi:nodetypes="ccccccccccc"
-             inkscape:connector-curvature="0"
              id="path4366"
              d="m 494.79147,354.64863 3.60322,3.60323 3.60322,0 3.42504,2.52908 0,5.48733 -3.85069,2.84274 -3.69232,0 -3.34089,3.3409 -3.46959,0 -0.002,-17.81968 z"
              style="fill:url(#linearGradient4432);fill-opacity:1;fill-rule:evenodd;stroke:#b08b21;stroke-width:3.58380508px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
@@ -416,9 +177,7 @@
             <path
                style="fill:url(#linearGradient4434);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4436);stroke-width:3.58380508;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
                d="m 487.40807,351.09688 c 1.22716,-1.17433 3.68149,1.86226 3.68149,3.52302 0,5.94129 0,12.02914 0,17.4619 0,2.60379 -2.50768,4.79948 -3.76152,3.5996 -4.2413,-4.05871 -10.72434,-10.26269 -10.72434,-10.26269 l 0,-3.5996 c 0,0 6.01931,-6.14314 10.80437,-10.72223 z"
-               id="path4326"
-               inkscape:connector-curvature="0"
-               sodipodi:nodetypes="ssssccs" />
+               id="path4326" />
             <rect
                style="opacity:1;fill:#547fc4;fill-opacity:1;stroke:none;stroke-width:1.79190254;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
                id="rect4358"
@@ -440,8 +199,6 @@
            id="g4382-6"
            transform="matrix(0.37338337,0,0,0.34563721,-176.18063,920.38629)">
           <path
-             sodipodi:nodetypes="ccccccccccc"
-             inkscape:connector-curvature="0"
              id="path4366-6"
              d="m 494.79147,354.64863 3.60322,3.60323 3.60322,0 3.42504,2.52908 0,5.48733 -3.85069,2.84274 -3.69232,0 -3.34089,3.3409 -3.46959,0 -0.002,-17.81968 z"
              style="fill:url(#linearGradient4453);fill-opacity:1;fill-rule:evenodd;stroke:#b08b21;stroke-width:3.58380508px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
@@ -450,9 +207,7 @@
             <path
                style="fill:url(#linearGradient4455);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4457);stroke-width:3.58380508;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
                d="m 487.40807,351.09688 c 1.22716,-1.17433 3.68149,1.86226 3.68149,3.52302 0,5.94129 0,12.02914 0,17.4619 0,2.60379 -2.50768,4.79948 -3.76152,3.5996 -4.2413,-4.05871 -10.72434,-10.26269 -10.72434,-10.26269 l 0,-3.5996 c 0,0 6.01931,-6.14314 10.80437,-10.72223 z"
-               id="path4326-2"
-               inkscape:connector-curvature="0"
-               sodipodi:nodetypes="ssssccs" />
+               id="path4326-2" />
             <rect
                style="opacity:1;fill:#547fc4;fill-opacity:1;stroke:none;stroke-width:1.79190254;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
                id="rect4358-7"
diff --git a/ui/org.eclipse.pde.ui/icons/obj16/run_exc.svg b/ui/org.eclipse.pde.ui/icons/obj16/run_exc.svg
index a37efceb78a..c1e06821f3c 100644
--- a/ui/org.eclipse.pde.ui/icons/obj16/run_exc.svg
+++ b/ui/org.eclipse.pde.ui/icons/obj16/run_exc.svg
@@ -6,10 +6,6 @@
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="1.3.2 (091e20e, 2023-11-25, custom)"
-   sodipodi:docname="start.svg"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:svg="http://www.w3.org/2000/svg"
@@ -19,7 +15,6 @@
   <defs
      id="defs4">
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10798-1-9-3-7-1-15-1-7-6-1"
        id="linearGradient8163-2"
        gradientUnits="userSpaceOnUse"
@@ -44,40 +39,6 @@
          id="stop10802-1-5-3-0-2-0-9-8-4-3" />
     </linearGradient>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="90.509664"
-     inkscape:cx="8.4134662"
-     inkscape:cy="1.3092525"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="1920"
-     inkscape:window-height="991"
-     inkscape:window-x="-9"
-     inkscape:window-y="-9"
-     inkscape:window-maximized="1"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:showpageshadow="2"
-     inkscape:pagecheckerboard="0"
-     inkscape:deskcolor="#d1d1d1">
-    <sodipodi:guide
-       position="0.98332041,11.735262"
-       orientation="1,0"
-       id="guide1"
-       inkscape:locked="false" />
-    <sodipodi:guide
-       position="7.0600196,15.01668"
-       orientation="0,-1"
-       id="guide2"
-       inkscape:locked="false" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -91,8 +52,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
@@ -107,8 +66,6 @@
          cy="1057.767"
          r="7.0294762" />
       <path
-         sodipodi:nodetypes="cccc"
-         inkscape:connector-curvature="0"
          id="path8117"
          d="m 14.220116,1052.2669 6,5.567 -5.938144,5.433 z"
          style="display:inline;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.03057" />
diff --git a/ui/org.eclipse.pde.ui/icons/obj16/runtime_obj.svg b/ui/org.eclipse.pde.ui/icons/obj16/runtime_obj.svg
index 91a22b257f3..6deae24c097 100644
--- a/ui/org.eclipse.pde.ui/icons/obj16/runtime_obj.svg
+++ b/ui/org.eclipse.pde.ui/icons/obj16/runtime_obj.svg
@@ -2,25 +2,20 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="runtime_obj.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient3973"
-       inkscape:collect="always">
+       id="linearGradient3973">
       <stop
          id="stop3975"
          offset="0"
@@ -31,8 +26,7 @@
          style="stop-color:#f8f0c8;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       id="linearGradient3967"
-       inkscape:collect="always">
+       id="linearGradient3967">
       <stop
          id="stop3969"
          offset="0"
@@ -66,7 +60,6 @@
          style="stop-color:#ba772f;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3949">
       <stop
          style="stop-color:#9e6627;stop-opacity:1"
@@ -78,7 +71,6 @@
          id="stop3953" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient3967"
        id="linearGradient3939"
        gradientUnits="userSpaceOnUse"
@@ -88,7 +80,6 @@
        x2="531.09253"
        y2="371.17883" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient3955"
        id="linearGradient3945"
        gradientUnits="userSpaceOnUse"
@@ -97,18 +88,7 @@
        x2="543.91406"
        y2="373.2294"
        gradientTransform="translate(-60.558598,0.88353259)" />
-    <mask
-       maskUnits="userSpaceOnUse"
-       id="mask4917">
-      <path
-         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;display:inline"
-         d="m 462.77563,373.22885 29.11636,0 c 1.45425,0 2.625,1.17075 2.625,2.625 l 0,18.76896 c 0,1.45425 -1.17412,2.52598 -2.625,2.625 l -29.11636,1.98708 c -1.45088,0.099 -2.625,-1.17075 -2.625,-2.625 l 0,-20.75604 c 0,-1.45425 1.17075,-2.625 2.625,-2.625 z"
-         id="path4919"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="sssssssss" />
-    </mask>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient3973"
        id="linearGradient4933"
        gradientUnits="userSpaceOnUse"
@@ -118,7 +98,6 @@
        x2="538.00562"
        y2="374.21222" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient3949"
        id="linearGradient4935"
        gradientUnits="userSpaceOnUse"
@@ -128,128 +107,6 @@
        x2="548.45923"
        y2="373.77069" />
     <linearGradient
-       id="linearGradient4284">
-      <stop
-         id="stop4286"
-         offset="0"
-         style="stop-color:#6588c1;stop-opacity:0" />
-      <stop
-         style="stop-color:#becce3;stop-opacity:1"
-         offset="0.49999967"
-         id="stop4288" />
-      <stop
-         id="stop4290"
-         offset="1"
-         style="stop-color:#809dcb;stop-opacity:0" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10157-2-5">
-      <stop
-         style="stop-color:#6588c1;stop-opacity:1"
-         offset="0"
-         id="stop10159-8-3" />
-      <stop
-         id="stop10165-3-9"
-         offset="0.5"
-         style="stop-color:#becce3;stop-opacity:1" />
-      <stop
-         style="stop-color:#809dcb;stop-opacity:1"
-         offset="1"
-         id="stop10161-5-0" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10414-9">
-      <stop
-         style="stop-color:#5078b9;stop-opacity:1;"
-         offset="0"
-         id="stop10416-3" />
-      <stop
-         id="stop10422-8"
-         offset="0.5"
-         style="stop-color:#6d8cbd;stop-opacity:1" />
-      <stop
-         style="stop-color:#5f88c9;stop-opacity:1"
-         offset="1"
-         id="stop10418-4" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10432-3">
-      <stop
-         id="stop10434-4"
-         offset="0"
-         style="stop-color:#1f4d9a;stop-opacity:1" />
-      <stop
-         style="stop-color:#4e6da1;stop-opacity:1"
-         offset="0.5"
-         id="stop10436-2" />
-      <stop
-         id="stop10438-9"
-         offset="1"
-         style="stop-color:#567ebc;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10448-90">
-      <stop
-         style="stop-color:#ecac18;stop-opacity:1"
-         offset="0"
-         id="stop10450-0" />
-      <stop
-         id="stop10458-2"
-         offset="0.25"
-         style="stop-color:#ffe38d;stop-opacity:1" />
-      <stop
-         id="stop10456-96"
-         offset="0.5"
-         style="stop-color:#fdf5d2;stop-opacity:1" />
-      <stop
-         style="stop-color:#ffeba7;stop-opacity:1"
-         offset="0.75"
-         id="stop10460-3" />
-      <stop
-         style="stop-color:#e5b630;stop-opacity:1"
-         offset="1"
-         id="stop10452-1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10748-8">
-      <stop
-         id="stop10750-5"
-         offset="0"
-         style="stop-color:#ecac18;stop-opacity:1" />
-      <stop
-         style="stop-color:#f1ce66;stop-opacity:1"
-         offset="0.25"
-         id="stop10752-8" />
-      <stop
-         style="stop-color:#f6e5a6;stop-opacity:1"
-         offset="0.5"
-         id="stop10754-8" />
-      <stop
-         id="stop10756-4"
-         offset="0.75"
-         style="stop-color:#f1cf6c;stop-opacity:1" />
-      <stop
-         id="stop10758-7"
-         offset="1"
-         style="stop-color:#e5b630;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10448-9-7-0-5">
-      <stop
-         style="stop-color:#cf9307;stop-opacity:1"
-         offset="0"
-         id="stop10450-3-5-6-7" />
-      <stop
-         id="stop10456-4-1-5-3"
-         offset="0.5"
-         style="stop-color:#f7d87b;stop-opacity:1" />
-      <stop
-         style="stop-color:#ebb313;stop-opacity:1"
-         offset="1"
-         id="stop10452-22-7-8-4" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4907-9"
        id="linearGradient26910"
        gradientUnits="userSpaceOnUse"
@@ -270,7 +127,6 @@
          id="stop4911-0" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4747-9"
        id="linearGradient26912"
        gradientUnits="userSpaceOnUse"
@@ -280,7 +136,6 @@
        x2="3.1875"
        y2="1046.3622" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4747-9">
       <stop
          style="stop-color:#058048;stop-opacity:1"
@@ -292,7 +147,6 @@
          id="stop4751" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4790"
        id="linearGradient26914"
        gradientUnits="userSpaceOnUse"
@@ -302,8 +156,7 @@
        x2="3.1875"
        y2="1046.3622" />
     <linearGradient
-       id="linearGradient4790"
-       inkscape:collect="always">
+       id="linearGradient4790">
       <stop
          id="stop4792"
          offset="0"
@@ -314,7 +167,6 @@
          style="stop-color:#40a5da;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4830"
        id="linearGradient26916"
        gradientUnits="userSpaceOnUse"
@@ -324,7 +176,6 @@
        x2="938.37811"
        y2="473.21918" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4830">
       <stop
          style="stop-color:#e0a010;stop-opacity:1"
@@ -336,29 +187,6 @@
          id="stop4834" />
     </linearGradient>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="5.6568545"
-     inkscape:cx="-35.828726"
-     inkscape:cy="14.689617"
-     inkscape:document-units="px"
-     inkscape:current-layer="g26748"
-     showgrid="true"
-     inkscape:window-width="1327"
-     inkscape:window-height="864"
-     inkscape:window-x="728"
-     inkscape:window-y="544"
-     inkscape:window-maximized="0"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3947" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -372,8 +200,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
@@ -396,14 +222,11 @@
         <path
            style="fill:url(#linearGradient4933);fill-opacity:1;stroke:url(#linearGradient4935);stroke-width:3.02792978;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
            d="m 463.24874,374.11292 30.75185,0 c 1.45425,0 2.625,1.17075 2.625,2.625 l 0,18.92132 c 0,1.45425 -1.17075,2.62773 -2.625,2.625 l -30.75185,-0.0577 c -1.45425,-0.003 -2.625,-1.17075 -2.625,-2.625 l 0,-18.86359 c 0,-1.45425 1.17075,-2.625 2.625,-2.625 z"
-           id="rect13693"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="sssssssss" />
+           id="rect13693" />
         <path
            style="fill:none;stroke:url(#linearGradient3945);stroke-width:3.02792978;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
            d="m 462.26171,374.11292 20.09375,0"
-           id="path13797"
-           inkscape:connector-curvature="0" />
+           id="path13797" />
       </g>
       <g
          style="display:inline"
diff --git a/ui/org.eclipse.pde.ui/icons/obj16/schema_obj.svg b/ui/org.eclipse.pde.ui/icons/obj16/schema_obj.svg
index 34b3de27ce2..eb9561f8ac1 100644
--- a/ui/org.eclipse.pde.ui/icons/obj16/schema_obj.svg
+++ b/ui/org.eclipse.pde.ui/icons/obj16/schema_obj.svg
@@ -2,64 +2,18 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="schema_obj.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
-    <linearGradient
-       id="linearGradient5103-3">
-      <stop
-         style="stop-color:#fefdef;stop-opacity:1"
-         offset="0"
-         id="stop5105-5" />
-      <stop
-         id="stop7550-07"
-         offset="0.26694915"
-         style="stop-color:#fef5d4;stop-opacity:1" />
-      <stop
-         id="stop7548-6"
-         offset="0.51694918"
-         style="stop-color:#fbe08e;stop-opacity:1" />
-      <stop
-         style="stop-color:#fbdd83;stop-opacity:1"
-         offset="1"
-         id="stop5107-7" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3955-9">
-      <stop
-         style="stop-color:#3870da;stop-opacity:1"
-         offset="0"
-         id="stop3957-3" />
-      <stop
-         id="stop3959-2"
-         offset="0.15381166"
-         style="stop-color:#78b8f0;stop-opacity:1" />
-      <stop
-         id="stop3961-3"
-         offset="0.65650523"
-         style="stop-color:#78b8f0;stop-opacity:1" />
-      <stop
-         style="stop-color:#3068d8;stop-opacity:1"
-         offset="0.92272848"
-         id="stop3963-9" />
-      <stop
-         style="stop-color:#3068d8;stop-opacity:1"
-         offset="1"
-         id="stop3965-8" />
-    </linearGradient>
     <linearGradient
        y2="1051.8378"
        x2="9.8946028"
@@ -68,10 +22,8 @@
        gradientUnits="userSpaceOnUse"
        id="linearGradient4101"
        xlink:href="#linearGradient4994-6"
-       inkscape:collect="always"
        gradientTransform="translate(-1.977903,-1.0442)" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4994-6">
       <stop
          style="stop-color:#f9fafc;stop-opacity:1;"
@@ -83,7 +35,6 @@
          id="stop4998-89" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4894-6"
        id="linearGradient4900-1"
        x1="7.9987183"
@@ -93,7 +44,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(2.022097,-1.0442)" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4894-6">
       <stop
          style="stop-color:#e0c88f;stop-opacity:1"
@@ -105,7 +55,6 @@
          id="stop4898-5" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4902-3"
        id="linearGradient4908-2"
        x1="10.544736"
@@ -115,7 +64,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-1.977903,-1.0442)" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4902-3">
       <stop
          style="stop-color:#bfb688;stop-opacity:1"
@@ -126,67 +74,6 @@
          offset="1"
          id="stop4906-2" />
     </linearGradient>
-    <linearGradient
-       id="linearGradient10448-9-7-0-5">
-      <stop
-         style="stop-color:#cf9307;stop-opacity:1"
-         offset="0"
-         id="stop10450-3-5-6-7" />
-      <stop
-         id="stop10456-4-1-5-3"
-         offset="0.5"
-         style="stop-color:#f7d87b;stop-opacity:1" />
-      <stop
-         style="stop-color:#ebb313;stop-opacity:1"
-         offset="1"
-         id="stop10452-22-7-8-4" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10748-8">
-      <stop
-         id="stop10750-5"
-         offset="0"
-         style="stop-color:#ecac18;stop-opacity:1" />
-      <stop
-         style="stop-color:#f1ce66;stop-opacity:1"
-         offset="0.25"
-         id="stop10752-8" />
-      <stop
-         style="stop-color:#f6e5a6;stop-opacity:1"
-         offset="0.5"
-         id="stop10754-8" />
-      <stop
-         id="stop10756-4"
-         offset="0.75"
-         style="stop-color:#f1cf6c;stop-opacity:1" />
-      <stop
-         id="stop10758-7"
-         offset="1"
-         style="stop-color:#e5b630;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10448-90">
-      <stop
-         style="stop-color:#ecac18;stop-opacity:1"
-         offset="0"
-         id="stop10450-0" />
-      <stop
-         id="stop10458-2"
-         offset="0.25"
-         style="stop-color:#ffe38d;stop-opacity:1" />
-      <stop
-         id="stop10456-96"
-         offset="0.5"
-         style="stop-color:#fdf5d2;stop-opacity:1" />
-      <stop
-         style="stop-color:#ffeba7;stop-opacity:1"
-         offset="0.75"
-         id="stop10460-3" />
-      <stop
-         style="stop-color:#e5b630;stop-opacity:1"
-         offset="1"
-         id="stop10452-1" />
-    </linearGradient>
     <linearGradient
        id="linearGradient10414-9">
       <stop
@@ -248,7 +135,6 @@
          style="stop-color:#809dcb;stop-opacity:0" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10414-9"
        id="linearGradient10782-3"
        gradientUnits="userSpaceOnUse"
@@ -258,7 +144,6 @@
        y2="519.08923"
        gradientTransform="matrix(0.27903303,0,0,0.27903303,-80.383503,898.62929)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10432-3"
        id="linearGradient10784-2"
        gradientUnits="userSpaceOnUse"
@@ -268,7 +153,6 @@
        y2="519.36218"
        gradientTransform="matrix(0.27903303,0,0,0.27903303,-80.383503,898.62929)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10157-6"
        id="linearGradient10786-1"
        gradientUnits="userSpaceOnUse"
@@ -278,7 +162,6 @@
        y2="514.75818"
        gradientTransform="matrix(0.28995536,0,0,0.16531775,-83.833594,958.22386)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10157-6"
        id="linearGradient10790-8"
        gradientUnits="userSpaceOnUse"
@@ -288,7 +171,6 @@
        x2="305"
        y2="542.73901" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10149-39-0"
        id="linearGradient10792-6"
        gradientUnits="userSpaceOnUse"
@@ -298,7 +180,6 @@
        x2="322.875"
        y2="504.44818" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient10149-39-0">
       <stop
          style="stop-color:#1d4d9d;stop-opacity:1"
@@ -310,7 +191,6 @@
          id="stop10153-72-3" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4284"
        id="linearGradient10790-8-2"
        gradientUnits="userSpaceOnUse"
@@ -320,31 +200,6 @@
        x2="305"
        y2="545.35248" />
   </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.71457992"
-     inkscape:cy="5.9681493"
-     inkscape:document-units="px"
-     inkscape:current-layer="g4259"
-     showgrid="false"
-     inkscape:window-width="1280"
-     inkscape:window-height="900"
-     inkscape:window-x="849"
-     inkscape:window-y="295"
-     inkscape:window-maximized="0"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3999" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -358,8 +213,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
@@ -367,26 +220,20 @@
        transform="matrix(1.2394243,0,0,1.2394243,-21.274665,-254.90388)"
        style="font-style:normal;font-weight:normal;font-size:13.58917427px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;display:inline;fill:#ffffff;fill-opacity:1;stroke:none"
        id="layer1-9"
-       inkscape:label="Layer 1"
        mask="none" />
     <g
        style="display:inline"
        id="g4486"
        transform="translate(0.9266651,-0.994369)">
       <path
-         sodipodi:nodetypes="cccccc"
-         inkscape:connector-curvature="0"
          id="rect4001-3"
          d="m 3.5193795,1037.8597 7.0096695,0 3.062057,3.0066 0,9.9546 -10.0717265,0 z"
          style="display:inline;fill:url(#linearGradient4101);fill-opacity:1;stroke:none" />
       <path
-         inkscape:connector-curvature="0"
          id="path4884"
          d="m 9.998718,1037.397 0,3.9112 3.977479,0 z"
          style="display:inline;fill:url(#linearGradient4900-1);fill-opacity:1;stroke:none" />
       <path
-         sodipodi:nodetypes="cccccc"
-         inkscape:connector-curvature="0"
          id="rect4001"
          d="m 3.5635737,1037.8597 6.9654753,0 3.062057,3.0066 0,9.9546 -10.0275323,0 z"
          style="display:inline;fill:none;stroke:url(#linearGradient4908-2);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1" />
diff --git a/ui/org.eclipse.pde.ui/icons/obj16/scomp_jar_obj.svg b/ui/org.eclipse.pde.ui/icons/obj16/scomp_jar_obj.svg
index ff973494a94..a025787ba3a 100644
--- a/ui/org.eclipse.pde.ui/icons/obj16/scomp_jar_obj.svg
+++ b/ui/org.eclipse.pde.ui/icons/obj16/scomp_jar_obj.svg
@@ -2,24 +2,19 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="scomp_jar_obj.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4176">
       <stop
          style="stop-color:#ffef57;stop-opacity:1;"
@@ -31,7 +26,6 @@
          id="stop4180" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4194">
       <stop
          style="stop-color:#9a610b;stop-opacity:1"
@@ -43,7 +37,6 @@
          id="stop4198" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4182">
       <stop
          style="stop-color:#72522c;stop-opacity:1"
@@ -108,7 +101,6 @@
          id="stop4851" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4825">
       <stop
          style="stop-color:#c7a229;stop-opacity:1"
@@ -120,7 +112,6 @@
          id="stop4829" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4817">
       <stop
          style="stop-color:#fefdef;stop-opacity:1;"
@@ -132,7 +123,6 @@
          id="stop4821" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4817"
        id="linearGradient4823"
        x1="25.082857"
@@ -142,7 +132,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-20,0)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4825"
        id="linearGradient4831"
        x1="27.425272"
@@ -152,7 +141,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-20,0)" />
     <radialGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4847"
        id="radialGradient4853"
        cx="28.538633"
@@ -170,10 +158,8 @@
        gradientUnits="userSpaceOnUse"
        id="linearGradient4882"
        xlink:href="#linearGradient4968"
-       inkscape:collect="always"
        gradientTransform="translate(-20,0)" />
     <radialGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4960"
        id="radialGradient4958"
        cx="28.552979"
@@ -184,7 +170,6 @@
        gradientTransform="matrix(0.88536081,0.01424168,-0.02077996,1.2918258,4.947957,-305.15187)"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4182"
        id="linearGradient4188"
        x1="24.109377"
@@ -194,7 +179,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(0.99168611,0,0,0.99318183,1.6913493,7.075609)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4194"
        id="linearGradient4200"
        x1="29.671877"
@@ -203,7 +187,6 @@
        y2="1046.7841"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4176"
        id="linearGradient4183"
        x1="22.456909"
@@ -212,31 +195,6 @@
        y2="1045.4901"
        gradientUnits="userSpaceOnUse" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="32"
-     inkscape:cx="7.2727734"
-     inkscape:cy="11.23685"
-     inkscape:document-units="px"
-     inkscape:current-layer="g4202"
-     showgrid="false"
-     inkscape:window-width="1410"
-     inkscape:window-height="1046"
-     inkscape:window-x="1030"
-     inkscape:window-y="517"
-     inkscape:window-maximized="0"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid4042" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -250,8 +208,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
@@ -259,20 +215,14 @@
        id="g4174"
        transform="translate(-1.9909588,-0.99908013)">
       <path
-         sodipodi:nodetypes="ccssssssc"
-         inkscape:connector-curvature="0"
          id="rect4044"
          d="m 6.253476,1039.2695 4.507805,0 c 0.453044,1.6907 2.762136,2.5911 2.762136,5.1157 l 0,3.7565 c 0,1.5302 -1.231912,2.7621 -2.762136,2.7621 l -4.507805,0 c -1.530224,0 -2.762136,-1.2319 -2.762136,-2.7621 l 0,-3.7565 c 0,-2.5909 2.334749,-3.5207 2.762136,-5.1157 z"
          style="fill:url(#radialGradient4853);fill-opacity:1;stroke:none" />
       <path
-         sodipodi:nodetypes="ccssssssc"
-         inkscape:connector-curvature="0"
          id="rect4044-7"
          d="m 6.253476,1039.2695 4.507805,0 c 0.453044,1.6907 2.762136,2.5911 2.762136,5.1157 l 0,3.7565 c 0,1.5302 -1.231912,2.7621 -2.762136,2.7621 l -4.507805,0 c -1.530224,0 -2.762136,-1.2319 -2.762136,-2.7621 l 0,-3.7565 c 0,-2.5909 2.334749,-3.5207 2.762136,-5.1157 z"
          style="display:inline;fill:url(#radialGradient4958);fill-opacity:1;stroke:none" />
       <path
-         sodipodi:nodetypes="ccssssssc"
-         inkscape:connector-curvature="0"
          id="rect4044-1"
          d="m 6.253476,1039.2695 4.507805,0 c 0.453044,1.6907 2.762136,2.5911 2.762136,5.1157 l 0,3.7565 c 0,1.5302 -1.231912,2.7621 -2.762136,2.7621 l -4.507805,0 c -1.530224,0 -2.762136,-1.2319 -2.762136,-2.7621 l 0,-3.7565 c 0,-2.5909 2.334749,-3.5207 2.762136,-5.1157 z"
          style="display:inline;fill:none;stroke:url(#linearGradient4882);stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
@@ -290,8 +240,6 @@
        id="g4202"
        transform="translate(-16.02968,0)">
       <path
-         sodipodi:nodetypes="cccccccccccccccccc"
-         inkscape:connector-curvature="0"
          id="path4180"
          d="m 22.454778,1042.8857 1.890402,1.959 6.198039,0 0.976191,0.9778 0,1.0708 -0.968444,0.9698 -1.154384,0 -1.003307,1.0049 -0.887094,0 -0.985877,-0.9874 -0.966506,0.968 -1.053667,0 -2.014363,2.0174 -1.952382,0 -3.021543,-3.0261 0,-2.0329 2.93632,-2.9407 z"
          style="fill:url(#linearGradient4183);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4188);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
@@ -302,7 +250,6 @@
          id="path4190"
          style="opacity:1;fill:#543830;fill-opacity:1;stroke:#a6792a;stroke-width:1;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
       <path
-         inkscape:connector-curvature="0"
          id="path4192"
          d="m 29.859376,1046.7216 -5.46875,0"
          style="fill:none;fill-rule:evenodd;stroke:url(#linearGradient4200);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
diff --git a/ui/org.eclipse.pde.ui/icons/obj16/seq_sc_obj.svg b/ui/org.eclipse.pde.ui/icons/obj16/seq_sc_obj.svg
index a12579c2107..21bef897f11 100644
--- a/ui/org.eclipse.pde.ui/icons/obj16/seq_sc_obj.svg
+++ b/ui/org.eclipse.pde.ui/icons/obj16/seq_sc_obj.svg
@@ -2,24 +2,19 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="sec_sc_obj.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4190"
        id="linearGradient4196"
        x1="18.493853"
@@ -29,7 +24,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(12.646149,12.332032)" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4190">
       <stop
          style="stop-color:#346692;stop-opacity:1"
@@ -41,7 +35,6 @@
          id="stop4194" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4190"
        id="linearGradient4196-4"
        x1="18.493853"
@@ -51,7 +44,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(0.67103256,12.337874)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4190"
        id="linearGradient4196-1"
        x1="18.493853"
@@ -61,33 +53,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(6.6558507,12.328678)" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="22.627416"
-     inkscape:cx="9.4556426"
-     inkscape:cy="14.194341"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1100"
-     inkscape:window-height="900"
-     inkscape:window-x="1111"
-     inkscape:window-y="527"
-     inkscape:window-maximized="0"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2985"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -101,8 +66,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      transform="translate(0,-1036.3622)">
     <g
@@ -116,8 +79,7 @@
           <path
              style="fill:none;fill-rule:evenodd;stroke:#5c7aaa;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
              d="m 20.030369,1055.6472 9.943689,0"
-             id="path4157"
-             inkscape:connector-curvature="0" />
+             id="path4157" />
           <rect
              ry="0"
              rx="0"
diff --git a/ui/org.eclipse.pde.ui/icons/obj16/settings.svg b/ui/org.eclipse.pde.ui/icons/obj16/settings.svg
index 85d8ac2c6ae..a63b52ec6f2 100644
--- a/ui/org.eclipse.pde.ui/icons/obj16/settings.svg
+++ b/ui/org.eclipse.pde.ui/icons/obj16/settings.svg
@@ -2,25 +2,20 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="settings.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient4172"
-       inkscape:collect="always">
+       id="linearGradient4172">
       <stop
          id="stop4174"
          offset="0"
@@ -31,7 +26,6 @@
          style="stop-color:#83727c;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4228">
       <stop
          style="stop-color:#869ac2;stop-opacity:1"
@@ -43,7 +37,6 @@
          id="stop4232" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4165">
       <stop
          style="stop-color:#787297;stop-opacity:1"
@@ -62,11 +55,9 @@
        gradientUnits="userSpaceOnUse"
        id="linearGradient4975-2-1"
        xlink:href="#linearGradient4994-4-7"
-       inkscape:collect="always"
        gradientTransform="translate(17,-4.9895789)" />
     <linearGradient
-       id="linearGradient4994-4-7"
-       inkscape:collect="always">
+       id="linearGradient4994-4-7">
       <stop
          id="stop4996-5-4"
          offset="0"
@@ -84,10 +75,8 @@
        gradientTransform="translate(17,-1.9062499)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient5062-9"
-       xlink:href="#linearGradient4910-4-4"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4910-4-4" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4910-4-4">
       <stop
          style="stop-color:#ffffff;stop-opacity:0"
@@ -99,7 +88,6 @@
          id="stop4914-8-8" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4883-4"
        id="linearGradient4889-2"
        x1="28"
@@ -109,7 +97,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-21,1.0937501)" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4883-4">
       <stop
          style="stop-color:#ebf9ff;stop-opacity:1"
@@ -121,7 +108,6 @@
          id="stop4887-5" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4172"
        id="linearGradient4171"
        x1="-17.022989"
@@ -132,7 +118,6 @@
        gradientTransform="matrix(1.0072573,0,0,1.0241112,0.144776,-25.040896)" />
     <linearGradient
        gradientTransform="matrix(1.0075747,0,0,0.9991477,0.14461692,6.9388457)"
-       inkscape:collect="always"
        xlink:href="#linearGradient4165"
        id="linearGradient4171-0"
        x1="-17.022989"
@@ -141,7 +126,6 @@
        y2="1038.5736"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4228"
        id="linearGradient4234"
        x1="-13.390836"
@@ -151,7 +135,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(22.38435,-1.6904273)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4228"
        id="linearGradient4234-3"
        x1="-13.390836"
@@ -161,31 +144,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(22.38435,4.2868778)" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="31.999998"
-     inkscape:cx="6.556361"
-     inkscape:cy="6.3697544"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1335"
-     inkscape:window-height="831"
-     inkscape:window-x="1093"
-     inkscape:window-y="524"
-     inkscape:window-maximized="0"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3999" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -199,38 +157,25 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
     <path
        style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#8b96ab;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate"
        d="m 0.99999994,1036.3624 0.03125,14.9831 14.9850031,0 -0.03125,-14.9831 z m 0.99999996,1 12.9850031,0 0.03125,12.9831 -12.9850031,0 z"
-       id="rect3997-9-1"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccccccc"
-       inkscape:export-filename="C:\Users\jmietling\Documents\rect3997-9-1.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
+       id="rect3997-9-1" />
     <path
        style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient4889-2);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate"
        d="m 1.9999999,1037.364 12.8855661,0 0.03125,13.0147 -12.8855661,0 z"
-       id="rect3997-9-1-1"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+       id="rect3997-9-1-1" />
     <path
        style="display:inline;fill:url(#linearGradient5062-9);fill-opacity:1;stroke:none"
        d="m 3.9999999,1039.3403 0,11.0384 -2,0 0,-13.0384 z"
-       id="rect4853-82-7"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+       id="rect4853-82-7" />
     <path
        style="display:inline;fill:url(#linearGradient4975-2-1);fill-opacity:1;stroke:none"
        d="m 3.9999999,1039.3727 10.9921881,0 0,-2 -12.9921881,0 z"
-       id="rect4853-82-0"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+       id="rect4853-82-0" />
     <g
        id="g4221"
        transform="translate(22.362253,0)">
diff --git a/ui/org.eclipse.pde.ui/icons/obj16/site_obj.svg b/ui/org.eclipse.pde.ui/icons/obj16/site_obj.svg
index 3909ef85e83..8c3e36608b6 100644
--- a/ui/org.eclipse.pde.ui/icons/obj16/site_obj.svg
+++ b/ui/org.eclipse.pde.ui/icons/obj16/site_obj.svg
@@ -2,871 +2,18 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="site_obj.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
-    <linearGradient
-       id="linearGradient5641">
-      <stop
-         style="stop-color:#1e6cbe;stop-opacity:1;"
-         offset="0"
-         id="stop5643" />
-      <stop
-         style="stop-color:#104276;stop-opacity:1;"
-         offset="1"
-         id="stop5645" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5411">
-      <stop
-         style="stop-color:#72828e;stop-opacity:1;"
-         offset="0"
-         id="stop5413" />
-      <stop
-         style="stop-color:#003358;stop-opacity:1;"
-         offset="1"
-         id="stop5415" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5630">
-      <stop
-         style="stop-color:#d8bc68;stop-opacity:1;"
-         offset="0"
-         id="stop5632" />
-      <stop
-         style="stop-color:#fff0c2;stop-opacity:1;"
-         offset="1"
-         id="stop5634" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4972">
-      <stop
-         style="stop-color:#c7e3e7;stop-opacity:1;"
-         offset="0"
-         id="stop4974" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop4976" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient6893-5-8-8">
-      <stop
-         style="stop-color:#7795b6;stop-opacity:1;"
-         offset="0"
-         id="stop6895-8-7-0" />
-      <stop
-         style="stop-color:#7795b6;stop-opacity:1;"
-         offset="1"
-         id="stop6897-2-6-5" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient6893-5-8-0-5">
-      <stop
-         style="stop-color:#7795b6;stop-opacity:1;"
-         offset="0"
-         id="stop6895-8-7-7-5" />
-      <stop
-         style="stop-color:#7795b6;stop-opacity:1;"
-         offset="1"
-         id="stop6897-2-6-9-8" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient6893-5-8-0-4-9">
-      <stop
-         style="stop-color:#7795b6;stop-opacity:1;"
-         offset="0"
-         id="stop6895-8-7-7-0-1" />
-      <stop
-         style="stop-color:#7795b6;stop-opacity:1;"
-         offset="1"
-         id="stop6897-2-6-9-2-4" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4972-4-1">
-      <stop
-         style="stop-color:#daedef;stop-opacity:1;"
-         offset="0"
-         id="stop4974-6-9" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop4976-2-4" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient6799-4-3">
-      <stop
-         style="stop-color:#c89840;stop-opacity:1;"
-         offset="0"
-         id="stop6801-4-0" />
-      <stop
-         style="stop-color:#798da2;stop-opacity:1;"
-         offset="1"
-         id="stop6803-5-7" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient6893-5-8-8-8">
-      <stop
-         style="stop-color:#7795b6;stop-opacity:1;"
-         offset="0"
-         id="stop6895-8-7-0-7" />
-      <stop
-         style="stop-color:#7795b6;stop-opacity:1;"
-         offset="1"
-         id="stop6897-2-6-5-3" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient6893-5-8-0-4-9-2">
-      <stop
-         style="stop-color:#7795b6;stop-opacity:1;"
-         offset="0"
-         id="stop6895-8-7-7-0-1-2" />
-      <stop
-         style="stop-color:#7795b6;stop-opacity:1;"
-         offset="1"
-         id="stop6897-2-6-9-2-4-3" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4972-6">
-      <stop
-         style="stop-color:#c7e3e7;stop-opacity:1;"
-         offset="0"
-         id="stop4974-71" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop4976-5" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4972-4-1-2">
-      <stop
-         style="stop-color:#daedef;stop-opacity:1;"
-         offset="0"
-         id="stop4974-6-9-4" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop4976-2-4-6" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient6799-4-3-3">
-      <stop
-         style="stop-color:#c89840;stop-opacity:1;"
-         offset="0"
-         id="stop6801-4-0-8" />
-      <stop
-         style="stop-color:#798da2;stop-opacity:1;"
-         offset="1"
-         id="stop6803-5-7-9" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4972-5-7">
-      <stop
-         style="stop-color:#85c2cb;stop-opacity:1;"
-         offset="0"
-         id="stop4974-7-4" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop4976-1-3" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient6893-5-8-8-9">
-      <stop
-         style="stop-color:#7795b6;stop-opacity:1;"
-         offset="0"
-         id="stop6895-8-7-0-5" />
-      <stop
-         style="stop-color:#7795b6;stop-opacity:1;"
-         offset="1"
-         id="stop6897-2-6-5-5" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient6893-5-8-0-5-7">
-      <stop
-         style="stop-color:#7795b6;stop-opacity:1;"
-         offset="0"
-         id="stop6895-8-7-7-5-6" />
-      <stop
-         style="stop-color:#7795b6;stop-opacity:1;"
-         offset="1"
-         id="stop6897-2-6-9-8-6" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient6893-5-8-0-4-9-7">
-      <stop
-         style="stop-color:#7795b6;stop-opacity:1;"
-         offset="0"
-         id="stop6895-8-7-7-0-1-0" />
-      <stop
-         style="stop-color:#7795b6;stop-opacity:1;"
-         offset="1"
-         id="stop6897-2-6-9-2-4-33" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4972-5-2-6">
-      <stop
-         style="stop-color:#85c2cb;stop-opacity:1;"
-         offset="0"
-         id="stop4974-7-3-0" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop4976-1-9-5" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient6893-5-8-8-8-8">
-      <stop
-         style="stop-color:#7795b6;stop-opacity:1;"
-         offset="0"
-         id="stop6895-8-7-0-7-9" />
-      <stop
-         style="stop-color:#7795b6;stop-opacity:1;"
-         offset="1"
-         id="stop6897-2-6-5-3-2" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient6893-5-8-0-4-9-2-0">
-      <stop
-         style="stop-color:#7795b6;stop-opacity:1;"
-         offset="0"
-         id="stop6895-8-7-7-0-1-2-1" />
-      <stop
-         style="stop-color:#7795b6;stop-opacity:1;"
-         offset="1"
-         id="stop6897-2-6-9-2-4-3-6" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4972-6"
-       id="linearGradient5572"
-       gradientUnits="userSpaceOnUse"
-       x1="5.1146584"
-       y1="1044.7372"
-       x2="12.520393"
-       y2="1044.7372" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4972"
-       id="linearGradient4283"
-       gradientUnits="userSpaceOnUse"
-       x1="5.1146582"
-       y1="1044.7372"
-       x2="12.520393"
-       y2="1044.7372" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4972"
-       id="linearGradient4288"
-       gradientUnits="userSpaceOnUse"
-       x1="5.1146582"
-       y1="1044.7372"
-       x2="12.520393"
-       y2="1044.7372" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4972"
-       id="linearGradient4321"
-       gradientUnits="userSpaceOnUse"
-       x1="5.1146582"
-       y1="1044.7372"
-       x2="12.520393"
-       y2="1044.7372" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4972-4-1"
-       id="linearGradient4382"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.6238641,0,0,1.6285353,-5.817902,-657.26294)"
-       x1="5.1146584"
-       y1="1044.7372"
-       x2="12.520393"
-       y2="1044.7372" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6799-4-3"
-       id="linearGradient4384"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.6238641,0,0,1.6285353,-5.817902,-662.30115)"
-       x1="11.977677"
-       y1="1042.1279"
-       x2="5.926301"
-       y2="1051.2535" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6893-5-8-0-4-9"
-       id="linearGradient4390"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2820342,0,0,0.26192632,-2.8911185,1046.2126)"
-       x1="9.2662354"
-       y1="5.3933983"
-       x2="5.8030186"
-       y2="5.3933983" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6893-5-8-8-8"
-       id="linearGradient4392"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.96301391,0,0,0.30750995,-1.0449584,-1044.537)"
-       x1="9.2662354"
-       y1="5.3933983"
-       x2="5.8030186"
-       y2="5.3933983" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6893-5-8-0-4-9-2"
-       id="linearGradient4394"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2784768,0,0,0.27549242,-2.8370137,-1046.8387)"
-       x1="9.2662354"
-       y1="5.3933983"
-       x2="5.8030186"
-       y2="5.3933983" />
-    <linearGradient
-       id="linearGradient6893-5-8-0-4-9-2-5">
-      <stop
-         style="stop-color:#7795b6;stop-opacity:1;"
-         offset="0"
-         id="stop6895-8-7-7-0-1-2-3" />
-      <stop
-         style="stop-color:#7795b6;stop-opacity:1;"
-         offset="1"
-         id="stop6897-2-6-9-2-4-3-0" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient6893-5-8-8-8-0">
-      <stop
-         style="stop-color:#7795b6;stop-opacity:1;"
-         offset="0"
-         id="stop6895-8-7-0-7-7" />
-      <stop
-         style="stop-color:#7795b6;stop-opacity:1;"
-         offset="1"
-         id="stop6897-2-6-5-3-7" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient6893-5-8-0-4-9-0">
-      <stop
-         style="stop-color:#7795b6;stop-opacity:1;"
-         offset="0"
-         id="stop6895-8-7-7-0-1-8" />
-      <stop
-         style="stop-color:#7795b6;stop-opacity:1;"
-         offset="1"
-         id="stop6897-2-6-9-2-4-1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4972-4-1-4"
-       id="linearGradient4382-7"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.6960825,0,0,1.7009614,-4.9210482,-731.7352)"
-       x1="5.1146584"
-       y1="1044.7372"
-       x2="12.520393"
-       y2="1044.7372" />
-    <linearGradient
-       id="linearGradient4972-4-1-4">
-      <stop
-         style="stop-color:#daedef;stop-opacity:1;"
-         offset="0"
-         id="stop4974-6-9-9" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop4976-2-4-0" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6799-4-3-7"
-       id="linearGradient4384-4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.6960825,0,0,1.7009614,-4.9210482,-736.99747)"
-       x1="11.977677"
-       y1="1042.1279"
-       x2="5.926301"
-       y2="1051.2535" />
-    <linearGradient
-       id="linearGradient6799-4-3-7">
-      <stop
-         style="stop-color:#c89840;stop-opacity:1;"
-         offset="0"
-         id="stop6801-4-0-9" />
-      <stop
-         style="stop-color:#798da2;stop-opacity:1;"
-         offset="1"
-         id="stop6803-5-7-7" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4972-4-1-9"
-       id="linearGradient4382-3"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.6960825,0,0,1.7009614,-6.197689,-731.7678)"
-       x1="5.1146584"
-       y1="1044.7372"
-       x2="12.520393"
-       y2="1044.7372" />
-    <linearGradient
-       id="linearGradient4972-4-1-9">
-      <stop
-         style="stop-color:#daedef;stop-opacity:1;"
-         offset="0"
-         id="stop4974-6-9-8" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop4976-2-4-9" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6799-4-3-9"
-       id="linearGradient4384-1"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.6960825,0,0,1.7009614,-6.197689,-737.03007)"
-       x1="11.977677"
-       y1="1042.1279"
-       x2="5.926301"
-       y2="1051.2535" />
-    <linearGradient
-       id="linearGradient6799-4-3-9">
-      <stop
-         style="stop-color:#c89840;stop-opacity:1;"
-         offset="0"
-         id="stop6801-4-0-7" />
-      <stop
-         style="stop-color:#798da2;stop-opacity:1;"
-         offset="1"
-         id="stop6803-5-7-74" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6893-5-8-0-4-9-2-1"
-       id="linearGradient4394-7"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.3892048,0,0,0.27549241,-31.899058,-1052.4756)"
-       x1="9.2662354"
-       y1="5.3933983"
-       x2="5.8030186"
-       y2="5.3933983" />
-    <linearGradient
-       id="linearGradient6893-5-8-0-4-9-2-1">
-      <stop
-         style="stop-color:#7795b6;stop-opacity:1;"
-         offset="0"
-         id="stop6895-8-7-7-0-1-2-2" />
-      <stop
-         style="stop-color:#7795b6;stop-opacity:1;"
-         offset="1"
-         id="stop6897-2-6-9-2-4-3-7" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6893-5-8-8-8-07"
-       id="linearGradient4392-0"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0464198,0,0,0.30750995,-29.951794,-1049.0796)"
-       x1="9.2662354"
-       y1="5.3933983"
-       x2="5.8030186"
-       y2="5.3933983" />
-    <linearGradient
-       id="linearGradient6893-5-8-8-8-07">
-      <stop
-         style="stop-color:#7795b6;stop-opacity:1;"
-         offset="0"
-         id="stop6895-8-7-0-7-0" />
-      <stop
-         style="stop-color:#7795b6;stop-opacity:1;"
-         offset="1"
-         id="stop6897-2-6-5-3-1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6893-5-8-0-4-9-4"
-       id="linearGradient4390-4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.3930703,0,0,0.26192631,-31.957849,1053.1869)"
-       x1="9.2662354"
-       y1="5.3933983"
-       x2="5.8030186"
-       y2="5.3933983" />
-    <linearGradient
-       id="linearGradient6893-5-8-0-4-9-4">
-      <stop
-         style="stop-color:#7795b6;stop-opacity:1;"
-         offset="0"
-         id="stop6895-8-7-7-0-1-26" />
-      <stop
-         style="stop-color:#7795b6;stop-opacity:1;"
-         offset="1"
-         id="stop6897-2-6-9-2-4-0" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4972-4-1-5"
-       id="linearGradient4382-9"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.623864,0.69032316,0,1.6285353,32.3374,-665.37304)"
-       x1="5.1146584"
-       y1="1044.7372"
-       x2="12.520393"
-       y2="1044.7372" />
-    <linearGradient
-       id="linearGradient4972-4-1-5">
-      <stop
-         style="stop-color:#daedef;stop-opacity:1;"
-         offset="0"
-         id="stop4974-6-9-97" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop4976-2-4-60" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6799-4-3-0"
-       id="linearGradient4384-0"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.623864,0.69032316,0,1.6285353,32.3374,-670.41122)"
-       x1="11.977677"
-       y1="1042.1279"
-       x2="5.926301"
-       y2="1051.2535" />
-    <linearGradient
-       id="linearGradient6799-4-3-0">
-      <stop
-         style="stop-color:#c89840;stop-opacity:1;"
-         offset="0"
-         id="stop6801-4-0-90" />
-      <stop
-         style="stop-color:#798da2;stop-opacity:1;"
-         offset="1"
-         id="stop6803-5-7-1" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5411"
-       id="radialGradient5417"
-       cx="13.94572"
-       cy="1045.8255"
-       fx="13.94572"
-       fy="1045.8255"
-       r="10.779004"
-       gradientTransform="matrix(1,0,0,0.98529514,0,15.378714)"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5411"
-       id="radialGradient5419"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.8121447,-1.9541983,0.96980008,0.27977302,-1035.1855,788.68965)"
-       cx="16.494715"
-       cy="1050.2904"
-       fx="16.494715"
-       fy="1050.2904"
-       r="10.779004" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6893-5-8-0-4-9"
-       id="linearGradient5426"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2820342,0,0,0.26192632,-2.8911185,1046.2126)"
-       x1="9.2662354"
-       y1="5.3933983"
-       x2="5.8030186"
-       y2="5.3933983" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6893-5-8-8-8"
-       id="linearGradient5428"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.96301391,0,0,0.30750995,-1.0449584,-1044.537)"
-       x1="9.2662354"
-       y1="5.3933983"
-       x2="5.8030186"
-       y2="5.3933983" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6893-5-8-0-4-9-2"
-       id="linearGradient5430"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2784768,0,0,0.27549242,-2.8370137,-1046.8387)"
-       x1="9.2662354"
-       y1="5.3933983"
-       x2="5.8030186"
-       y2="5.3933983" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6893-5-8-0-4-9-2-6"
-       id="linearGradient5430-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2784768,0,0,0.27549242,-2.8370137,-1046.8387)"
-       x1="9.2662354"
-       y1="5.3933983"
-       x2="5.8030186"
-       y2="5.3933983" />
-    <linearGradient
-       id="linearGradient6893-5-8-0-4-9-2-6">
-      <stop
-         style="stop-color:#7795b6;stop-opacity:1;"
-         offset="0"
-         id="stop6895-8-7-7-0-1-2-35" />
-      <stop
-         style="stop-color:#7795b6;stop-opacity:1;"
-         offset="1"
-         id="stop6897-2-6-9-2-4-3-9" />
-    </linearGradient>
-    <linearGradient
-       y2="5.3933983"
-       x2="5.8030186"
-       y1="5.3933983"
-       x1="9.2662354"
-       gradientTransform="matrix(1.2784768,0,0,0.27549241,-2.8370135,-1044.4678)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient5475"
-       xlink:href="#linearGradient6893-5-8-0-4-9-2-6"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6893-5-8-0-4-9-9"
-       id="linearGradient5426-4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2820342,0,0,0.26192632,-2.8911185,1046.2126)"
-       x1="9.2662354"
-       y1="5.3933983"
-       x2="5.8030186"
-       y2="5.3933983" />
-    <linearGradient
-       id="linearGradient6893-5-8-0-4-9-9">
-      <stop
-         style="stop-color:#7795b6;stop-opacity:1;"
-         offset="0"
-         id="stop6895-8-7-7-0-1-80" />
-      <stop
-         style="stop-color:#7795b6;stop-opacity:1;"
-         offset="1"
-         id="stop6897-2-6-9-2-4-6" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6893-5-8-0-4-9-2-66"
-       id="linearGradient5430-1"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2784768,0,0,0.27549242,-2.8370137,-1046.8387)"
-       x1="9.2662354"
-       y1="5.3933983"
-       x2="5.8030186"
-       y2="5.3933983" />
-    <linearGradient
-       id="linearGradient6893-5-8-0-4-9-2-66">
-      <stop
-         style="stop-color:#7795b6;stop-opacity:1;"
-         offset="0"
-         id="stop6895-8-7-7-0-1-2-23" />
-      <stop
-         style="stop-color:#7795b6;stop-opacity:1;"
-         offset="1"
-         id="stop6897-2-6-9-2-4-3-8" />
-    </linearGradient>
-    <linearGradient
-       y2="5.3933983"
-       x2="5.8030186"
-       y1="5.3933983"
-       x1="9.2662354"
-       gradientTransform="matrix(1.2784768,0,0,0.27549241,-2.8370135,-1044.4678)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient5475-9"
-       xlink:href="#linearGradient6893-5-8-0-4-9-2-6-9"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient6893-5-8-0-4-9-2-6-9">
-      <stop
-         style="stop-color:#7795b6;stop-opacity:1;"
-         offset="0"
-         id="stop6895-8-7-7-0-1-2-35-8" />
-      <stop
-         style="stop-color:#7795b6;stop-opacity:1;"
-         offset="1"
-         id="stop6897-2-6-9-2-4-3-9-1" />
-    </linearGradient>
-    <linearGradient
-       y2="5.3933983"
-       x2="5.8030186"
-       y1="5.3933983"
-       x1="9.2662354"
-       gradientTransform="matrix(1.2784768,0,0,0.27549241,-2.8370135,-1044.4678)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient5525"
-       xlink:href="#linearGradient6893-5-8-0-4-9-2-6-9"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6893-5-8-0-4-9-9-2"
-       id="linearGradient5426-4-0"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2820342,0,0,0.26192632,-2.8911185,1046.2126)"
-       x1="9.2662354"
-       y1="5.3933983"
-       x2="5.8030186"
-       y2="5.3933983" />
-    <linearGradient
-       id="linearGradient6893-5-8-0-4-9-9-2">
-      <stop
-         style="stop-color:#7795b6;stop-opacity:1;"
-         offset="0"
-         id="stop6895-8-7-7-0-1-80-0" />
-      <stop
-         style="stop-color:#7795b6;stop-opacity:1;"
-         offset="1"
-         id="stop6897-2-6-9-2-4-6-1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6893-5-8-0-4-9-2-66-1"
-       id="linearGradient5430-1-7"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2784768,0,0,0.27549242,-2.8370137,-1046.8387)"
-       x1="9.2662354"
-       y1="5.3933983"
-       x2="5.8030186"
-       y2="5.3933983" />
-    <linearGradient
-       id="linearGradient6893-5-8-0-4-9-2-66-1">
-      <stop
-         style="stop-color:#7795b6;stop-opacity:1;"
-         offset="0"
-         id="stop6895-8-7-7-0-1-2-23-1" />
-      <stop
-         style="stop-color:#7795b6;stop-opacity:1;"
-         offset="1"
-         id="stop6897-2-6-9-2-4-3-8-6" />
-    </linearGradient>
-    <linearGradient
-       y2="5.3933983"
-       x2="5.8030186"
-       y1="5.3933983"
-       x1="9.2662354"
-       gradientTransform="matrix(1.2784768,0,0,0.27549241,-2.8370135,-1044.4678)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient5525-6"
-       xlink:href="#linearGradient6893-5-8-0-4-9-2-6-9-6"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient6893-5-8-0-4-9-2-6-9-6">
-      <stop
-         style="stop-color:#7795b6;stop-opacity:1;"
-         offset="0"
-         id="stop6895-8-7-7-0-1-2-35-8-5" />
-      <stop
-         style="stop-color:#7795b6;stop-opacity:1;"
-         offset="1"
-         id="stop6897-2-6-9-2-4-3-9-1-1" />
-    </linearGradient>
-    <linearGradient
-       y2="5.3933983"
-       x2="5.8030186"
-       y1="5.3933983"
-       x1="9.2662354"
-       gradientTransform="matrix(1.2784768,0,0,0.27549241,-2.8370135,-1044.4678)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient5592"
-       xlink:href="#linearGradient6893-5-8-0-4-9-2-6-9-6"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5641"
-       id="linearGradient5647"
-       x1="30.45603"
-       y1="1028.9988"
-       x2="30.45603"
-       y2="1033.8717"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-12.948786,22.935422)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5641-4"
-       id="linearGradient5647-2"
-       x1="30.45603"
-       y1="1028.9988"
-       x2="30.45603"
-       y2="1033.8717"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-12.948786,22.935422)" />
-    <linearGradient
-       id="linearGradient5641-4">
-      <stop
-         style="stop-color:#1e6cbe;stop-opacity:1;"
-         offset="0"
-         id="stop5643-1" />
-      <stop
-         style="stop-color:#104276;stop-opacity:1;"
-         offset="1"
-         id="stop5645-2" />
-    </linearGradient>
-    <linearGradient
-       y2="1033.8717"
-       x2="30.45603"
-       y1="1028.9988"
-       x1="30.45603"
-       gradientTransform="matrix(0.71554797,0.15002359,0,0.70580829,-11.070338,316.74005)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient5664"
-       xlink:href="#linearGradient5641-4"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6893-5-8-0-4-9"
-       id="linearGradient5695"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2820342,0,0,0.26192632,-2.8911185,1046.2126)"
-       x1="9.2662354"
-       y1="5.3933983"
-       x2="5.8030186"
-       y2="5.3933983" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6893-5-8-0-4-9-2"
-       id="linearGradient5697"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2784768,0,0,0.27549242,-2.8370137,-1046.8387)"
-       x1="9.2662354"
-       y1="5.3933983"
-       x2="5.8030186"
-       y2="5.3933983" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6893-5-8-0-4-9-2-6"
-       id="linearGradient5699"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2784768,0,0,0.27549241,-2.8370135,-1044.4678)"
-       x1="9.2662354"
-       y1="5.3933983"
-       x2="5.8030186"
-       y2="5.3933983" />
-    <linearGradient
-       y2="1033.8717"
-       x2="30.45603"
-       y1="1028.9988"
-       x1="30.45603"
-       gradientTransform="matrix(0.71554797,0.15002359,0,0.70580829,-11.070338,316.74005)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient5664-4"
-       xlink:href="#linearGradient5641-4-8"
-       inkscape:collect="always" />
     <linearGradient
        id="linearGradient5641-4-8">
       <stop
@@ -886,10 +33,8 @@
        gradientTransform="matrix(-0.71554797,0.15002359,0,0.70580829,35.111967,316.65165)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient3174"
-       xlink:href="#linearGradient5641-4-8"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient5641-4-8" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4204"
        id="linearGradient4210"
        x1="-708.08484"
@@ -899,7 +44,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(0.26814319,16.7129)" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4204">
       <stop
          style="stop-color:#8e6aae;stop-opacity:1"
@@ -911,7 +55,6 @@
          id="stop4208" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4229"
        id="linearGradient4235"
        x1="44.955429"
@@ -920,7 +63,6 @@
        y2="1042.4124"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4229">
       <stop
          style="stop-color:#713e9d;stop-opacity:1;"
@@ -932,7 +74,6 @@
          id="stop4233" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4276"
        id="linearGradient4235-4"
        x1="44.955429"
@@ -942,8 +83,7 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(-1,0,0,1,83.988875,0)" />
     <linearGradient
-       id="linearGradient4276"
-       inkscape:collect="always">
+       id="linearGradient4276">
       <stop
          id="stop4278"
          offset="0"
@@ -962,31 +102,6 @@
          style="stop-color:#ffffff;stop-opacity:1" />
     </linearGradient>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="22.627416"
-     inkscape:cx="3.8906881"
-     inkscape:cy="7.3192208"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1171"
-     inkscape:window-height="959"
-     inkscape:window-x="954"
-     inkscape:window-y="324"
-     inkscape:window-maximized="0"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid4250" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -1000,17 +115,13 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
     <path
        style="display:inline;fill:#71baff;fill-opacity:1;stroke:url(#linearGradient3174);stroke-width:0.97756845px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
        d="m 15.567564,1038.006 c 0,0 0.278356,-1.0382 -0.722142,-1.1241 -1.000497,-0.085 -2.305493,-0.045 -2.305493,-0.045 l 0,14.4475 2.839295,-2.5522 0.205697,3.6859 c 0,0 -0.104357,-1.5627 -0.06086,-2.3782 0.0435,-0.8151 0.0435,-12.0333 0.0435,-12.0333 z"
-       id="path5639"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="csccccscc" />
+       id="path5639" />
     <g
        style="display:inline"
        id="g4286"
@@ -1026,26 +137,18 @@
          id="rect3394"
          style="opacity:1;fill:#f2aaf1;fill-opacity:1;stroke:url(#linearGradient4210);stroke-width:1;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
       <path
-         sodipodi:nodetypes="cccc"
-         inkscape:connector-curvature="0"
          id="path4212"
          d="m 46.545386,1043.3647 -4.540397,4.6029 -0.0095,-4.5977 z"
          style="fill:#8861aa;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
       <path
-         sodipodi:nodetypes="cccc"
-         inkscape:connector-curvature="0"
          id="path4212-4"
          d="m 46.545386,1043.3659 -4.540397,-4.6029 -0.0095,4.5977 z"
          style="display:inline;fill:url(#linearGradient4235);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
       <path
-         sodipodi:nodetypes="cccc"
-         inkscape:connector-curvature="0"
          id="path4212-9"
          d="m 37.44617,1043.3647 4.540397,4.6029 0.0095,-4.5977 z"
          style="display:inline;fill:#ad86cf;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
       <path
-         sodipodi:nodetypes="cccc"
-         inkscape:connector-curvature="0"
          id="path4212-4-2"
          d="m 37.443489,1043.3659 4.540397,-4.6029 0.0095,4.5977 z"
          style="display:inline;fill:url(#linearGradient4235-4);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
diff --git a/ui/org.eclipse.pde.ui/icons/obj16/site_xml_obj.svg b/ui/org.eclipse.pde.ui/icons/obj16/site_xml_obj.svg
index 2a03a6c9ccc..6acc6a5e086 100644
--- a/ui/org.eclipse.pde.ui/icons/obj16/site_xml_obj.svg
+++ b/ui/org.eclipse.pde.ui/icons/obj16/site_xml_obj.svg
@@ -2,24 +2,19 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="site_xml_obj.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4902-3"
        id="linearGradient4908-2"
        x1="10.544736"
@@ -29,7 +24,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-2.009153,-1.0294106)" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4902-3">
       <stop
          style="stop-color:#b28a30;stop-opacity:1"
@@ -41,7 +35,6 @@
          id="stop4906-2" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4894-6"
        id="linearGradient4900-1"
        x1="7.9987183"
@@ -51,7 +44,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(1.990847,-1.0294106)" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4894-6">
       <stop
          style="stop-color:#e0c88f;stop-opacity:1"
@@ -63,7 +55,6 @@
          id="stop4898-5" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4994-6">
       <stop
          style="stop-color:#f9fafc;stop-opacity:1;"
@@ -82,29 +73,8 @@
        gradientUnits="userSpaceOnUse"
        id="linearGradient4101"
        xlink:href="#linearGradient4994-6"
-       inkscape:collect="always"
        gradientTransform="translate(-2.009153,-1.0294106)" />
     <linearGradient
-       id="linearGradient5103-3">
-      <stop
-         style="stop-color:#fefdef;stop-opacity:1"
-         offset="0"
-         id="stop5105-5" />
-      <stop
-         id="stop7550-07"
-         offset="0.26694915"
-         style="stop-color:#fef5d4;stop-opacity:1" />
-      <stop
-         id="stop7548-6"
-         offset="0.51694918"
-         style="stop-color:#fbe08e;stop-opacity:1" />
-      <stop
-         style="stop-color:#fbdd83;stop-opacity:1"
-         offset="1"
-         id="stop5107-7" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4204"
        id="linearGradient4210"
        x1="-708.08484"
@@ -114,7 +84,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(0.26814319,16.7129)" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4204">
       <stop
          style="stop-color:#8e6aae;stop-opacity:1"
@@ -126,7 +95,6 @@
          id="stop4208" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4229"
        id="linearGradient4235"
        x1="44.955429"
@@ -135,7 +103,6 @@
        y2="1042.4124"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4229">
       <stop
          style="stop-color:#713e9d;stop-opacity:1;"
@@ -147,7 +114,6 @@
          id="stop4233" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4276"
        id="linearGradient4235-4"
        x1="44.955429"
@@ -157,8 +123,7 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(-1,0,0,1,83.988875,0)" />
     <linearGradient
-       id="linearGradient4276"
-       inkscape:collect="always">
+       id="linearGradient4276">
       <stop
          id="stop4278"
          offset="0"
@@ -177,31 +142,6 @@
          style="stop-color:#ffffff;stop-opacity:1" />
     </linearGradient>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="2"
-     inkscape:cx="80.493163"
-     inkscape:cy="63.360287"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="900"
-     inkscape:window-x="784"
-     inkscape:window-y="490"
-     inkscape:window-maximized="0"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3999" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -215,28 +155,21 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
     <path
        style="fill:url(#linearGradient4101);fill-opacity:1;stroke:none;display:inline"
        d="m 3.4881295,1037.8727 7.0096695,0 3.062057,3.0066 0,9.9546 -10.0717265,0 z"
-       id="rect4001-3"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccc" />
+       id="rect4001-3" />
     <path
        style="fill:url(#linearGradient4900-1);fill-opacity:1;stroke:none;display:inline"
        d="m 9.967468,1037.41 0,3.9112 3.977478,0 z"
-       id="path4884"
-       inkscape:connector-curvature="0" />
+       id="path4884" />
     <path
        style="fill:none;stroke:url(#linearGradient4908-2);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;display:inline"
        d="m 3.4881295,1037.8727 6.9471695,0 3.062057,3.0066 0,9.9546 -10.0092265,0 z"
-       id="rect4001"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccc" />
+       id="rect4001" />
     <g
        style="display:inline"
        id="g4286"
@@ -252,26 +185,18 @@
          id="rect3394"
          style="opacity:1;fill:#f2aaf1;fill-opacity:1;stroke:url(#linearGradient4210);stroke-width:1;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
       <path
-         sodipodi:nodetypes="cccc"
-         inkscape:connector-curvature="0"
          id="path4212"
          d="m 46.545386,1043.3647 -4.540397,4.6029 -0.0095,-4.5977 z"
          style="fill:#8861aa;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
       <path
-         sodipodi:nodetypes="cccc"
-         inkscape:connector-curvature="0"
          id="path4212-4"
          d="m 46.545386,1043.3659 -4.540397,-4.6029 -0.0095,4.5977 z"
          style="display:inline;fill:url(#linearGradient4235);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
       <path
-         sodipodi:nodetypes="cccc"
-         inkscape:connector-curvature="0"
          id="path4212-9"
          d="m 37.44617,1043.3647 4.540397,4.6029 0.0095,-4.5977 z"
          style="display:inline;fill:#ad86cf;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
       <path
-         sodipodi:nodetypes="cccc"
-         inkscape:connector-curvature="0"
          id="path4212-4-2"
          d="m 37.443489,1043.3659 4.540397,-4.6029 0.0095,4.5977 z"
          style="display:inline;fill:url(#linearGradient4235-4);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
diff --git a/ui/org.eclipse.pde.ui/icons/obj16/source_attach_attrib.svg b/ui/org.eclipse.pde.ui/icons/obj16/source_attach_attrib.svg
index 665cca92d2b..5ea183222dd 100644
--- a/ui/org.eclipse.pde.ui/icons/obj16/source_attach_attrib.svg
+++ b/ui/org.eclipse.pde.ui/icons/obj16/source_attach_attrib.svg
@@ -2,24 +2,19 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.48.0 r9654"
-   sodipodi:docname="source_attach_attrib.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient8553">
       <stop
          style="stop-color:#b1760e;stop-opacity:1"
@@ -31,7 +26,6 @@
          id="stop8557" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient5147-4"
        id="linearGradient4871-2"
        x1="10.999999"
@@ -41,8 +35,7 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-3.031249,-4.0207056)" />
     <linearGradient
-       id="linearGradient5147-4"
-       inkscape:collect="always">
+       id="linearGradient5147-4">
       <stop
          id="stop5149-5"
          offset="0"
@@ -53,7 +46,6 @@
          style="stop-color:#286296;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4902-3"
        id="linearGradient4908-2"
        x1="10.544736"
@@ -63,7 +55,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-2.009153,-1.0294106)" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4902-3">
       <stop
          style="stop-color:#b28a30;stop-opacity:1"
@@ -75,7 +66,6 @@
          id="stop4906-2" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4894-6"
        id="linearGradient4900-1"
        x1="7.9987183"
@@ -85,7 +75,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(1.990847,-1.0294106)" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4894-6">
       <stop
          style="stop-color:#e0c88f;stop-opacity:1"
@@ -97,7 +86,6 @@
          id="stop4898-5" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4994-6">
       <stop
          style="stop-color:#f9fafc;stop-opacity:1;"
@@ -116,11 +104,9 @@
        gradientUnits="userSpaceOnUse"
        id="linearGradient4101"
        xlink:href="#linearGradient4994-6"
-       inkscape:collect="always"
        gradientTransform="translate(-2.009153,-1.0294106)" />
     <linearGradient
-       id="linearGradient5147-4-7"
-       inkscape:collect="always">
+       id="linearGradient5147-4-7">
       <stop
          id="stop5149-5-4"
          offset="0"
@@ -138,10 +124,8 @@
        gradientTransform="translate(-3.031249,-2.0206496)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient4092"
-       xlink:href="#linearGradient5147-4-7"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient5147-4-7" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient5103-3"
        id="linearGradient5109-0"
        x1="11.718328"
@@ -177,11 +161,9 @@
        gradientTransform="translate(19.911612,-20)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient8518"
-       xlink:href="#linearGradient8553"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient8553" />
     <linearGradient
-       id="linearGradient5147-4-4"
-       inkscape:collect="always">
+       id="linearGradient5147-4-4">
       <stop
          id="stop5149-5-0"
          offset="0"
@@ -199,11 +181,9 @@
        gradientTransform="translate(-3.031249,-6.02065)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient6311"
-       xlink:href="#linearGradient5147-4-4"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient5147-4-4" />
     <linearGradient
-       id="linearGradient5147-4-7-8"
-       inkscape:collect="always">
+       id="linearGradient5147-4-7-8">
       <stop
          id="stop5149-5-4-2"
          offset="0"
@@ -221,34 +201,8 @@
        gradientTransform="translate(-3.031249,-0.02065)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient6345"
-       xlink:href="#linearGradient5147-4-7-8"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient5147-4-7-8" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="16.000001"
-     inkscape:cx="23.437525"
-     inkscape:cy="14.853252"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="900"
-     inkscape:window-x="100"
-     inkscape:window-y="100"
-     inkscape:window-maximized="0"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3999" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -262,28 +216,21 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
     <path
        style="fill:url(#linearGradient4101);fill-opacity:1;stroke:none;display:inline"
        d="m 3.4881295,1037.8727 7.0096695,0 3.062057,3.0066 0,9.9546 -10.0717265,0 z"
-       id="rect4001-3"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccc" />
+       id="rect4001-3" />
     <path
        style="fill:url(#linearGradient4900-1);fill-opacity:1;stroke:none;display:inline"
        d="m 9.967468,1037.41 0,3.9112 3.977478,0 z"
-       id="path4884"
-       inkscape:connector-curvature="0" />
+       id="path4884" />
     <path
        style="fill:none;stroke:url(#linearGradient4908-2);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;display:inline"
        d="m 3.4881295,1037.8727 6.9471695,0 3.062057,3.0066 0,9.9546 -10.0092265,0 z"
-       id="rect4001"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccc" />
+       id="rect4001" />
     <rect
        style="fill:url(#linearGradient4871-2);fill-opacity:1;stroke:none;display:inline"
        id="rect4001-1-7-4"
@@ -299,28 +246,21 @@
        x="7.96875"
        y="1045.3309" />
     <path
-       inkscape:connector-curvature="0"
        id="path4119"
        style="font-size:11.09719372px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#2b6498;fill-opacity:1;stroke:none;font-family:Sans"
-       d="m 3.9044723,1043.947 c 0.2803059,-0.01 0.5087374,-0.072 0.6852938,-0.1978 0.1765563,-0.1256 0.293957,-0.2979 0.3522038,-0.5172 0.058245,-0.2192 0.092242,-0.297 0.092823,-0.3819 0.0036,-0.5306 0.014559,-0.8802 0.032762,-1.0486 0.032762,-0.2669 0.09374,-0.4814 0.182927,-0.6435 0.08919,-0.1621 0.1993063,-0.2916 0.3303599,-0.3886 0.1310517,-0.097 0.2985064,-0.1707 0.5023677,-0.2216 0.1383312,-0.032 0.3647257,-0.025 0.6771046,-0.047 l 0.3057887,0 0,0.7484 -0.1692769,0 c -0.3785981,0 -0.6297815,0.06 -0.7535511,0.1788 -0.1237741,0.1192 -0.1856589,0.3853 -0.1856561,0.7984 -8e-7,0.2487 -0.020021,0.6153 -0.060072,0.8346 -0.065525,0.3401 -0.1774688,0.6023 -0.3358209,0.7866 -0.1583567,0.1843 -0.4068101,0.348 -0.745361,0.4909 0.4004366,0.1462 0.6907539,0.3695 0.8709527,0.6697 0.1801942,0.3004 0.2702985,0.7922 0.2702955,1.4755 -6e-7,0.1313 0.00729,0.2451 0.021838,0.3627 0.029127,0.216 0.1028371,0.367 0.2211503,0.4528 0.1183085,0.086 0.3503807,0.1286 0.6962148,0.1286 l 0.1692769,0 0,0.7485 -0.3057887,0 c -0.3567561,0 -0.6152208,-0.026 -0.7753932,-0.077 -0.2329838,-0.073 -0.4259222,-0.1915 -0.5788142,-0.3552 -0.1528957,-0.1637 -0.2520959,-0.371 -0.2975977,-0.622 -0.045513,-0.251 -0.07278,-0.3439 -0.073717,-0.4915 -0.0036,-0.572 -0.034589,-0.9676 -0.092823,-1.1869 -0.058245,-0.2193 -0.1756476,-0.3924 -0.3522039,-0.5195 -0.1765563,-0.1272 -0.4049879,-0.1939 -0.6852938,-0.2003 z"
-       sodipodi:nodetypes="ccccccccsccsccccccsccsccscccccscc" />
+       d="m 3.9044723,1043.947 c 0.2803059,-0.01 0.5087374,-0.072 0.6852938,-0.1978 0.1765563,-0.1256 0.293957,-0.2979 0.3522038,-0.5172 0.058245,-0.2192 0.092242,-0.297 0.092823,-0.3819 0.0036,-0.5306 0.014559,-0.8802 0.032762,-1.0486 0.032762,-0.2669 0.09374,-0.4814 0.182927,-0.6435 0.08919,-0.1621 0.1993063,-0.2916 0.3303599,-0.3886 0.1310517,-0.097 0.2985064,-0.1707 0.5023677,-0.2216 0.1383312,-0.032 0.3647257,-0.025 0.6771046,-0.047 l 0.3057887,0 0,0.7484 -0.1692769,0 c -0.3785981,0 -0.6297815,0.06 -0.7535511,0.1788 -0.1237741,0.1192 -0.1856589,0.3853 -0.1856561,0.7984 -8e-7,0.2487 -0.020021,0.6153 -0.060072,0.8346 -0.065525,0.3401 -0.1774688,0.6023 -0.3358209,0.7866 -0.1583567,0.1843 -0.4068101,0.348 -0.745361,0.4909 0.4004366,0.1462 0.6907539,0.3695 0.8709527,0.6697 0.1801942,0.3004 0.2702985,0.7922 0.2702955,1.4755 -6e-7,0.1313 0.00729,0.2451 0.021838,0.3627 0.029127,0.216 0.1028371,0.367 0.2211503,0.4528 0.1183085,0.086 0.3503807,0.1286 0.6962148,0.1286 l 0.1692769,0 0,0.7485 -0.3057887,0 c -0.3567561,0 -0.6152208,-0.026 -0.7753932,-0.077 -0.2329838,-0.073 -0.4259222,-0.1915 -0.5788142,-0.3552 -0.1528957,-0.1637 -0.2520959,-0.371 -0.2975977,-0.622 -0.045513,-0.251 -0.07278,-0.3439 -0.073717,-0.4915 -0.0036,-0.572 -0.034589,-0.9676 -0.092823,-1.1869 -0.058245,-0.2193 -0.1756476,-0.3924 -0.3522039,-0.5195 -0.1765563,-0.1272 -0.4049879,-0.1939 -0.6852938,-0.2003 z" />
     <g
        transform="matrix(1,0,0,-1,-18.161675,2114.6687)"
-       inkscape:label="Layer 1"
        id="layer1-7"
        style="display:inline">
       <path
          style="fill:url(#linearGradient5109-0);fill-opacity:1;stroke:none;display:inline"
          d="m 26.911612,1043.9275 0,2.3878 4.25,0 0,1.5313 3.781143,-2.432 -3.781143,-3.0027 0,1.5156 z"
-         id="path4108-1"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccccc" />
+         id="path4108-1" />
       <path
          style="fill:url(#linearGradient8518);fill-opacity:1;stroke:none;display:inline"
          d="m 30.161612,1041.8097 0,1.5156 -2.25,0 -1,0 c -0.99185,0.9918 -0.986324,3.0037 0,3.99 l 1,0 2.25,0 0,1.5313 c 0,0.6519 0.740915,0.6375 1.5,0 l 3.923255,-3.4983 -3.923255,-3.5386 c -0.760225,-0.7602 -1.5,-0.5203 -1.5,0 z m 1,1 2.985755,2.5386 -2.985755,2.4983 0,-1.5313 -3.6875,0 c -0.276214,-0.2099 -0.277444,-1.7182 0,-1.99 l 3.6875,0 z"
-         id="path4108-1-6"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccccccccccccccccc" />
+         id="path4108-1-6" />
     </g>
     <rect
        style="fill:url(#linearGradient6311);fill-opacity:1;stroke:none;display:inline"
diff --git a/ui/org.eclipse.pde.ui/icons/obj16/start_application.svg b/ui/org.eclipse.pde.ui/icons/obj16/start_application.svg
index 4c461a04c5e..89ae76f08a3 100644
--- a/ui/org.eclipse.pde.ui/icons/obj16/start_application.svg
+++ b/ui/org.eclipse.pde.ui/icons/obj16/start_application.svg
@@ -2,24 +2,19 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="start_application.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient8287">
       <stop
          style="stop-color:#6eb6e2;stop-opacity:1;"
@@ -46,8 +41,7 @@
          id="stop4086-2" />
     </linearGradient>
     <linearGradient
-       id="linearGradient4994-4-5"
-       inkscape:collect="always">
+       id="linearGradient4994-4-5">
       <stop
          id="stop4996-5-9"
          offset="0"
@@ -58,7 +52,6 @@
          style="stop-color:#ffffff;stop-opacity:0;" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4910-4-0">
       <stop
          style="stop-color:#ffffff;stop-opacity:0"
@@ -70,8 +63,7 @@
          id="stop4914-8-1" />
     </linearGradient>
     <linearGradient
-       id="linearGradient4810-5"
-       inkscape:collect="always">
+       id="linearGradient4810-5">
       <stop
          id="stop4812-0"
          offset="0"
@@ -82,7 +74,6 @@
          style="stop-color:#877e60;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4082-3"
        id="linearGradient8878"
        gradientUnits="userSpaceOnUse"
@@ -92,7 +83,6 @@
        x2="8.0137892"
        y2="1041.8765" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4994-4-5"
        id="linearGradient8881"
        gradientUnits="userSpaceOnUse"
@@ -102,7 +92,6 @@
        x2="-11"
        y2="1044.3622" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4910-4-0"
        id="linearGradient8884"
        gradientUnits="userSpaceOnUse"
@@ -112,7 +101,6 @@
        x2="-15"
        y2="1047.3622" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4810-5"
        id="linearGradient8887"
        gradientUnits="userSpaceOnUse"
@@ -122,7 +110,6 @@
        x2="8.0137892"
        y2="1050.0707" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient8287"
        id="linearGradient8293"
        x1="-18.996288"
@@ -139,8 +126,7 @@
        gradientTransform="matrix(0.59875177,0,0,0.56057055,-10.143881,453.49445)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient14026"
-       xlink:href="#linearGradient8164-4"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient8164-4" />
     <linearGradient
        id="linearGradient8164-4">
       <stop
@@ -176,11 +162,9 @@
        x1="21.469872"
        gradientUnits="userSpaceOnUse"
        id="linearGradient14028"
-       xlink:href="#linearGradient8180-2"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient8180-2" />
     <linearGradient
-       id="linearGradient8180-2"
-       inkscape:collect="always">
+       id="linearGradient8180-2">
       <stop
          id="stop8182-5"
          offset="0"
@@ -191,31 +175,6 @@
          style="stop-color:#257550;stop-opacity:1" />
     </linearGradient>
   </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="3.345947"
-     inkscape:cy="17.326399"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="952"
-     inkscape:window-height="944"
-     inkscape:window-x="1606"
-     inkscape:window-y="536"
-     inkscape:window-maximized="0"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid8762" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -229,38 +188,26 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
     <path
-       sodipodi:nodetypes="ccccc"
-       inkscape:connector-curvature="0"
        id="rect3997-9"
        d="m 3.5076731,1039.9279 12.0019249,0 0,8.9042 -12.0019249,0 z"
        style="display:inline;fill:#f4fcff;fill-opacity:1;stroke:url(#linearGradient8887);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1" />
     <path
-       sodipodi:nodetypes="ccccc"
-       inkscape:connector-curvature="0"
        id="rect4853-82-7"
        d="m 5.0000001,1041.3611 0,9.0312 -1,0 0,-10.0312 z"
        style="display:inline;fill:url(#linearGradient8884);fill-opacity:1;stroke:none" />
     <path
-       sodipodi:nodetypes="ccccc"
-       inkscape:connector-curvature="0"
        id="rect4853-82-0"
        d="m 5.0625001,1042.3923 8.8655779,0 0,-1 -9.8655779,0 z"
        style="display:inline;fill:url(#linearGradient8881);fill-opacity:1;stroke:none" />
     <path
-       sodipodi:nodetypes="ccccc"
-       inkscape:connector-curvature="0"
        id="rect3997-9-9"
        d="m 3.5037121,1038.8924 12.0668329,0 0,2.0053 -12.0668329,0 z"
        style="display:inline;fill:url(#linearGradient8293);fill-opacity:1;stroke:url(#linearGradient8878);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1" />
     <path
-       sodipodi:nodetypes="cccc"
-       inkscape:connector-curvature="0"
        id="path8117"
        d="m 1.4593485,1044.7573 6.4563463,3.2601 -6.4189245,3.254 z"
        style="display:inline;fill:url(#linearGradient14026);fill-opacity:1;stroke:url(#linearGradient14028);stroke-width:0.74857056;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
diff --git a/ui/org.eclipse.pde.ui/icons/obj16/target_profile_xml_obj.svg b/ui/org.eclipse.pde.ui/icons/obj16/target_profile_xml_obj.svg
index a0da0e779c0..fe4317f1f66 100644
--- a/ui/org.eclipse.pde.ui/icons/obj16/target_profile_xml_obj.svg
+++ b/ui/org.eclipse.pde.ui/icons/obj16/target_profile_xml_obj.svg
@@ -2,64 +2,18 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="target_profile_xml_obj.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
-    <linearGradient
-       id="linearGradient5103-3">
-      <stop
-         style="stop-color:#fefdef;stop-opacity:1"
-         offset="0"
-         id="stop5105-5" />
-      <stop
-         id="stop7550-07"
-         offset="0.26694915"
-         style="stop-color:#fef5d4;stop-opacity:1" />
-      <stop
-         id="stop7548-6"
-         offset="0.51694918"
-         style="stop-color:#fbe08e;stop-opacity:1" />
-      <stop
-         style="stop-color:#fbdd83;stop-opacity:1"
-         offset="1"
-         id="stop5107-7" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3955-9">
-      <stop
-         style="stop-color:#3870da;stop-opacity:1"
-         offset="0"
-         id="stop3957-3" />
-      <stop
-         id="stop3959-2"
-         offset="0.15381166"
-         style="stop-color:#78b8f0;stop-opacity:1" />
-      <stop
-         id="stop3961-3"
-         offset="0.65650523"
-         style="stop-color:#78b8f0;stop-opacity:1" />
-      <stop
-         style="stop-color:#3068d8;stop-opacity:1"
-         offset="0.92272848"
-         id="stop3963-9" />
-      <stop
-         style="stop-color:#3068d8;stop-opacity:1"
-         offset="1"
-         id="stop3965-8" />
-    </linearGradient>
     <linearGradient
        y2="1051.8378"
        x2="9.8946028"
@@ -68,10 +22,8 @@
        gradientUnits="userSpaceOnUse"
        id="linearGradient4101"
        xlink:href="#linearGradient4994-6"
-       inkscape:collect="always"
        gradientTransform="translate(-1.977903,-1.0442)" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4994-6">
       <stop
          style="stop-color:#f9fafc;stop-opacity:1;"
@@ -83,7 +35,6 @@
          id="stop4998-89" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4894-6"
        id="linearGradient4900-1"
        x1="7.9987183"
@@ -93,7 +44,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(2.022097,-1.0442)" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4894-6">
       <stop
          style="stop-color:#e0c88f;stop-opacity:1"
@@ -105,128 +55,6 @@
          id="stop4898-5" />
     </linearGradient>
     <linearGradient
-       id="linearGradient10448-9-7-0-5">
-      <stop
-         style="stop-color:#cf9307;stop-opacity:1"
-         offset="0"
-         id="stop10450-3-5-6-7" />
-      <stop
-         id="stop10456-4-1-5-3"
-         offset="0.5"
-         style="stop-color:#f7d87b;stop-opacity:1" />
-      <stop
-         style="stop-color:#ebb313;stop-opacity:1"
-         offset="1"
-         id="stop10452-22-7-8-4" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10748-8">
-      <stop
-         id="stop10750-5"
-         offset="0"
-         style="stop-color:#ecac18;stop-opacity:1" />
-      <stop
-         style="stop-color:#f1ce66;stop-opacity:1"
-         offset="0.25"
-         id="stop10752-8" />
-      <stop
-         style="stop-color:#f6e5a6;stop-opacity:1"
-         offset="0.5"
-         id="stop10754-8" />
-      <stop
-         id="stop10756-4"
-         offset="0.75"
-         style="stop-color:#f1cf6c;stop-opacity:1" />
-      <stop
-         id="stop10758-7"
-         offset="1"
-         style="stop-color:#e5b630;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10448-90">
-      <stop
-         style="stop-color:#ecac18;stop-opacity:1"
-         offset="0"
-         id="stop10450-0" />
-      <stop
-         id="stop10458-2"
-         offset="0.25"
-         style="stop-color:#ffe38d;stop-opacity:1" />
-      <stop
-         id="stop10456-96"
-         offset="0.5"
-         style="stop-color:#fdf5d2;stop-opacity:1" />
-      <stop
-         style="stop-color:#ffeba7;stop-opacity:1"
-         offset="0.75"
-         id="stop10460-3" />
-      <stop
-         style="stop-color:#e5b630;stop-opacity:1"
-         offset="1"
-         id="stop10452-1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10414-9">
-      <stop
-         style="stop-color:#5078b9;stop-opacity:1;"
-         offset="0"
-         id="stop10416-3" />
-      <stop
-         id="stop10422-8"
-         offset="0.5"
-         style="stop-color:#6d8cbd;stop-opacity:1" />
-      <stop
-         style="stop-color:#5f88c9;stop-opacity:1"
-         offset="1"
-         id="stop10418-4" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10432-3">
-      <stop
-         id="stop10434-4"
-         offset="0"
-         style="stop-color:#1f4d9a;stop-opacity:1" />
-      <stop
-         style="stop-color:#4e6da1;stop-opacity:1"
-         offset="0.5"
-         id="stop10436-2" />
-      <stop
-         id="stop10438-9"
-         offset="1"
-         style="stop-color:#567ebc;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10157-6">
-      <stop
-         style="stop-color:#6588c1;stop-opacity:1"
-         offset="0"
-         id="stop10159-5" />
-      <stop
-         id="stop10165-9"
-         offset="0.5"
-         style="stop-color:#becce3;stop-opacity:1" />
-      <stop
-         style="stop-color:#809dcb;stop-opacity:1"
-         offset="1"
-         id="stop10161-55" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4284">
-      <stop
-         id="stop4286"
-         offset="0"
-         style="stop-color:#6588c1;stop-opacity:0" />
-      <stop
-         style="stop-color:#becce3;stop-opacity:1"
-         offset="0.49999967"
-         id="stop4288" />
-      <stop
-         id="stop4290"
-         offset="1"
-         style="stop-color:#809dcb;stop-opacity:0" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4317"
        id="linearGradient4323"
        x1="19.792524"
@@ -235,7 +63,6 @@
        y2="1064.6748"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4317">
       <stop
          style="stop-color:#f8e8a8;stop-opacity:1"
@@ -255,7 +82,6 @@
          id="stop4321" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4311"
        id="linearGradient4307"
        gradientUnits="userSpaceOnUse"
@@ -264,8 +90,7 @@
        x2="18.92688"
        y2="1065.5569" />
     <linearGradient
-       id="linearGradient4311"
-       inkscape:collect="always">
+       id="linearGradient4311">
       <stop
          id="stop4313"
          offset="0"
@@ -276,7 +101,6 @@
          style="stop-color:#a87000;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4311"
        id="linearGradient4309"
        gradientUnits="userSpaceOnUse"
@@ -285,7 +109,6 @@
        x2="17.04467"
        y2="1063.8405" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4258"
        id="linearGradient4264"
        x1="17.04467"
@@ -294,7 +117,6 @@
        y2="1063.8405"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4258">
       <stop
          style="stop-color:#5888c8;stop-opacity:1"
@@ -306,7 +128,6 @@
          id="stop4262" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4250"
        id="linearGradient4256"
        x1="18.92688"
@@ -315,7 +136,6 @@
        y2="1065.5569"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4250">
       <stop
          style="stop-color:#7090c0;stop-opacity:1"
@@ -327,7 +147,6 @@
          id="stop4254" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4464"
        id="linearGradient4470-8-6"
        x1="9.375"
@@ -337,7 +156,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(0.74650889,0,0,1,1.5883978,-0.12860153)" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4464">
       <stop
          style="stop-color:#ffffff;stop-opacity:1"
@@ -349,7 +167,6 @@
          id="stop4468" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4464"
        id="linearGradient4470-8"
        x1="9.375"
@@ -360,7 +177,6 @@
        gradientTransform="translate(1033.257,-1043.4262)" />
     <linearGradient
        gradientTransform="translate(0,-1.5330059e-6)"
-       inkscape:collect="always"
        xlink:href="#linearGradient4464"
        id="linearGradient4470"
        x1="9.375"
@@ -369,31 +185,6 @@
        y2="1037.8778"
        gradientUnits="userSpaceOnUse" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1"
-     inkscape:cx="6.0819701"
-     inkscape:cy="11.098912"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="1280"
-     inkscape:window-height="900"
-     inkscape:window-x="1115"
-     inkscape:window-y="626"
-     inkscape:window-maximized="0"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3999" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -407,8 +198,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
@@ -416,26 +205,20 @@
        transform="matrix(1.2394243,0,0,1.2394243,-21.274665,-254.90388)"
        style="font-style:normal;font-weight:normal;font-size:13.58917427px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;display:inline;fill:#ffffff;fill-opacity:1;stroke:none"
        id="layer1-9"
-       inkscape:label="Layer 1"
        mask="none" />
     <g
        style="display:inline"
        id="g4486"
        transform="translate(1.9873253,-0.11048548)">
       <path
-         sodipodi:nodetypes="cccccc"
-         inkscape:connector-curvature="0"
          id="rect4001-3"
          d="m 3.5193795,1037.8597 7.0096695,0 3.062057,3.0066 0,9.9546 -10.0717265,0 z"
          style="display:inline;fill:url(#linearGradient4101);fill-opacity:1;stroke:none" />
       <path
-         inkscape:connector-curvature="0"
          id="path4884"
          d="m 9.998718,1037.397 0,3.9112 3.977479,0 z"
          style="display:inline;fill:url(#linearGradient4900-1);fill-opacity:1;stroke:none" />
       <path
-         sodipodi:nodetypes="cccccc"
-         inkscape:connector-curvature="0"
          id="rect4001"
          d="m 3.5635737,1037.8597 6.9654753,0 3.062057,3.0066 0,9.9546 -10.0275323,0 z"
          style="display:inline;fill:none;stroke:#a1813a;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1" />
@@ -452,7 +235,6 @@
            id="path4320"
            style="display:inline;opacity:1;fill:#d8e8e0;fill-opacity:1;stroke:#2068a0;stroke-width:1;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
         <path
-           inkscape:connector-curvature="0"
            id="path4322"
            d="m 8.0064212,1060.9149 0,1.0254 -1.0019532,0 0,1 1.0019532,0 0,0.9785 1,0 0,-0.9785 0.9824218,0 0,-1 -0.9824218,0 0,-1.0254 -1,0 z"
            style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#2068a0;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
@@ -492,8 +274,6 @@
            id="g4266-0"
            style="display:inline">
           <path
-             sodipodi:nodetypes="ssssccs"
-             inkscape:connector-curvature="0"
              id="path4242-9"
              d="m 19.520119,1060.4831 c 0.341806,-0.3409 1.0254,0.4474 1.0254,0.9295 l 0,2.9581 c 0,0.5003 -0.709328,1.5082 -1.063991,1.1545 -1.323187,-1.3197 -1.935031,-2.0399 -1.935031,-2.0399 l 0,-0.9787 c 0,0 0.739057,-0.7922 1.973622,-2.0235 z"
              style="fill:url(#linearGradient4323);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4307);stroke-width:0.89697278;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
@@ -518,9 +298,7 @@
         <path
            style="fill:#a8c0d8;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4256);stroke-width:0.89697278;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
            d="m 19.520119,1060.4831 c 0.341806,-0.3409 1.0254,1.0466 1.0254,1.5287 l 0,2.4522 c 0,0.5003 -0.709328,1.4149 -1.063991,1.0612 -1.323187,-1.3197 -1.935031,-2.0399 -1.935031,-2.0399 l 0,-0.9787 c 0,0 0.739057,-0.7922 1.973622,-2.0235 z"
-           id="path4242"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ssssccs" />
+           id="path4242" />
       </g>
     </g>
   </g>
diff --git a/ui/org.eclipse.pde.ui/icons/obj16/test.svg b/ui/org.eclipse.pde.ui/icons/obj16/test.svg
index d70ecb6d71e..8d2c0355925 100644
--- a/ui/org.eclipse.pde.ui/icons/obj16/test.svg
+++ b/ui/org.eclipse.pde.ui/icons/obj16/test.svg
@@ -2,24 +2,19 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="test.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4902-3"
        id="linearGradient4908-2"
        x1="10.544736"
@@ -29,7 +24,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-2.9501748,-1.044194)" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4902-3">
       <stop
          style="stop-color:#bfb688;stop-opacity:1"
@@ -41,7 +35,6 @@
          id="stop4906-2" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4994-6">
       <stop
          style="stop-color:#f9fafc;stop-opacity:1;"
@@ -60,34 +53,8 @@
        gradientUnits="userSpaceOnUse"
        id="linearGradient4101"
        xlink:href="#linearGradient4994-6"
-       inkscape:collect="always"
        gradientTransform="translate(-2.9501748,-1.044194)" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="32.000002"
-     inkscape:cx="14.104336"
-     inkscape:cy="7.6199383"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1440"
-     inkscape:window-height="900"
-     inkscape:window-x="1097"
-     inkscape:window-y="566"
-     inkscape:window-maximized="0"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3999" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -101,98 +68,68 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
     <path
        style="display:inline;fill:url(#linearGradient4101);fill-opacity:1;stroke:none"
        d="m 2.5471077,1037.8597 7.0096695,0 3.4683068,0.1004 0,12.8608 -10.4779763,0 z"
-       id="rect4001-3"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccc" />
+       id="rect4001-3" />
     <path
        style="display:inline;fill:none;stroke:url(#linearGradient4908-2);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1"
        d="m 2.5471077,1037.8597 10.8839173,0 0.03855,3.0066 0,9.9546 -10.9224643,0 z"
-       id="rect4001"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccc" />
+       id="rect4001" />
     <g
        id="g4191"
        transform="translate(-1.0035218,-18.203124)">
       <path
-         inkscape:connector-curvature="0"
          id="path4185"
          d="m 5.5312498,1057.5932 0,9.4565 5.5000002,0"
-         style="fill:none;fill-rule:evenodd;stroke:#49a068;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         sodipodi:nodetypes="ccc" />
+         style="fill:none;fill-rule:evenodd;stroke:#49a068;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
       <path
-         inkscape:connector-curvature="0"
          id="path4187"
          d="m 5.5624998,1061.0654 5.4687502,0"
-         style="fill:none;fill-rule:evenodd;stroke:#49a068;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         sodipodi:nodetypes="cc" />
+         style="fill:none;fill-rule:evenodd;stroke:#49a068;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
       <path
-         inkscape:connector-curvature="0"
          id="path4189"
          d="m 5.4999998,1064.0497 5.5312502,0"
-         style="fill:none;fill-rule:evenodd;stroke:#49a068;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         sodipodi:nodetypes="cc" />
+         style="fill:none;fill-rule:evenodd;stroke:#49a068;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
       <path
-         inkscape:connector-curvature="0"
          id="path4187-6"
          d="m 12.002674,1061.0654 1.005138,0"
-         style="display:inline;fill:none;fill-rule:evenodd;stroke:#49a068;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         sodipodi:nodetypes="cc" />
+         style="display:inline;fill:none;fill-rule:evenodd;stroke:#49a068;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
       <path
-         inkscape:connector-curvature="0"
          id="path4187-6-4"
          d="m 12.002674,1064.0672 1.005138,0"
-         style="display:inline;fill:none;fill-rule:evenodd;stroke:#49a068;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         sodipodi:nodetypes="cc" />
+         style="display:inline;fill:none;fill-rule:evenodd;stroke:#49a068;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
       <path
-         inkscape:connector-curvature="0"
          id="path4187-6-4-2"
          d="m 12.002674,1067.0669 1.005138,0"
-         style="display:inline;fill:none;fill-rule:evenodd;stroke:#49a068;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         sodipodi:nodetypes="cc" />
+         style="display:inline;fill:none;fill-rule:evenodd;stroke:#49a068;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
       <path
          style="fill:none;fill-rule:evenodd;stroke:#49a068;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.2154696"
          d="m 6.5056962,1057.5723 0,2.4969 4.4857088,0"
-         id="path4278"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccc" />
+         id="path4278" />
       <path
          style="display:inline;fill:none;fill-rule:evenodd;stroke:#49a068;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.2154696"
          d="m 6.0416574,1063.0523 4.9497476,0"
-         id="path4278-4"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
+         id="path4278-4" />
       <path
          style="display:inline;fill:none;fill-rule:evenodd;stroke:#49a068;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.2154696"
          d="m 6.0416574,1066.0796 4.9497476,0"
-         id="path4278-4-0"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
+         id="path4278-4-0" />
       <path
          style="display:inline;fill:none;fill-rule:evenodd;stroke:#49a068;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.2154696"
          d="m 11.985774,1066.0796 1.016466,0"
-         id="path4278-4-0-3"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
+         id="path4278-4-0-3" />
       <path
          style="display:inline;fill:none;fill-rule:evenodd;stroke:#49a068;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.2154696"
          d="m 11.985774,1063.0744 1.016466,0"
-         id="path4278-4-0-3-7"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
+         id="path4278-4-0-3-7" />
       <path
          style="display:inline;fill:none;fill-rule:evenodd;stroke:#49a068;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.2154696"
          d="m 11.985774,1060.0692 1.016466,0"
-         id="path4278-4-0-3-7-2"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
+         id="path4278-4-0-3-7-2" />
     </g>
   </g>
 </svg>
diff --git a/ui/org.eclipse.pde.ui/icons/obj16/toc_anchor_obj.svg b/ui/org.eclipse.pde.ui/icons/obj16/toc_anchor_obj.svg
index 1a2b05ff87c..da549980cd5 100644
--- a/ui/org.eclipse.pde.ui/icons/obj16/toc_anchor_obj.svg
+++ b/ui/org.eclipse.pde.ui/icons/obj16/toc_anchor_obj.svg
@@ -2,24 +2,19 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r"
-   sodipodi:docname="toc_anchor_obj.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <radialGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4206"
        id="radialGradient4216"
        cx="19.032227"
@@ -30,7 +25,6 @@
        gradientTransform="matrix(1.1024822,-0.00577547,0.00898139,1.7144603,-13.024771,1030.6744)"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4206">
       <stop
          style="stop-color:#496e95;stop-opacity:1;"
@@ -46,31 +40,6 @@
          id="stop4210" />
     </linearGradient>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="16.000001"
-     inkscape:cx="22.830858"
-     inkscape:cy="7.642835"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1440"
-     inkscape:window-height="900"
-     inkscape:window-x="81"
-     inkscape:window-y="29"
-     inkscape:window-maximized="0"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3999" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -84,22 +53,16 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
     <path
        style="display:inline;fill:url(#radialGradient4216);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="m 7.0410165,1038.3661 0,2.0117 -3.027344,0 0,0.9844 3.027344,0 0,6.3476 c 0,0 -1.2091643,-0.7226 -1.5892893,-1.1288 -0.380125,-0.4063 -0.632812,-1.9375 -0.632812,-1.9375 l -0.828125,-0.3125 c 0,0 0.033267,2.4687 0.318359,3.25 0.285094,0.7812 2.9525703,2.8437 2.9525703,2.8437 l 0.740234,0.5235 0.800781,-0.5235 c 0,0 2.6031365,-2.0625 2.8882315,-2.8437 0.285094,-0.7813 0.316406,-3.25 0.316406,-3.25 l -0.794922,0.3125 c 0,0 -0.252686,1.5976 -0.632812,2.0039 -0.380127,0.4062 -1.5542465,1.0624 -1.5542465,1.0624 l 0,-6.3476 2.9882805,0 0,-0.9844 -2.9882805,0 0,-2.0117 -0.75586,0 -0.472656,0 z"
-       id="path4185"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccccccccccccccccccccccc" />
+       id="path4185" />
     <path
        style="display:inline;fill:#01467a;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="m 7.0410165,1049.3664 c 0,0 -1.2091643,-1.0976 -1.5892893,-1.5038 -0.380125,-0.4063 -0.976562,-1.8437 -0.976562,-1.8437 l -0.484375,-1.6879 c 0,0 0.033267,2.4687 0.318359,3.25 0.285094,0.7812 2.9525703,2.8437 2.9525703,2.8437 l 0.740234,0.5235 0.800781,-0.5235 c 0,0 2.6031365,-2.0625 2.8882315,-2.8437 0.285094,-0.7813 0.316406,-3.25 0.316406,-3.25 l -0.513672,1.7035 c 0,0 -0.533936,1.4882 -0.914062,1.8945 -0.380127,0.4062 -1.5542465,1.4374 -1.5542465,1.4374 z"
-       id="path4185-2"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccccccccccc" />
+       id="path4185-2" />
   </g>
 </svg>
diff --git a/ui/org.eclipse.pde.ui/icons/obj16/toc_leaftopic_obj.svg b/ui/org.eclipse.pde.ui/icons/obj16/toc_leaftopic_obj.svg
index f218408c1c5..0060ae897b5 100644
--- a/ui/org.eclipse.pde.ui/icons/obj16/toc_leaftopic_obj.svg
+++ b/ui/org.eclipse.pde.ui/icons/obj16/toc_leaftopic_obj.svg
@@ -2,24 +2,19 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.48.0 r9654"
-   sodipodi:docname="toc_leaftopic_obj.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient5135-7"
        id="linearGradient4873-1"
        x1="7.0070496"
@@ -29,8 +24,7 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-1.977903,-3.044194)" />
     <linearGradient
-       id="linearGradient5135-7"
-       inkscape:collect="always">
+       id="linearGradient5135-7">
       <stop
          id="stop5137-4"
          offset="0"
@@ -41,7 +35,6 @@
          style="stop-color:#637aa7;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient5141-4"
        id="linearGradient4875-9"
        x1="7.0070496"
@@ -51,8 +44,7 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-1.977903,-3.044194)" />
     <linearGradient
-       id="linearGradient5141-4"
-       inkscape:collect="always">
+       id="linearGradient5141-4">
       <stop
          id="stop5143-8"
          offset="0"
@@ -63,7 +55,6 @@
          style="stop-color:#637aa7;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient5147-4"
        id="linearGradient4871-2"
        x1="7.0070496"
@@ -73,8 +64,7 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-1.977903,-3.044194)" />
     <linearGradient
-       id="linearGradient5147-4"
-       inkscape:collect="always">
+       id="linearGradient5147-4">
       <stop
          id="stop5149-5"
          offset="0"
@@ -85,7 +75,6 @@
          style="stop-color:#637aa7;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4861-1"
        id="linearGradient4869-17"
        x1="7.0070496"
@@ -95,7 +84,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-1.977903,-3.044194)" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4861-1">
       <stop
          style="stop-color:#91a5c7;stop-opacity:1;"
@@ -107,7 +95,6 @@
          id="stop4865-52" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4877-6"
        id="linearGradient4867-7"
        x1="7.0070496"
@@ -117,8 +104,7 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-1.977903,-3.044194)" />
     <linearGradient
-       id="linearGradient4877-6"
-       inkscape:collect="always">
+       id="linearGradient4877-6">
       <stop
          id="stop4879-1"
          offset="0"
@@ -129,7 +115,6 @@
          style="stop-color:#5e76a3;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4902-3"
        id="linearGradient4908-2"
        x1="10.544736"
@@ -139,7 +124,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-1.977903,-1.044194)" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4902-3">
       <stop
          style="stop-color:#bfb688;stop-opacity:1"
@@ -151,7 +135,6 @@
          id="stop4906-2" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4894-6"
        id="linearGradient4900-1"
        x1="7.9987183"
@@ -161,7 +144,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(2.022097,-1.044194)" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4894-6">
       <stop
          style="stop-color:#e0c88f;stop-opacity:1"
@@ -173,7 +155,6 @@
          id="stop4898-5" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4994-6">
       <stop
          style="stop-color:#f9fafc;stop-opacity:1;"
@@ -192,34 +173,8 @@
        gradientUnits="userSpaceOnUse"
        id="linearGradient4101"
        xlink:href="#linearGradient4994-6"
-       inkscape:collect="always"
        gradientTransform="translate(-1.977903,-1.044194)" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="11.313709"
-     inkscape:cx="39.563403"
-     inkscape:cy="1.2514114"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1440"
-     inkscape:window-height="900"
-     inkscape:window-x="81"
-     inkscape:window-y="29"
-     inkscape:window-maximized="0"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3999" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -233,28 +188,21 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
     <path
        style="fill:url(#linearGradient4101);fill-opacity:1;stroke:none;display:inline"
        d="m 3.5193795,1037.8597 7.0096695,0 3.062057,3.0066 0,9.9546 -10.0717265,0 z"
-       id="rect4001-3"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccc" />
+       id="rect4001-3" />
     <path
        style="fill:url(#linearGradient4900-1);fill-opacity:1;stroke:none;display:inline"
        d="m 9.998718,1037.397 0,3.9112 3.977478,0 z"
-       id="path4884"
-       inkscape:connector-curvature="0" />
+       id="path4884" />
     <path
        style="fill:none;stroke:url(#linearGradient4908-2);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;display:inline"
        d="m 3.5193795,1037.8597 7.0096695,0 3.062057,3.0066 0,9.9546 -10.0717265,0 z"
-       id="rect4001"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccc" />
+       id="rect4001" />
     <rect
        style="fill:url(#linearGradient4867-7);fill-opacity:1;stroke:none;display:inline"
        id="rect4001-1"
diff --git a/ui/org.eclipse.pde.ui/icons/obj16/toc_link_obj.svg b/ui/org.eclipse.pde.ui/icons/obj16/toc_link_obj.svg
index 6ded0022dc0..09956715e8f 100644
--- a/ui/org.eclipse.pde.ui/icons/obj16/toc_link_obj.svg
+++ b/ui/org.eclipse.pde.ui/icons/obj16/toc_link_obj.svg
@@ -2,24 +2,19 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="toc_link_obj.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4191">
       <stop
          style="stop-color:#b9cad4;stop-opacity:1"
@@ -31,7 +26,6 @@
          id="stop4195" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4181">
       <stop
          style="stop-color:#998f6a;stop-opacity:1"
@@ -43,7 +37,6 @@
          id="stop4185" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4173">
       <stop
          style="stop-color:#267fe3;stop-opacity:1"
@@ -55,7 +48,6 @@
          id="stop4177" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4173"
        id="linearGradient4179"
        x1="16.798458"
@@ -64,7 +56,6 @@
        y2="1045.6079"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4181"
        id="linearGradient4187"
        x1="18.834337"
@@ -73,7 +64,6 @@
        y2="1045.91"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4191"
        id="linearGradient4197"
        x1="25.593748"
@@ -82,31 +72,6 @@
        y2="1048.5029"
        gradientUnits="userSpaceOnUse" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="45.254834"
-     inkscape:cx="8.5007097"
-     inkscape:cy="6.1408713"
-     inkscape:document-units="px"
-     inkscape:current-layer="g4274"
-     showgrid="true"
-     inkscape:window-width="1214"
-     inkscape:window-height="1045"
-     inkscape:window-x="680"
-     inkscape:window-y="379"
-     inkscape:window-maximized="0"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3999" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -120,8 +85,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
@@ -131,31 +94,23 @@
       <path
          style="fill:#80b4ef;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4187);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
          d="m 22.718749,1037.8623 6.169845,6.5927 -6.84375,3.965 -6.232345,-6.6827 z"
-         id="path4163"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
+         id="path4163" />
       <path
          style="fill:url(#linearGradient4179);fill-opacity:1;fill-rule:evenodd;stroke:#8f8b70;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
          d="m 15.829234,1041.7098 c 0,0 -0.511908,0.2976 -0.734834,0.5205 -0.440434,0.4405 -0.281901,2.757 -0.281901,2.757 l 5.875,5.875 0.972075,0.2604 0,-3.2292 z"
-         id="path4165"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="csccccc" />
+         id="path4165" />
       <path
          style="fill:none;fill-rule:evenodd;stroke:#727b84;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
          d="m 21.874999,1051.0498 c 0.25,-0.094 7.729397,-4.4626 7.729397,-4.4626 m -0.220971,-2.3156 -0.607442,0.334 -5.325044,3.0112 -1.66969,0.8033"
-         id="path4169"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccc" />
+         id="path4169" />
       <path
          style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#8f8b70;stroke-width:1.11224616px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
          d="m 23.984508,1042.9939 0,-1.147 -1.077488,-1.0427 -1.216519,0 -0.973215,1.1817 -1.112246,0.034 -0.263635,0.9839 1.375881,1.0669 1.112246,0 1.216519,-1.1472 z"
-         id="path4171"
-         inkscape:connector-curvature="0" />
+         id="path4171" />
       <path
          style="fill:url(#linearGradient4197);fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1"
          d="m 22.156249,1048.1123 7.0625,-3.7188 0,2.375 -7.28125,4.0938 z"
-         id="path4189"
-         inkscape:connector-curvature="0" />
+         id="path4189" />
     </g>
   </g>
 </svg>
diff --git a/ui/org.eclipse.pde.ui/icons/obj16/toc_obj.svg b/ui/org.eclipse.pde.ui/icons/obj16/toc_obj.svg
index 5b6159bc444..4370489484d 100644
--- a/ui/org.eclipse.pde.ui/icons/obj16/toc_obj.svg
+++ b/ui/org.eclipse.pde.ui/icons/obj16/toc_obj.svg
@@ -2,24 +2,19 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="toc_obj.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4259"
        id="linearGradient4265"
        x1="24.120523"
@@ -28,7 +23,6 @@
        y2="1040.597"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4259">
       <stop
          style="stop-color:#dfe9f8;stop-opacity:1"
@@ -40,7 +34,6 @@
          id="stop4263" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4185"
        id="linearGradient4191"
        x1="22.993999"
@@ -50,7 +43,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(0,-12.561868)" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4185">
       <stop
          style="stop-color:#525f71;stop-opacity:1"
@@ -62,7 +54,6 @@
          id="stop4189" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4193"
        id="linearGradient4199"
        x1="21.093748"
@@ -71,7 +62,6 @@
        y2="1048.3466"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4193">
       <stop
          style="stop-color:#958e6c;stop-opacity:1;"
@@ -83,31 +73,6 @@
          id="stop4197" />
     </linearGradient>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1"
-     inkscape:cx="143.92411"
-     inkscape:cy="-16.55322"
-     inkscape:document-units="px"
-     inkscape:current-layer="g4274"
-     showgrid="false"
-     inkscape:window-width="1440"
-     inkscape:window-height="900"
-     inkscape:window-x="781"
-     inkscape:window-y="423"
-     inkscape:window-maximized="0"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3999" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -121,8 +86,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
@@ -146,14 +109,11 @@
           <path
              style="display:inline;fill:#7aace7;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4199);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
              d="m 17.656249,1039.1123 8.031249,-2.125 0,11.0312 -8.062499,2.125 z"
-             id="path4156"
-             inkscape:connector-curvature="0" />
+             id="path4156" />
           <path
              style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#958e6c;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
              d="m 19.643305,1041.6966 4.016734,-0.7459 -0.0221,2.3242 -4.014839,0.7291 z"
-             id="path4181"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccc" />
+             id="path4181" />
         </g>
       </g>
     </g>
diff --git a/ui/org.eclipse.pde.ui/icons/obj16/toc_topic_obj.svg b/ui/org.eclipse.pde.ui/icons/obj16/toc_topic_obj.svg
index 9b09e9b1848..f3c08b989a9 100644
--- a/ui/org.eclipse.pde.ui/icons/obj16/toc_topic_obj.svg
+++ b/ui/org.eclipse.pde.ui/icons/obj16/toc_topic_obj.svg
@@ -2,24 +2,19 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="toc_topic_obj.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4446">
       <stop
          style="stop-color:#d1d6dd;stop-opacity:1"
@@ -31,7 +26,6 @@
          id="stop4450" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4289">
       <stop
          style="stop-color:#bfc9d6;stop-opacity:1"
@@ -43,7 +37,6 @@
          id="stop4293" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4209">
       <stop
          style="stop-color:#eef6ff;stop-opacity:1"
@@ -55,7 +48,6 @@
          id="stop4213" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4201">
       <stop
          style="stop-color:#717883;stop-opacity:1"
@@ -67,7 +59,6 @@
          id="stop4205" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4179">
       <stop
          style="stop-color:#d6e0e6;stop-opacity:1;"
@@ -79,7 +70,6 @@
          id="stop4183" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4201"
        id="linearGradient4207"
        x1="21.948286"
@@ -89,7 +79,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-14.203124,22.029685)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4209"
        id="linearGradient4215"
        x1="20.93182"
@@ -99,7 +88,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-14.203124,22.029685)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4289"
        id="linearGradient4295"
        x1="23.191113"
@@ -109,7 +97,6 @@
        gradientUnits="userSpaceOnUse" />
     <linearGradient
        gradientTransform="translate(-5.4632568e-7,-2.0000302)"
-       inkscape:collect="always"
        xlink:href="#linearGradient4289"
        id="linearGradient4295-6"
        x1="23.191113"
@@ -119,7 +106,6 @@
        gradientUnits="userSpaceOnUse" />
     <linearGradient
        gradientTransform="translate(-5.4632568e-7,-3.9844052)"
-       inkscape:collect="always"
        xlink:href="#linearGradient4289"
        id="linearGradient4295-6-2"
        x1="23.191113"
@@ -128,7 +114,6 @@
        y2="1022.8389"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4179"
        id="linearGradient4374"
        gradientUnits="userSpaceOnUse"
@@ -137,7 +122,6 @@
        x2="28.135472"
        y2="1043.7998" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4446"
        id="linearGradient4452"
        x1="17.205662"
@@ -148,7 +132,6 @@
        gradientTransform="translate(-14.203124,34.030335)" />
     <linearGradient
        gradientTransform="translate(-14.203124,36.037394)"
-       inkscape:collect="always"
        xlink:href="#linearGradient4446"
        id="linearGradient4452-6"
        x1="17.205662"
@@ -157,31 +140,6 @@
        y2="1020.3426"
        gradientUnits="userSpaceOnUse" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="5.6568542"
-     inkscape:cx="16.491742"
-     inkscape:cy="3.3705216"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="964"
-     inkscape:window-height="972"
-     inkscape:window-x="1353"
-     inkscape:window-y="422"
-     inkscape:window-maximized="0"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3999" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -195,8 +153,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
@@ -213,13 +169,10 @@
            id="rect4217"
            style="opacity:1;fill:#3d4b65;fill-opacity:1;stroke:#3d4b65;stroke-width:1;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
         <path
-           sodipodi:nodetypes="cssccssccscccs"
-           inkscape:connector-curvature="0"
            d="m 7.535109,1056.0246 -2.209709,0 c -0.369764,0 -0.359452,-1.0385 -0.795495,-1.0385 l -3.071495,0 0,4.9497 2.452777,0 c 0.637939,0 0.201444,1.0469 0.60439,1.0469 l 3.019532,0 z m -0.0221,0.044 c 0,-0.4897 1.06066,-1.0164 1.06066,-1.0164 l -0.132583,4.9939 -0.883883,0.8839 c 0,0 -0.04419,-2.1102 -0.04419,-4.8614 z"
            style="display:inline;fill:#3d4b65;fill-opacity:1;fill-rule:evenodd;stroke:#3d4b65;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
            id="path4192-8" />
         <path
-           inkscape:connector-curvature="0"
            d="m 7.57662,1051.91 -2.209709,0 c -0.369764,0 -0.359452,-1.0385 -0.795495,-1.0385 l -3.071495,0 0,8.0433 2.452777,0 c 0.637939,0 0.201444,1.0469 0.60439,1.0469 l 3.019532,0 z m -0.0221,0.044 c 0,-0.4897 0.570981,-1.0164 1.06066,-1.0164 l 4.905553,0 0,8.0875 c 0,0 -3.574259,0 -5.038136,0 -0.350397,0 -0.883883,0.8839 -0.883883,0.8839 0,0 -0.04419,-5.2038 -0.04419,-7.955 z"
            style="fill:url(#linearGradient4215);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4207);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
            id="path4192" />
@@ -253,15 +206,11 @@
       <path
          id="path4192-1"
          style="display:inline;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4452);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 7.024208,1054.8923 -1.325826,0 c -0.369764,0 -0.359452,-1.0385 -0.795495,-1.0385 l -1.900349,0"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cssc" />
+         d="m 7.024208,1054.8923 -1.325826,0 c -0.369764,0 -0.359452,-1.0385 -0.795495,-1.0385 l -1.900349,0" />
       <path
          id="path4192-1-0"
          style="display:inline;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4452-6);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 7.024208,1056.8993 -1.325826,0 c -0.369764,0 -0.359452,-1.0385 -0.795495,-1.0385 l -1.900349,0"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cssc" />
+         d="m 7.024208,1056.8993 -1.325826,0 c -0.369764,0 -0.359452,-1.0385 -0.795495,-1.0385 l -1.900349,0" />
     </g>
   </g>
 </svg>
diff --git a/ui/org.eclipse.pde.ui/icons/obj16/tsk_alert_obj.svg b/ui/org.eclipse.pde.ui/icons/obj16/tsk_alert_obj.svg
index 94b483bf0dd..3642bd8a502 100644
--- a/ui/org.eclipse.pde.ui/icons/obj16/tsk_alert_obj.svg
+++ b/ui/org.eclipse.pde.ui/icons/obj16/tsk_alert_obj.svg
@@ -2,24 +2,19 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="tsk_alert_obj.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4845">
       <stop
          style="stop-color:#afb8cd;stop-opacity:1;"
@@ -31,7 +26,6 @@
          id="stop4849" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4837">
       <stop
          style="stop-color:#acbfd5;stop-opacity:1;"
@@ -58,7 +52,6 @@
          id="stop4788" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4767">
       <stop
          style="stop-color:#f1c373;stop-opacity:1"
@@ -70,7 +63,6 @@
          id="stop4771" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4767"
        id="linearGradient4774"
        x1="-11.999999"
@@ -80,7 +72,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(0.9952107,0,0,1.0001919,21.923082,-0.24472688)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4784"
        id="linearGradient4790"
        x1="-17.3125"
@@ -90,7 +81,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(0.9952107,0,0,1.0001919,21.923082,-0.24472688)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4837"
        id="linearGradient4843"
        x1="-11.375669"
@@ -100,7 +90,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1.0013811,0,0,1,21.992229,0)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4845"
        id="linearGradient4851"
        x1="-12.921875"
@@ -117,8 +106,7 @@
        y1="1039.153"
        x1="9.8946028"
        id="linearGradient5000-6"
-       xlink:href="#linearGradient4994-7"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4994-7" />
     <linearGradient
        gradientTransform="matrix(1.052086,0,0,0.99742216,-4.460066,0.48040062)"
        gradientUnits="userSpaceOnUse"
@@ -127,11 +115,9 @@
        y1="1038.5779"
        x1="10.544736"
        id="linearGradient4908"
-       xlink:href="#linearGradient4902"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4902" />
     <linearGradient
-       id="linearGradient4902"
-       inkscape:collect="always">
+       id="linearGradient4902">
       <stop
          id="stop4904"
          offset="0"
@@ -142,8 +128,7 @@
          style="stop-color:#9a9a8f;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       id="linearGradient4994-7"
-       inkscape:collect="always">
+       id="linearGradient4994-7">
       <stop
          id="stop4996-7"
          offset="0"
@@ -154,19 +139,16 @@
          style="stop-color:#dce7f7;stop-opacity:1" />
     </linearGradient>
     <filter
-       inkscape:collect="always"
        id="filter11154"
-       x="-0.10200531"
-       width="1.2040106"
-       y="-0.1500768"
-       height="1.3001536">
+       x="-0.18204814"
+       width="1.3631471"
+       y="-0.26778204"
+       height="1.6519907">
       <feGaussianBlur
-         inkscape:collect="always"
          stdDeviation="0.34001774"
          id="feGaussianBlur11156" />
     </filter>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4225"
        id="linearGradient4216"
        x1="37.41367"
@@ -175,8 +157,7 @@
        y2="1047.8444"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       id="linearGradient4225"
-       inkscape:collect="always">
+       id="linearGradient4225">
       <stop
          id="stop4227"
          offset="0"
@@ -195,31 +176,6 @@
          style="stop-color:#ffeec1;stop-opacity:1" />
     </linearGradient>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="45.254834"
-     inkscape:cx="7.4808507"
-     inkscape:cy="16.166564"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1241"
-     inkscape:window-height="814"
-     inkscape:window-x="489"
-     inkscape:window-y="584"
-     inkscape:window-maximized="0"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3999" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -233,65 +189,46 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
     <path
        style="fill:url(#linearGradient4774);fill-opacity:1;stroke:url(#linearGradient4790);stroke-width:0.99769819;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        d="m 4.7019574,1038.8234 8.5752326,0 c 0.671953,0 1.212913,0.5437 1.212913,1.219 l 0,7.0382 c 0,0.6753 -3.113936,3.7386 -3.78589,3.7386 l -6.0022556,0 c -0.6719538,0 -1.212913,-0.5438 -1.212913,-1.219 l 0,-9.5578 c 0,-0.6753 0.5409592,-1.219 1.212913,-1.219 z"
-       id="rect3997"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="sssssssss" />
+       id="rect3997" />
     <path
        style="fill:url(#linearGradient4851);fill-opacity:1;stroke:none"
        d="m 4.9843751,1040.3466 1.53125,-1.3672 0.9375,-2.1172 1.5,0 1.4999999,0 0.953125,2.1172 1.546875,1.3672"
-       id="path4794"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccc" />
+       id="path4794" />
     <path
        style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient4843);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;marker:none;enable-background:accumulate"
        d="m 7.315738,1036.375 c -0.1384039,0.043 -0.255969,0.1482 -0.3129316,0.2812 l -0.8762084,2 -0.9674182,0.8634 c -0.2197521,0.2194 -0.161654,0.3252 -0.1911977,0.8384 0.2056987,0 0.4856127,0 0.7477252,-3e-4 l 1.1306333,-1.0139 c 0.051671,-0.043 0.09453,-0.097 0.1251727,-0.1563 l 0.8136221,-1.8125 1.18914,0 1.1578466,0 0.813622,1.8125 c 0.03064,0.06 0.0735,0.1133 0.125173,0.1563 l 1.174871,1.0325 c 0.113675,0 0.47259,-0.02 0.716988,-0.031 0,-0.2129 0.08273,-0.5753 -0.123986,-0.7817 l -1.016837,-0.9075 -0.907502,-2 c -0.07985,-0.164 -0.255595,-0.2768 -0.438104,-0.2812 l -1.5020716,0 -1.5020716,0 c -0.051731,-0.01 -0.1047395,-0.01 -0.1564658,0 z"
-       id="path4794-5"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccccccccccccccccccc" />
+       id="path4794-5" />
     <g
        style="display:inline"
        id="layer1-3"
-       inkscape:label="Layer 1"
        transform="translate(3.1589147,4.1676048)">
       <path
-         sodipodi:nodetypes="cccccc"
-         inkscape:connector-curvature="0"
          id="rect4001-3"
          d="m 1.4972825,1036.9037 8.1563025,0 0.759173,3.0066 -0.5303301,5.2997 -8.3851454,0.7955 z"
          style="display:inline;fill:url(#linearGradient5000-6);fill-opacity:1;stroke:none" />
       <path
-         sodipodi:nodetypes="cccccccc"
-         inkscape:connector-curvature="0"
          id="rect4001"
          d="m 1.3235477,1036.7059 9.0425143,-0.024 -0.0044,3.0224 0,4.0925 -0.8800923,0.9577 -1.1279456,0.9502 -7.0301273,0 z"
          style="fill:none;stroke:url(#linearGradient4908);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
       <path
          style="display:inline;fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
          d="m 8.9173918,1039.1724 2.5468752,2.5313 0.380725,0"
-         id="path4393"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccc" />
+         id="path4393" />
       <path
          style="display:inline;fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
          d="m 3.7956479,1044.2524 2.5468743,2.5313 0,0.364"
-         id="path4393-2"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
+         id="path4393-2" />
       <g
          style="display:inline"
          id="g4237"
          transform="matrix(0.65339357,0,0,0.65339357,-16.563529,354.91957)">
         <path
-           sodipodi:nodetypes="ccccccccc"
-           inkscape:connector-curvature="0"
            id="path4208"
            d="m 36.610511,1047.9757 -4.696973,4.6631 0,1.4587 4.483802,4.6191 1.518515,0 4.731818,-4.8163 0,-1.4289 -4.605334,-4.4808 z"
            style="fill:url(#linearGradient4216);fill-opacity:1;fill-rule:evenodd;stroke:#ca8325;stroke-width:1.53047109;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
@@ -330,14 +267,12 @@
       </g>
     </g>
     <path
-       inkscape:connector-curvature="0"
        id="path4065-9"
        d="m 1.7812498,1045.1747 2.4999999,2.5313 5.5000013,-5.4375"
        style="fill:none;stroke:#ffffff;stroke-width:1.79999995;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline;filter:url(#filter11154)" />
     <path
        style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#0073ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
        d="m 7.8671875,1041.8789 -4.859375,4.8047 -1.8671875,-1.8906 -1.28125,1.2636 3.1328125,3.1719 6.140625,-6.0703 -1.265625,-1.2793 z"
-       id="path4065"
-       inkscape:connector-curvature="0" />
+       id="path4065" />
   </g>
 </svg>
diff --git a/ui/org.eclipse.pde.ui/icons/obj16/warning_st_obj.svg b/ui/org.eclipse.pde.ui/icons/obj16/warning_st_obj.svg
index 2f850bbeed7..639978a71e7 100644
--- a/ui/org.eclipse.pde.ui/icons/obj16/warning_st_obj.svg
+++ b/ui/org.eclipse.pde.ui/icons/obj16/warning_st_obj.svg
@@ -2,24 +2,19 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.48.0 r9654"
-   sodipodi:docname="warning.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient5091">
       <stop
          style="stop-color:#c6852e;stop-opacity:1"
@@ -46,7 +41,6 @@
          id="stop5085" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient5091"
        id="linearGradient4200"
        gradientUnits="userSpaceOnUse"
@@ -56,7 +50,6 @@
        y2="0.39338252"
        gradientTransform="matrix(1.0698871,0,0,1.0698871,15.590192,1043.527)" />
     <radialGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient5081"
        id="radialGradient4963"
        cx="19.36529"
@@ -67,35 +60,6 @@
        gradientTransform="matrix(2.8249601,0,0,1.7930635,-35.371372,-833.43041)"
        gradientUnits="userSpaceOnUse" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="5.6568543"
-     inkscape:cx="-11.10583"
-     inkscape:cy="-21.989605"
-     inkscape:document-units="px"
-     inkscape:current-layer="g8472"
-     showgrid="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="1024"
-     inkscape:window-x="150"
-     inkscape:window-y="138"
-     inkscape:window-maximized="0"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid4202"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -109,8 +73,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
@@ -123,24 +85,15 @@
          transform="matrix(1.4166388,0,0,1.4166388,-3.2411359,-441.5072)"
          style="opacity:1">
         <path
-           sodipodi:nodetypes="ccccccccc"
-           inkscape:connector-curvature="0"
            id="path4292"
            d="m 18.599249,1044.4966 -2.362015,4.3798 c -0.648383,1.0968 -0.206291,2.7732 1.003019,2.7928 l 1.5596,0 1.069887,0 1.5596,0 c 1.209311,-0.019 1.651402,-1.6961 1.003019,-2.7928 l -2.362015,-4.3798 c -0.314859,-0.5957 -1.196998,-0.4999 -1.471095,0 z"
            style="fill:url(#radialGradient4963);fill-opacity:1;stroke:url(#linearGradient4200);stroke-width:0.75522922999999986;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
         <path
            transform="matrix(1.125929,0,0,1.125929,15.411638,1043.5862)"
            d="m 4.109375,5.484375 c 0,0.345178 -0.279822,0.625 -0.625,0.625 -0.345178,0 -0.625,-0.279822 -0.625,-0.625 0,-0.345178 0.279822,-0.625 0.625,-0.625 0.345178,0 0.625,0.279822 0.625,0.625 z"
-           sodipodi:ry="0.625"
-           sodipodi:rx="0.625"
-           sodipodi:cy="5.484375"
-           sodipodi:cx="3.484375"
            id="path4253"
-           style="fill:#7b5113;fill-opacity:1;stroke:none"
-           sodipodi:type="arc" />
+           style="fill:#7b5113;fill-opacity:1;stroke:none" />
         <path
-           sodipodi:nodetypes="sccsccs"
-           inkscape:connector-curvature="0"
            id="path4253-7"
            d="m 19.350026,1045.7152 c -0.378471,0 -0.700512,0.3368 -0.700512,0.774 l 0.09137,1.4889 c 0,0.3887 0.272722,0.7037 0.609141,0.7037 0.336419,0 0.609139,-0.315 0.609139,-0.7037 l 0.06091,-1.4889 c 0,-0.4372 -0.291583,-0.774 -0.670056,-0.774 z"
            style="fill:#7b5113;fill-opacity:1;stroke:none;display:inline" />
diff --git a/ui/org.eclipse.pde.ui/icons/obj16/xml_text_node.svg b/ui/org.eclipse.pde.ui/icons/obj16/xml_text_node.svg
index 9c8898993ac..2ab421fa6e2 100644
--- a/ui/org.eclipse.pde.ui/icons/obj16/xml_text_node.svg
+++ b/ui/org.eclipse.pde.ui/icons/obj16/xml_text_node.svg
@@ -2,20 +2,16 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="xml_text_node.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
@@ -26,11 +22,9 @@
        gradientUnits="userSpaceOnUse"
        id="linearGradient4975-2-1"
        xlink:href="#linearGradient4994-4-7"
-       inkscape:collect="always"
        gradientTransform="translate(18,-3)" />
     <linearGradient
-       id="linearGradient4994-4-7"
-       inkscape:collect="always">
+       id="linearGradient4994-4-7">
       <stop
          id="stop4996-5-4"
          offset="0"
@@ -48,10 +42,8 @@
        gradientTransform="translate(18,-3)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient5062-9"
-       xlink:href="#linearGradient4910-4-4"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4910-4-4" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4910-4-4">
       <stop
          style="stop-color:#ffffff;stop-opacity:0"
@@ -63,7 +55,6 @@
          id="stop4914-8-8" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4883-4"
        id="linearGradient4889-2"
        x1="28"
@@ -73,7 +64,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-20,0)" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4883-4">
       <stop
          style="stop-color:#ebf9ff;stop-opacity:1"
@@ -85,31 +75,6 @@
          id="stop4887-5" />
     </linearGradient>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="22.627416"
-     inkscape:cx="2.6043508"
-     inkscape:cy="4.1508198"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1241"
-     inkscape:window-height="814"
-     inkscape:window-x="965"
-     inkscape:window-y="659"
-     inkscape:window-maximized="0"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3999" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -123,37 +88,25 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
     <path
        style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#6a9ac2;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
        d="m 2,1038.3622 0.03125,12 11.96875,0 -0.03125,-12 z m 1,1 9.96875,0 0.03125,10 -9.96875,0 z"
-       id="rect3997-9-1"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccccccc"
-       inkscape:export-filename="C:\Users\jmietling\Documents\rect3997-9-1.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
+       id="rect3997-9-1" />
     <path
        style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:url(#linearGradient4889-2);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
        d="m 3,1039.3622 9.96875,0 0.03125,10 -9.96875,0 z"
-       id="rect3997-9-1-1"
-       inkscape:connector-curvature="0" />
+       id="rect3997-9-1-1" />
     <path
        style="fill:url(#linearGradient5062-9);fill-opacity:1;stroke:none;display:inline"
        d="m 5,1041.3622 0,8 -2,0 0,-10 z"
-       id="rect4853-82-7"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+       id="rect4853-82-7" />
     <path
        style="fill:url(#linearGradient4975-2-1);fill-opacity:1;stroke:none;display:inline"
        d="m 5,1041.3622 8,0 0,-2 -10,0 z"
-       id="rect4853-82-0"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+       id="rect4853-82-0" />
     <g
        style="font-style:normal;font-weight:normal;font-size:8.52455902px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#001445;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
        id="text4161"
@@ -161,9 +114,7 @@
       <path
          d="m 9.0037173,1048.2969 c 0,0.3289 -0.217019,0.4934 -0.6510573,0.4934 l -1.7005762,0 c -0.4340374,0 -0.6510564,-0.1645 -0.6510564,-0.4934 0,-0.1907 0.07892,-0.332 0.236747,-0.4241 0.06577,-0.046 0.203865,-0.069 0.4143094,-0.069 l 0.3404118,0 0,-4.9812 -0.9851902,0.031 0,0.3236 c 0,0.2105 -0.02959,0.3585 -0.08878,0.4439 -0.105221,0.1382 -0.240036,0.2072 -0.404445,0.2072 -0.190713,0 -0.332105,-0.079 -0.424174,-0.2368 -0.04603,-0.085 -0.06905,-0.2235 -0.06905,-0.4143 l 0,-1.3492 4.9886386,-0.027 0,1.385 c 0,0.2236 -0.02959,0.3716 -0.08878,0.4439 -0.1052206,0.1381 -0.2400356,0.2072 -0.4044446,0.2072 -0.184137,0 -0.3255285,-0.079 -0.4241736,-0.2368 -0.046035,-0.085 -0.069052,-0.2236 -0.069052,-0.4143 l 0,-0.3594 -1.0089401,0 0,4.9812 0.3385575,0 c 0.2104429,0 0.3584105,0.03 0.4439029,0.089 0.1381031,0.1052 0.2071546,0.24 0.2071546,0.4044 z"
          style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:'Tlwg Typo';fill:#001445;fill-opacity:1"
-         id="path4166"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cssscscccscscsccscscscccsccc" />
+         id="path4166" />
     </g>
   </g>
 </svg>
diff --git a/ui/org.eclipse.pde.ui/icons/onboarding_plugins.svg b/ui/org.eclipse.pde.ui/icons/onboarding_plugins.svg
index 4458327f69e..4ad750c1d1a 100644
--- a/ui/org.eclipse.pde.ui/icons/onboarding_plugins.svg
+++ b/ui/org.eclipse.pde.ui/icons/onboarding_plugins.svg
@@ -6,261 +6,13 @@
    height="260"
    id="svg2"
    version="1.1"
-   inkscape:version="1.2.2 (b0a84865, 2022-12-01)"
-   sodipodi:docname="onboarding_plugins.svg"
-   inkscape:export-filename="../../../eclipse-png/org.eclipse.pde.ui/icons/onboarding_plugins.png"
-   inkscape:export-xdpi="68.571426"
-   inkscape:export-ydpi="68.571426"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:cc="http://creativecommons.org/ns#"
    xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient4284">
-      <stop
-         id="stop4286"
-         offset="0"
-         style="stop-color:#6588c1;stop-opacity:0" />
-      <stop
-         style="stop-color:#becce3;stop-opacity:1"
-         offset="0.49999967"
-         id="stop4288" />
-      <stop
-         id="stop4290"
-         offset="1"
-         style="stop-color:#809dcb;stop-opacity:0" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10448-9-7-0-5">
-      <stop
-         style="stop-color:#cf9307;stop-opacity:1"
-         offset="0"
-         id="stop10450-3-5-6-7" />
-      <stop
-         id="stop10456-4-1-5-3"
-         offset="0.5"
-         style="stop-color:#f7d87b;stop-opacity:1" />
-      <stop
-         style="stop-color:#ebb313;stop-opacity:1"
-         offset="1"
-         id="stop10452-22-7-8-4" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10440-1-0-0-3">
-      <stop
-         style="stop-color:#ae7603;stop-opacity:1;"
-         offset="0"
-         id="stop10442-43-2-0-9" />
-      <stop
-         id="stop10521-1-2-5-3"
-         offset="0.5"
-         style="stop-color:#e8d8a3;stop-opacity:1" />
-      <stop
-         style="stop-color:#bb9221;stop-opacity:1"
-         offset="1"
-         id="stop10444-3-4-0-4" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10748-8">
-      <stop
-         id="stop10750-5"
-         offset="0"
-         style="stop-color:#c9c9c9;stop-opacity:1;" />
-      <stop
-         style="stop-color:#f1ce66;stop-opacity:1"
-         offset="0.25"
-         id="stop10752-8" />
-      <stop
-         style="stop-color:#f6e5a6;stop-opacity:1"
-         offset="0.5"
-         id="stop10754-8" />
-      <stop
-         id="stop10756-4"
-         offset="0.75"
-         style="stop-color:#f1cf6c;stop-opacity:1" />
-      <stop
-         id="stop10758-7"
-         offset="1"
-         style="stop-color:#e5b630;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10440-1-3-4">
-      <stop
-         style="stop-color:#ae7603;stop-opacity:1;"
-         offset="0"
-         id="stop10442-43-0-5" />
-      <stop
-         id="stop10521-1-4-7"
-         offset="0.5"
-         style="stop-color:#e8d8a3;stop-opacity:1" />
-      <stop
-         style="stop-color:#bb9221;stop-opacity:1"
-         offset="1"
-         id="stop10444-3-2-0" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10448-90">
-      <stop
-         style="stop-color:#ecac18;stop-opacity:1"
-         offset="0"
-         id="stop10450-0" />
-      <stop
-         id="stop10458-2"
-         offset="0.25"
-         style="stop-color:#ffe38d;stop-opacity:1" />
-      <stop
-         id="stop10456-96"
-         offset="0.5"
-         style="stop-color:#fdf5d2;stop-opacity:1" />
-      <stop
-         style="stop-color:#ffeba7;stop-opacity:1"
-         offset="0.75"
-         id="stop10460-3" />
-      <stop
-         style="stop-color:#e5b630;stop-opacity:1"
-         offset="1"
-         id="stop10452-1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10440-18">
-      <stop
-         style="stop-color:#ae7603;stop-opacity:1;"
-         offset="0"
-         id="stop10442-8" />
-      <stop
-         id="stop10521-7"
-         offset="0.5"
-         style="stop-color:#e8d8a3;stop-opacity:1" />
-      <stop
-         style="stop-color:#bb9221;stop-opacity:1"
-         offset="1"
-         id="stop10444-0" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10414-9">
-      <stop
-         style="stop-color:#5078b9;stop-opacity:1;"
-         offset="0"
-         id="stop10416-3" />
-      <stop
-         id="stop10422-8"
-         offset="0.5"
-         style="stop-color:#6d8cbd;stop-opacity:1" />
-      <stop
-         style="stop-color:#5f88c9;stop-opacity:1"
-         offset="1"
-         id="stop10418-4" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10432-3">
-      <stop
-         id="stop10434-4"
-         offset="0"
-         style="stop-color:#1f4d9a;stop-opacity:1" />
-      <stop
-         style="stop-color:#4e6da1;stop-opacity:1"
-         offset="0.5"
-         id="stop10436-2" />
-      <stop
-         id="stop10438-9"
-         offset="1"
-         style="stop-color:#567ebc;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10157-6">
-      <stop
-         style="stop-color:#6588c1;stop-opacity:1"
-         offset="0"
-         id="stop10159-5" />
-      <stop
-         id="stop10165-9"
-         offset="0.5"
-         style="stop-color:#becce3;stop-opacity:1" />
-      <stop
-         style="stop-color:#809dcb;stop-opacity:1"
-         offset="1"
-         id="stop10161-55" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10396-5">
-      <stop
-         style="stop-color:#1b3e79;stop-opacity:1;"
-         offset="0"
-         id="stop10398-7" />
-      <stop
-         id="stop10404-9"
-         offset="0.5"
-         style="stop-color:#728fbf;stop-opacity:1" />
-      <stop
-         style="stop-color:#1f4d9a;stop-opacity:1"
-         offset="1"
-         id="stop10400-9" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10157-2-5">
-      <stop
-         style="stop-color:#6588c1;stop-opacity:1"
-         offset="0"
-         id="stop10159-8-3" />
-      <stop
-         id="stop10165-3-9"
-         offset="0.49999985"
-         style="stop-color:#becce3;stop-opacity:1" />
-      <stop
-         style="stop-color:#809dcb;stop-opacity:1"
-         offset="1"
-         id="stop10161-5-0" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10149-6-5-4">
-      <stop
-         style="stop-color:#1f4d9a;stop-opacity:1"
-         offset="0"
-         id="stop10151-5-7-2" />
-      <stop
-         id="stop10394-3"
-         offset="0.5"
-         style="stop-color:#b9c7df;stop-opacity:1" />
-      <stop
-         style="stop-color:#567ebc;stop-opacity:1"
-         offset="1"
-         id="stop10153-8-1-2" />
-    </linearGradient>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#f3f3f3"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1.4142136"
-     inkscape:cx="55.507882"
-     inkscape:cy="71.064231"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="1920"
-     inkscape:window-height="1027"
-     inkscape:window-x="0"
-     inkscape:window-y="25"
-     inkscape:window-maximized="1"
-     inkscape:snap-global="false"
-     inkscape:showpageshadow="2"
-     inkscape:pagecheckerboard="0"
-     inkscape:deskcolor="#d1d1d1"
-     showguides="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid4210"
-       originx="0"
-       originy="0" />
-  </sodipodi:namedview>
+     id="defs4" />
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -273,31 +25,22 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
     <path
        id="path8722-7-7"
        style="display:inline;opacity:0.6;fill:#999999;fill-opacity:1;stroke:#898989;stroke-width:15.9999;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:2;stroke-dasharray:none;stroke-opacity:1"
-       d="m 123,1044.3622 v 50 H 73.078125 v 72 72 H 123 v 50 h 69 v -244 z"
-       sodipodi:nodetypes="cccccccccc" />
+       d="m 123,1044.3622 v 50 H 73.078125 v 72 72 H 123 v 50 h 69 v -244 z" />
     <path
-       sodipodi:nodetypes="cccccc"
-       inkscape:connector-curvature="0"
        d="m 7.8984119,1166.1771 v 24.8148 H 57.078981 v -49.6297 H 7.8984119 v 24.8149"
        style="display:inline;opacity:0.6;fill:#8d8d8d;fill-opacity:1;stroke:#8c8c8c;stroke-width:16;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="path8722-7" />
     <path
-       sodipodi:nodetypes="cccccc"
-       inkscape:connector-curvature="0"
        d="m 311.00005,1166.1771 v 24.8148 h 30.75288 v -49.6297 h -30.75288 v 24.8149"
        style="display:inline;fill:#8d8d8d;fill-opacity:1;stroke:#8d8d8d;stroke-width:16.0001;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;opacity:0.6"
        id="path8722-7-0" />
     <path
-       sodipodi:nodetypes="ccccscccczccssc"
-       inkscape:connector-curvature="0"
        d="m 200,1089.3772 c 0,0 25.13487,-7e-4 34.23683,3e-4 13.04486,5e-4 23.54669,10.3223 23.54669,23.1429 v 1.6725 h 17.59998 c 10.87072,0 19.62224,7.1455 19.62224,16.0218 v 21.2005 l -10e-6,37.2231 -1e-5,8.7893 c 0,8.8763 -7.82529,16.2339 -19.62224,16.0218 -11.79695,-0.211 -17.59997,0 -17.59997,0 v 1.6725 c 0,12.8206 -10.50183,23.1398 -23.54669,23.1423 h -14.94108 c -3.23604,0 -19.29574,-0.095 -19.29574,-0.095"
        style="display:inline;opacity:0.6;fill:#b0b0b0;fill-opacity:1;stroke:#8a8a8a;stroke-width:16;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect8645-2-5" />
diff --git a/ui/org.eclipse.pde.ui/icons/ovr16/binary_co.svg b/ui/org.eclipse.pde.ui/icons/ovr16/binary_co.svg
index c367e153883..037925defaf 100644
--- a/ui/org.eclipse.pde.ui/icons/ovr16/binary_co.svg
+++ b/ui/org.eclipse.pde.ui/icons/ovr16/binary_co.svg
@@ -2,48 +2,17 @@
 <!-- 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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="7"
    height="8"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="binary_co.svg">
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="11.2"
-     inkscape:cx="-10.533289"
-     inkscape:cy="-6.0695833"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="831"
-     inkscape:window-height="877"
-     inkscape:window-x="1026"
-     inkscape:window-y="566"
-     inkscape:window-maximized="0"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2985"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -57,8 +26,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      transform="translate(0,-1044.3622)">
     <g
@@ -77,15 +44,11 @@
         <path
            style="fill:none;fill-rule:evenodd;stroke:#17325d;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
            d="m -6.5178571,1045.822 c -0.5103111,0.01 -1.0825893,0.5723 -1.0825893,1.0826 0,1.0603 0,1.9847 0,2.9353 0,0.4972 0.5575001,1.0547 1.0546875,1.0547 0.5182457,0 1.0993304,-0.5812 1.0993304,-1.0994 0,-1.2647 0,-1.9534 0,-2.9464 0,-0.4947 -0.5767875,-1.0321 -1.0714286,-1.0268 z"
-           id="path4147"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="sssssss" />
+           id="path4147" />
         <path
            style="fill:none;fill-rule:evenodd;stroke:#17325d;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
            d="m -3.7619539,1047.2282 c 0,0 1.1607143,-1.8524 1.1607143,-1.3839 l 0,5.4235"
-           id="path4149"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="csc" />
+           id="path4149" />
       </g>
     </g>
   </g>
diff --git a/ui/org.eclipse.pde.ui/icons/ovr16/doc_co.svg b/ui/org.eclipse.pde.ui/icons/ovr16/doc_co.svg
index 3001464f3cc..c365c91af30 100644
--- a/ui/org.eclipse.pde.ui/icons/ovr16/doc_co.svg
+++ b/ui/org.eclipse.pde.ui/icons/ovr16/doc_co.svg
@@ -2,20 +2,16 @@
 <!-- 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="7"
    height="8"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="doc_co.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
@@ -33,71 +29,6 @@
          offset="1"
          id="stop4254" />
     </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5081"
-       id="linearGradient5087"
-       x1="3.3833356"
-       y1="7.0159616"
-       x2="3.3833356"
-       y2="0.98171616"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient5081">
-      <stop
-         style="stop-color:#ffe296;stop-opacity:1"
-         offset="0"
-         id="stop5083" />
-      <stop
-         id="stop5089"
-         offset="0.5"
-         style="stop-color:#f8d880;stop-opacity:1" />
-      <stop
-         style="stop-color:#fffcd3;stop-opacity:1"
-         offset="1"
-         id="stop5085" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5091"
-       id="linearGradient5097"
-       x1="6.3885393"
-       y1="7.2369323"
-       x2="6.3885393"
-       y2="0.39338252"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient5091">
-      <stop
-         style="stop-color:#c6852e;stop-opacity:1"
-         offset="0"
-         id="stop5093" />
-      <stop
-         style="stop-color:#e1a555;stop-opacity:1"
-         offset="1"
-         id="stop5095" />
-    </linearGradient>
-    <linearGradient
-       gradientTransform="translate(3.8209032e-8,1044.3622)"
-       y2="0.98171616"
-       x2="3.3833356"
-       y1="7.0159616"
-       x1="3.3833356"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4230"
-       xlink:href="#linearGradient5081"
-       inkscape:collect="always" />
-    <linearGradient
-       gradientTransform="translate(3.8209032e-8,1044.3622)"
-       y2="0.39338252"
-       x2="6.3885393"
-       y1="7.2369323"
-       x1="6.3885393"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4232"
-       xlink:href="#linearGradient5091"
-       inkscape:collect="always" />
     <linearGradient
        y2="1050.3188"
        x2="1.9838035"
@@ -106,8 +37,7 @@
        gradientTransform="translate(4,-1036.3622)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient5196-1"
-       xlink:href="#linearGradient5077-5-7"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient5077-5-7" />
     <linearGradient
        id="linearGradient5077-5-7">
       <stop
@@ -127,30 +57,6 @@
          offset="1"
          style="stop-color:#ad8865;stop-opacity:1" />
     </linearGradient>
-    <linearGradient
-       y2="1050.5304"
-       x2="4.0822439"
-       y1="1049.3976"
-       x1="2.65625"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient8889"
-       xlink:href="#linearGradient5300-4"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient5300-4">
-      <stop
-         id="stop5302-6"
-         offset="0"
-         style="stop-color:#4d4d4d;stop-opacity:1;" />
-      <stop
-         style="stop-color:#727272;stop-opacity:1;"
-         offset="0.29405674"
-         id="stop5308-0" />
-      <stop
-         id="stop5304-3"
-         offset="1"
-         style="stop-color:#4d4d4d;stop-opacity:1" />
-    </linearGradient>
     <linearGradient
        y2="1050.5304"
        x2="4.0822439"
@@ -158,115 +64,19 @@
        x1="2.65625"
        gradientUnits="userSpaceOnUse"
        id="linearGradient4185"
-       xlink:href="#linearGradient4248"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient5077-5-7-6">
-      <stop
-         id="stop5079-7-3-5"
-         offset="0"
-         style="stop-color:#e4cf94;stop-opacity:1" />
-      <stop
-         style="stop-color:#ede0ba;stop-opacity:1"
-         offset="0.32186735"
-         id="stop5087-6-0-5" />
-      <stop
-         style="stop-color:#c1aa7e;stop-opacity:1"
-         offset="0.64764118"
-         id="stop5085-1-4-1" />
-      <stop
-         id="stop5081-8-3-4"
-         offset="1"
-         style="stop-color:#ad8865;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       y2="1050.5304"
-       x2="4.0822439"
-       y1="1049.3976"
-       x1="2.65625"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4185-4"
-       xlink:href="#linearGradient5300-4-3"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient5300-4-3">
-      <stop
-         id="stop5302-6-3"
-         offset="0"
-         style="stop-color:#4d4d4d;stop-opacity:1;" />
-      <stop
-         style="stop-color:#727272;stop-opacity:1;"
-         offset="0.29405674"
-         id="stop5308-0-4" />
-      <stop
-         id="stop5304-3-0"
-         offset="1"
-         style="stop-color:#4d4d4d;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       gradientTransform="translate(20,0)"
-       inkscape:collect="always"
-       xlink:href="#linearGradient4908-52-3-2-1-7"
-       id="linearGradient5173-7-5"
-       gradientUnits="userSpaceOnUse"
-       x1="-11.21119"
-       y1="1042.1598"
-       x2="-8.7005796"
-       y2="1044.6704" />
-    <linearGradient
-       id="linearGradient4908-52-3-2-1-7"
-       inkscape:collect="always">
-      <stop
-         id="stop4910-7-2-7-0-5"
-         offset="0"
-         style="stop-color:#986443;stop-opacity:1" />
-      <stop
-         id="stop4912-6-2-9-2-2"
-         offset="1"
-         style="stop-color:#994f1b;stop-opacity:1" />
-    </linearGradient>
+       xlink:href="#linearGradient4248" />
     <filter
        style="color-interpolation-filters:sRGB"
        id="filter5428-5"
-       inkscape:collect="always">
+       x="-0.098946937"
+       y="-0.10066635"
+       width="1.1978939"
+       height="1.2013327">
       <feGaussianBlur
          id="feGaussianBlur5430-1"
-         stdDeviation="0.22207033"
-         inkscape:collect="always" />
+         stdDeviation="0.22207033" />
     </filter>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="45.254834"
-     inkscape:cx="5.7360244"
-     inkscape:cy="6.7421008"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1-7"
-     showgrid="true"
-     inkscape:window-width="1437"
-     inkscape:window-height="1010"
-     inkscape:window-x="692"
-     inkscape:window-y="302"
-     inkscape:window-maximized="0"
-     inkscape:snap-global="false"
-     showguides="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3024"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-    <sodipodi:guide
-       position="-9.5982143,15.558036"
-       orientation="-0.70710678,0.70710678"
-       id="guide4232" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -280,63 +90,46 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      transform="translate(0,-1044.3622)">
     <g
        transform="matrix(0.69306831,-0.19692471,0.19692471,0.69306831,-206.89443,323.82599)"
        style="display:inline"
-       id="layer1-7"
-       inkscape:label="Layer 1">
+       id="layer1-7">
       <path
          style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.38792133px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
          d="m 1.8335342,1044.514 -1.89494335,4.969 -0.49419166,2.5327 4.03630181,1.4367 3.4272053,-1.8604 1.7136026,-0.9302 4.5208231,-4.8025 -0.0093,-3.481 c 0,0 -1.006077,-1.2199 -1.155081,-1.2622 -0.149004,-0.042 -4.4240629,-1.7724 -4.4240629,-1.7724 z"
-         id="path3388"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccccccccc" />
+         id="path3388" />
       <path
-         sodipodi:nodetypes="ccccccc"
-         inkscape:connector-curvature="0"
          id="path5226-6-14-1-5-3-4"
          d="m 18.016618,1038.9808 -10.9555465,10.8111 -6.84871234,3.212 3.23910734,-6.7855 10.8502885,-10.8335 c 1.596467,0.7543 2.78078,2.0205 3.714865,3.5965 z"
          style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:none;stroke:#ffffff;stroke-width:1.25037313;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans" />
       <path
-         sodipodi:nodetypes="ccccccc"
-         inkscape:connector-curvature="0"
          id="path5226-6-14-1-5-3"
          d="m 15.685953,1040.5523 -8.747594,8.7054 -5.461084,2.5938 2.59375,-5.4564 8.663811,-8.7231 c 1.269887,0.6025 2.210467,1.6169 2.951117,2.8807 z"
          style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:none;stroke:#7f5f3f;stroke-width:1.38792134;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans" />
       <path
-         inkscape:connector-curvature="0"
          id="path5424-0"
          d="m 12.75,1037.6747 -8.6875,8.7188 0.9375,0.9062 8.9375,-8.875 c -0.362696,-0.2963 -0.752826,-0.5438 -1.1875,-0.75 z"
          style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#bf7f3f;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans" />
       <path
-         inkscape:connector-curvature="0"
          id="path5226-6-14-1-5-2-8"
          d="m 15.3125,1039.956 -8.78125,8.9062 0.40625,0.4063 8.75,-8.7188 c -0.120121,-0.205 -0.24381,-0.4026 -0.375,-0.5937 z"
          style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#966d28;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans" />
       <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
          id="path5226-6-14-1-5-2-7-1"
          d="m 5.6755834,1049.7054 -1.548139,-1.5456 9.8008516,-9.7308 c 0.52506,0.4288 0.980135,0.9451 1.380966,1.5292 z"
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#d6812d;fill-opacity:1;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" />
       <path
          transform="translate(0,1036.3622)"
-         sodipodi:nodetypes="ccccccccc"
-         inkscape:connector-curvature="0"
          id="path5006-17"
          d="m 4.09375,10 -1.40625,2.9375 1.375,1.28125 -0.03125,0.0625 2.9375,-1.40625 -0.024111,-0.04534 -1.916565,-0.429795 0.3403999,-1.81447 c 0,0 -0.5976692,-0.340649 -1.2747239,-0.585395 z"
          style="display:inline;fill:url(#linearGradient5196-1);fill-opacity:1;stroke:none" />
       <path
-         inkscape:connector-curvature="0"
          id="path5006-1-1"
          d="m 3.25,1049.1435 c -0.211528,0.024 -0.41079,0.089 -0.5625,0.1562 l -1.21875,2.5625 2.5625,-1.2187 0.03125,-0.062 c 0.121601,-0.3002 0.273127,-0.8318 -0.09375,-1.2188 -0.132606,-0.1402 -0.331591,-0.1963 -0.5,-0.2187 -0.08057,-0.011 -0.138928,-0.01 -0.21875,0 z"
          style="fill:url(#linearGradient4185);fill-opacity:1;stroke:none;display:inline" />
       <path
-         inkscape:connector-curvature="0"
          id="path5426-5"
          d="m 4.984376,1047.2528 8.937501,-8.8281"
          style="display:inline;opacity:0;fill:none;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter5428-5)" />
diff --git a/ui/org.eclipse.pde.ui/icons/ovr16/error_co.svg b/ui/org.eclipse.pde.ui/icons/ovr16/error_co.svg
index 1b2a9282bff..1b139709a95 100644
--- a/ui/org.eclipse.pde.ui/icons/ovr16/error_co.svg
+++ b/ui/org.eclipse.pde.ui/icons/ovr16/error_co.svg
@@ -2,47 +2,17 @@
 <!-- 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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="7"
    height="8"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="error_co.svg">
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1"
-     inkscape:cx="1.7591406"
-     inkscape:cy="1.7730252"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="1107"
-     inkscape:window-height="870"
-     inkscape:window-x="350"
-     inkscape:window-y="350"
-     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>
@@ -56,8 +26,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      transform="translate(0,-1044.3622)">
     <rect
@@ -68,10 +36,8 @@
        x="-1.1130133e-007"
        y="1044.3622" />
     <path
-       inkscape:connector-curvature="0"
        style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:7.68999243px;line-height:125%;font-family:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:0px;word-spacing:0px;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.27519909;marker:none;enable-background:accumulate"
        d="m 1.0021364,1046.3608 0,0.1184 0,0.7609 0,0.1184 0.1384548,0 0.4153647,0 1.3153211,1.0447 -1.3499348,0.9579 -0.380751,0 -0.1384548,0 0,0.1184 0,0.7561 0,0.1184 0.1384548,0 1.7277497,0 0.1384542,0 0,-0.1184 0,-0.7561 0,-0.1184 -0.1384542,0 0.6259832,-0.3067 0.64808,0.3067 -0.138455,0 0,0.1184 0,0.7561 0,0.1184 0.138455,0 1.705653,0 0.138454,0 0,-0.1184 0,-0.7561 0,-0.1184 -0.138454,0 -0.346138,0 -1.384549,-0.9876 1.280708,-1.015 0.449979,0 0.138454,0 0,-0.1184 0,-0.7609 0,-0.1184 -0.138454,0 -1.705653,0 -0.138455,0 0,0.1184 0,0.7609 0,0.1184 0.06923,0 -0.578853,0.3935 -0.5678034,-0.3935 0.069227,0 0,-0.1184 0,-0.7609 0,-0.1184 -0.1384531,0 -1.7167011,0 z"
-       id="path4187-6"
-       sodipodi:nodetypes="ccccccccccccccccccccccccccccccccccccccccccccccccccccccccc" />
+       id="path4187-6" />
   </g>
 </svg>
diff --git a/ui/org.eclipse.pde.ui/icons/ovr16/export_co.svg b/ui/org.eclipse.pde.ui/icons/ovr16/export_co.svg
index b289550c451..05377688cec 100644
--- a/ui/org.eclipse.pde.ui/icons/ovr16/export_co.svg
+++ b/ui/org.eclipse.pde.ui/icons/ovr16/export_co.svg
@@ -2,48 +2,17 @@
 <!-- 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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="7"
    height="8"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="export_co.svg">
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="44.8"
-     inkscape:cx="1.3795181"
-     inkscape:cy="3.5201148"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1288"
-     inkscape:window-height="951"
-     inkscape:window-x="656"
-     inkscape:window-y="413"
-     inkscape:window-maximized="0"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2985"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -57,19 +26,15 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      transform="translate(0,-1044.3622)">
     <path
        style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
        d="m 0.46875,1044.8622 4.0401786,0 1.9754464,1.9754 0,2.1541 -2.9631696,2.9631 -1.0881697,-1.0881 -1.94196427,0 z"
-       id="path4146"
-       inkscape:connector-curvature="0" />
+       id="path4146" />
     <path
        style="fill:#808080;fill-opacity:1;fill-rule:evenodd;stroke:#3f3f5f;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
        d="m 3.5661438,1044.8362 3.0304576,3.062 -3.0620248,3.0147 -0.9785853,-1.0575 -1.0575035,0 0,-3.9933 1.1048544,0 z"
-       id="path4149"
-       inkscape:connector-curvature="0" />
+       id="path4149" />
   </g>
 </svg>
diff --git a/ui/org.eclipse.pde.ui/icons/ovr16/external_co.svg b/ui/org.eclipse.pde.ui/icons/ovr16/external_co.svg
index 41620315670..f12960b00ca 100644
--- a/ui/org.eclipse.pde.ui/icons/ovr16/external_co.svg
+++ b/ui/org.eclipse.pde.ui/icons/ovr16/external_co.svg
@@ -2,24 +2,19 @@
 <!-- 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="7"
    height="8"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="external_co.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4228">
       <stop
          style="stop-color:#004b85;stop-opacity:1"
@@ -50,29 +45,6 @@
          id="stop5107-7-48" />
     </linearGradient>
     <linearGradient
-       y2="1063.0186"
-       x2="11.41764"
-       y1="1067.1729"
-       x1="11.41764"
-       gradientTransform="translate(19.911612,-20)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient6319"
-       xlink:href="#linearGradient6354"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient6354"
-       inkscape:collect="always">
-      <stop
-         id="stop6356"
-         offset="0"
-         style="stop-color:#6994ad;stop-opacity:1" />
-      <stop
-         id="stop6358"
-         offset="1"
-         style="stop-color:#095a98;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient5103-3-7"
        id="linearGradient4179"
        x1="712.93414"
@@ -82,7 +54,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1.222744,0,0,1.0527567,-910.22289,-245.27711)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4228"
        id="linearGradient4234"
        x1="24.953371"
@@ -90,67 +61,7 @@
        x2="31.05195"
        y2="1046.0502"
        gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient4921">
-      <stop
-         id="stop4923"
-         offset="0"
-         style="stop-color:#85a2cd;stop-opacity:1;" />
-      <stop
-         id="stop4925"
-         offset="1"
-         style="stop-color:#d3dce9;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4913">
-      <stop
-         id="stop4915"
-         offset="0"
-         style="stop-color:#4e6b9b;stop-opacity:1" />
-      <stop
-         id="stop4917"
-         offset="1"
-         style="stop-color:#6783b1;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4789">
-      <stop
-         id="stop4791"
-         offset="0"
-         style="stop-color:#4e8fbd;stop-opacity:1;" />
-      <stop
-         id="stop4793"
-         offset="1"
-         style="stop-color:#30495a;stop-opacity:1;" />
-    </linearGradient>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="64"
-     inkscape:cx="-4.6511734"
-     inkscape:cy="-0.4048277"
-     inkscape:document-units="px"
-     inkscape:current-layer="g4213"
-     showgrid="true"
-     inkscape:window-width="2560"
-     inkscape:window-height="1537"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2985"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -164,24 +75,19 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      transform="translate(0,-1044.3622)">
     <g
        transform="matrix(0.74698003,0.66484647,0.66484647,-0.74698003,-713.30256,1809.3162)"
-       inkscape:label="Layer 1"
        id="layer1-7"
        style="display:inline">
       <g
          id="g4254">
         <path
-           inkscape:connector-curvature="0"
            id="path4251"
            d="m 5.4375,1049.7887 0.033146,-2.3772 -4.67141501,-4.7289 -2.53406569,2.4568 4.6942974,4.6943 z"
            style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-           transform="matrix(0.74698003,0.66484647,0.66484647,-0.74698003,-670.09473,1825.7598)"
-           sodipodi:nodetypes="cccccc" />
+           transform="matrix(0.74698003,0.66484647,0.66484647,-0.74698003,-670.09473,1825.7598)" />
         <g
            transform="translate(-0.02286401,0.01625567)"
            id="g4213">
@@ -196,30 +102,22 @@
                id="rect4163"
                style="opacity:1;fill:url(#linearGradient4179);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
             <path
-               inkscape:connector-curvature="0"
                id="path4181"
                d="m 24.981797,1046.3108 6.41149,-0.3651"
-               style="fill:url(#linearGradient4234);fill-opacity:1;fill-rule:evenodd;stroke:#003f80;stroke-width:0.9;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-               sodipodi:nodetypes="cc" />
+               style="fill:url(#linearGradient4234);fill-opacity:1;fill-rule:evenodd;stroke:#003f80;stroke-width:0.9;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
             <path
-               inkscape:connector-curvature="0"
                id="path4181-5"
                d="m 24.924064,1044.7803 3.102993,-0.2 3.102992,-0.2001"
-               style="display:inline;fill:none;fill-rule:evenodd;stroke:#003f80;stroke-width:0.89999998;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-               sodipodi:nodetypes="ccc" />
+               style="display:inline;fill:none;fill-rule:evenodd;stroke:#003f80;stroke-width:0.89999998;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
           </g>
           <path
              style="display:inline;fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
              d="m 28.992013,1047.847 1.116592,0.9938 3.337468,-3.7498 -3.718763,-3.3098 -1.023441,1.1499"
-             id="path4211-6"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccc" />
+             id="path4211-6" />
           <path
              style="fill:none;fill-rule:evenodd;stroke:#003165;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
              d="m 29.701517,1047.7883 2.335005,-2.6235 -2.607962,-2.3212"
-             id="path4211"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccc" />
+             id="path4211" />
         </g>
       </g>
     </g>
diff --git a/ui/org.eclipse.pde.ui/icons/ovr16/friend_co.svg b/ui/org.eclipse.pde.ui/icons/ovr16/friend_co.svg
index c0c3f4d5662..a24f414c3ed 100644
--- a/ui/org.eclipse.pde.ui/icons/ovr16/friend_co.svg
+++ b/ui/org.eclipse.pde.ui/icons/ovr16/friend_co.svg
@@ -2,24 +2,19 @@
 <!-- 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="7"
    height="8"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="friend_co.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4184">
       <stop
          style="stop-color:#be9c28;stop-opacity:1"
@@ -31,48 +26,6 @@
          id="stop4188" />
     </linearGradient>
     <linearGradient
-       id="linearGradient5103-3-7">
-      <stop
-         style="stop-color:#b3ffc6;stop-opacity:1"
-         offset="0"
-         id="stop5105-5-4" />
-      <stop
-         id="stop7550-07-0"
-         offset="0.26694915"
-         style="stop-color:#93e8c0;stop-opacity:1" />
-      <stop
-         id="stop7548-6-9"
-         offset="0.51694918"
-         style="stop-color:#69b5b5;stop-opacity:1" />
-      <stop
-         style="stop-color:#1c5ea6;stop-opacity:1"
-         offset="1"
-         id="stop5107-7-48" />
-    </linearGradient>
-    <linearGradient
-       y2="1063.0186"
-       x2="11.41764"
-       y1="1067.1729"
-       x1="11.41764"
-       gradientTransform="translate(19.911612,-20)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient6319"
-       xlink:href="#linearGradient6354"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient6354"
-       inkscape:collect="always">
-      <stop
-         id="stop6356"
-         offset="0"
-         style="stop-color:#6994ad;stop-opacity:1" />
-      <stop
-         id="stop6358"
-         offset="1"
-         style="stop-color:#095a98;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        id="linearGradient4165">
       <stop
          style="stop-color:#ffffff;stop-opacity:1"
@@ -84,7 +37,6 @@
          id="stop4169" />
     </linearGradient>
     <radialGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4165"
        id="radialGradient4171-3"
        cx="29.150478"
@@ -95,7 +47,6 @@
        gradientTransform="matrix(0.8923152,-0.05887665,0.0499861,0.99229166,-49.073146,9.6805859)"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4184"
        id="linearGradient4190"
        x1="27.327204"
@@ -104,33 +55,6 @@
        y2="1042.3307"
        gradientUnits="userSpaceOnUse" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="32"
-     inkscape:cx="13.644731"
-     inkscape:cy="5.363979"
-     inkscape:document-units="px"
-     inkscape:current-layer="g4192"
-     showgrid="true"
-     inkscape:window-width="1363"
-     inkscape:window-height="877"
-     inkscape:window-x="881"
-     inkscape:window-y="432"
-     inkscape:window-maximized="0"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2985"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -144,27 +68,20 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      transform="translate(0,-1044.3622)">
     <g
        transform="matrix(0.74698003,0.66484647,0.66484647,-0.74698003,-713.30256,1809.3162)"
-       inkscape:label="Layer 1"
        id="layer1-7"
        style="display:inline">
       <g
          id="g4192"
          transform="translate(-0.04407351,0.04951825)">
         <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
            id="path4163"
            d="m 27.22161,1047.55 c -0.07068,-1.215 -0.15404,-2.6478 -0.252273,-4.3364 1.462315,-0.085 2.749941,-0.1599 4.258425,-0.2477 0.08288,1.4247 0.113731,1.9549 0.251366,4.3208 -1.273172,0.074 -3.087781,0.1953 -4.257518,0.2633 z"
            style="display:inline;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4190);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
         <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
            id="path4163-7"
            d="m 27.927981,1046.7458 -0.174933,-2.8438 2.748381,-0.1463 0.184641,2.8303 z"
            style="display:inline;fill:url(#radialGradient4171-3);fill-opacity:1;fill-rule:evenodd;stroke:#fecf6c;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;opacity:0.445" />
diff --git a/ui/org.eclipse.pde.ui/icons/ovr16/internal_co.svg b/ui/org.eclipse.pde.ui/icons/ovr16/internal_co.svg
index fac2eafe897..c681d15ed26 100644
--- a/ui/org.eclipse.pde.ui/icons/ovr16/internal_co.svg
+++ b/ui/org.eclipse.pde.ui/icons/ovr16/internal_co.svg
@@ -2,24 +2,19 @@
 <!-- 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="7"
    height="8"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="internal_co.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4162">
       <stop
          style="stop-color:#ec525c;stop-opacity:1"
@@ -30,49 +25,7 @@
          offset="1"
          id="stop4166" />
     </linearGradient>
-    <linearGradient
-       id="linearGradient5103-3-7">
-      <stop
-         style="stop-color:#b3ffc6;stop-opacity:1"
-         offset="0"
-         id="stop5105-5-4" />
-      <stop
-         id="stop7550-07-0"
-         offset="0.26694915"
-         style="stop-color:#93e8c0;stop-opacity:1" />
-      <stop
-         id="stop7548-6-9"
-         offset="0.51694918"
-         style="stop-color:#69b5b5;stop-opacity:1" />
-      <stop
-         style="stop-color:#1c5ea6;stop-opacity:1"
-         offset="1"
-         id="stop5107-7-48" />
-    </linearGradient>
-    <linearGradient
-       y2="1063.0186"
-       x2="11.41764"
-       y1="1067.1729"
-       x1="11.41764"
-       gradientTransform="translate(19.911612,-20)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient6319"
-       xlink:href="#linearGradient6354"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient6354"
-       inkscape:collect="always">
-      <stop
-         id="stop6356"
-         offset="0"
-         style="stop-color:#6994ad;stop-opacity:1" />
-      <stop
-         id="stop6358"
-         offset="1"
-         style="stop-color:#095a98;stop-opacity:1" />
-    </linearGradient>
     <radialGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4162"
        id="radialGradient4168"
        cx="723.52917"
@@ -83,33 +36,6 @@
        gradientTransform="matrix(1,0,0,0.99380805,-5.734375,-4.7085486)"
        gradientUnits="userSpaceOnUse" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="64"
-     inkscape:cx="6.5131712"
-     inkscape:cy="3.3795175"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1-7"
-     showgrid="true"
-     inkscape:window-width="1363"
-     inkscape:window-height="877"
-     inkscape:window-x="588"
-     inkscape:window-y="508"
-     inkscape:window-maximized="0"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2985"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -123,13 +49,10 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      transform="translate(0,-1044.3622)">
     <g
        transform="matrix(0.74698003,0.66484647,0.66484647,-0.74698003,-713.30256,1809.3162)"
-       inkscape:label="Layer 1"
        id="layer1-7"
        style="display:inline">
       <rect
diff --git a/ui/org.eclipse.pde.ui/icons/ovr16/jar_co.svg b/ui/org.eclipse.pde.ui/icons/ovr16/jar_co.svg
index 7c6c8235dbb..4442ae0ad5a 100644
--- a/ui/org.eclipse.pde.ui/icons/ovr16/jar_co.svg
+++ b/ui/org.eclipse.pde.ui/icons/ovr16/jar_co.svg
@@ -2,24 +2,19 @@
 <!-- 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="7"
    height="8"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="jar_co.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <radialGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4152"
        id="radialGradient4158"
        cx="4.0166512"
@@ -30,7 +25,6 @@
        gradientTransform="matrix(0.73948628,-1.1965452e-5,1.8057451e-5,1.1159827,1.0559089,-121.6468)"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4152">
       <stop
          style="stop-color:#ffffff;stop-opacity:1;"
@@ -42,33 +36,6 @@
          id="stop4156" />
     </linearGradient>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="11.313709"
-     inkscape:cx="-4.1894405"
-     inkscape:cy="-7.8057061"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1231"
-     inkscape:window-height="862"
-     inkscape:window-x="797"
-     inkscape:window-y="513"
-     inkscape:window-maximized="0"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2985"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -82,22 +49,16 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      transform="translate(0,-1044.3622)">
     <path
        style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
        d="m 1.5909902,1044.363 0,1.4585 0,0.8838 -1.0827572,1.0828 0,3.1599 0,0.906 5.9883105,0 0,-7.4909"
-       id="path4177"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccccc" />
+       id="path4177" />
     <path
        style="fill:url(#radialGradient4158);fill-opacity:1;fill-rule:evenodd;stroke:#12437b;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
        d="m 2.5222748,1045.359 0,1.4789 c 0,0.4911 -1.0417198,0.5506 -1.0417198,1.0417 l 0,2.9989 c 0,0.8854 1.0575034,1.0575 1.0575034,1.0575 0,0 1.9246381,0 2.8726213,0 0.531987,0 1.1285298,-0.5965 1.1285298,-1.1285 l 0,-2.991 c 0,-0.5041 -1.0693412,-0.5652 -1.0693412,-1.0693 l 0,-1.377"
-       id="path4150"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="csszcssssc" />
+       id="path4150" />
     <rect
        style="opacity:1;fill:#762800;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect4160"
diff --git a/ui/org.eclipse.pde.ui/icons/ovr16/java_co.svg b/ui/org.eclipse.pde.ui/icons/ovr16/java_co.svg
index ca54a82a8d2..a3f846a5674 100644
--- a/ui/org.eclipse.pde.ui/icons/ovr16/java_co.svg
+++ b/ui/org.eclipse.pde.ui/icons/ovr16/java_co.svg
@@ -2,84 +2,28 @@
 <!-- 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="7"
    height="8"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="java_ovr.svg">
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3768">
-      <stop
-         style="stop-color:#147a38;stop-opacity:1;"
-         offset="0"
-         id="stop3770" />
-      <stop
-         style="stop-color:#308a50;stop-opacity:1"
-         offset="1"
-         id="stop3772" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3768"
-       id="linearGradient3774"
-       x1="6"
-       y1="1051.3622"
-       x2="6"
-       y2="1044.3622"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-2,0)" />
     <filter
-       inkscape:collect="always"
        id="filter3787"
-       x="-0.1885095"
-       width="1.377019"
+       x="-0.43680911"
+       width="1.8736182"
        y="-0.088013492"
-       height="1.176027">
+       height="1.291956">
       <feGaussianBlur
-         inkscape:collect="always"
          stdDeviation="0.23725055"
          id="feGaussianBlur3789" />
     </filter>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="44.8"
-     inkscape:cx="7.3443892"
-     inkscape:cy="4.3578248"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="831"
-     inkscape:window-height="877"
-     inkscape:window-x="1108"
-     inkscape:window-y="484"
-     inkscape:window-maximized="0"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2985"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -93,27 +37,19 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      transform="translate(0,-1044.3622)">
     <path
        style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
        d="m 4.0090429,1044.3757 0,2.9909 -3.014674,0.01 c 0,0 -0.26722643,2.4484 0.2051873,3.3462 0.4724137,0.8977 0.6450779,1.1364 1.4205269,1.5152 0.775449,0.3788 2.4306796,0.1579 2.4306796,0.1579 0,0 1.6730651,-0.1894 1.894036,-2.0519 0.2209709,-1.8625 0.1262691,-5.9978 0.1262691,-5.9978 z"
-       id="path4152"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccczzcscc" />
+       id="path4152" />
     <path
        style="fill:none;stroke:#ffffff;stroke-width:1.50000000000000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter3787);stroke-miterlimit:4;stroke-dasharray:none;opacity:0.75"
        d="m 2.470527,1048.3667 0,0.9905 c 0,2.0131 3.0205444,2.0023 3.0205444,0 l 0,-4.9637"
-       id="path2999-1"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cscc" />
+       id="path2999-1" />
     <path
        style="fill:none;stroke:#286296;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
        d="m 2.470527,1048.3667 0,0.9905 c 0,2.0131 3.0205444,2.0023 3.0205444,0 l 0,-4.9637"
-       id="path2999"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cscc" />
+       id="path2999" />
   </g>
 </svg>
diff --git a/ui/org.eclipse.pde.ui/icons/ovr16/optional_co.svg b/ui/org.eclipse.pde.ui/icons/ovr16/optional_co.svg
index df70df4d858..6f55c2040b0 100644
--- a/ui/org.eclipse.pde.ui/icons/ovr16/optional_co.svg
+++ b/ui/org.eclipse.pde.ui/icons/ovr16/optional_co.svg
@@ -2,48 +2,17 @@
 <!-- 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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="7"
    height="8"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="optional_co.svg">
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="126.71354"
-     inkscape:cx="5.7663929"
-     inkscape:cy="4.4229606"
-     inkscape:document-units="px"
-     inkscape:current-layer="g4385"
-     showgrid="true"
-     inkscape:window-width="1236"
-     inkscape:window-height="964"
-     inkscape:window-x="1119"
-     inkscape:window-y="572"
-     inkscape:window-maximized="0"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2985"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -57,15 +26,12 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      transform="translate(0,-1044.3622)">
     <path
        style="fill:#ffffff;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1"
        d="m 0,1044.3757 0,1.9572 2.0203051,2.0203 0,4.009 3.9774756,0 0,-3.0147 1.0259362,-1.0259 0,-3.9775 z"
-       id="path4389"
-       inkscape:connector-curvature="0" />
+       id="path4389" />
     <g
        id="g4381">
       <g
@@ -73,9 +39,7 @@
         <path
            style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#17325d;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
            d="m 2.2617188,1044.3477 -0.1503907,0.1621 -1.1269531,1.2168 0,1.6269 0.5,0 c 0.4461727,0 0.5481223,0.025 1.0678835,0.025 0.3569029,0 0.332218,-0.8719 0.4655277,-1.1229 0.2479358,-0.4669 0.5717966,-0.7795 0.689245,-0.8829 l 0.1583022,0 0.1306907,0.7305 c 0.00192,0.1428 0.00509,0.3822 0.00781,0.7637 0.00121,0.1702 -0.060416,0.8961 -0.060416,0.8961 l -0.9832341,0.6225 -0.024524,1.0595 1.675662,0 1.716222,-1.3867 0,-2.3457 -0.025391,-0.027 -1.5228625,-1.3125 -2.5175781,-0.025 z"
-           id="path4157"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccssccccccccccccccc" />
+           id="path4157" />
         <rect
            style="opacity:1;fill:#17325d;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
            id="rect4159"
diff --git a/ui/org.eclipse.pde.ui/icons/ovr16/project_co.svg b/ui/org.eclipse.pde.ui/icons/ovr16/project_co.svg
index 0cf2651afe6..37e1420d003 100644
--- a/ui/org.eclipse.pde.ui/icons/ovr16/project_co.svg
+++ b/ui/org.eclipse.pde.ui/icons/ovr16/project_co.svg
@@ -2,24 +2,19 @@
 <!-- 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="7"
    height="8"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="project_co.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4191">
       <stop
          style="stop-color:#a07069;stop-opacity:1"
@@ -31,7 +26,6 @@
          id="stop4195" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4170">
       <stop
          style="stop-color:#b6ffff;stop-opacity:1;"
@@ -43,7 +37,6 @@
          id="stop4174" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4170"
        id="linearGradient4176"
        x1="3.5402315"
@@ -53,7 +46,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(0.99696963,0,0,1.0542465,0.01068348,-61.430095)" />
     <radialGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4191"
        id="radialGradient4197"
        cx="2.9199722"
@@ -64,33 +56,6 @@
        gradientTransform="matrix(1.0633486,-1.2722881e-6,7.7922859e-7,0.65126099,-0.18579009,365.52168)"
        gradientUnits="userSpaceOnUse" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="63.356768"
-     inkscape:cx="1.6977865"
-     inkscape:cy="4.1071188"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1326"
-     inkscape:window-height="937"
-     inkscape:window-x="438"
-     inkscape:window-y="381"
-     inkscape:window-maximized="0"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2985"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -104,8 +69,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      transform="translate(0,-1044.3622)">
     <rect
@@ -125,14 +88,10 @@
     <path
        style="fill:url(#linearGradient4176);fill-opacity:1;fill-rule:evenodd;stroke:#123596;stroke-width:1.02520812px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
        d="m 0.26245634,1047.3864 1.25099636,1.3561 0,2.1216 4.0047619,0 0,-2.1798 1.2746,-1.3478"
-       id="path4168"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccc" />
+       id="path4168" />
     <path
        style="fill:none;fill-rule:evenodd;stroke:url(#radialGradient4197);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
        d="m 0.01578364,1046.8695 1.51522876,0 0.9864771,-0.9865 1.0180444,0 0.9825312,0.9825 2.4740845,0"
-       id="path4178"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccc" />
+       id="path4178" />
   </g>
 </svg>
diff --git a/ui/org.eclipse.pde.ui/icons/ovr16/warning_co.svg b/ui/org.eclipse.pde.ui/icons/ovr16/warning_co.svg
index 57200548fef..f5ff895da1a 100644
--- a/ui/org.eclipse.pde.ui/icons/ovr16/warning_co.svg
+++ b/ui/org.eclipse.pde.ui/icons/ovr16/warning_co.svg
@@ -2,31 +2,18 @@
 <!-- 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="7"
    height="8"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="warning_co.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5081"
-       id="linearGradient5087"
-       x1="3.3833356"
-       y1="7.0159616"
-       x2="3.3833356"
-       y2="0.98171616"
-       gradientUnits="userSpaceOnUse" />
     <linearGradient
        id="linearGradient5081">
       <stop
@@ -43,16 +30,6 @@
          id="stop5085" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5091"
-       id="linearGradient5097"
-       x1="6.3885393"
-       y1="7.2369323"
-       x2="6.3885393"
-       y2="0.39338252"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
        id="linearGradient5091">
       <stop
          style="stop-color:#c6852e;stop-opacity:1"
@@ -71,8 +48,7 @@
        x1="3.3833356"
        gradientUnits="userSpaceOnUse"
        id="linearGradient4230"
-       xlink:href="#linearGradient5081"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient5081" />
     <linearGradient
        gradientTransform="translate(3.8209032e-8,1044.3622)"
        y2="0.39338252"
@@ -81,35 +57,8 @@
        x1="6.3885393"
        gradientUnits="userSpaceOnUse"
        id="linearGradient4232"
-       xlink:href="#linearGradient5091"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient5091" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="31.678384"
-     inkscape:cx="-0.64549806"
-     inkscape:cy="2.3717404"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="945"
-     inkscape:window-height="1125"
-     inkscape:window-x="736"
-     inkscape:window-y="438"
-     inkscape:window-maximized="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3024"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -123,36 +72,24 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      transform="translate(0,-1044.3622)">
     <path
        style="fill:#ffffff;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1"
        d="m -1,1050.3622 3,-7 3,0 3,7 z"
-       id="path3348"
-       inkscape:connector-curvature="0" />
+       id="path3348" />
     <path
        style="fill:url(#linearGradient4230);fill-opacity:1;stroke:url(#linearGradient4232);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
        d="m 2.8125,1045.2684 -2.03124996,4.0938 c -0.60602934,1.0251 -0.19281594,2.4817 0.93749996,2.5 l 1.28125,0 1,0 1.28125,0 c 1.1303165,-0.018 1.5435294,-1.475 0.9375,-2.5 l -2.03125,-4.0938 c -0.2942923,-0.5567 -1.1188077,-0.4672 -1.375,0 z"
-       id="path4292"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccccc" />
+       id="path4292" />
     <path
-       sodipodi:type="arc"
        style="fill:#502800;fill-opacity:1;stroke:none;display:inline"
        id="path4253"
-       sodipodi:cx="3.484375"
-       sodipodi:cy="5.484375"
-       sodipodi:rx="0.625"
-       sodipodi:ry="0.625"
        d="m 4.109375,5.484375 a 0.625,0.625 0 0 1 -0.625,0.625 0.625,0.625 0 0 1 -0.625,-0.625 0.625,0.625 0 0 1 0.625,-0.625 0.625,0.625 0 0 1 0.625,0.625 z"
        transform="matrix(1.0523812,0,0,1.0523812,-0.16689048,1044.2631)" />
     <path
        style="fill:#502800;fill-opacity:1;stroke:none;display:inline"
        d="m 3.5142345,1046.253 c -0.3537485,0 -0.6547532,0.3148 -0.6547532,0.7235 l 0.085402,1.3916 c 0,0.3633 0.2549073,0.6577 0.5693508,0.6577 0.3144435,0 0.5693489,-0.2944 0.5693489,-0.6577 l 0.056931,-1.3916 c 0,-0.4087 -0.2725362,-0.7235 -0.6262867,-0.7235 z"
-       id="path4253-7"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="sccsccs" />
+       id="path4253-7" />
   </g>
 </svg>
diff --git a/ui/org.eclipse.pde.ui/icons/view16/plugins.svg b/ui/org.eclipse.pde.ui/icons/view16/plugins.svg
index 6741d827a52..9e20febec4f 100644
--- a/ui/org.eclipse.pde.ui/icons/view16/plugins.svg
+++ b/ui/org.eclipse.pde.ui/icons/view16/plugins.svg
@@ -2,20 +2,16 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="plugins.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
@@ -34,7 +30,6 @@
          style="stop-color:#809dcb;stop-opacity:0" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10448-9-7-0-5"
        id="linearGradient10770-6"
        gradientUnits="userSpaceOnUse"
@@ -59,22 +54,6 @@
          id="stop10452-22-7-8-4" />
     </linearGradient>
     <linearGradient
-       id="linearGradient10440-1-0-0-3">
-      <stop
-         style="stop-color:#ae7603;stop-opacity:1;"
-         offset="0"
-         id="stop10442-43-2-0-9" />
-      <stop
-         id="stop10521-1-2-5-3"
-         offset="0.5"
-         style="stop-color:#e8d8a3;stop-opacity:1" />
-      <stop
-         style="stop-color:#bb9221;stop-opacity:1"
-         offset="1"
-         id="stop10444-3-4-0-4" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10748-8"
        id="linearGradient10774-5"
        gradientUnits="userSpaceOnUse"
@@ -107,22 +86,6 @@
          style="stop-color:#e5b630;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       id="linearGradient10440-1-3-4">
-      <stop
-         style="stop-color:#ae7603;stop-opacity:1;"
-         offset="0"
-         id="stop10442-43-0-5" />
-      <stop
-         id="stop10521-1-4-7"
-         offset="0.5"
-         style="stop-color:#e8d8a3;stop-opacity:1" />
-      <stop
-         style="stop-color:#bb9221;stop-opacity:1"
-         offset="1"
-         id="stop10444-3-2-0" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10448-90"
        id="linearGradient10778-6"
        gradientUnits="userSpaceOnUse"
@@ -155,22 +118,6 @@
          id="stop10452-1" />
     </linearGradient>
     <linearGradient
-       id="linearGradient10440-18">
-      <stop
-         style="stop-color:#ae7603;stop-opacity:1;"
-         offset="0"
-         id="stop10442-8" />
-      <stop
-         id="stop10521-7"
-         offset="0.5"
-         style="stop-color:#e8d8a3;stop-opacity:1" />
-      <stop
-         style="stop-color:#bb9221;stop-opacity:1"
-         offset="1"
-         id="stop10444-0" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10414-9"
        id="linearGradient10782-3"
        gradientUnits="userSpaceOnUse"
@@ -195,7 +142,6 @@
          id="stop10418-4" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10432-3"
        id="linearGradient10784-2"
        gradientUnits="userSpaceOnUse"
@@ -220,7 +166,6 @@
          style="stop-color:#567ebc;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10157-6"
        id="linearGradient10786-1"
        gradientUnits="userSpaceOnUse"
@@ -245,22 +190,6 @@
          id="stop10161-55" />
     </linearGradient>
     <linearGradient
-       id="linearGradient10396-5">
-      <stop
-         style="stop-color:#1b3e79;stop-opacity:1;"
-         offset="0"
-         id="stop10398-7" />
-      <stop
-         id="stop10404-9"
-         offset="0.5"
-         style="stop-color:#728fbf;stop-opacity:1" />
-      <stop
-         style="stop-color:#1f4d9a;stop-opacity:1"
-         offset="1"
-         id="stop10400-9" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10157-2-5"
        id="linearGradient10790-8"
        gradientUnits="userSpaceOnUse"
@@ -285,7 +214,6 @@
          id="stop10161-5-0" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10149-39-0"
        id="linearGradient10792-6"
        gradientUnits="userSpaceOnUse"
@@ -295,7 +223,6 @@
        x2="322.875"
        y2="504.44818" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient10149-39-0">
       <stop
          style="stop-color:#1d4d9d;stop-opacity:1"
@@ -307,22 +234,6 @@
          id="stop10153-72-3" />
     </linearGradient>
     <linearGradient
-       id="linearGradient10149-6-5-4">
-      <stop
-         style="stop-color:#1f4d9a;stop-opacity:1"
-         offset="0"
-         id="stop10151-5-7-2" />
-      <stop
-         id="stop10394-3"
-         offset="0.5"
-         style="stop-color:#b9c7df;stop-opacity:1" />
-      <stop
-         style="stop-color:#567ebc;stop-opacity:1"
-         offset="1"
-         id="stop10153-8-1-2" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4284"
        id="linearGradient10790-8-2"
        gradientUnits="userSpaceOnUse"
@@ -332,29 +243,6 @@
        x2="305"
        y2="545.35248" />
   </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="47.607658"
-     inkscape:cy="-9.9169213"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1609"
-     inkscape:window-height="978"
-     inkscape:window-x="719"
-     inkscape:window-y="519"
-     inkscape:window-maximized="0"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid4210" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -368,8 +256,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
@@ -385,19 +271,15 @@
     <path
        style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
        d="m 12.648438,1043.3652 0,1 3.351562,0 0,-1 -3.351562,0 z"
-       id="path4313-8-8"
-       inkscape:connector-curvature="0" />
+       id="path4313-8-8" />
     <path
        style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.94926554px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
        d="m 12.981809,1043.3594 0,3.0195 1.01551,0 0,-3.0195 z"
-       id="path4313-8-8-7"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+       id="path4313-8-8-7" />
     <path
        style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#9e7400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
        d="m 15.992188,1045.3613 -3.359376,0.031 0.0098,1 3.359375,-0.031 -0.0098,-1 z"
-       id="path4313-5-1-8"
-       inkscape:connector-curvature="0" />
+       id="path4313-5-1-8" />
     <rect
        style="fill:url(#linearGradient10774-5);fill-opacity:1;stroke:none;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        id="rect10007-0-74-2-7"
@@ -410,13 +292,11 @@
     <path
        style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#9e7400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
        d="m 13.005859,1046.3711 -3.3593746,0.031 0.00977,1 3.359375,-0.031 -0.0098,-1 z"
-       id="path4313-5-1"
-       inkscape:connector-curvature="0" />
+       id="path4313-5-1" />
     <path
        style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
        d="m 12.996094,1042.3633 -3.3593752,0.031 0.00977,1 3.3593746,-0.031 -0.0098,-1 z"
-       id="path4313-8"
-       inkscape:connector-curvature="0" />
+       id="path4313-8" />
     <rect
        style="fill:url(#linearGradient10778-6);fill-opacity:1;stroke:none;stroke-width:1.50161433;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        id="rect10007-0-74-2"
@@ -456,13 +336,11 @@
     <path
        style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
        d="m 10.996094,1041.3613 -3.3593752,0.031 0.00977,1 3.3593746,-0.031 -0.0098,-1 z"
-       id="path4313"
-       inkscape:connector-curvature="0" />
+       id="path4313" />
     <path
        style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#9e7400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
        d="m 11.001953,1047.3613 -3.3593749,0.031 0.00977,1 3.3593752,-0.031 -0.0098,-1 z"
-       id="path4313-5"
-       inkscape:connector-curvature="0" />
+       id="path4313-5" />
     <rect
        ry="1.0288811"
        style="fill:url(#linearGradient10790-8);fill-opacity:1;stroke:url(#linearGradient10792-6);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
@@ -482,8 +360,6 @@
     <path
        style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:0.64640886;fill-rule:evenodd;stroke:none;stroke-width:0.97351193px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
        d="m 11.003629,1043.3647 0,3.01 1.000277,0 0,-3.01 z"
-       id="path4313-8-8-7-8"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+       id="path4313-8-8-7-8" />
   </g>
 </svg>
diff --git a/ui/org.eclipse.pde.ui/icons/view16/registry.svg b/ui/org.eclipse.pde.ui/icons/view16/registry.svg
index f294b08bc1f..ad07f307bdc 100644
--- a/ui/org.eclipse.pde.ui/icons/view16/registry.svg
+++ b/ui/org.eclipse.pde.ui/icons/view16/registry.svg
@@ -2,20 +2,16 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="restore_log.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
@@ -45,26 +41,21 @@
        maskUnits="userSpaceOnUse"
        id="mask7366">
       <path
-         sodipodi:nodetypes="ccccccc"
-         inkscape:connector-curvature="0"
          id="path7368"
          d="m -16.593048,1040.862 9.990206,0 0,10.0018 -2.983353,3.0385 -5.966213,0 c -0.53033,-0.022 -1.04064,-0.5519 -1.04064,-1.0385 z"
          style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;display:inline" />
     </mask>
     <filter
-       inkscape:collect="always"
        id="filter7378"
-       x="-0.11264625"
-       width="1.2252925"
-       y="-0.44767511"
-       height="1.8953502">
+       x="-0.23764625"
+       width="1.4752925"
+       y="-0.94444611"
+       height="2.8888922">
       <feGaussianBlur
-         inkscape:collect="always"
          stdDeviation="0.3754875"
          id="feGaussianBlur7380" />
     </filter>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient7087"
        id="linearGradient7541"
        gradientUnits="userSpaceOnUse"
@@ -104,8 +95,7 @@
        gradientTransform="translate(-18,4.7e-5)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient7117"
-       xlink:href="#linearGradient7087-7"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient7087-7" />
     <linearGradient
        id="linearGradient7087-7-4">
       <stop
@@ -137,8 +127,7 @@
        gradientTransform="translate(-16,4.7e-5)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient7160"
-       xlink:href="#linearGradient7087-7-4"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient7087-7-4" />
     <linearGradient
        id="linearGradient7087-7-4-2">
       <stop
@@ -170,8 +159,7 @@
        gradientTransform="translate(-14,4.7e-5)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient7203"
-       xlink:href="#linearGradient7087-7-4-2"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient7087-7-4-2" />
     <linearGradient
        id="linearGradient7087-7-4-2-2">
       <stop
@@ -203,30 +191,7 @@
        gradientTransform="translate(-12,4.7e-5)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient7246"
-       xlink:href="#linearGradient7087-7-4-2-2"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient7584-5">
-      <stop
-         style="stop-color:#f9cd5f;stop-opacity:1"
-         offset="0"
-         id="stop7586-4" />
-      <stop
-         style="stop-color:#fbf0b4;stop-opacity:1"
-         offset="1"
-         id="stop7588-5" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient7592-1">
-      <stop
-         style="stop-color:#bd8416;stop-opacity:1"
-         offset="0"
-         id="stop7594-6" />
-      <stop
-         style="stop-color:#a66b10;stop-opacity:1"
-         offset="1"
-         id="stop7596-9" />
-    </linearGradient>
+       xlink:href="#linearGradient7087-7-4-2-2" />
     <linearGradient
        gradientTransform="matrix(0.72293526,0,0,1,-0.03086799,-2091.7193)"
        gradientUnits="userSpaceOnUse"
@@ -235,10 +200,8 @@
        y1="1047.8571"
        x1="7.0070496"
        id="linearGradient4871"
-       xlink:href="#linearGradient5147"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient5147" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient5147">
       <stop
          style="stop-color:#91a5c7;stop-opacity:1;"
@@ -257,8 +220,7 @@
        y1="1045.8571"
        x1="7.0070496"
        id="linearGradient4869"
-       xlink:href="#linearGradient5147"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient5147" />
     <linearGradient
        gradientTransform="matrix(0.82571734,0,0,1,-0.75106699,-2091.7193)"
        gradientUnits="userSpaceOnUse"
@@ -267,10 +229,8 @@
        y1="1043.8571"
        x1="7.0070496"
        id="linearGradient4867"
-       xlink:href="#linearGradient4877"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4877" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4877">
       <stop
          style="stop-color:#91a5c7;stop-opacity:1;"
@@ -289,8 +249,7 @@
        y1="1047.8571"
        x1="7.0070496"
        id="linearGradient4871-8"
-       xlink:href="#linearGradient5147"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient5147" />
     <linearGradient
        id="linearGradient4284">
       <stop
@@ -321,21 +280,6 @@
          offset="1"
          style="stop-color:#ebb313;stop-opacity:1" />
     </linearGradient>
-    <linearGradient
-       id="linearGradient10440-1-0-0-3">
-      <stop
-         id="stop10442-43-2-0-9"
-         offset="0"
-         style="stop-color:#ae7603;stop-opacity:1;" />
-      <stop
-         style="stop-color:#e8d8a3;stop-opacity:1"
-         offset="0.5"
-         id="stop10521-1-2-5-3" />
-      <stop
-         id="stop10444-3-4-0-4"
-         offset="1"
-         style="stop-color:#bb9221;stop-opacity:1" />
-    </linearGradient>
     <linearGradient
        id="linearGradient10748-8">
       <stop
@@ -427,36 +371,6 @@
          offset="1"
          style="stop-color:#809dcb;stop-opacity:1" />
     </linearGradient>
-    <linearGradient
-       id="linearGradient10396-5">
-      <stop
-         id="stop10398-7"
-         offset="0"
-         style="stop-color:#1b3e79;stop-opacity:1;" />
-      <stop
-         style="stop-color:#728fbf;stop-opacity:1"
-         offset="0.5"
-         id="stop10404-9" />
-      <stop
-         id="stop10400-9"
-         offset="1"
-         style="stop-color:#1f4d9a;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10149-6-5-4">
-      <stop
-         id="stop10151-5-7-2"
-         offset="0"
-         style="stop-color:#1f4d9a;stop-opacity:1" />
-      <stop
-         style="stop-color:#b9c7df;stop-opacity:1"
-         offset="0.5"
-         id="stop10394-3" />
-      <stop
-         id="stop10153-8-1-2"
-         offset="1"
-         style="stop-color:#567ebc;stop-opacity:1" />
-    </linearGradient>
     <linearGradient
        y2="518.28192"
        x2="323.98331"
@@ -465,8 +379,7 @@
        gradientTransform="matrix(0.28984397,0,0,0.32432277,-81.608152,874.91954)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient10770-6"
-       xlink:href="#linearGradient10448-9-7-0-5"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient10448-9-7-0-5" />
     <linearGradient
        y2="515.53949"
        x2="324.1601"
@@ -475,8 +388,7 @@
        gradientTransform="matrix(0.29647957,0,0,0.30390146,-83.81694,885.61311)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient10774-5"
-       xlink:href="#linearGradient10748-8"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient10748-8" />
     <linearGradient
        gradientTransform="matrix(0.30039597,0,0,0.29632024,-87.12885,889.63566)"
        y2="511.66458"
@@ -485,8 +397,7 @@
        x1="324.1601"
        gradientUnits="userSpaceOnUse"
        id="linearGradient10778-6"
-       xlink:href="#linearGradient10448-90"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient10448-90" />
     <linearGradient
        gradientTransform="matrix(0.27903303,0,0,0.27903303,-80.383503,898.62929)"
        y2="519.08923"
@@ -495,8 +406,7 @@
        x1="298.34253"
        gradientUnits="userSpaceOnUse"
        id="linearGradient10782-3"
-       xlink:href="#linearGradient10414-9"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient10414-9" />
     <linearGradient
        gradientTransform="matrix(0.27903303,0,0,0.27903303,-80.383503,898.62929)"
        y2="519.36218"
@@ -505,8 +415,7 @@
        x1="289.8125"
        gradientUnits="userSpaceOnUse"
        id="linearGradient10784-2"
-       xlink:href="#linearGradient10432-3"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient10432-3" />
     <linearGradient
        gradientTransform="matrix(0.28995536,0,0,0.16531775,-83.833594,958.22386)"
        y2="514.75818"
@@ -515,8 +424,7 @@
        x1="306.05069"
        gradientUnits="userSpaceOnUse"
        id="linearGradient10786-1"
-       xlink:href="#linearGradient10157-6"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient10157-6" />
     <linearGradient
        y2="542.73901"
        x2="305"
@@ -525,8 +433,7 @@
        gradientTransform="matrix(0.27929794,0,0,0.27455303,-80.466752,901.06458)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient10790-8"
-       xlink:href="#linearGradient10157-6"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient10157-6" />
     <linearGradient
        y2="504.44818"
        x2="322.875"
@@ -535,11 +442,9 @@
        gradientTransform="matrix(0.27929794,0,0,0.27455303,-80.466752,901.06458)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient10792-6"
-       xlink:href="#linearGradient10149-39-0"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient10149-39-0" />
     <linearGradient
-       id="linearGradient10149-39-0"
-       inkscape:collect="always">
+       id="linearGradient10149-39-0">
       <stop
          id="stop10151-3-0"
          offset="0"
@@ -557,34 +462,8 @@
        gradientTransform="matrix(0.09367554,0,0,0.16487513,-23.823728,957.45703)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient10790-8-2"
-       xlink:href="#linearGradient4284"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4284" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="5.6568545"
-     inkscape:cx="2.7874265"
-     inkscape:cy="-6.4432563"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1208"
-     inkscape:window-height="847"
-     inkscape:window-x="1144"
-     inkscape:window-y="599"
-     inkscape:window-maximized="0"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid6272" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -598,8 +477,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
@@ -609,11 +486,8 @@
       <g
          transform="translate(-18.599558,-2.010247)"
          style="display:inline"
-         id="layer1-8"
-         inkscape:label="Layer 1">
+         id="layer1-8">
         <path
-           sodipodi:nodetypes="ccccccc"
-           inkscape:connector-curvature="0"
            id="rect3997-9"
            d="m 2.9043501,1039.2874 11.0066719,0 0.486136,10.5764 -2.983353,3.0385 -6.982679,0 c -0.53033,-0.022 -1.04064,-0.5519 -1.04064,-1.0385 z"
            style="display:inline;fill:#e6f8ff;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1" />
@@ -625,14 +499,10 @@
            x="2.9007957"
            y="1052.3395" />
         <path
-           sodipodi:nodetypes="cccc"
-           inkscape:connector-curvature="0"
            id="rect3997-9-4"
            d="m 10.885887,1049.3225 3.997407,0 -3.99982,4.0737 z"
            style="display:inline;fill:#e6c8ad;fill-opacity:1;stroke:none" />
         <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
            id="rect3997-9-4-5"
            d="m 11.604042,1053.3998 3.274053,-3.3145 0.0052,-0.7628 -3.99982,4.0737 z"
            style="display:inline;fill:#d4b268;fill-opacity:1;stroke:none;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
@@ -647,32 +517,22 @@
                style="display:inline;opacity:0.75;stroke:#ffffff;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;filter:url(#filter7378)"
                id="g7205-6">
               <path
-                 sodipodi:nodetypes="cc"
-                 inkscape:connector-curvature="0"
                  id="path7045-6"
                  d="m -15.584151,1041.8789 0,-2.013"
                  style="fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
               <path
-                 sodipodi:nodetypes="cc"
-                 inkscape:connector-curvature="0"
                  id="path7045-0-6"
                  d="m -13.584151,1041.8789 0,-2.013"
                  style="display:inline;fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
               <path
-                 sodipodi:nodetypes="cc"
-                 inkscape:connector-curvature="0"
                  id="path7045-3-5"
                  d="m -11.584151,1041.8789 0,-2.013"
                  style="display:inline;fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
               <path
-                 sodipodi:nodetypes="cc"
-                 inkscape:connector-curvature="0"
                  id="path7045-3-4-1"
                  d="m -9.584151,1041.8789 0,-2.013"
                  style="display:inline;fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
               <path
-                 sodipodi:nodetypes="cc"
-                 inkscape:connector-curvature="0"
                  id="path7045-3-4-7-2"
                  d="m -7.584151,1041.8789 0,-2.013"
                  style="display:inline;fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
@@ -684,33 +544,23 @@
             <path
                style="fill:none;stroke:url(#linearGradient7541);stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
                d="m -15.584151,1041.8789 0,-2.013"
-               id="path7045"
-               inkscape:connector-curvature="0"
-               sodipodi:nodetypes="cc" />
+               id="path7045" />
             <path
                style="display:inline;fill:none;stroke:url(#linearGradient7117);stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
                d="m -13.584151,1041.8789 0,-2.013"
-               id="path7045-8"
-               inkscape:connector-curvature="0"
-               sodipodi:nodetypes="cc" />
+               id="path7045-8" />
             <path
                style="display:inline;fill:none;stroke:url(#linearGradient7160);stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
                d="m -11.584151,1041.8789 0,-2.013"
-               id="path7045-8-1"
-               inkscape:connector-curvature="0"
-               sodipodi:nodetypes="cc" />
+               id="path7045-8-1" />
             <path
                style="display:inline;fill:none;stroke:url(#linearGradient7203);stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
                d="m -9.584151,1041.8789 0,-2.013"
-               id="path7045-8-1-3"
-               inkscape:connector-curvature="0"
-               sodipodi:nodetypes="cc" />
+               id="path7045-8-1-3" />
             <path
                style="display:inline;fill:none;stroke:url(#linearGradient7246);stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
                d="m -7.584151,1041.8789 0,-2.013"
-               id="path7045-8-1-3-6"
-               inkscape:connector-curvature="0"
-               sodipodi:nodetypes="cc" />
+               id="path7045-8-1-3-6" />
           </g>
         </g>
         <g
@@ -777,7 +627,6 @@
     <g
        style="display:inline"
        id="layer1-0"
-       inkscape:label="Layer 1"
        transform="translate(0.04635446,-1.9913314)">
       <rect
          ry="0"
@@ -789,18 +638,14 @@
          id="rect10007-0-74-2-7-6"
          style="fill:url(#linearGradient10770-6);fill-opacity:1;stroke:none;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
       <path
-         inkscape:connector-curvature="0"
          id="path4313-8-8"
          d="m 12.648438,1043.3652 0,1 3.351562,0 0,-1 -3.351562,0 z"
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
       <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
          id="path4313-8-8-7"
          d="m 12.981809,1043.3594 0,3.0195 1.01551,0 0,-3.0195 z"
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.94926554px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
       <path
-         inkscape:connector-curvature="0"
          id="path4313-5-1-8"
          d="m 15.992188,1045.3613 -3.359376,0.031 0.0098,1 3.359375,-0.031 -0.0098,-1 z"
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#9e7400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
@@ -814,12 +659,10 @@
          id="rect10007-0-74-2-7"
          style="fill:url(#linearGradient10774-5);fill-opacity:1;stroke:none;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
       <path
-         inkscape:connector-curvature="0"
          id="path4313-5-1"
          d="m 13.005859,1046.3711 -3.3593746,0.031 0.00977,1 3.3593746,-0.031 -0.0098,-1 z"
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#9e7400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
       <path
-         inkscape:connector-curvature="0"
          id="path4313-8"
          d="m 12.996094,1042.3633 -3.3593752,0.031 0.00977,1 3.3593742,-0.031 -0.0098,-1 z"
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
@@ -860,12 +703,10 @@
          id="rect10007-0-74"
          style="fill:url(#linearGradient10786-1);fill-opacity:1;stroke:none;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
       <path
-         inkscape:connector-curvature="0"
          id="path4313"
          d="m 10.996094,1041.3613 -3.3593752,0.031 0.00977,1 3.3593742,-0.031 -0.0098,-1 z"
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
       <path
-         inkscape:connector-curvature="0"
          id="path4313-5"
          d="m 11.001953,1047.3613 -3.3593749,0.031 0.00977,1 3.3593749,-0.031 -0.0098,-1 z"
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#9e7400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
@@ -885,8 +726,6 @@
          id="rect10007-6-6"
          style="display:inline;fill:url(#linearGradient10790-8-2);fill-opacity:1;stroke:none;stroke-width:3.58380508;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
       <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
          id="path4313-8-8-7-8"
          d="m 11.003629,1043.3647 0,3.01 1.000277,0 0,-3.01 z"
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c18e00;fill-opacity:0.64640886;fill-rule:evenodd;stroke:none;stroke-width:0.97351193px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
diff --git a/ui/org.eclipse.pde.ui/icons/view16/variable_tab.svg b/ui/org.eclipse.pde.ui/icons/view16/variable_tab.svg
index 8d51c641b0f..d544d24656d 100644
--- a/ui/org.eclipse.pde.ui/icons/view16/variable_tab.svg
+++ b/ui/org.eclipse.pde.ui/icons/view16/variable_tab.svg
@@ -2,46 +2,17 @@
 <!-- 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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="variable_tab.svg">
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="11.313708"
-     inkscape:cx="11.27237"
-     inkscape:cy="7.2292042"
-     inkscape:document-units="px"
-     inkscape:current-layer="g8159"
-     showgrid="true"
-     inkscape:window-width="746"
-     inkscape:window-height="536"
-     inkscape:window-x="1054"
-     inkscape:window-y="913"
-     inkscape:window-maximized="0"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid4092" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -55,8 +26,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
@@ -68,14 +37,10 @@
          id="g3348"
          transform="matrix(1,0,0,1.0390149,0,-41.095587)">
         <path
-           sodipodi:nodetypes="cccscccsssccssscccscccccccccccccccc"
-           inkscape:connector-curvature="0"
            id="text4105-1-1-4"
            d="m 17.407616,1053.3294 -1.181219,0.5938 c 0.49154,0.5175 0.887698,1.1305 1.15625,1.8125 0.268557,0.6819 0.406252,1.3776 0.40625,2.0937 2e-6,0.7324 -0.142576,1.4297 -0.40625,2.0938 -0.27669,0.6901 -0.673174,1.2617 -1.1875,1.75 l 1.212469,0.6562 c 0.615237,-0.5762 1.089195,-1.2715 1.4375,-2.0625 0.348309,-0.791 0.531251,-1.5977 0.53125,-2.4375 10e-7,-0.8333 -0.182941,-1.6465 -0.53125,-2.4375 -0.348305,-0.791 -0.822263,-1.4896 -1.4375,-2.0625 z m -7.09375,0.062 c -0.6152366,0.5729 -1.0891944,1.2715 -1.4374997,2.0625 -0.3483086,0.791 -0.5312511,1.6042 -0.53125,2.4375 -1.1e-6,0.8398 0.1829414,1.6465 0.53125,2.4375 0.3483053,0.791 0.8222631,1.4863 1.4374997,2.0625 l 0.991498,-0.7004 c -0.514326,-0.4883 -0.91081,-1.0599 -1.1875,-1.75 -0.2636742,-0.6641 -0.4062522,-1.3614 -0.4062501,-2.0938 -2.1e-6,-0.7161 0.1376931,-1.4118 0.4062501,-2.0937 0.268552,-0.682 0.633461,-1.295 1.125,-1.8125 z m 0.517655,1.875 1.6875,2.4063 -1.84375,2.5625 1.888595,0 1.25,-1.9375 1.21875,1.9375 1.899318,0 -1.84375,-2.5625 1.6875,-2.4063 -1.868068,0 -1.09375,1.75 -1.09375,-1.75 z"
            style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10px;line-height:125%;font-family:Gautami;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;display:inline;fill:#334c6f;fill-opacity:1;stroke:none" />
         <path
-           sodipodi:nodetypes="cccccccccc"
-           inkscape:connector-curvature="0"
            id="text4105-1-1-4-4"
            d="m 20.214429,1056.2608 0,1.0224 4.018306,0 0,-1.0224 z m 0,2.0018 0,1.006 4.018306,0 0,-1.006 z"
            style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10px;line-height:125%;font-family:Gautami;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;display:inline;fill:#334c6f;fill-opacity:1;stroke:none" />
diff --git a/ui/org.eclipse.pde.ui/icons/wizban/cleanmanifest_wiz.svg b/ui/org.eclipse.pde.ui/icons/wizban/cleanmanifest_wiz.svg
index d997b848a1a..1b2d223eab6 100644
--- a/ui/org.eclipse.pde.ui/icons/wizban/cleanmanifest_wiz.svg
+++ b/ui/org.eclipse.pde.ui/icons/wizban/cleanmanifest_wiz.svg
@@ -6,14 +6,7 @@
    height="66"
    id="svg2"
    version="1.1"
-   inkscape:version="1.3 (0e150ed, 2023-07-21)"
-   sodipodi:docname="cleanmanifest_wiz.svg"
-   inkscape:export-filename="/Users/d021678/git/eclipse.jdt.ui/org.eclipse.jdt.ui/icons/full/wizban/newclass_wiz2.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90"
    xml:space="preserve"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:svg="http://www.w3.org/2000/svg"
@@ -21,299 +14,6 @@
    xmlns:cc="http://creativecommons.org/ns#"
    xmlns:dc="http://purl.org/dc/elements/1.1/"><defs
      id="defs4"><linearGradient
-       inkscape:collect="always"
-       id="linearGradient4972"><stop
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0"
-         id="stop4974" /><stop
-         style="stop-color:#f5f8fd;stop-opacity:1"
-         offset="1"
-         id="stop4976" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       id="linearGradient4964"><stop
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0"
-         id="stop4966" /><stop
-         style="stop-color:#e8eefa;stop-opacity:1"
-         offset="1"
-         id="stop4968" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       id="linearGradient4956"><stop
-         style="stop-color:#fcfdfe;stop-opacity:1"
-         offset="0"
-         id="stop4958" /><stop
-         style="stop-color:#dee6f8;stop-opacity:1"
-         offset="1"
-         id="stop4960" /></linearGradient><filter
-       style="color-interpolation-filters:sRGB"
-       inkscape:label="Drop Shadow"
-       id="filter8854"><feFlood
-         flood-opacity="0.933333"
-         flood-color="rgb(244,248,254)"
-         result="flood"
-         id="feFlood8856" /><feComposite
-         in="flood"
-         in2="SourceGraphic"
-         operator="in"
-         result="composite1"
-         id="feComposite8858" /><feGaussianBlur
-         in="composite1"
-         stdDeviation="1.2"
-         result="blur"
-         id="feGaussianBlur8860" /><feOffset
-         dx="-1"
-         dy="3"
-         result="offset"
-         id="feOffset8862" /><feComposite
-         in="SourceGraphic"
-         in2="offset"
-         operator="over"
-         result="composite2"
-         id="feComposite8864" /></filter><linearGradient
-       id="linearGradient6122"><stop
-         style="stop-color:#c0c0c0;stop-opacity:1"
-         offset="0"
-         id="stop6124" /><stop
-         id="stop6132"
-         offset="0.5"
-         style="stop-color:#adadad;stop-opacity:1" /><stop
-         style="stop-color:#808080;stop-opacity:1"
-         offset="1"
-         id="stop6126" /></linearGradient><linearGradient
-       id="linearGradient7087"><stop
-         style="stop-color:#17325d;stop-opacity:1;"
-         offset="0"
-         id="stop7089" /><stop
-         id="stop7091"
-         offset="0.25"
-         style="stop-color:#b4d0e2;stop-opacity:1" /><stop
-         id="stop7093"
-         offset="0.5"
-         style="stop-color:#b7d2e4;stop-opacity:1" /><stop
-         style="stop-color:#acc9de;stop-opacity:1"
-         offset="0.75"
-         id="stop7095" /><stop
-         style="stop-color:#3e72a7;stop-opacity:1"
-         offset="1"
-         id="stop7097" /></linearGradient><mask
-       id="mask7366"
-       maskUnits="userSpaceOnUse"><path
-         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;display:inline"
-         d="m -16.593048,1040.862 9.990206,0 0,10.0018 -2.983353,3.0385 -5.966213,0 c -0.53033,-0.022 -1.04064,-0.5519 -1.04064,-1.0385 z"
-         id="path7368"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccccc" /></mask><linearGradient
-       id="linearGradient7584-5"><stop
-         id="stop7586-4"
-         offset="0"
-         style="stop-color:#f9cd5f;stop-opacity:1" /><stop
-         id="stop7588-5"
-         offset="1"
-         style="stop-color:#fbf0b4;stop-opacity:1" /></linearGradient><linearGradient
-       id="linearGradient7592-1"><stop
-         id="stop7594-6"
-         offset="0"
-         style="stop-color:#bd8416;stop-opacity:1" /><stop
-         id="stop7596-9"
-         offset="1"
-         style="stop-color:#a66b10;stop-opacity:1" /></linearGradient><linearGradient
-       id="linearGradient10798-1-9-3-7-6-6-6-2-6-7-98-9-4-1"><stop
-         style="stop-color:#5aad60;stop-opacity:1;"
-         offset="0"
-         id="stop10800-5-2-1-8-20-4-0-2-1-9-0-0-1-1" /><stop
-         id="stop10806-6-8-5-3-9-2-2-7-0-4-2-7-8-9"
-         offset="0.5"
-         style="stop-color:#5bb26a;stop-opacity:1;" /><stop
-         style="stop-color:#a4c589;stop-opacity:1"
-         offset="1"
-         id="stop10802-1-5-3-0-4-6-8-5-5-6-69-6-4-0" /></linearGradient><mask
-       maskUnits="userSpaceOnUse"
-       id="mask7366-4"><path
-         sodipodi:nodetypes="ccccccc"
-         inkscape:connector-curvature="0"
-         id="path7368-2"
-         d="m -16.593048,1040.862 9.990206,0 0,10.0018 -2.983353,3.0385 -5.966213,0 c -0.53033,-0.022 -1.04064,-0.5519 -1.04064,-1.0385 z"
-         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;display:inline" /></mask><linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient7087"
-       id="linearGradient9331"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-20,0)"
-       x1="4.7776356"
-       y1="1039.8118"
-       x2="4.7776356"
-       y2="1041.911" /><linearGradient
-       y2="1041.911"
-       x2="4.7776356"
-       y1="1039.8118"
-       x1="4.7776356"
-       gradientTransform="translate(-18,4.7e-5)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient9333"
-       xlink:href="#linearGradient7087"
-       inkscape:collect="always" /><linearGradient
-       y2="1041.911"
-       x2="4.7776356"
-       y1="1039.8118"
-       x1="4.7776356"
-       gradientTransform="translate(-16,4.7e-5)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient9335"
-       xlink:href="#linearGradient7087"
-       inkscape:collect="always" /><linearGradient
-       y2="1041.911"
-       x2="4.7776356"
-       y1="1039.8118"
-       x1="4.7776356"
-       gradientTransform="translate(-14,4.7e-5)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient9337"
-       xlink:href="#linearGradient7087"
-       inkscape:collect="always" /><linearGradient
-       y2="1041.911"
-       x2="4.7776356"
-       y1="1039.8118"
-       x1="4.7776356"
-       gradientTransform="translate(-12,4.7e-5)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient9339"
-       xlink:href="#linearGradient7087"
-       inkscape:collect="always" /><linearGradient
-       gradientTransform="translate(-80,0)"
-       gradientUnits="userSpaceOnUse"
-       y2="1042.7973"
-       x2="163.22012"
-       y1="1042.7973"
-       x1="88.220117"
-       id="linearGradient68073"
-       xlink:href="#linearGradient4956"
-       inkscape:collect="always" /><linearGradient
-       gradientTransform="translate(-80,0)"
-       gradientUnits="userSpaceOnUse"
-       y2="1032.2669"
-       x2="163.22012"
-       y1="1032.2668"
-       x1="94.469681"
-       id="linearGradient68075"
-       xlink:href="#linearGradient4964"
-       inkscape:collect="always" /><linearGradient
-       gradientTransform="translate(-80,0)"
-       gradientUnits="userSpaceOnUse"
-       y2="1032.2668"
-       x2="152.72206"
-       y1="1032.2668"
-       x1="88.220116"
-       id="linearGradient68077"
-       xlink:href="#linearGradient4972"
-       inkscape:collect="always" /><filter
-       id="filter8854-9"
-       inkscape:label="Drop Shadow"
-       style="color-interpolation-filters:sRGB"><feFlood
-         id="feFlood8856-0"
-         result="flood"
-         flood-color="rgb(244,248,254)"
-         flood-opacity="0.933333" /><feComposite
-         id="feComposite8858-2"
-         result="composite1"
-         operator="in"
-         in2="SourceGraphic"
-         in="flood" /><feGaussianBlur
-         id="feGaussianBlur8860-3"
-         result="blur"
-         stdDeviation="1.2"
-         in="composite1" /><feOffset
-         id="feOffset8862-2"
-         result="offset"
-         dy="3"
-         dx="-1" /><feComposite
-         id="feComposite8864-3"
-         result="composite2"
-         operator="over"
-         in2="offset"
-         in="SourceGraphic" /></filter><linearGradient
-       id="linearGradient10798-1-9-3-7-6-8-9-0-9-1"><stop
-         id="stop10800-5-2-1-8-20-6-4-9-8-2"
-         offset="0"
-         style="stop-color:#7564b1;stop-opacity:1" /><stop
-         style="stop-color:#5d4aa1;stop-opacity:1"
-         offset="0.5"
-         id="stop10806-6-8-5-3-9-24-8-4-3-2" /><stop
-         id="stop10802-1-5-3-0-4-8-4-2-9-2"
-         offset="1"
-         style="stop-color:#9283c3;stop-opacity:1" /></linearGradient><linearGradient
-       id="linearGradient7540-2-3-8-7"><stop
-         id="stop7542-8-7-5-3"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.502" /><stop
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0.47623286"
-         id="stop7544-8-2-0-5" /><stop
-         style="stop-color:#ffffff;stop-opacity:0"
-         offset="0.5"
-         id="stop7546-1-7-9-5" /><stop
-         id="stop7548-98-9-2-4"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       id="linearGradient7272-66-4-5-5-5-8"><stop
-         style="stop-color:#8f6c10;stop-opacity:1"
-         offset="0"
-         id="stop7274-6-0-1-7-4-7" /><stop
-         style="stop-color:#c9a645;stop-opacity:1"
-         offset="1"
-         id="stop7276-66-6-3-9-1-4" /></linearGradient><linearGradient
-       y2="1030.3411"
-       x2="-10.159802"
-       y1="1030.3411"
-       x1="-22.453552"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient10540"
-       xlink:href="#linearGradient7540-2-3-8-7"
-       inkscape:collect="always" /><linearGradient
-       y2="1030.3411"
-       x2="-10.159802"
-       y1="1030.3411"
-       x1="-22.453552"
-       gradientTransform="matrix(0,1,-1,0,1014.0344,1046.6478)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient10542"
-       xlink:href="#linearGradient7540-2-3-8-7"
-       inkscape:collect="always" /><linearGradient
-       y2="1023.2569"
-       x2="-15.945988"
-       y1="1037.4661"
-       x1="-15.945988"
-       gradientTransform="matrix(0.95585117,0,0,0.95585117,-0.71992063,45.488394)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient10544"
-       xlink:href="#linearGradient7272-66-4-5-5-5-8"
-       inkscape:collect="always" /><mask
-       id="mask10620"
-       maskUnits="userSpaceOnUse"><path
-         transform="matrix(0.55482947,0,0,0.55482947,-206.96039,787.08655)"
-         d="m 398.75,468.23718 a 10.625,10.625 0 1 1 -21.25,0 10.625,10.625 0 1 1 21.25,0 z"
-         sodipodi:ry="10.625"
-         sodipodi:rx="10.625"
-         sodipodi:cy="468.23718"
-         sodipodi:cx="388.125"
-         id="path10622"
-         style="font-size:13.58917427px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:2.16621375;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline;font-family:Sans"
-         sodipodi:type="arc" /></mask><linearGradient
-       id="linearGradient4528-9-5-7-9-7-3"><stop
-         id="stop4530-0-5-0-5-8-4"
-         offset="0"
-         style="stop-color:#e0c576;stop-opacity:1;" /><stop
-         id="stop4532-7-9-3-3-6-1"
-         offset="1"
-         style="stop-color:#9e7916;stop-opacity:1" /></linearGradient><linearGradient
-       id="linearGradient6281-8-0-1-6-6-4-2-8-0"><stop
-         style="stop-color:#f7f9fb;stop-opacity:1"
-         offset="0"
-         id="stop6283-0-2-2-1-2-0-1-6-0" /><stop
-         style="stop-color:#ffd680;stop-opacity:1"
-         offset="1"
-         id="stop6285-5-0-9-7-6-9-9-1-9" /></linearGradient><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4972-7"
        id="linearGradient4978"
        x1="88.220116"
@@ -322,7 +22,6 @@
        y2="1032.2668"
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-88.220116,-999.2669)" /><linearGradient
-       inkscape:collect="always"
        id="linearGradient4972-7"><stop
          style="stop-color:#b8ccf1;stop-opacity:0.10196079"
          offset="0"
@@ -330,7 +29,6 @@
          style="stop-color:#6e97e2;stop-opacity:0.10196079"
          offset="1"
          id="stop4976-1" /></linearGradient><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4964-3"
        id="linearGradient4970"
        x1="118.38584"
@@ -339,7 +37,6 @@
        y2="1032.2668"
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-88.220117,-999.2669)" /><linearGradient
-       inkscape:collect="always"
        id="linearGradient4964-3"><stop
          style="stop-color:#ffffff;stop-opacity:0.349"
          offset="0"
@@ -347,7 +44,6 @@
          style="stop-color:#91ade6;stop-opacity:1"
          offset="1"
          id="stop4968-1" /></linearGradient><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4956-2"
        id="linearGradient4962"
        x1="88.220116"
@@ -356,7 +52,6 @@
        y2="1042.7972"
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-88.220116,-999.2669)" /><linearGradient
-       inkscape:collect="always"
        id="linearGradient4956-2"><stop
          style="stop-color:#fcfdfe;stop-opacity:0.25641027"
          offset="0"
@@ -364,27 +59,6 @@
          style="stop-color:#98aae7;stop-opacity:0.40392157"
          offset="1"
          id="stop4960-6" /></linearGradient><linearGradient
-       id="linearGradient3827"><stop
-         id="stop3829"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0;" /><stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0.60149658"
-         id="stop3835" /><stop
-         id="stop3831"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" /></linearGradient><linearGradient
-       id="linearGradient10798-1-9-3-7-6-8-9-0-9-1-0"><stop
-         id="stop10800-5-2-1-8-20-6-4-9-8-2-9"
-         offset="0"
-         style="stop-color:#f3faed;stop-opacity:1" /><stop
-         style="stop-color:#e7f4da;stop-opacity:1"
-         offset="0.65917557"
-         id="stop10806-6-8-5-3-9-24-8-4-3-2-4" /><stop
-         id="stop10802-1-5-3-0-4-8-4-2-9-2-5"
-         offset="1"
-         style="stop-color:#67bf1f;stop-opacity:1" /></linearGradient><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4994"
        id="linearGradient6375-6"
        x1="50.702839"
@@ -393,15 +67,13 @@
        y2="1014.1386"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(0.96603716,0,0,1.0044749,-7.0456322,-17.42557)" /><linearGradient
-       id="linearGradient4994"
-       inkscape:collect="always"><stop
+       id="linearGradient4994"><stop
          id="stop4996"
          offset="0"
          style="stop-color:#ffffff;stop-opacity:1" /><stop
          id="stop4998"
          offset="1"
          style="stop-color:#dbe2eb;stop-opacity:1" /></linearGradient><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4902"
        id="linearGradient4238"
        gradientUnits="userSpaceOnUse"
@@ -410,15 +82,13 @@
        y1="1038.5779"
        x2="10.544736"
        y2="1052.3228" /><linearGradient
-       id="linearGradient4902"
-       inkscape:collect="always"><stop
+       id="linearGradient4902"><stop
          id="stop4904"
          offset="0"
          style="stop-color:#c7b571;stop-opacity:1;" /><stop
          id="stop4906"
          offset="1"
          style="stop-color:#9a9a8f;stop-opacity:1" /></linearGradient><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient6411"
        id="linearGradient4240"
        gradientUnits="userSpaceOnUse"
@@ -427,7 +97,6 @@
        y1="1020.8994"
        x2="47.429596"
        y2="1023.1616" /><linearGradient
-       inkscape:collect="always"
        id="linearGradient6411"><stop
          style="stop-color:#4f605c;stop-opacity:1"
          offset="0"
@@ -435,7 +104,6 @@
          style="stop-color:#dbe2eb;stop-opacity:0"
          offset="1"
          id="stop6415" /></linearGradient><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4258"
        id="linearGradient4264"
        x1="59.220116"
@@ -444,7 +112,6 @@
        y2="1025.2668"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1.7498306,0,0,1.8651544,-65.901292,-906.74278)" /><linearGradient
-       inkscape:collect="always"
        id="linearGradient4258"><stop
          style="stop-color:#f4ae5f;stop-opacity:1;"
          offset="0"
@@ -455,14 +122,12 @@
          style="stop-color:#c7700e;stop-opacity:1"
          offset="1"
          id="stop4262" /></linearGradient><filter
-       inkscape:collect="always"
        style="color-interpolation-filters:sRGB"
        id="filter5097"
        x="-0.053063725"
        width="1.1061275"
        y="-0.16582764"
        height="1.3316553"><feGaussianBlur
-         inkscape:collect="always"
          stdDeviation="1.1055176"
          id="feGaussianBlur5099" /></filter><filter
        height="1.0954513"
@@ -470,12 +135,9 @@
        width="1.0967932"
        x="-0.048396592"
        id="filter4285-9-8-5"
-       style="color-interpolation-filters:sRGB"
-       inkscape:collect="always"><feGaussianBlur
+       style="color-interpolation-filters:sRGB"><feGaussianBlur
          id="feGaussianBlur4287-9-5-9"
-         stdDeviation="0.10000000000000001"
-         inkscape:collect="always" /></filter><linearGradient
-       inkscape:collect="always"
+         stdDeviation="0.10000000000000001" /></filter><linearGradient
        xlink:href="#linearGradient5726"
        id="linearGradient5732"
        x1="71.496254"
@@ -484,7 +146,6 @@
        y2="1042.7766"
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-37.146475,-0.81699625)" /><linearGradient
-       inkscape:collect="always"
        id="linearGradient5726"><stop
          style="stop-color:#fdf4c5;stop-opacity:1"
          offset="0"
@@ -492,7 +153,6 @@
          style="stop-color:#d6ba65;stop-opacity:1"
          offset="1"
          id="stop5730" /></linearGradient><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient5714"
        id="linearGradient5720"
        x1="62.826176"
@@ -501,7 +161,6 @@
        y2="1024.3622"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1.0368001,0,0,1,-28.330414,12.000004)" /><linearGradient
-       inkscape:collect="always"
        id="linearGradient5714"><stop
          style="stop-color:#cb9b77;stop-opacity:1"
          offset="0"
@@ -509,7 +168,6 @@
          style="stop-color:#89460e;stop-opacity:1"
          offset="1"
          id="stop5718" /></linearGradient><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient5706"
        id="linearGradient5712"
        x1="89"
@@ -518,7 +176,6 @@
        y2="1014.3622"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1.0368001,0,0,1,-28.330414,12.000004)" /><linearGradient
-       inkscape:collect="always"
        id="linearGradient5706"><stop
          style="stop-color:#613307;stop-opacity:1"
          offset="0"
@@ -526,77 +183,30 @@
          style="stop-color:#c19f85;stop-opacity:1"
          offset="1"
          id="stop5710" /></linearGradient><filter
-       inkscape:collect="always"
        style="color-interpolation-filters:sRGB"
        id="filter5957"
        x="-0.090847392"
        width="1.1816948"
        y="-0.34355638"
        height="1.6871128"><feGaussianBlur
-         inkscape:collect="always"
          stdDeviation="1.2442823"
          id="feGaussianBlur5959" /></filter><filter
-       inkscape:collect="always"
        style="color-interpolation-filters:sRGB"
        id="filter5961"
        x="-0.1059952"
        width="1.2119904"
        y="-0.59725548"
        height="2.194511"><feGaussianBlur
-         inkscape:collect="always"
          stdDeviation="1.2442823"
-         id="feGaussianBlur5963" /></filter></defs><sodipodi:namedview
-     id="base"
-     pagecolor="#3e3e3e"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="4.7112569"
-     inkscape:cx="40.222812"
-     inkscape:cy="49.880532"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1728"
-     inkscape:window-height="1051"
-     inkscape:window-x="0"
-     inkscape:window-y="38"
-     inkscape:window-maximized="1"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="true"
-     inkscape:snap-bbox="true"
-     inkscape:bbox-nodes="true"
-     inkscape:showpageshadow="2"
-     inkscape:pagecheckerboard="0"
-     inkscape:deskcolor="#d1d1d1"><inkscape:grid
-       type="xygrid"
-       id="grid4112"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       originx="0"
-       originy="0"
-       spacingy="1"
-       spacingx="1"
-       units="px" /></sodipodi:namedview><metadata
+         id="feGaussianBlur5963" /></filter></defs><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" /></cc:Work></rdf:RDF></metadata><g
-     inkscape:groupmode="layer"
      id="layer2"
-     inkscape:label="Background"
-     style="display:inline"
-     sodipodi:insensitive="true"><path
-       sodipodi:nodetypes="cccc"
-       inkscape:connector-curvature="0"
+     style="display:inline"><path
        id="rect4113-1"
        d="M 75,0 75,66 1e-6,66 C 1e-6,41.2048 50.00969,0 75,0 Z"
        style="display:inline;fill:url(#linearGradient4978);fill-opacity:1;stroke:none" /><path
-       sodipodi:nodetypes="cccc"
-       inkscape:connector-curvature="0"
        id="rect4113-1-0"
        d="M 75,21.0607 75,66 1e-6,66 C 10.625001,47.804 43.509694,25.4357 75,21.0607 Z"
        style="display:inline;opacity:0.40400002;fill:url(#linearGradient4962);fill-opacity:1;stroke:none" /><g
@@ -605,145 +215,89 @@
        transform="matrix(0.27903303,0,0,0.27903303,-14.618136,-107.52874)"><g
          style="fill:#737986;fill-opacity:1;stroke:#595e68;stroke-opacity:1"
          id="g13408-8-2" /></g><path
-       sodipodi:nodetypes="cccc"
-       inkscape:connector-curvature="0"
        id="rect4113-1-7"
        d="M 75,4.0000001e-7 75,66 30.000003,66 C 30.000003,46.1545 47.70944,9.2500004 75,4e-7 Z"
        style="display:inline;opacity:0.18399999;fill:url(#linearGradient4970);fill-opacity:1;stroke:none" /></g><g
-     inkscape:label="Foreground"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-986.3622)"><path
-       sodipodi:nodetypes="cccccc"
-       inkscape:connector-curvature="0"
        id="rect4001-3-4-5"
        d="m 61.725004,1022.8099 21.27431,-0.1009 1.654984,3.7793 -20.678174,12.1198 -29.322882,0.1009 z"
        style="display:inline;opacity:0.52;fill:#c5c3d4;fill-opacity:0.72941178;stroke:none;filter:url(#filter5097)"
        transform="matrix(0.81385308,0,0,0.61823795,1.9444875,397.72502)" /><path
-       sodipodi:nodetypes="cccccc"
-       inkscape:connector-curvature="0"
        id="rect4001-3-4"
        d="m 11,997.3622 23.759832,0 9.151348,10.3929 0.08882,33.6071 -33,0 z"
        style="display:inline;opacity:1;fill:url(#linearGradient6375-6);fill-opacity:1;stroke:none" /><path
-       sodipodi:nodetypes="ccscccc"
-       inkscape:connector-curvature="0"
        id="rect4001-1"
        d="m 10.5,996.86218 23.755611,0 c 0,0 7.142644,1.47217 5.331245,4.86412 -0.05617,0.1062 4.913143,5.7835 4.913143,5.7835 l 0,34.3524 -33.999999,0 z"
        style="fill:none;stroke:url(#linearGradient4238);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1" /><path
-       sodipodi:nodetypes="cccccc"
-       inkscape:connector-curvature="0"
        id="rect4001-3-9-0"
        d="M 34.82782,997.05565 44,1007.504 l 0,10.8582 -13.460738,-9.4981 c 1.765426,-3.8089 3.044415,-7.7874 4.288484,-11.80845 z"
        style="display:inline;fill:url(#linearGradient4240);fill-opacity:1;stroke:none" /><path
-       sodipodi:nodetypes="cccc"
        id="path5675-4"
        d="m 34.227017,996.25928 c 1.979191,2.74202 4.365887,6.24982 2.596924,12.24302 4.070558,-2.3415 8.288172,-1.0995 8.288172,-1.0995 0,-5.5953 -6.679314,-11.40728 -10.885096,-11.14352 z"
-       style="display:inline;fill:url(#linearGradient4264);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       inkscape:connector-curvature="0" /><path
+       style="display:inline;fill:url(#linearGradient4264);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /><path
        style="fill:none;fill-rule:evenodd;stroke:#bbc5d8;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="m 15,1036.3622 11.741406,0"
-       id="path4696"
-       inkscape:connector-curvature="0" /><path
+       id="path4696" /><path
        style="display:inline;fill:none;fill-rule:evenodd;stroke:#bbc5d8;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="m 15,1031.3622 16.144433,0"
-       id="path4696-5"
-       inkscape:connector-curvature="0" /><path
+       id="path4696-5" /><path
        style="display:inline;fill:none;fill-rule:evenodd;stroke:#bbc5d8;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="m 15,1026.3622 17.612109,0"
-       id="path4696-4"
-       inkscape:connector-curvature="0" /><path
+       id="path4696-4" /><path
        style="display:inline;fill:none;fill-rule:evenodd;stroke:#bbc5d8;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="m 15,1006.3622 16.144433,0"
-       id="path4696-0"
-       inkscape:connector-curvature="0" /><path
+       id="path4696-0" /><path
        style="display:inline;fill:none;fill-rule:evenodd;stroke:#bbc5d8;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="m 15,1010.3622 16.144433,0"
-       id="path4696-9"
-       inkscape:connector-curvature="0" /><path
+       id="path4696-9" /><path
        style="display:inline;fill:none;fill-rule:evenodd;stroke:#bbc5d8;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="m 15,1014.3622 16.144433,0"
-       id="path4696-8"
-       inkscape:connector-curvature="0" /><path
+       id="path4696-8" /><path
        style="display:inline;fill:none;fill-rule:evenodd;stroke:#bbc5d8;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="m 15,1019.3622 13.209081,0"
-       id="path4696-2"
-       inkscape:connector-curvature="0" /><g
+       id="path4696-2" /><g
        style="display:inline"
        id="g5965"
        transform="matrix(1.0869246,0,0,1.1336064,-42.808683,-92.463724)"><path
-         sodipodi:nodetypes="czc"
-         inkscape:connector-curvature="0"
          id="path5724-1"
          d="m 59.513629,993.05892 c -9.367718,8.37518 5.421071,8.81118 13.8565,8.61968 8.435429,-0.1915 22.999595,2.035 12.143495,-8.61968"
          style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter5957)" /><path
-         sodipodi:nodetypes="sssss"
-         inkscape:connector-curvature="0"
          id="path5704-8"
          d="m 86.072684,994.37592 -25.920005,0 c -1.555202,0 -1.555202,-5 0,-5 l 25.920005,0 c 1.34029,0 1.55519,5 0,5 z"
          style="display:inline;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter5961)" /></g><g
        transform="translate(-15.222779,-3)"
        style="display:inline"
        id="g5842"><path
-         sodipodi:nodetypes="czc"
-         inkscape:connector-curvature="0"
          id="path5724"
          d="m 37.853525,1037.5452 c -9.367718,8.3752 5.421071,8.8112 13.8565,8.6197 8.435429,-0.1915 22.9996,2.035 12.1435,-8.6197"
          style="opacity:1;fill:url(#linearGradient5732);fill-opacity:1;fill-rule:evenodd;stroke:#ac7404;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /><path
-         sodipodi:nodetypes="sssss"
-         inkscape:connector-curvature="0"
          id="path5704"
          d="m 64.412584,1038.8622 -25.920009,0 c -1.555202,0 -1.555202,-5 0,-5 l 25.920009,0 c 1.34029,0 1.55519,5 0,5 z"
          style="fill:url(#linearGradient5720);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient5712);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /><path
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
          id="path5734"
          d="m 41.915555,1045.9174 c -0.726314,-0.2736 -1.34618,-2.1481 -1.558271,-3.3722"
          style="fill:none;fill-rule:evenodd;stroke:#ac7404;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /><path
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
          id="path5736"
          d="m 45.357285,1046.173 c 1.066029,-0.6187 1.898784,-2.173 2.12406,-3"
          style="fill:none;fill-rule:evenodd;stroke:#ac7404;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /><path
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
          id="path5738"
          d="m 48.729465,1046.173 c -0.695075,-0.4472 -1.037533,-2.6869 -1.43421,-4.1785"
          style="fill:none;fill-rule:evenodd;stroke:#ac7404;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /><path
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
          id="path5740"
          d="m 50.791495,1046.049 c -0.190241,-0.8602 -0.893537,-2.0396 -0.31015,-3.0545"
          style="fill:none;fill-rule:evenodd;stroke:#ac7404;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /><path
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
          id="path5742"
          d="m 56.736984,1045.9869 c -0.650626,-1.5502 -0.626444,-3.0822 -0.310151,-4.3101"
          style="fill:none;fill-rule:evenodd;stroke:#ac7404;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /><path
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
          id="path5744"
          d="m 60.674953,1046.1655 c -0.637596,-0.5133 -0.469257,-2.484 -0.12406,-3.4887"
          style="fill:none;fill-rule:evenodd;stroke:#ac7404;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /><path
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
          id="path5746"
          d="m 65.054653,1045.6072 c -2.603123,-0.7126 -1.47242,-2.1661 -1.68985,-3.0545"
          style="fill:none;fill-rule:evenodd;stroke:#ac7404;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /></g><path
-       sodipodi:type="star"
        style="display:inline;opacity:0.9;fill:#fefdd7;fill-opacity:0.87537991;stroke:none;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;filter:url(#filter4285-9-8-5)"
        id="path4252-6-0-8"
-       sodipodi:sides="4"
-       sodipodi:cx="4.7729707"
-       sodipodi:cy="1041.2474"
-       sodipodi:r1="3.3255017"
-       sodipodi:r2="1.2227583"
-       sodipodi:arg1="2.432965"
-       sodipodi:arg2="-3.0251395"
-       inkscape:flatsided="false"
-       inkscape:rounded="0"
-       inkscape:randomized="-0.017554997"
        d="m 2.2999628,1043.3702 1.2678863,-2.2671 -0.9589021,-2.3795 2.34832,1.2825 2.3017227,-0.9043 -1.2596655,2.2746 0.9632718,2.3759 -2.3064219,-1.2826 z"
-       transform="matrix(0.07472589,0.48703815,-0.54811936,-0.00135053,594.24354,1030.9831)"
-       inkscape:transform-center-x="-0.029844543"
-       inkscape:transform-center-y="0.12561887" /></g></svg>
+       transform="matrix(0.07472589,0.48703815,-0.54811936,-0.00135053,594.24354,1030.9831)" /></g></svg>
diff --git a/ui/org.eclipse.pde.ui/icons/wizban/convjpprj_wiz.svg b/ui/org.eclipse.pde.ui/icons/wizban/convjpprj_wiz.svg
index db24c41cd03..f31ee9682c7 100644
--- a/ui/org.eclipse.pde.ui/icons/wizban/convjpprj_wiz.svg
+++ b/ui/org.eclipse.pde.ui/icons/wizban/convjpprj_wiz.svg
@@ -6,14 +6,7 @@
    height="66"
    id="svg2"
    version="1.1"
-   inkscape:version="1.3 (0e150ed, 2023-07-21)"
-   sodipodi:docname="convjpprj_wiz.svg"
-   inkscape:export-filename="/Users/d021678/git/eclipse.jdt.ui/org.eclipse.jdt.ui/icons/full/wizban/newclass_wiz2.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90"
    xml:space="preserve"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:svg="http://www.w3.org/2000/svg"
@@ -21,307 +14,6 @@
    xmlns:cc="http://creativecommons.org/ns#"
    xmlns:dc="http://purl.org/dc/elements/1.1/"><defs
      id="defs4"><linearGradient
-       inkscape:collect="always"
-       id="linearGradient4541"><stop
-         style="stop-color:#a1adb2;stop-opacity:1"
-         offset="0"
-         id="stop4543" /><stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop4545" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       id="linearGradient4972"><stop
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0"
-         id="stop4974" /><stop
-         style="stop-color:#f5f8fd;stop-opacity:1"
-         offset="1"
-         id="stop4976" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       id="linearGradient4964"><stop
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0"
-         id="stop4966" /><stop
-         style="stop-color:#e8eefa;stop-opacity:1"
-         offset="1"
-         id="stop4968" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       id="linearGradient4956"><stop
-         style="stop-color:#fcfdfe;stop-opacity:1"
-         offset="0"
-         id="stop4958" /><stop
-         style="stop-color:#dee6f8;stop-opacity:1"
-         offset="1"
-         id="stop4960" /></linearGradient><filter
-       style="color-interpolation-filters:sRGB"
-       inkscape:label="Drop Shadow"
-       id="filter8854"><feFlood
-         flood-opacity="0.933333"
-         flood-color="rgb(244,248,254)"
-         result="flood"
-         id="feFlood8856" /><feComposite
-         in="flood"
-         in2="SourceGraphic"
-         operator="in"
-         result="composite1"
-         id="feComposite8858" /><feGaussianBlur
-         in="composite1"
-         stdDeviation="1.2"
-         result="blur"
-         id="feGaussianBlur8860" /><feOffset
-         dx="-1"
-         dy="3"
-         result="offset"
-         id="feOffset8862" /><feComposite
-         in="SourceGraphic"
-         in2="offset"
-         operator="over"
-         result="composite2"
-         id="feComposite8864" /></filter><linearGradient
-       id="linearGradient6122"><stop
-         style="stop-color:#c0c0c0;stop-opacity:1"
-         offset="0"
-         id="stop6124" /><stop
-         id="stop6132"
-         offset="0.5"
-         style="stop-color:#adadad;stop-opacity:1" /><stop
-         style="stop-color:#808080;stop-opacity:1"
-         offset="1"
-         id="stop6126" /></linearGradient><linearGradient
-       id="linearGradient7087"><stop
-         style="stop-color:#17325d;stop-opacity:1;"
-         offset="0"
-         id="stop7089" /><stop
-         id="stop7091"
-         offset="0.25"
-         style="stop-color:#b4d0e2;stop-opacity:1" /><stop
-         id="stop7093"
-         offset="0.5"
-         style="stop-color:#b7d2e4;stop-opacity:1" /><stop
-         style="stop-color:#acc9de;stop-opacity:1"
-         offset="0.75"
-         id="stop7095" /><stop
-         style="stop-color:#3e72a7;stop-opacity:1"
-         offset="1"
-         id="stop7097" /></linearGradient><mask
-       id="mask7366"
-       maskUnits="userSpaceOnUse"><path
-         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;display:inline"
-         d="m -16.593048,1040.862 9.990206,0 0,10.0018 -2.983353,3.0385 -5.966213,0 c -0.53033,-0.022 -1.04064,-0.5519 -1.04064,-1.0385 z"
-         id="path7368"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccccc" /></mask><linearGradient
-       id="linearGradient7584-5"><stop
-         id="stop7586-4"
-         offset="0"
-         style="stop-color:#f9cd5f;stop-opacity:1" /><stop
-         id="stop7588-5"
-         offset="1"
-         style="stop-color:#fbf0b4;stop-opacity:1" /></linearGradient><linearGradient
-       id="linearGradient7592-1"><stop
-         id="stop7594-6"
-         offset="0"
-         style="stop-color:#bd8416;stop-opacity:1" /><stop
-         id="stop7596-9"
-         offset="1"
-         style="stop-color:#a66b10;stop-opacity:1" /></linearGradient><linearGradient
-       id="linearGradient10798-1-9-3-7-6-6-6-2-6-7-98-9-4-1"><stop
-         style="stop-color:#5aad60;stop-opacity:1;"
-         offset="0"
-         id="stop10800-5-2-1-8-20-4-0-2-1-9-0-0-1-1" /><stop
-         id="stop10806-6-8-5-3-9-2-2-7-0-4-2-7-8-9"
-         offset="0.5"
-         style="stop-color:#5bb26a;stop-opacity:1;" /><stop
-         style="stop-color:#a4c589;stop-opacity:1"
-         offset="1"
-         id="stop10802-1-5-3-0-4-6-8-5-5-6-69-6-4-0" /></linearGradient><mask
-       maskUnits="userSpaceOnUse"
-       id="mask7366-4"><path
-         sodipodi:nodetypes="ccccccc"
-         inkscape:connector-curvature="0"
-         id="path7368-2"
-         d="m -16.593048,1040.862 9.990206,0 0,10.0018 -2.983353,3.0385 -5.966213,0 c -0.53033,-0.022 -1.04064,-0.5519 -1.04064,-1.0385 z"
-         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;display:inline" /></mask><linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient7087"
-       id="linearGradient9331"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-20,0)"
-       x1="4.7776356"
-       y1="1039.8118"
-       x2="4.7776356"
-       y2="1041.911" /><linearGradient
-       y2="1041.911"
-       x2="4.7776356"
-       y1="1039.8118"
-       x1="4.7776356"
-       gradientTransform="translate(-18,4.7e-5)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient9333"
-       xlink:href="#linearGradient7087"
-       inkscape:collect="always" /><linearGradient
-       y2="1041.911"
-       x2="4.7776356"
-       y1="1039.8118"
-       x1="4.7776356"
-       gradientTransform="translate(-16,4.7e-5)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient9335"
-       xlink:href="#linearGradient7087"
-       inkscape:collect="always" /><linearGradient
-       y2="1041.911"
-       x2="4.7776356"
-       y1="1039.8118"
-       x1="4.7776356"
-       gradientTransform="translate(-14,4.7e-5)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient9337"
-       xlink:href="#linearGradient7087"
-       inkscape:collect="always" /><linearGradient
-       y2="1041.911"
-       x2="4.7776356"
-       y1="1039.8118"
-       x1="4.7776356"
-       gradientTransform="translate(-12,4.7e-5)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient9339"
-       xlink:href="#linearGradient7087"
-       inkscape:collect="always" /><linearGradient
-       gradientTransform="translate(-80,0)"
-       gradientUnits="userSpaceOnUse"
-       y2="1042.7973"
-       x2="163.22012"
-       y1="1042.7973"
-       x1="88.220117"
-       id="linearGradient68073"
-       xlink:href="#linearGradient4956"
-       inkscape:collect="always" /><linearGradient
-       gradientTransform="translate(-80,0)"
-       gradientUnits="userSpaceOnUse"
-       y2="1032.2669"
-       x2="163.22012"
-       y1="1032.2668"
-       x1="94.469681"
-       id="linearGradient68075"
-       xlink:href="#linearGradient4964"
-       inkscape:collect="always" /><linearGradient
-       gradientTransform="translate(-80,0)"
-       gradientUnits="userSpaceOnUse"
-       y2="1032.2668"
-       x2="152.72206"
-       y1="1032.2668"
-       x1="88.220116"
-       id="linearGradient68077"
-       xlink:href="#linearGradient4972"
-       inkscape:collect="always" /><filter
-       id="filter8854-9"
-       inkscape:label="Drop Shadow"
-       style="color-interpolation-filters:sRGB"><feFlood
-         id="feFlood8856-0"
-         result="flood"
-         flood-color="rgb(244,248,254)"
-         flood-opacity="0.933333" /><feComposite
-         id="feComposite8858-2"
-         result="composite1"
-         operator="in"
-         in2="SourceGraphic"
-         in="flood" /><feGaussianBlur
-         id="feGaussianBlur8860-3"
-         result="blur"
-         stdDeviation="1.2"
-         in="composite1" /><feOffset
-         id="feOffset8862-2"
-         result="offset"
-         dy="3"
-         dx="-1" /><feComposite
-         id="feComposite8864-3"
-         result="composite2"
-         operator="over"
-         in2="offset"
-         in="SourceGraphic" /></filter><linearGradient
-       id="linearGradient10798-1-9-3-7-6-8-9-0-9-1"><stop
-         id="stop10800-5-2-1-8-20-6-4-9-8-2"
-         offset="0"
-         style="stop-color:#7564b1;stop-opacity:1" /><stop
-         style="stop-color:#5d4aa1;stop-opacity:1"
-         offset="0.5"
-         id="stop10806-6-8-5-3-9-24-8-4-3-2" /><stop
-         id="stop10802-1-5-3-0-4-8-4-2-9-2"
-         offset="1"
-         style="stop-color:#9283c3;stop-opacity:1" /></linearGradient><linearGradient
-       id="linearGradient7540-2-3-8-7"><stop
-         id="stop7542-8-7-5-3"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.502" /><stop
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0.47623286"
-         id="stop7544-8-2-0-5" /><stop
-         style="stop-color:#ffffff;stop-opacity:0"
-         offset="0.5"
-         id="stop7546-1-7-9-5" /><stop
-         id="stop7548-98-9-2-4"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       id="linearGradient7272-66-4-5-5-5-8"><stop
-         style="stop-color:#8f6c10;stop-opacity:1"
-         offset="0"
-         id="stop7274-6-0-1-7-4-7" /><stop
-         style="stop-color:#c9a645;stop-opacity:1"
-         offset="1"
-         id="stop7276-66-6-3-9-1-4" /></linearGradient><linearGradient
-       y2="1030.3411"
-       x2="-10.159802"
-       y1="1030.3411"
-       x1="-22.453552"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient10540"
-       xlink:href="#linearGradient7540-2-3-8-7"
-       inkscape:collect="always" /><linearGradient
-       y2="1030.3411"
-       x2="-10.159802"
-       y1="1030.3411"
-       x1="-22.453552"
-       gradientTransform="matrix(0,1,-1,0,1014.0344,1046.6478)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient10542"
-       xlink:href="#linearGradient7540-2-3-8-7"
-       inkscape:collect="always" /><linearGradient
-       y2="1023.2569"
-       x2="-15.945988"
-       y1="1037.4661"
-       x1="-15.945988"
-       gradientTransform="matrix(0.95585117,0,0,0.95585117,-0.71992063,45.488394)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient10544"
-       xlink:href="#linearGradient7272-66-4-5-5-5-8"
-       inkscape:collect="always" /><mask
-       id="mask10620"
-       maskUnits="userSpaceOnUse"><path
-         transform="matrix(0.55482947,0,0,0.55482947,-206.96039,787.08655)"
-         d="m 398.75,468.23718 a 10.625,10.625 0 1 1 -21.25,0 10.625,10.625 0 1 1 21.25,0 z"
-         sodipodi:ry="10.625"
-         sodipodi:rx="10.625"
-         sodipodi:cy="468.23718"
-         sodipodi:cx="388.125"
-         id="path10622"
-         style="font-size:13.58917427px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:2.16621375;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline;font-family:Sans"
-         sodipodi:type="arc" /></mask><linearGradient
-       id="linearGradient4528-9-5-7-9-7-3"><stop
-         id="stop4530-0-5-0-5-8-4"
-         offset="0"
-         style="stop-color:#e0c576;stop-opacity:1;" /><stop
-         id="stop4532-7-9-3-3-6-1"
-         offset="1"
-         style="stop-color:#9e7916;stop-opacity:1" /></linearGradient><linearGradient
-       id="linearGradient6281-8-0-1-6-6-4-2-8-0"><stop
-         style="stop-color:#f7f9fb;stop-opacity:1"
-         offset="0"
-         id="stop6283-0-2-2-1-2-0-1-6-0" /><stop
-         style="stop-color:#ffd680;stop-opacity:1"
-         offset="1"
-         id="stop6285-5-0-9-7-6-9-9-1-9" /></linearGradient><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4972-7"
        id="linearGradient4978"
        x1="88.220116"
@@ -330,7 +22,6 @@
        y2="1032.2668"
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-88.220116,-999.2669)" /><linearGradient
-       inkscape:collect="always"
        id="linearGradient4972-7"><stop
          style="stop-color:#b8ccf1;stop-opacity:0.10196079"
          offset="0"
@@ -338,7 +29,6 @@
          style="stop-color:#6e97e2;stop-opacity:0.10196079"
          offset="1"
          id="stop4976-1" /></linearGradient><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4964-3"
        id="linearGradient4970"
        x1="118.38584"
@@ -347,7 +37,6 @@
        y2="1032.2668"
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-88.220117,-999.2669)" /><linearGradient
-       inkscape:collect="always"
        id="linearGradient4964-3"><stop
          style="stop-color:#ffffff;stop-opacity:0.349"
          offset="0"
@@ -355,7 +44,6 @@
          style="stop-color:#91ade6;stop-opacity:1"
          offset="1"
          id="stop4968-1" /></linearGradient><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4956-2"
        id="linearGradient4962"
        x1="88.220116"
@@ -364,7 +52,6 @@
        y2="1042.7972"
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-88.220116,-999.2669)" /><linearGradient
-       inkscape:collect="always"
        id="linearGradient4956-2"><stop
          style="stop-color:#fcfdfe;stop-opacity:0.25641027"
          offset="0"
@@ -372,36 +59,6 @@
          style="stop-color:#98aae7;stop-opacity:0.40392157"
          offset="1"
          id="stop4960-6" /></linearGradient><linearGradient
-       id="linearGradient3827"><stop
-         id="stop3829"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0;" /><stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0.60149658"
-         id="stop3835" /><stop
-         id="stop3831"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" /></linearGradient><linearGradient
-       id="linearGradient10798-1-9-3-7-6-8-9-0-9-1-0"><stop
-         id="stop10800-5-2-1-8-20-6-4-9-8-2-9"
-         offset="0"
-         style="stop-color:#f3faed;stop-opacity:1" /><stop
-         style="stop-color:#e7f4da;stop-opacity:1"
-         offset="0.65917557"
-         id="stop10806-6-8-5-3-9-24-8-4-3-2-4" /><stop
-         id="stop10802-1-5-3-0-4-8-4-2-9-2-5"
-         offset="1"
-         style="stop-color:#67bf1f;stop-opacity:1" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4541"
-       id="linearGradient5885"
-       x1="41"
-       y1="1007.8622"
-       x2="60"
-       y2="1008.3622"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0,1,-1,0,1034.3618,967.36133)" /><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4894"
        id="linearGradient4884"
        x1="11.927121"
@@ -410,8 +67,7 @@
        y2="30.177986"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1.0044289,0,0,1.0089329,10.981389,978.91464)" /><linearGradient
-       id="linearGradient4894"
-       inkscape:collect="always"><stop
+       id="linearGradient4894"><stop
          id="stop4896"
          offset="0"
          style="stop-color:#000000;stop-opacity:1" /><stop
@@ -424,7 +80,6 @@
          id="stop4898"
          offset="1"
          style="stop-color:#ffffff;stop-opacity:1" /></linearGradient><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient5252"
        id="linearGradient5258"
        x1="5"
@@ -433,7 +88,6 @@
        y2="32"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1.0067606,0,0,1.0132311,10.880208,978.77677)" /><linearGradient
-       inkscape:collect="always"
        id="linearGradient5252"><stop
          style="stop-color:#5f443c;stop-opacity:1"
          offset="0"
@@ -441,7 +95,6 @@
          style="stop-color:#765d54;stop-opacity:1"
          offset="1"
          id="stop5256" /></linearGradient><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4199"
        id="linearGradient4205"
        x1="12"
@@ -450,7 +103,6 @@
        y2="21"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1.4358218,0,0,1.270043,-3.499458,979.01147)" /><linearGradient
-       inkscape:collect="always"
        id="linearGradient4199"><stop
          style="stop-color:#765d54;stop-opacity:1;"
          offset="0"
@@ -461,7 +113,6 @@
          style="stop-color:#765d54;stop-opacity:1"
          offset="1"
          id="stop4203" /></linearGradient><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4944"
        id="linearGradient4936"
        gradientUnits="userSpaceOnUse"
@@ -470,7 +121,6 @@
        x2="49.569252"
        y2="40.099323"
        gradientTransform="matrix(1,0,0,1.0179005,545.46723,1114.4865)" /><linearGradient
-       inkscape:collect="always"
        id="linearGradient4944"><stop
          style="stop-color:#000000;stop-opacity:1"
          offset="0"
@@ -484,7 +134,6 @@
          style="stop-color:#ffffff;stop-opacity:1"
          offset="1"
          id="stop4910" /></linearGradient><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4950"
        id="linearGradient4956-9"
        x1="60.342896"
@@ -493,54 +142,21 @@
        y2="44.682102"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1,0,0,1.0179005,545.46723,1114.4865)" /><linearGradient
-       inkscape:collect="always"
        id="linearGradient4950"><stop
          style="stop-color:#6a5148;stop-opacity:1;"
          offset="0"
          id="stop4952" /><stop
          style="stop-color:#978379;stop-opacity:1"
          offset="1"
-         id="stop4954" /></linearGradient><linearGradient
-       id="linearGradient11146-4-4-4-6-2"><stop
-         id="stop11150-4-72-3-9-7"
-         offset="0"
-         style="stop-color:#faefba;stop-opacity:1" /><stop
-         style="stop-color:#9e6542;stop-opacity:1"
-         offset="1"
-         id="stop11152-9-0-7-3-8" /></linearGradient><linearGradient
-       id="linearGradient10507"><stop
-         style="stop-color:#5f392d;stop-opacity:1"
-         offset="0"
-         id="stop10509" /><stop
-         id="stop10511"
-         offset="0.18181793"
-         style="stop-color:#9e7058;stop-opacity:1" /><stop
-         id="stop10513"
-         offset="0.36363617"
-         style="stop-color:#794f40;stop-opacity:1" /><stop
-         id="stop10515"
-         offset="0.49999985"
-         style="stop-color:#794f40;stop-opacity:1" /><stop
-         id="stop10517"
-         offset="0.63636351"
-         style="stop-color:#794f40;stop-opacity:1" /><stop
-         style="stop-color:#9e7058;stop-opacity:1"
-         offset="0.81818175"
-         id="stop10519" /><stop
-         style="stop-color:#5f392d;stop-opacity:1"
-         offset="1"
-         id="stop10522" /></linearGradient><filter
-       inkscape:collect="always"
+         id="stop4954" /></linearGradient><filter
        style="color-interpolation-filters:sRGB"
        id="filter5309"
        x="-0.41279999"
        width="1.8256"
        y="-0.68799998"
        height="2.376"><feGaussianBlur
-         inkscape:collect="always"
          stdDeviation="2.58"
          id="feGaussianBlur5311" /></filter><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4456"
        id="linearGradient4462"
        x1="63.734764"
@@ -549,7 +165,6 @@
        y2="1006.3618"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1,0,-0.72750163,1,733.40264,2.0004)" /><linearGradient
-       inkscape:collect="always"
        id="linearGradient4456"><stop
          style="stop-color:#ffffff;stop-opacity:0.659"
          offset="0"
@@ -557,46 +172,14 @@
          style="stop-color:#ffffff;stop-opacity:0.369"
          offset="1"
          id="stop4460" /></linearGradient><filter
-       inkscape:collect="always"
        style="color-interpolation-filters:sRGB"
        id="filter4606"
        x="-0.062976157"
        width="1.1259523"
        y="-0.10879013"
        height="1.2175803"><feGaussianBlur
-         inkscape:collect="always"
          stdDeviation="1.5412116"
          id="feGaussianBlur4608" /></filter><linearGradient
-       id="linearGradient11146-4-4-4-6-2-8"><stop
-         id="stop11150-4-72-3-9-7-2"
-         offset="0"
-         style="stop-color:#faefba;stop-opacity:1" /><stop
-         style="stop-color:#ad6e48;stop-opacity:1"
-         offset="1"
-         id="stop11152-9-0-7-3-8-0" /></linearGradient><linearGradient
-       id="linearGradient4368"><stop
-         id="stop4370"
-         offset="0"
-         style="stop-color:#9c7561;stop-opacity:1" /><stop
-         style="stop-color:#966d59;stop-opacity:1"
-         offset="0.18181793"
-         id="stop4372" /><stop
-         style="stop-color:#8c6250;stop-opacity:1"
-         offset="0.36363617"
-         id="stop4374" /><stop
-         style="stop-color:#794f40;stop-opacity:1"
-         offset="0.49999985"
-         id="stop4376" /><stop
-         style="stop-color:#8c6250;stop-opacity:1"
-         offset="0.63636351"
-         id="stop4378" /><stop
-         id="stop4380"
-         offset="0.81818175"
-         style="stop-color:#966d59;stop-opacity:1" /><stop
-         id="stop4382"
-         offset="1"
-         style="stop-color:#99705c;stop-opacity:1" /></linearGradient><linearGradient
-       inkscape:collect="always"
        id="linearGradient4548"><stop
          style="stop-color:#32699b;stop-opacity:1"
          offset="0"
@@ -604,7 +187,6 @@
          style="stop-color:#5281ab;stop-opacity:1"
          offset="1"
          id="stop4552" /></linearGradient><linearGradient
-       inkscape:collect="always"
        id="linearGradient4540"><stop
          style="stop-color:#164b82;stop-opacity:1;"
          offset="0"
@@ -612,7 +194,6 @@
          style="stop-color:#3b70a0;stop-opacity:1"
          offset="1"
          id="stop4544" /></linearGradient><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4548"
        id="linearGradient1"
        gradientUnits="userSpaceOnUse"
@@ -621,7 +202,6 @@
        x2="37.947941"
        y2="1285.8445"
        gradientTransform="matrix(1,0,0.06151352,1,-80.062767,-0.33101948)" /><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4540"
        id="linearGradient2"
        gradientUnits="userSpaceOnUse"
@@ -630,7 +210,6 @@
        x2="37.947941"
        y2="1285.8445"
        gradientTransform="matrix(1,0,0.06151352,1,-80.062767,-0.33101948)" /><linearGradient
-       inkscape:collect="always"
        id="linearGradient2543"><stop
          style="stop-color:#4f76b0;stop-opacity:1"
          offset="0"
@@ -641,8 +220,7 @@
          style="stop-color:#587cb2;stop-opacity:1"
          offset="1"
          id="stop2541" /></linearGradient><linearGradient
-       id="linearGradient8785"
-       inkscape:collect="always"><stop
+       id="linearGradient8785"><stop
          id="stop8781"
          offset="0"
          style="stop-color:#bb8d2d;stop-opacity:1" /><stop
@@ -652,113 +230,34 @@
          id="stop8783"
          offset="1"
          style="stop-color:#b07905;stop-opacity:1" /></linearGradient><linearGradient
-       id="linearGradient8777"
-       inkscape:collect="always"><stop
+       id="linearGradient8777"><stop
          id="stop8773"
          offset="0"
          style="stop-color:#fbeaab;stop-opacity:1;" /><stop
          id="stop8775"
          offset="1"
          style="stop-color:#deb241;stop-opacity:1" /></linearGradient><linearGradient
-       id="linearGradient8767"
-       inkscape:collect="always"><stop
+       id="linearGradient8767"><stop
          id="stop8763"
          offset="0"
          style="stop-color:#6a8ec1;stop-opacity:1" /><stop
          id="stop8765"
          offset="1"
          style="stop-color:#80a1cf;stop-opacity:1" /></linearGradient><linearGradient
-       id="linearGradient8759"
-       inkscape:collect="always"><stop
+       id="linearGradient8759"><stop
          id="stop8755"
          offset="0"
          style="stop-color:#d3e0eb;stop-opacity:1" /><stop
          id="stop8757"
          offset="1"
          style="stop-color:#5179b5;stop-opacity:1" /></linearGradient><linearGradient
-       id="linearGradient8751"
-       inkscape:collect="always"><stop
+       id="linearGradient8751"><stop
          id="stop8747"
          offset="0"
          style="stop-color:#2e5d8f;stop-opacity:1" /><stop
          id="stop8749"
          offset="1"
-         style="stop-color:#6085bb;stop-opacity:1" /></linearGradient><filter
-       id="filter8854-7"
-       inkscape:label="Drop Shadow"
-       style="color-interpolation-filters:sRGB"><feFlood
-         id="feFlood8856-03"
-         result="flood"
-         flood-color="rgb(244,248,254)"
-         flood-opacity="0.933333" /><feComposite
-         id="feComposite8858-9"
-         result="composite1"
-         operator="in"
-         in2="SourceGraphic"
-         in="flood" /><feGaussianBlur
-         id="feGaussianBlur8860-9"
-         result="blur"
-         stdDeviation="1.2"
-         in="composite1" /><feOffset
-         id="feOffset8862-9"
-         result="offset"
-         dy="3"
-         dx="-1" /><feComposite
-         id="feComposite8864-1"
-         result="composite2"
-         operator="over"
-         in2="offset"
-         in="SourceGraphic" /></filter><mask
-       maskUnits="userSpaceOnUse"
-       id="mask7366-47"><path
-         sodipodi:nodetypes="ccccccc"
-         inkscape:connector-curvature="0"
-         id="path7368-1"
-         d="m -16.593048,1040.862 9.990206,0 0,10.0018 -2.983353,3.0385 -5.966213,0 c -0.53033,-0.022 -1.04064,-0.5519 -1.04064,-1.0385 z"
-         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;display:inline" /></mask><mask
-       id="mask7366-4-0"
-       maskUnits="userSpaceOnUse"><path
-         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;display:inline"
-         d="m -16.593048,1040.862 9.990206,0 0,10.0018 -2.983353,3.0385 -5.966213,0 c -0.53033,-0.022 -1.04064,-0.5519 -1.04064,-1.0385 z"
-         id="path7368-2-3"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccccc" /></mask><filter
-       style="color-interpolation-filters:sRGB"
-       inkscape:label="Drop Shadow"
-       id="filter8854-9-2"><feFlood
-         flood-opacity="0.933333"
-         flood-color="rgb(244,248,254)"
-         result="flood"
-         id="feFlood8856-0-6" /><feComposite
-         in="flood"
-         in2="SourceGraphic"
-         operator="in"
-         result="composite1"
-         id="feComposite8858-2-9" /><feGaussianBlur
-         in="composite1"
-         stdDeviation="1.2"
-         result="blur"
-         id="feGaussianBlur8860-3-4" /><feOffset
-         dx="-1"
-         dy="3"
-         result="offset"
-         id="feOffset8862-2-1" /><feComposite
-         in="SourceGraphic"
-         in2="offset"
-         operator="over"
-         result="composite2"
-         id="feComposite8864-3-3" /></filter><mask
-       maskUnits="userSpaceOnUse"
-       id="mask10620-4"><path
-         sodipodi:type="arc"
-         style="font-size:13.58917427px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:2.16621375;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline;font-family:Sans"
-         id="path10622-3"
-         sodipodi:cx="388.125"
-         sodipodi:cy="468.23718"
-         sodipodi:rx="10.625"
-         sodipodi:ry="10.625"
-         d="m 398.75,468.23718 a 10.625,10.625 0 1 1 -21.25,0 10.625,10.625 0 1 1 21.25,0 z"
-         transform="matrix(0.55482947,0,0,0.55482947,-206.96039,787.08655)" /></mask><linearGradient
+         style="stop-color:#6085bb;stop-opacity:1" /></linearGradient><linearGradient
        gradientUnits="userSpaceOnUse"
        y2="1024.3622"
        x2="50"
@@ -766,7 +265,6 @@
        x1="50"
        id="linearGradient8753"
        xlink:href="#linearGradient8751"
-       inkscape:collect="always"
        gradientTransform="matrix(2.7500001,0,0,0.99370101,-129.87501,-991.91286)" /><linearGradient
        gradientUnits="userSpaceOnUse"
        y2="1030.3622"
@@ -775,7 +273,6 @@
        x1="57"
        id="linearGradient8761"
        xlink:href="#linearGradient8759"
-       inkscape:collect="always"
        gradientTransform="matrix(1.0999999,0,0,1.1281495,-43.249997,-1129.0318)" /><linearGradient
        gradientUnits="userSpaceOnUse"
        y2="1023.234"
@@ -784,7 +281,6 @@
        x1="51.658199"
        id="linearGradient8769"
        xlink:href="#linearGradient8767"
-       inkscape:collect="always"
        gradientTransform="matrix(2.7500001,0,0,0.99370101,-129.87501,-991.91286)" /><linearGradient
        gradientUnits="userSpaceOnUse"
        y2="1026.0538"
@@ -793,7 +289,6 @@
        x1="63.98344"
        id="linearGradient8779"
        xlink:href="#linearGradient8777"
-       inkscape:collect="always"
        gradientTransform="matrix(1.3687895,0,0,1.494898,-60.408122,-1504.0798)" /><linearGradient
        gradientUnits="userSpaceOnUse"
        y2="1028.4165"
@@ -802,59 +297,47 @@
        x1="68.47998"
        id="linearGradient8787"
        xlink:href="#linearGradient8785"
-       inkscape:collect="always"
        gradientTransform="matrix(1.3687895,0,0,1.494898,-60.408122,-1504.0798)" /><filter
        height="1.4861495"
        y="-0.24307477"
        width="2.0754105"
        x="-0.53770523"
        id="filter8813"
-       style="color-interpolation-filters:sRGB"
-       inkscape:collect="always"><feGaussianBlur
+       style="color-interpolation-filters:sRGB"><feGaussianBlur
          id="feGaussianBlur8815"
-         stdDeviation="1.1269452"
-         inkscape:collect="always" /></filter><filter
+         stdDeviation="1.1269452" /></filter><filter
        height="1.6025846"
        y="-0.30129232"
        width="1.626688"
        x="-0.313344"
        id="filter8835"
-       style="color-interpolation-filters:sRGB"
-       inkscape:collect="always"><feGaussianBlur
+       style="color-interpolation-filters:sRGB"><feGaussianBlur
          id="feGaussianBlur8837"
-         stdDeviation="0.49751501"
-         inkscape:collect="always" /></filter><filter
+         stdDeviation="0.49751501" /></filter><filter
        height="1.2365698"
        y="-0.11828489"
        width="1.8310951"
        x="-0.41554753"
        id="filter8871"
-       style="color-interpolation-filters:sRGB"
-       inkscape:collect="always"><feGaussianBlur
+       style="color-interpolation-filters:sRGB"><feGaussianBlur
          id="feGaussianBlur8873"
-         stdDeviation="0.53588249"
-         inkscape:collect="always" /></filter><filter
+         stdDeviation="0.53588249" /></filter><filter
        height="1.2365698"
        y="-0.11828489"
        width="1.8310951"
        x="-0.41554753"
        id="filter8871-1"
-       style="color-interpolation-filters:sRGB"
-       inkscape:collect="always"><feGaussianBlur
+       style="color-interpolation-filters:sRGB"><feGaussianBlur
          id="feGaussianBlur8873-8"
-         stdDeviation="0.53588249"
-         inkscape:collect="always" /></filter><filter
-       inkscape:collect="always"
+         stdDeviation="0.53588249" /></filter><filter
        style="color-interpolation-filters:sRGB"
        id="filter2533"
        x="-0.59377657"
        width="2.1875531"
        y="-0.92639431"
        height="2.8527886"><feGaussianBlur
-         inkscape:collect="always"
          stdDeviation="0.73536407"
          id="feGaussianBlur2535" /></filter><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient2543"
        id="linearGradient2545"
        x1="18.423391"
@@ -867,112 +350,57 @@
        width="2.2508695"
        x="-0.62393297"
        id="filter8813-5"
-       style="color-interpolation-filters:sRGB"
-       inkscape:collect="always"><feGaussianBlur
+       style="color-interpolation-filters:sRGB"><feGaussianBlur
          id="feGaussianBlur8815-0"
-         stdDeviation="1.1269452"
-         inkscape:collect="always" /></filter><filter
+         stdDeviation="1.1269452" /></filter><filter
        height="1.3657107"
-       y="-0.14956415"
-       width="2.0529235"
+       y="-0.14956416"
+       width="2.0529236"
        x="-0.5290004"
        id="filter8871-4"
-       style="color-interpolation-filters:sRGB"
-       inkscape:collect="always"><feGaussianBlur
+       style="color-interpolation-filters:sRGB"><feGaussianBlur
          id="feGaussianBlur8873-9"
-         stdDeviation="0.53588249"
-         inkscape:collect="always" /></filter><filter
+         stdDeviation="0.53588249" /></filter><filter
        height="1.8202161"
        y="-0.41010804"
        width="1.8530247"
        x="-0.42651235"
        id="filter8835-5"
-       style="color-interpolation-filters:sRGB"
-       inkscape:collect="always"><feGaussianBlur
+       style="color-interpolation-filters:sRGB"><feGaussianBlur
          id="feGaussianBlur8837-4"
-         stdDeviation="0.49751501"
-         inkscape:collect="always" /></filter><filter
-       inkscape:collect="always"
+         stdDeviation="0.49751501" /></filter><filter
        style="color-interpolation-filters:sRGB"
        id="filter2533-6"
        x="-0.68029651"
        width="2.5817097"
        y="-1.073697"
        height="3.2469451"><feGaussianBlur
-         inkscape:collect="always"
          stdDeviation="0.73536407"
          id="feGaussianBlur2535-0" /></filter><filter
-       height="1.402261"
-       y="-0.15841809"
+       height="1.4022611"
+       y="-0.1584181"
        width="2.1157048"
        x="-0.56110931"
        id="filter8871-1-6"
-       style="color-interpolation-filters:sRGB"
-       inkscape:collect="always"><feGaussianBlur
+       style="color-interpolation-filters:sRGB"><feGaussianBlur
          id="feGaussianBlur8873-8-9"
-         stdDeviation="0.53588249"
-         inkscape:collect="always" /></filter><filter
-       inkscape:collect="always"
+         stdDeviation="0.53588249" /></filter><filter
        style="color-interpolation-filters:sRGB"
        id="filter2728"
        x="-0.06427016"
        width="1.1285403"
        y="-0.1171224"
        height="1.2342448"><feGaussianBlur
-         inkscape:collect="always"
          stdDeviation="0.90744768"
-         id="feGaussianBlur2730" /></filter></defs><sodipodi:namedview
-     id="base"
-     pagecolor="#bcbcbc"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7.185918"
-     inkscape:cx="61.787513"
-     inkscape:cy="24.770669"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1728"
-     inkscape:window-height="1051"
-     inkscape:window-x="0"
-     inkscape:window-y="38"
-     inkscape:window-maximized="1"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="true"
-     inkscape:snap-bbox="true"
-     inkscape:bbox-nodes="true"
-     inkscape:showpageshadow="2"
-     inkscape:pagecheckerboard="0"
-     inkscape:deskcolor="#d1d1d1"><inkscape:grid
-       type="xygrid"
-       id="grid4112"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       originx="0"
-       originy="0"
-       spacingy="1"
-       spacingx="1"
-       units="px" /></sodipodi:namedview><metadata
+         id="feGaussianBlur2730" /></filter></defs><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" /></cc:Work></rdf:RDF></metadata><g
-     inkscape:groupmode="layer"
      id="layer2"
-     inkscape:label="Background"
-     style="display:inline"
-     sodipodi:insensitive="true"><path
-       sodipodi:nodetypes="cccc"
-       inkscape:connector-curvature="0"
+     style="display:inline"><path
        id="rect4113-1"
        d="M 75,0 75,66 1e-6,66 C 1e-6,41.2048 50.00969,0 75,0 Z"
        style="display:inline;fill:url(#linearGradient4978);fill-opacity:1;stroke:none" /><path
-       sodipodi:nodetypes="cccc"
-       inkscape:connector-curvature="0"
        id="rect4113-1-0"
        d="M 75,21.0607 75,66 1e-6,66 C 10.625001,47.804 43.509694,25.4357 75,21.0607 Z"
        style="display:inline;opacity:0.40400002;fill:url(#linearGradient4962);fill-opacity:1;stroke:none" /><g
@@ -981,83 +409,58 @@
        transform="matrix(0.27903303,0,0,0.27903303,-14.618136,-107.52874)"><g
          style="fill:#737986;fill-opacity:1;stroke:#595e68;stroke-opacity:1"
          id="g13408-8-2" /></g><path
-       sodipodi:nodetypes="cccc"
-       inkscape:connector-curvature="0"
        id="rect4113-1-7"
        d="M 75,4.0000001e-7 75,66 30.000003,66 C 30.000003,46.1545 47.70944,9.2500004 75,4e-7 Z"
        style="display:inline;opacity:0.18399999;fill:url(#linearGradient4970);fill-opacity:1;stroke:none" /></g><g
-     inkscape:label="Foreground"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-986.3622)"><path
        style="font-style:normal;font-weight:normal;font-size:13.58917427px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;display:inline;fill:url(#linearGradient4462);fill-opacity:1;stroke:none;stroke-width:1.99999988;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;filter:url(#filter4606)"
        d="m 47.000294,1007.3622 -12.319149,16.9335 -12.416197,17.0669 16.933329,0 17.066666,0 12.416197,-17.0669 0.09676,-0.133 12.2221,-16.8001 -17.066666,0 -16.933329,0 z"
        id="rect10961-8-3-6-1"
-       inkscape:connector-curvature="0"
-       transform="matrix(1.1726491,0,0.08958045,0.36603268,-107.93917,662.83554)"
-       inkscape:transform-center-x="4.3534013"
-       inkscape:transform-center-y="0.53407962"
-       inkscape:label="shadow" /><path
-       sodipodi:nodetypes="ccccc"
-       inkscape:connector-curvature="0"
+       transform="matrix(1.1726491,0,0.08958045,0.36603268,-107.93917,662.83554)" /><path
        id="path5250"
        d="m 14.403025,1011.8441 3.760593,-4.9642 h 16.536826 l 3.904565,4.9642 z"
-       style="fill:#fffabf;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4205);stroke-width:1;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       inkscape:label="tab-shadow" /><ellipse
+       style="fill:#fffabf;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4205);stroke-width:1;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /><ellipse
        transform="matrix(1,0,0,0.38855855,-1.156034,1007.0198)"
        ry="4.5"
        rx="7.5"
        cy="8.3080006"
        cx="23.691999"
        id="path5111"
-       style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;filter:url(#filter5309)"
-       inkscape:label="tab" /><rect
+       style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;filter:url(#filter5309)" /><rect
        ry="2.0792062"
        y="1011.8622"
        x="11.639588"
        height="31"
        width="41.860409"
        id="rect4876"
-       style="fill:url(#linearGradient4884);fill-opacity:1;stroke:url(#linearGradient5258);stroke-width:1;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       inkscape:label="back" /><g
+       style="fill:url(#linearGradient4884);fill-opacity:1;stroke:url(#linearGradient5258);stroke-width:1;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /><g
        id="g2"
-       transform="translate(25.45733,987.51169)"
-       inkscape:label="plug"><g
+       transform="translate(25.45733,987.51169)"><g
          transform="matrix(1.0729615,0,0,1.0787087,-1.2096914,-0.17204372)"
          id="g2558-4"
          style="opacity:0.503;fill:#808080;stroke:#808080;stroke-width:0.929514;filter:url(#filter2728)"><path
            transform="matrix(1.029538,0,0,1.1281495,-40.181606,-1129.0381)"
            style="fill:#808080;fill-opacity:1;stroke:#808080;stroke-width:0.862484px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter8813-5)"
            d="m 53.577367,1026.9835 -0.152425,-8.8407 0.91455,-1.2194 3.124711,-0.076 0.07621,-0.9908 h 0.91455 l -0.07621,1.9054 -3.048499,1.2194 -0.152425,4.9538 z"
-           id="path8791-1"
-           inkscape:connector-curvature="0" /><path
+           id="path8791-1" /><path
            id="path8722-7-8"
            style="display:inline;opacity:1;fill:#808080;fill-opacity:1;stroke:#808080;stroke-width:0.929514;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="M 3.4999999,23.512598 V 25.5 H 14.5 V 21.525196 H 3.4999999 v 1.987402"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccccc" /><path
-           sodipodi:nodetypes="csssscsscccsssscsscc"
+           d="M 3.4999999,23.512598 V 25.5 H 14.5 V 21.525196 H 3.4999999 v 1.987402" /><path
            id="rect8645-3-9"
            style="display:inline;opacity:1;fill:#808080;fill-opacity:1;stroke:#808080;stroke-width:0.929514;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="M 25.499998,23.781495 25.5,15.413559 C 25.5,13.799403 24.568942,12.5 23.412427,12.5 h -2.424855 c -1.156515,0 -2.483072,1.299403 -2.483072,2.913559 v 1.599039 h -2.264856 c -0.963763,0 -1.739644,0.794104 -1.739644,1.780446 v 1.468512 3.519375 m 10.999998,5.64e-4 2e-6,8.367936 c 0,1.614156 -0.931058,2.913559 -2.087573,2.913559 h -2.424855 c -1.156515,0 -2.483072,-1.299403 -2.483072,-2.913559 V 30.550392 H 16.239644 C 15.275881,30.550392 14.5,29.756288 14.5,28.769946 v -1.468512 -3.519375"
-           inkscape:connector-curvature="0" /><path
-           sodipodi:nodetypes="cc"
-           inkscape:connector-curvature="0"
+           d="M 25.499998,23.781495 25.5,15.413559 C 25.5,13.799403 24.568942,12.5 23.412427,12.5 h -2.424855 c -1.156515,0 -2.483072,1.299403 -2.483072,2.913559 v 1.599039 h -2.264856 c -0.963763,0 -1.739644,0.794104 -1.739644,1.780446 v 1.468512 3.519375 m 10.999998,5.64e-4 2e-6,8.367936 c 0,1.614156 -0.931058,2.913559 -2.087573,2.913559 h -2.424855 c -1.156515,0 -2.483072,-1.299403 -2.483072,-2.913559 V 30.550392 H 16.239644 C 15.275881,30.550392 14.5,29.756288 14.5,28.769946 v -1.468512 -3.519375" /><path
            id="path2537-0"
            d="M 18.51661,16.539741 18.5464,30.705846"
            style="fill:#808080;stroke:#808080;stroke-width:0.929514px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /><path
            id="rect8645-2-5-2"
            style="display:inline;opacity:1;fill:#808080;fill-opacity:1;stroke:#808080;stroke-width:0.929514;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="m 36.091538,26.489769 -10e-7,1.058985 c 0,1.06945 -0.863288,1.955925 -2.164732,1.930363 -1.301445,-0.02541 -1.941636,0 -1.941636,0 v 0.201512 c 0,1.544678 -1.158564,2.787985 -2.597679,2.788284 l -1.648306,2.98e-4 c -1.360345,3e-4 -1.22903,0.546236 -1.22903,-2.989646 V 17.520381 c 0,-3.536032 -0.205068,-2.989797 1.22903,-2.989797 h 1.648306 c 1.439115,0 2.597679,1.243607 2.597679,2.788284 v 0.201513 h 1.941637 c 1.199261,0 2.164732,0.860911 2.164732,1.930361 v 2.554332 z m 0.06454,-6.010119 h 8.461471 l -0.05085,6.010119 h -8.188123"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cczccssssssccsccccccc" /><path
+           d="m 36.091538,26.489769 -10e-7,1.058985 c 0,1.06945 -0.863288,1.955925 -2.164732,1.930363 -1.301445,-0.02541 -1.941636,0 -1.941636,0 v 0.201512 c 0,1.544678 -1.158564,2.787985 -2.597679,2.788284 l -1.648306,2.98e-4 c -1.360345,3e-4 -1.22903,0.546236 -1.22903,-2.989646 V 17.520381 c 0,-3.536032 -0.205068,-2.989797 1.22903,-2.989797 h 1.648306 c 1.439115,0 2.597679,1.243607 2.597679,2.788284 v 0.201513 h 1.941637 c 1.199261,0 2.164732,0.860911 2.164732,1.930361 v 2.554332 z m 0.06454,-6.010119 h 8.461471 l -0.05085,6.010119 h -8.188123" /><path
            transform="matrix(1.445753,0,0,1.3224494,-65.097292,-1327.9481)"
            style="opacity:0.794;fill:#808080;fill-opacity:1;stroke:#808080;stroke-width:0.672232px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter8871-4)"
            d="m 64.018476,1016.5423 -0.152427,10.8222 c 2.375507,-3.3036 3.484206,-4.2052 2.972286,-9.2217 0.305009,-1.654 -1.117834,-1.7529 -2.819859,-1.6005 z"
-           id="path8861-9"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccc" /><ellipse
+           id="path8861-9" /><ellipse
            transform="matrix(1.029538,0,0,1.1281495,-39.470994,-1128.0797)"
            style="opacity:0.828;fill:#808080;fill-opacity:1;stroke:#808080;stroke-width:0.862484;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter8835-5)"
            id="path8817-1"
@@ -1068,14 +471,11 @@
            transform="matrix(1.7350569,0,0,1.8824502,-91.814902,-1903.1505)"
            style="opacity:0.862;fill:#808080;fill-opacity:1;stroke:#808080;stroke-width:0.514324px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter2533-6)"
            d="m 70.953811,1023.4014 v -1.8291 l 2.972286,-0.076 z"
-           id="path8875-0"
-           inkscape:connector-curvature="0" /><path
+           id="path8875-0" /><path
            transform="matrix(1.029538,0,0,1.1281495,-39.928294,-1128.6206)"
            style="display:inline;opacity:0.485;fill:#808080;fill-opacity:1;stroke:#808080;stroke-width:0.862484px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter8871-1-6)"
            d="m 53.924652,1016.631 -0.152427,10.8222 c 2.375507,-3.3036 3.484206,-4.2052 2.972286,-9.2217 0.305009,-1.654 -1.117834,-1.7529 -2.819859,-1.6005 z"
-           id="path8861-7-0"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccc" /></g><g
+           id="path8861-7-0" /></g><g
          id="g11331-3-1-1"
          style="display:inline"
          transform="matrix(0.92787456,0,0,0.92766861,-283.31685,-391.9053)"><g
@@ -1107,34 +507,23 @@
            transform="matrix(1.029538,0,0,1.1281495,-40.181606,-1129.0381)"
            style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.927888px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter8813)"
            d="m 53.577367,1026.9835 -0.152425,-8.8407 0.91455,-1.2194 3.124711,-0.076 0.07621,-0.9908 h 0.91455 l -0.07621,1.9054 -3.048499,1.2194 -0.152425,4.9538 z"
-           id="path8791"
-           inkscape:connector-curvature="0" /><path
+           id="path8791" /><path
            id="path8722-7"
            style="display:inline;opacity:1;fill:url(#linearGradient8769);fill-opacity:1;stroke:url(#linearGradient8753);stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="M 3.4999999,23.512598 V 25.5 H 14.5 V 21.525196 H 3.4999999 v 1.987402"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccccc" /><path
-           sodipodi:nodetypes="csssscsscccsssscsscc"
+           d="M 3.4999999,23.512598 V 25.5 H 14.5 V 21.525196 H 3.4999999 v 1.987402" /><path
            id="rect8645-3"
            style="display:inline;opacity:1;fill:url(#linearGradient8761);fill-opacity:1;stroke:#4d73ae;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="M 25.499998,23.781495 25.5,15.413559 C 25.5,13.799403 24.568942,12.5 23.412427,12.5 h -2.424855 c -1.156515,0 -2.483072,1.299403 -2.483072,2.913559 v 1.599039 h -2.264856 c -0.963763,0 -1.739644,0.794104 -1.739644,1.780446 v 1.468512 3.519375 m 10.999998,5.64e-4 2e-6,8.367936 c 0,1.614156 -0.931058,2.913559 -2.087573,2.913559 h -2.424855 c -1.156515,0 -2.483072,-1.299403 -2.483072,-2.913559 V 30.550392 H 16.239644 C 15.275881,30.550392 14.5,29.756288 14.5,28.769946 v -1.468512 -3.519375"
-           inkscape:connector-curvature="0" /><path
-           sodipodi:nodetypes="cc"
-           inkscape:connector-curvature="0"
+           d="M 25.499998,23.781495 25.5,15.413559 C 25.5,13.799403 24.568942,12.5 23.412427,12.5 h -2.424855 c -1.156515,0 -2.483072,1.299403 -2.483072,2.913559 v 1.599039 h -2.264856 c -0.963763,0 -1.739644,0.794104 -1.739644,1.780446 v 1.468512 3.519375 m 10.999998,5.64e-4 2e-6,8.367936 c 0,1.614156 -0.931058,2.913559 -2.087573,2.913559 h -2.424855 c -1.156515,0 -2.483072,-1.299403 -2.483072,-2.913559 V 30.550392 H 16.239644 C 15.275881,30.550392 14.5,29.756288 14.5,28.769946 v -1.468512 -3.519375" /><path
            id="path2537"
            d="M 18.51661,16.539741 18.5464,30.705846"
            style="fill:none;stroke:url(#linearGradient2545);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /><path
            id="rect8645-2-5"
            style="display:inline;opacity:1;fill:url(#linearGradient8779);fill-opacity:1;stroke:url(#linearGradient8787);stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="m 36.091538,26.489769 -10e-7,1.058985 c 0,1.06945 -0.863288,1.955925 -2.164732,1.930363 -1.301445,-0.02541 -1.941636,0 -1.941636,0 v 0.201512 c 0,1.544678 -1.158564,2.787985 -2.597679,2.788284 l -1.648306,2.98e-4 c -1.360345,3e-4 -1.22903,0.546236 -1.22903,-2.989646 V 17.520381 c 0,-3.536032 -0.205068,-2.989797 1.22903,-2.989797 h 1.648306 c 1.439115,0 2.597679,1.243607 2.597679,2.788284 v 0.201513 h 1.941637 c 1.199261,0 2.164732,0.860911 2.164732,1.930361 v 2.554332 z m 0.06454,-6.010119 h 8.461471 l -0.05085,6.010119 h -8.188123"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cczccssssssccsccccccc" /><path
+           d="m 36.091538,26.489769 -10e-7,1.058985 c 0,1.06945 -0.863288,1.955925 -2.164732,1.930363 -1.301445,-0.02541 -1.941636,0 -1.941636,0 v 0.201512 c 0,1.544678 -1.158564,2.787985 -2.597679,2.788284 l -1.648306,2.98e-4 c -1.360345,3e-4 -1.22903,0.546236 -1.22903,-2.989646 V 17.520381 c 0,-3.536032 -0.205068,-2.989797 1.22903,-2.989797 h 1.648306 c 1.439115,0 2.597679,1.243607 2.597679,2.788284 v 0.201513 h 1.941637 c 1.199261,0 2.164732,0.860911 2.164732,1.930361 v 2.554332 z m 0.06454,-6.010119 h 8.461471 l -0.05085,6.010119 h -8.188123" /><path
            transform="matrix(1.445753,0,0,1.3224494,-65.097292,-1327.9481)"
            style="opacity:0.794;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.723208px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter8871)"
            d="m 64.018476,1016.5423 -0.152427,10.8222 c 2.375507,-3.3036 3.484206,-4.2052 2.972286,-9.2217 0.305009,-1.654 -1.117834,-1.7529 -2.819859,-1.6005 z"
-           id="path8861"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccc" /><ellipse
+           id="path8861" /><ellipse
            transform="matrix(1.029538,0,0,1.1281495,-39.470994,-1128.0797)"
            style="opacity:0.828;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.927888;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter8835)"
            id="path8817"
@@ -1145,14 +534,11 @@
            transform="matrix(1.7350569,0,0,1.8824502,-91.814902,-1903.1505)"
            style="opacity:0.862;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.553326px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter2533)"
            d="m 70.953811,1023.4014 v -1.8291 l 2.972286,-0.076 z"
-           id="path8875"
-           inkscape:connector-curvature="0" /><path
+           id="path8875" /><path
            transform="matrix(1.029538,0,0,1.1281495,-39.928294,-1128.6206)"
            style="display:inline;opacity:0.485;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.927888px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter8871-1)"
            d="m 53.924652,1016.631 -0.152427,10.8222 c 2.375507,-3.3036 3.484206,-4.2052 2.972286,-9.2217 0.305009,-1.654 -1.117834,-1.7529 -2.819859,-1.6005 z"
-           id="path8861-7"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccc" /></g></g><rect
+           id="path8861-7" /></g></g><rect
        transform="matrix(1,0,-0.47943731,0.87757613,0,0)"
        style="display:inline;fill:url(#linearGradient4936);fill-opacity:1;stroke:url(#linearGradient4956-9);stroke-width:1.06747;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect4932"
@@ -1160,11 +546,8 @@
        height="27.408155"
        x="581.66913"
        y="1160.9717"
-       ry="1.8222821"
-       inkscape:label="front" /><path
+       ry="1.8222821" /><path
        d="m 36.870011,1291.8214 c 0.06324,1.028 0.02768,1.9692 -0.106669,2.8236 -0.134343,0.8545 -0.409995,1.5821 -0.826959,2.1828 -1.452185,1.8279 -3.495527,1.8405 -5.605137,1.8497 -1.204916,-0.01 -2.319515,-0.2915 -3.44223,-0.9412 -0.327635,-0.2299 -0.371015,-0.6499 -0.381195,-0.9416 -0.06452,-1.4687 -0.215579,-3.3729 -0.274062,-4.4553 -0.05848,-1.0824 2.178483,0.2177 3.232162,0.02 1.815913,-0.2352 2.411262,-2.0006 2.369355,-3.9924 l -0.913786,-15.4294 c -0.0055,-0.093 0.01562,-0.1802 0.06409,-0.2603 0.04848,-0.08 0.137822,-0.1468 0.268044,-0.2002 0.130243,-0.053 0.301339,-0.093 0.513272,-0.1202 0.225297,-0.027 0.504856,-0.04 0.838617,-0.04 0.32041,0 1.937393,0.013 2.166011,0.04 0.228617,0.027 0.404634,0.067 0.528061,0.1202 0.136764,0.053 0.234344,0.1201 0.292674,0.2002 0.07167,0.08 0.110394,0.1669 0.11614,0.2603 z"
        style="display:inline;font-style:normal;font-weight:normal;font-size:41.0125px;line-height:125%;font-family:Calibri;letter-spacing:0px;word-spacing:0px;fill:url(#linearGradient1);fill-opacity:1;stroke:url(#linearGradient2);stroke-width:1.17869px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-variant:normal;font-stretch:normal"
        id="path4569"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccczccscccssccsc"
        transform="matrix(1.0213931,0,-0.44860554,0.70470227,594.75457,124.97464)" /></g></svg>
diff --git a/ui/org.eclipse.pde.ui/icons/wizban/defcon_wiz.svg b/ui/org.eclipse.pde.ui/icons/wizban/defcon_wiz.svg
index d9e1aa73419..6e53bdd8e92 100644
--- a/ui/org.eclipse.pde.ui/icons/wizban/defcon_wiz.svg
+++ b/ui/org.eclipse.pde.ui/icons/wizban/defcon_wiz.svg
@@ -6,14 +6,7 @@
    height="66"
    id="svg2"
    version="1.1"
-   inkscape:version="1.3 (0e150ed, 2023-07-21)"
-   sodipodi:docname="defcon_wiz.svg"
-   inkscape:export-filename="/Users/d021678/git/eclipse.jdt.ui/org.eclipse.jdt.ui/icons/full/wizban/newclass_wiz2.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90"
    xml:space="preserve"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:svg="http://www.w3.org/2000/svg"
@@ -21,23 +14,20 @@
    xmlns:cc="http://creativecommons.org/ns#"
    xmlns:dc="http://purl.org/dc/elements/1.1/"><defs
      id="defs4"><linearGradient
-       id="linearGradient5904"
-       inkscape:collect="always"><stop
+       id="linearGradient5904"><stop
          id="stop5906"
          offset="0"
          style="stop-color:#c5c6c6;stop-opacity:1" /><stop
          id="stop5908"
          offset="1"
          style="stop-color:#000000;stop-opacity:0;" /></linearGradient><linearGradient
-       id="linearGradient5898"
-       inkscape:collect="always"><stop
+       id="linearGradient5898"><stop
          id="stop5900"
          offset="0"
          style="stop-color:#c0c1c1;stop-opacity:1" /><stop
          id="stop5902"
          offset="1"
          style="stop-color:#000000;stop-opacity:0;" /></linearGradient><linearGradient
-       inkscape:collect="always"
        id="linearGradient4581"><stop
          style="stop-color:#dddddd;stop-opacity:1"
          offset="0"
@@ -45,7 +35,6 @@
          style="stop-color:#9f9f9f;stop-opacity:1"
          offset="1"
          id="stop4585" /></linearGradient><linearGradient
-       inkscape:collect="always"
        id="linearGradient4541"><stop
          style="stop-color:#a1adb2;stop-opacity:1"
          offset="0"
@@ -53,7 +42,6 @@
          style="stop-color:#000000;stop-opacity:0;"
          offset="1"
          id="stop4545" /></linearGradient><linearGradient
-       inkscape:collect="always"
        id="linearGradient4461"><stop
          style="stop-color:#d8d8d8;stop-opacity:1"
          offset="0"
@@ -67,299 +55,6 @@
          style="stop-color:#b4b4b4;stop-opacity:1"
          offset="1"
          id="stop4465" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       id="linearGradient4972"><stop
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0"
-         id="stop4974" /><stop
-         style="stop-color:#f5f8fd;stop-opacity:1"
-         offset="1"
-         id="stop4976" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       id="linearGradient4964"><stop
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0"
-         id="stop4966" /><stop
-         style="stop-color:#e8eefa;stop-opacity:1"
-         offset="1"
-         id="stop4968" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       id="linearGradient4956"><stop
-         style="stop-color:#fcfdfe;stop-opacity:1"
-         offset="0"
-         id="stop4958" /><stop
-         style="stop-color:#dee6f8;stop-opacity:1"
-         offset="1"
-         id="stop4960" /></linearGradient><filter
-       style="color-interpolation-filters:sRGB"
-       inkscape:label="Drop Shadow"
-       id="filter8854"><feFlood
-         flood-opacity="0.933333"
-         flood-color="rgb(244,248,254)"
-         result="flood"
-         id="feFlood8856" /><feComposite
-         in="flood"
-         in2="SourceGraphic"
-         operator="in"
-         result="composite1"
-         id="feComposite8858" /><feGaussianBlur
-         in="composite1"
-         stdDeviation="1.2"
-         result="blur"
-         id="feGaussianBlur8860" /><feOffset
-         dx="-1"
-         dy="3"
-         result="offset"
-         id="feOffset8862" /><feComposite
-         in="SourceGraphic"
-         in2="offset"
-         operator="over"
-         result="composite2"
-         id="feComposite8864" /></filter><linearGradient
-       id="linearGradient6122"><stop
-         style="stop-color:#c0c0c0;stop-opacity:1"
-         offset="0"
-         id="stop6124" /><stop
-         id="stop6132"
-         offset="0.5"
-         style="stop-color:#adadad;stop-opacity:1" /><stop
-         style="stop-color:#808080;stop-opacity:1"
-         offset="1"
-         id="stop6126" /></linearGradient><linearGradient
-       id="linearGradient7087"><stop
-         style="stop-color:#17325d;stop-opacity:1;"
-         offset="0"
-         id="stop7089" /><stop
-         id="stop7091"
-         offset="0.25"
-         style="stop-color:#b4d0e2;stop-opacity:1" /><stop
-         id="stop7093"
-         offset="0.5"
-         style="stop-color:#b7d2e4;stop-opacity:1" /><stop
-         style="stop-color:#acc9de;stop-opacity:1"
-         offset="0.75"
-         id="stop7095" /><stop
-         style="stop-color:#3e72a7;stop-opacity:1"
-         offset="1"
-         id="stop7097" /></linearGradient><mask
-       id="mask7366"
-       maskUnits="userSpaceOnUse"><path
-         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;display:inline"
-         d="m -16.593048,1040.862 9.990206,0 0,10.0018 -2.983353,3.0385 -5.966213,0 c -0.53033,-0.022 -1.04064,-0.5519 -1.04064,-1.0385 z"
-         id="path7368"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccccc" /></mask><linearGradient
-       id="linearGradient7584-5"><stop
-         id="stop7586-4"
-         offset="0"
-         style="stop-color:#f9cd5f;stop-opacity:1" /><stop
-         id="stop7588-5"
-         offset="1"
-         style="stop-color:#fbf0b4;stop-opacity:1" /></linearGradient><linearGradient
-       id="linearGradient7592-1"><stop
-         id="stop7594-6"
-         offset="0"
-         style="stop-color:#bd8416;stop-opacity:1" /><stop
-         id="stop7596-9"
-         offset="1"
-         style="stop-color:#a66b10;stop-opacity:1" /></linearGradient><linearGradient
-       id="linearGradient10798-1-9-3-7-6-6-6-2-6-7-98-9-4-1"><stop
-         style="stop-color:#5aad60;stop-opacity:1;"
-         offset="0"
-         id="stop10800-5-2-1-8-20-4-0-2-1-9-0-0-1-1" /><stop
-         id="stop10806-6-8-5-3-9-2-2-7-0-4-2-7-8-9"
-         offset="0.5"
-         style="stop-color:#5bb26a;stop-opacity:1;" /><stop
-         style="stop-color:#a4c589;stop-opacity:1"
-         offset="1"
-         id="stop10802-1-5-3-0-4-6-8-5-5-6-69-6-4-0" /></linearGradient><mask
-       maskUnits="userSpaceOnUse"
-       id="mask7366-4"><path
-         sodipodi:nodetypes="ccccccc"
-         inkscape:connector-curvature="0"
-         id="path7368-2"
-         d="m -16.593048,1040.862 9.990206,0 0,10.0018 -2.983353,3.0385 -5.966213,0 c -0.53033,-0.022 -1.04064,-0.5519 -1.04064,-1.0385 z"
-         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;display:inline" /></mask><linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient7087"
-       id="linearGradient9331"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-20,0)"
-       x1="4.7776356"
-       y1="1039.8118"
-       x2="4.7776356"
-       y2="1041.911" /><linearGradient
-       y2="1041.911"
-       x2="4.7776356"
-       y1="1039.8118"
-       x1="4.7776356"
-       gradientTransform="translate(-18,4.7e-5)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient9333"
-       xlink:href="#linearGradient7087"
-       inkscape:collect="always" /><linearGradient
-       y2="1041.911"
-       x2="4.7776356"
-       y1="1039.8118"
-       x1="4.7776356"
-       gradientTransform="translate(-16,4.7e-5)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient9335"
-       xlink:href="#linearGradient7087"
-       inkscape:collect="always" /><linearGradient
-       y2="1041.911"
-       x2="4.7776356"
-       y1="1039.8118"
-       x1="4.7776356"
-       gradientTransform="translate(-14,4.7e-5)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient9337"
-       xlink:href="#linearGradient7087"
-       inkscape:collect="always" /><linearGradient
-       y2="1041.911"
-       x2="4.7776356"
-       y1="1039.8118"
-       x1="4.7776356"
-       gradientTransform="translate(-12,4.7e-5)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient9339"
-       xlink:href="#linearGradient7087"
-       inkscape:collect="always" /><linearGradient
-       gradientTransform="translate(-80,0)"
-       gradientUnits="userSpaceOnUse"
-       y2="1042.7973"
-       x2="163.22012"
-       y1="1042.7973"
-       x1="88.220117"
-       id="linearGradient68073"
-       xlink:href="#linearGradient4956"
-       inkscape:collect="always" /><linearGradient
-       gradientTransform="translate(-80,0)"
-       gradientUnits="userSpaceOnUse"
-       y2="1032.2669"
-       x2="163.22012"
-       y1="1032.2668"
-       x1="94.469681"
-       id="linearGradient68075"
-       xlink:href="#linearGradient4964"
-       inkscape:collect="always" /><linearGradient
-       gradientTransform="translate(-80,0)"
-       gradientUnits="userSpaceOnUse"
-       y2="1032.2668"
-       x2="152.72206"
-       y1="1032.2668"
-       x1="88.220116"
-       id="linearGradient68077"
-       xlink:href="#linearGradient4972"
-       inkscape:collect="always" /><filter
-       id="filter8854-9"
-       inkscape:label="Drop Shadow"
-       style="color-interpolation-filters:sRGB"><feFlood
-         id="feFlood8856-0"
-         result="flood"
-         flood-color="rgb(244,248,254)"
-         flood-opacity="0.933333" /><feComposite
-         id="feComposite8858-2"
-         result="composite1"
-         operator="in"
-         in2="SourceGraphic"
-         in="flood" /><feGaussianBlur
-         id="feGaussianBlur8860-3"
-         result="blur"
-         stdDeviation="1.2"
-         in="composite1" /><feOffset
-         id="feOffset8862-2"
-         result="offset"
-         dy="3"
-         dx="-1" /><feComposite
-         id="feComposite8864-3"
-         result="composite2"
-         operator="over"
-         in2="offset"
-         in="SourceGraphic" /></filter><linearGradient
-       id="linearGradient10798-1-9-3-7-6-8-9-0-9-1"><stop
-         id="stop10800-5-2-1-8-20-6-4-9-8-2"
-         offset="0"
-         style="stop-color:#7564b1;stop-opacity:1" /><stop
-         style="stop-color:#5d4aa1;stop-opacity:1"
-         offset="0.5"
-         id="stop10806-6-8-5-3-9-24-8-4-3-2" /><stop
-         id="stop10802-1-5-3-0-4-8-4-2-9-2"
-         offset="1"
-         style="stop-color:#9283c3;stop-opacity:1" /></linearGradient><linearGradient
-       id="linearGradient7540-2-3-8-7"><stop
-         id="stop7542-8-7-5-3"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.502" /><stop
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0.47623286"
-         id="stop7544-8-2-0-5" /><stop
-         style="stop-color:#ffffff;stop-opacity:0"
-         offset="0.5"
-         id="stop7546-1-7-9-5" /><stop
-         id="stop7548-98-9-2-4"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       id="linearGradient7272-66-4-5-5-5-8"><stop
-         style="stop-color:#8f6c10;stop-opacity:1"
-         offset="0"
-         id="stop7274-6-0-1-7-4-7" /><stop
-         style="stop-color:#c9a645;stop-opacity:1"
-         offset="1"
-         id="stop7276-66-6-3-9-1-4" /></linearGradient><linearGradient
-       y2="1030.3411"
-       x2="-10.159802"
-       y1="1030.3411"
-       x1="-22.453552"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient10540"
-       xlink:href="#linearGradient7540-2-3-8-7"
-       inkscape:collect="always" /><linearGradient
-       y2="1030.3411"
-       x2="-10.159802"
-       y1="1030.3411"
-       x1="-22.453552"
-       gradientTransform="matrix(0,1,-1,0,1014.0344,1046.6478)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient10542"
-       xlink:href="#linearGradient7540-2-3-8-7"
-       inkscape:collect="always" /><linearGradient
-       y2="1023.2569"
-       x2="-15.945988"
-       y1="1037.4661"
-       x1="-15.945988"
-       gradientTransform="matrix(0.95585117,0,0,0.95585117,-0.71992063,45.488394)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient10544"
-       xlink:href="#linearGradient7272-66-4-5-5-5-8"
-       inkscape:collect="always" /><mask
-       id="mask10620"
-       maskUnits="userSpaceOnUse"><path
-         transform="matrix(0.55482947,0,0,0.55482947,-206.96039,787.08655)"
-         d="m 398.75,468.23718 a 10.625,10.625 0 1 1 -21.25,0 10.625,10.625 0 1 1 21.25,0 z"
-         sodipodi:ry="10.625"
-         sodipodi:rx="10.625"
-         sodipodi:cy="468.23718"
-         sodipodi:cx="388.125"
-         id="path10622"
-         style="font-size:13.58917427px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:2.16621375;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline;font-family:Sans"
-         sodipodi:type="arc" /></mask><linearGradient
-       id="linearGradient4528-9-5-7-9-7-3"><stop
-         id="stop4530-0-5-0-5-8-4"
-         offset="0"
-         style="stop-color:#e0c576;stop-opacity:1;" /><stop
-         id="stop4532-7-9-3-3-6-1"
-         offset="1"
-         style="stop-color:#9e7916;stop-opacity:1" /></linearGradient><linearGradient
-       id="linearGradient6281-8-0-1-6-6-4-2-8-0"><stop
-         style="stop-color:#f7f9fb;stop-opacity:1"
-         offset="0"
-         id="stop6283-0-2-2-1-2-0-1-6-0" /><stop
-         style="stop-color:#ffd680;stop-opacity:1"
-         offset="1"
-         id="stop6285-5-0-9-7-6-9-9-1-9" /></linearGradient><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4972-7"
        id="linearGradient4978"
        x1="88.220116"
@@ -368,7 +63,6 @@
        y2="1032.2668"
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-88.220116,-999.2669)" /><linearGradient
-       inkscape:collect="always"
        id="linearGradient4972-7"><stop
          style="stop-color:#b8ccf1;stop-opacity:0.10196079"
          offset="0"
@@ -376,7 +70,6 @@
          style="stop-color:#6e97e2;stop-opacity:0.10196079"
          offset="1"
          id="stop4976-1" /></linearGradient><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4964-3"
        id="linearGradient4970"
        x1="118.38584"
@@ -385,7 +78,6 @@
        y2="1032.2668"
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-88.220117,-999.2669)" /><linearGradient
-       inkscape:collect="always"
        id="linearGradient4964-3"><stop
          style="stop-color:#ffffff;stop-opacity:0.349"
          offset="0"
@@ -393,7 +85,6 @@
          style="stop-color:#91ade6;stop-opacity:1"
          offset="1"
          id="stop4968-1" /></linearGradient><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4956-2"
        id="linearGradient4962"
        x1="88.220116"
@@ -402,7 +93,6 @@
        y2="1042.7972"
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-88.220116,-999.2669)" /><linearGradient
-       inkscape:collect="always"
        id="linearGradient4956-2"><stop
          style="stop-color:#fcfdfe;stop-opacity:0.25641027"
          offset="0"
@@ -410,27 +100,6 @@
          style="stop-color:#98aae7;stop-opacity:0.40392157"
          offset="1"
          id="stop4960-6" /></linearGradient><linearGradient
-       id="linearGradient3827"><stop
-         id="stop3829"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0;" /><stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0.60149658"
-         id="stop3835" /><stop
-         id="stop3831"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" /></linearGradient><linearGradient
-       id="linearGradient10798-1-9-3-7-6-8-9-0-9-1-0"><stop
-         id="stop10800-5-2-1-8-20-6-4-9-8-2-9"
-         offset="0"
-         style="stop-color:#f3faed;stop-opacity:1" /><stop
-         style="stop-color:#e7f4da;stop-opacity:1"
-         offset="0.65917557"
-         id="stop10806-6-8-5-3-9-24-8-4-3-2-4" /><stop
-         id="stop10802-1-5-3-0-4-8-4-2-9-2-5"
-         offset="1"
-         style="stop-color:#67bf1f;stop-opacity:1" /></linearGradient><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4994"
        id="linearGradient6375-6"
        x1="50.702839"
@@ -439,15 +108,13 @@
        y2="1011.338"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1.1849336,0,0,0.66623436,3.388291,334.57319)" /><linearGradient
-       id="linearGradient4994"
-       inkscape:collect="always"><stop
+       id="linearGradient4994"><stop
          id="stop4996"
          offset="0"
          style="stop-color:#ffffff;stop-opacity:1" /><stop
          id="stop4998"
          offset="1"
          style="stop-color:#d2f1ff;stop-opacity:1" /></linearGradient><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4902"
        id="linearGradient4238"
        gradientUnits="userSpaceOnUse"
@@ -456,8 +123,7 @@
        y1="1039.059"
        x2="10.632975"
        y2="1051.5835" /><linearGradient
-       id="linearGradient4902"
-       inkscape:collect="always"><stop
+       id="linearGradient4902"><stop
          id="stop4904"
          offset="0"
          style="stop-color:#777777;stop-opacity:0.74901962" /><stop
@@ -467,7 +133,6 @@
          id="stop4906"
          offset="1"
          style="stop-color:#939195;stop-opacity:0.93333334" /></linearGradient><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4461"
        id="linearGradient4467"
        x1="60.069771"
@@ -476,7 +141,6 @@
        y2="997.19556"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(0.99999996,0,0,1.2,-15.999595,-199.27331)" /><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4541"
        id="linearGradient4547"
        x1="41"
@@ -485,7 +149,6 @@
        y2="1008.3622"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1.3158111,0,0,1.3158111,-28.947849,-318.29488)" /><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4541"
        id="linearGradient4547-0"
        x1="41"
@@ -494,7 +157,6 @@
        y2="1008.3622"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(0,1.2632053,-1.2632053,0,1298.6373,956.56996)" /><radialGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4581"
        id="radialGradient4587"
        cx="68.5"
@@ -505,7 +167,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-15.999595,-8.6771508e-4)" /><radialGradient
        gradientTransform="translate(-10.999595,-8.6771508e-4)"
-       inkscape:collect="always"
        xlink:href="#linearGradient4581"
        id="radialGradient4587-5"
        cx="68.5"
@@ -515,7 +176,6 @@
        r="1.5"
        gradientUnits="userSpaceOnUse" /><radialGradient
        gradientTransform="translate(-5.999595,-8.6771508e-4)"
-       inkscape:collect="always"
        xlink:href="#linearGradient4581"
        id="radialGradient4587-0"
        cx="68.5"
@@ -524,16 +184,6 @@
        fy="1004.8622"
        r="1.5"
        gradientUnits="userSpaceOnUse" /><linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4541"
-       id="linearGradient5885"
-       x1="41"
-       y1="1007.8622"
-       x2="60"
-       y2="1008.3622"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0,1,-1,0,1034.3618,967.36133)" /><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient5904"
        id="linearGradient5890"
        gradientUnits="userSpaceOnUse"
@@ -542,7 +192,6 @@
        y1="1007.8622"
        x2="60.03624"
        y2="1007.8358" /><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient5898"
        id="linearGradient5892"
        gradientUnits="userSpaceOnUse"
@@ -551,7 +200,6 @@
        y1="1007.8622"
        x2="59.944244"
        y2="1007.8496" /><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient5517"
        id="linearGradient6406"
        gradientUnits="userSpaceOnUse"
@@ -559,32 +207,27 @@
        y1="1041.0833"
        x2="75.020309"
        y2="1023.2908" /><filter
-       inkscape:collect="always"
        style="color-interpolation-filters:sRGB"
        id="filter4344"
        x="-0.027383926"
        width="1.0547679"
        y="-0.085576576"
        height="1.1711532"><feGaussianBlur
-         inkscape:collect="always"
          stdDeviation="0.57051052"
          id="feGaussianBlur4346" /></filter><linearGradient
-       id="linearGradient5517"
-       inkscape:collect="always"><stop
+       id="linearGradient5517"><stop
          id="stop5519"
          offset="0"
          style="stop-color:#c5c3d4;stop-opacity:0.72941178" /><stop
          id="stop5521"
          offset="1"
          style="stop-color:#c5c3d4;stop-opacity:0.72941178" /></linearGradient><filter
-       inkscape:collect="always"
        style="color-interpolation-filters:sRGB"
        id="filter2728"
        x="-0.063235322"
        width="1.1264706"
        y="-0.11523657"
        height="1.2304731"><feGaussianBlur
-         inkscape:collect="always"
          stdDeviation="0.90744768"
          id="feGaussianBlur2730" /></filter><filter
        height="1.5377248"
@@ -592,61 +235,49 @@
        width="2.2348057"
        x="-0.61603857"
        id="filter8813-5"
-       style="color-interpolation-filters:sRGB"
-       inkscape:collect="always"><feGaussianBlur
+       style="color-interpolation-filters:sRGB"><feGaussianBlur
          id="feGaussianBlur8815-0"
-         stdDeviation="1.1269452"
-         inkscape:collect="always" /></filter><filter
+         stdDeviation="1.1269452" /></filter><filter
        height="1.3538871"
-       y="-0.14670009"
-       width="2.0326143"
+       y="-0.1467001"
+       width="2.0326144"
        x="-0.51861343"
        id="filter8871-4"
-       style="color-interpolation-filters:sRGB"
-       inkscape:collect="always"><feGaussianBlur
+       style="color-interpolation-filters:sRGB"><feGaussianBlur
          id="feGaussianBlur8873-9"
-         stdDeviation="0.53588249"
-         inkscape:collect="always" /></filter><filter
+         stdDeviation="0.53588249" /></filter><filter
        height="1.8002913"
        y="-0.40014564"
        width="1.8323029"
        x="-0.41615145"
        id="filter8835-5"
-       style="color-interpolation-filters:sRGB"
-       inkscape:collect="always"><feGaussianBlur
+       style="color-interpolation-filters:sRGB"><feGaussianBlur
          id="feGaussianBlur8837-4"
-         stdDeviation="0.49751501"
-         inkscape:collect="always" /></filter><filter
-       inkscape:collect="always"
+         stdDeviation="0.49751501" /></filter><filter
        style="color-interpolation-filters:sRGB"
        id="filter2533-6"
        x="-0.6723755"
        width="2.5456241"
        y="-1.0602113"
        height="3.2108596"><feGaussianBlur
-         inkscape:collect="always"
          stdDeviation="0.73536407"
          id="feGaussianBlur2535-0" /></filter><filter
        height="1.387091"
-       y="-0.15474324"
+       y="-0.15474326"
        width="2.0896478"
        x="-0.5477827"
        id="filter8871-1-6"
-       style="color-interpolation-filters:sRGB"
-       inkscape:collect="always"><feGaussianBlur
+       style="color-interpolation-filters:sRGB"><feGaussianBlur
          id="feGaussianBlur8873-8-9"
-         stdDeviation="0.53588249"
-         inkscape:collect="always" /></filter><filter
+         stdDeviation="0.53588249" /></filter><filter
        height="1.4861495"
        y="-0.24307477"
        width="2.0754105"
        x="-0.53770523"
        id="filter8813"
-       style="color-interpolation-filters:sRGB"
-       inkscape:collect="always"><feGaussianBlur
+       style="color-interpolation-filters:sRGB"><feGaussianBlur
          id="feGaussianBlur8815"
-         stdDeviation="1.1269452"
-         inkscape:collect="always" /></filter><linearGradient
+         stdDeviation="1.1269452" /></filter><linearGradient
        gradientUnits="userSpaceOnUse"
        y2="1023.234"
        x2="51.933025"
@@ -654,10 +285,8 @@
        x1="51.658199"
        id="linearGradient8769"
        xlink:href="#linearGradient8767"
-       inkscape:collect="always"
        gradientTransform="matrix(2.7500001,0,0,0.99370101,-129.87501,-991.91286)" /><linearGradient
-       id="linearGradient8767"
-       inkscape:collect="always"><stop
+       id="linearGradient8767"><stop
          id="stop8763"
          offset="0"
          style="stop-color:#6a8ec1;stop-opacity:1" /><stop
@@ -671,10 +300,8 @@
        x1="50"
        id="linearGradient8753"
        xlink:href="#linearGradient8751"
-       inkscape:collect="always"
        gradientTransform="matrix(2.7500001,0,0,0.99370101,-129.87501,-991.91286)" /><linearGradient
-       id="linearGradient8751"
-       inkscape:collect="always"><stop
+       id="linearGradient8751"><stop
          id="stop8747"
          offset="0"
          style="stop-color:#2e5d8f;stop-opacity:1" /><stop
@@ -688,17 +315,14 @@
        x1="57"
        id="linearGradient8761"
        xlink:href="#linearGradient8759"
-       inkscape:collect="always"
        gradientTransform="matrix(1.0999999,0,0,1.1281495,-43.249997,-1129.0318)" /><linearGradient
-       id="linearGradient8759"
-       inkscape:collect="always"><stop
+       id="linearGradient8759"><stop
          id="stop8755"
          offset="0"
          style="stop-color:#d3e0eb;stop-opacity:1" /><stop
          id="stop8757"
          offset="1"
          style="stop-color:#5179b5;stop-opacity:1" /></linearGradient><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient2543"
        id="linearGradient2545"
        x1="18.423391"
@@ -706,7 +330,6 @@
        x2="18.436228"
        y2="30.334658"
        gradientUnits="userSpaceOnUse" /><linearGradient
-       inkscape:collect="always"
        id="linearGradient2543"><stop
          style="stop-color:#4f76b0;stop-opacity:1"
          offset="0"
@@ -724,10 +347,8 @@
        x1="63.98344"
        id="linearGradient8779"
        xlink:href="#linearGradient8777"
-       inkscape:collect="always"
        gradientTransform="matrix(1.3687895,0,0,1.494898,-60.408122,-1504.0798)" /><linearGradient
-       id="linearGradient8777"
-       inkscape:collect="always"><stop
+       id="linearGradient8777"><stop
          id="stop8773"
          offset="0"
          style="stop-color:#fbeaab;stop-opacity:1;" /><stop
@@ -741,10 +362,8 @@
        x1="68.47998"
        id="linearGradient8787"
        xlink:href="#linearGradient8785"
-       inkscape:collect="always"
        gradientTransform="matrix(1.3687895,0,0,1.494898,-60.408122,-1504.0798)" /><linearGradient
-       id="linearGradient8785"
-       inkscape:collect="always"><stop
+       id="linearGradient8785"><stop
          id="stop8781"
          offset="0"
          style="stop-color:#bb8d2d;stop-opacity:1" /><stop
@@ -759,29 +378,23 @@
        width="1.8310951"
        x="-0.41554753"
        id="filter8871"
-       style="color-interpolation-filters:sRGB"
-       inkscape:collect="always"><feGaussianBlur
+       style="color-interpolation-filters:sRGB"><feGaussianBlur
          id="feGaussianBlur8873"
-         stdDeviation="0.53588249"
-         inkscape:collect="always" /></filter><filter
+         stdDeviation="0.53588249" /></filter><filter
        height="1.6025846"
        y="-0.30129232"
        width="1.626688"
        x="-0.313344"
        id="filter8835"
-       style="color-interpolation-filters:sRGB"
-       inkscape:collect="always"><feGaussianBlur
+       style="color-interpolation-filters:sRGB"><feGaussianBlur
          id="feGaussianBlur8837"
-         stdDeviation="0.49751501"
-         inkscape:collect="always" /></filter><filter
-       inkscape:collect="always"
+         stdDeviation="0.49751501" /></filter><filter
        style="color-interpolation-filters:sRGB"
        id="filter2533"
        x="-0.59377657"
        width="2.1875531"
        y="-0.92639431"
        height="2.8527886"><feGaussianBlur
-         inkscape:collect="always"
          stdDeviation="0.73536407"
          id="feGaussianBlur2535" /></filter><filter
        height="1.2365698"
@@ -789,62 +402,17 @@
        width="1.8310951"
        x="-0.41554753"
        id="filter8871-1"
-       style="color-interpolation-filters:sRGB"
-       inkscape:collect="always"><feGaussianBlur
+       style="color-interpolation-filters:sRGB"><feGaussianBlur
          id="feGaussianBlur8873-8"
-         stdDeviation="0.53588249"
-         inkscape:collect="always" /></filter></defs><sodipodi:namedview
-     id="base"
-     pagecolor="#bcbcbc"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="11.625"
-     inkscape:cx="32"
-     inkscape:cy="26.150537"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1728"
-     inkscape:window-height="1051"
-     inkscape:window-x="0"
-     inkscape:window-y="38"
-     inkscape:window-maximized="1"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="true"
-     inkscape:snap-bbox="true"
-     inkscape:bbox-nodes="true"
-     inkscape:showpageshadow="2"
-     inkscape:pagecheckerboard="0"
-     inkscape:deskcolor="#d1d1d1"><inkscape:grid
-       type="xygrid"
-       id="grid4112"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       originx="0"
-       originy="0"
-       spacingy="1"
-       spacingx="1"
-       units="px" /></sodipodi:namedview><metadata
+         stdDeviation="0.53588249" /></filter></defs><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" /></cc:Work></rdf:RDF></metadata><g
-     inkscape:groupmode="layer"
      id="layer2"
-     inkscape:label="Background"
-     style="display:inline"
-     sodipodi:insensitive="true"><path
-       sodipodi:nodetypes="cccc"
-       inkscape:connector-curvature="0"
+     style="display:inline"><path
        id="rect4113-1"
        d="M 75,0 75,66 1e-6,66 C 1e-6,41.2048 50.00969,0 75,0 Z"
        style="display:inline;fill:url(#linearGradient4978);fill-opacity:1;stroke:none" /><path
-       sodipodi:nodetypes="cccc"
-       inkscape:connector-curvature="0"
        id="rect4113-1-0"
        d="M 75,21.0607 75,66 1e-6,66 C 10.625001,47.804 43.509694,25.4357 75,21.0607 Z"
        style="display:inline;opacity:0.40400002;fill:url(#linearGradient4962);fill-opacity:1;stroke:none" /><g
@@ -853,80 +421,53 @@
        transform="matrix(0.27903303,0,0,0.27903303,-14.618136,-107.52874)"><g
          style="fill:#737986;fill-opacity:1;stroke:#595e68;stroke-opacity:1"
          id="g13408-8-2" /></g><path
-       sodipodi:nodetypes="cccc"
-       inkscape:connector-curvature="0"
        id="rect4113-1-7"
        d="M 75,4.0000001e-7 75,66 30.000003,66 C 30.000003,46.1545 47.70944,9.2500004 75,4e-7 Z"
        style="display:inline;opacity:0.18399999;fill:url(#linearGradient4970);fill-opacity:1;stroke:none" /></g><g
-     inkscape:label="Foreground"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-986.3622)"><path
-       sodipodi:nodetypes="cccccc"
-       inkscape:connector-curvature="0"
        id="rect4001-3-4-5"
        d="m 61.725004,1022.8099 21.27431,-0.1009 1.654984,3.7793 -20.678174,12.1198 -29.322882,0.1009 z"
        style="display:inline;opacity:0.63;fill:url(#linearGradient6406);fill-opacity:1;stroke:none;filter:url(#filter4344)"
-       transform="matrix(1.4111948,0,0,0.94753947,-25.395948,53.893899)"
-       inkscape:label="shadow" /><g
+       transform="matrix(1.4111948,0,0,0.94753947,-25.395948,53.893899)" /><g
        id="g8799"
-       inkscape:label="window"
        transform="translate(-15.000815,-1.9999989)"><path
          style="display:inline;fill:url(#linearGradient6375-6);fill-opacity:1;stroke:none"
          d="m 25.000405,1007.361 41,3e-4 c 0,0 -0.06713,15.3717 0,29 h -41 z"
-         id="rect4001-3-4"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" /><path
+         id="rect4001-3-4" /><path
          style="fill:none;stroke:url(#linearGradient4238);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1"
          d="m 24.5,995.86533 c 18.334725,0.11446 42.000815,0 42.000815,0 v 40.99577 H 24.5 Z"
-         id="rect4001-1"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" /><path
+         id="rect4001-1" /><path
          style="display:inline;fill:#ffffff;fill-opacity:1;stroke:none"
          d="m 25.000405,1001.3613 41,10e-5 c 0,0 -0.06713,3.1803 0,5.9999 h -41 z"
-         id="rect4001-3-4-1"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" /><path
+         id="rect4001-3-4-1" /><path
          style="display:inline;fill:url(#linearGradient4467);fill-opacity:1;stroke:none"
          d="m 25.000405,996.36133 41,1e-4 c 0,0 -0.0671,3.1803 0,5.99987 h -41 z"
-         id="rect4001-3-4-1-6"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" /><path
+         id="rect4001-3-4-1-6" /><path
          style="display:inline;fill:url(#radialGradient4587);fill-opacity:1;stroke:none"
          d="m 51.000405,1003.3613 3,10e-5 c 0,0 -0.005,1.5901 0,2.9999 h -3 z"
-         id="rect4001-3-4-1-1-8"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" /><path
-         inkscape:connector-curvature="0"
+         id="rect4001-3-4-1-1-8" /><path
          id="path4539"
          d="M 25.000406,1007.8613 H 50.000817"
          style="fill:none;fill-rule:evenodd;stroke:url(#linearGradient4547);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /><path
-         inkscape:connector-curvature="0"
          id="path4539-4"
          d="m 25.500406,1008.3613 v 24.0009"
          style="display:inline;fill:none;fill-rule:evenodd;stroke:url(#linearGradient4547-0);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /><path
          style="display:inline;fill:url(#radialGradient4587-5);fill-opacity:1;stroke:none"
          d="m 56.000405,1003.3613 3,10e-5 c 0,0 -0.005,1.5901 0,2.9999 h -3 z"
-         id="rect4001-3-4-1-1-8-5"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" /><path
+         id="rect4001-3-4-1-1-8-5" /><path
          style="display:inline;fill:url(#radialGradient4587-0);fill-opacity:1;stroke:none"
          d="m 61.000405,1003.3613 3,10e-5 c 0,0 -0.005,1.5901 0,2.9999 h -3 z"
-         id="rect4001-3-4-1-1-8-3"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" /><path
-         inkscape:connector-curvature="0"
+         id="rect4001-3-4-1-1-8-3" /><path
          id="path4539-6"
          d="m 66.000816,1035.8622 h -40"
          style="fill:none;fill-rule:evenodd;stroke:url(#linearGradient5890);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /><path
-         inkscape:connector-curvature="0"
          id="path4539-4-6"
          d="m 65.500818,1035.3623 v -26.0001"
          style="display:inline;fill:none;fill-rule:evenodd;stroke:url(#linearGradient5892);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /></g><g
        id="g2"
        transform="matrix(1.151737,0,0,1.0520762,2.6621505,1009.4508)"
-       inkscape:label="plug"
        style="display:inline;stroke-width:0.908446"><g
          transform="matrix(1.0729615,0,0,1.0787087,-1.2096914,-0.17204372)"
          id="g2558-4"
@@ -934,34 +475,23 @@
            transform="matrix(1.029538,0,0,1.1281495,-40.181606,-1129.0381)"
            style="fill:#808080;fill-opacity:1;stroke:#808080;stroke-width:0.783521px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter8813-5)"
            d="m 53.577367,1026.9835 -0.152425,-8.8407 0.91455,-1.2194 3.124711,-0.076 0.07621,-0.9908 h 0.91455 l -0.07621,1.9054 -3.048499,1.2194 -0.152425,4.9538 z"
-           id="path8791-1"
-           inkscape:connector-curvature="0" /><path
+           id="path8791-1" /><path
            id="path8722-7-8"
            style="display:inline;opacity:1;fill:#808080;fill-opacity:1;stroke:#808080;stroke-width:0.844414;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="M 3.4999999,23.512598 V 25.5 H 14.5 V 21.525196 H 3.4999999 v 1.987402"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccccc" /><path
-           sodipodi:nodetypes="csssscsscccsssscsscc"
+           d="M 3.4999999,23.512598 V 25.5 H 14.5 V 21.525196 H 3.4999999 v 1.987402" /><path
            id="rect8645-3-9"
            style="display:inline;opacity:1;fill:#808080;fill-opacity:1;stroke:#808080;stroke-width:0.844414;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="M 25.499998,23.781495 25.5,15.413559 C 25.5,13.799403 24.568942,12.5 23.412427,12.5 h -2.424855 c -1.156515,0 -2.483072,1.299403 -2.483072,2.913559 v 1.599039 h -2.264856 c -0.963763,0 -1.739644,0.794104 -1.739644,1.780446 v 1.468512 3.519375 m 10.999998,5.64e-4 2e-6,8.367936 c 0,1.614156 -0.931058,2.913559 -2.087573,2.913559 h -2.424855 c -1.156515,0 -2.483072,-1.299403 -2.483072,-2.913559 V 30.550392 H 16.239644 C 15.275881,30.550392 14.5,29.756288 14.5,28.769946 v -1.468512 -3.519375"
-           inkscape:connector-curvature="0" /><path
-           sodipodi:nodetypes="cc"
-           inkscape:connector-curvature="0"
+           d="M 25.499998,23.781495 25.5,15.413559 C 25.5,13.799403 24.568942,12.5 23.412427,12.5 h -2.424855 c -1.156515,0 -2.483072,1.299403 -2.483072,2.913559 v 1.599039 h -2.264856 c -0.963763,0 -1.739644,0.794104 -1.739644,1.780446 v 1.468512 3.519375 m 10.999998,5.64e-4 2e-6,8.367936 c 0,1.614156 -0.931058,2.913559 -2.087573,2.913559 h -2.424855 c -1.156515,0 -2.483072,-1.299403 -2.483072,-2.913559 V 30.550392 H 16.239644 C 15.275881,30.550392 14.5,29.756288 14.5,28.769946 v -1.468512 -3.519375" /><path
            id="path2537-0"
            d="M 18.51661,16.539741 18.5464,30.705846"
            style="fill:#808080;stroke:#808080;stroke-width:0.844414px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /><path
            id="rect8645-2-5-2"
            style="display:inline;opacity:1;fill:#808080;fill-opacity:1;stroke:#808080;stroke-width:0.844414;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="m 36.091538,26.489769 -10e-7,1.058985 c 0,1.06945 -0.863288,1.955925 -2.164732,1.930363 -1.301445,-0.02541 -1.941636,0 -1.941636,0 v 0.201512 c 0,1.544678 -1.158564,2.787985 -2.597679,2.788284 l -1.648306,2.98e-4 c -1.360345,3e-4 -1.22903,0.546236 -1.22903,-2.989646 V 17.520381 c 0,-3.536032 -0.205068,-2.989797 1.22903,-2.989797 h 1.648306 c 1.439115,0 2.597679,1.243607 2.597679,2.788284 v 0.201513 h 1.941637 c 1.199261,0 2.164732,0.860911 2.164732,1.930361 v 2.554332 z m 0.06454,-6.010119 h 8.461471 l -0.05085,6.010119 h -8.188123"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cczccssssssccsccccccc" /><path
+           d="m 36.091538,26.489769 -10e-7,1.058985 c 0,1.06945 -0.863288,1.955925 -2.164732,1.930363 -1.301445,-0.02541 -1.941636,0 -1.941636,0 v 0.201512 c 0,1.544678 -1.158564,2.787985 -2.597679,2.788284 l -1.648306,2.98e-4 c -1.360345,3e-4 -1.22903,0.546236 -1.22903,-2.989646 V 17.520381 c 0,-3.536032 -0.205068,-2.989797 1.22903,-2.989797 h 1.648306 c 1.439115,0 2.597679,1.243607 2.597679,2.788284 v 0.201513 h 1.941637 c 1.199261,0 2.164732,0.860911 2.164732,1.930361 v 2.554332 z m 0.06454,-6.010119 h 8.461471 l -0.05085,6.010119 h -8.188123" /><path
            transform="matrix(1.445753,0,0,1.3224494,-65.097292,-1327.9481)"
            style="opacity:0.794;fill:#808080;fill-opacity:1;stroke:#808080;stroke-width:0.610687px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter8871-4)"
            d="m 64.018476,1016.5423 -0.152427,10.8222 c 2.375507,-3.3036 3.484206,-4.2052 2.972286,-9.2217 0.305009,-1.654 -1.117834,-1.7529 -2.819859,-1.6005 z"
-           id="path8861-9"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccc" /><ellipse
+           id="path8861-9" /><ellipse
            transform="matrix(1.029538,0,0,1.1281495,-39.470994,-1128.0797)"
            style="opacity:0.828;fill:#808080;fill-opacity:1;stroke:#808080;stroke-width:0.783521;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter8835-5)"
            id="path8817-1"
@@ -972,14 +502,11 @@
            transform="matrix(1.7350569,0,0,1.8824502,-91.814902,-1903.1505)"
            style="opacity:0.862;fill:#808080;fill-opacity:1;stroke:#808080;stroke-width:0.467237px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter2533-6)"
            d="m 70.953811,1023.4014 v -1.8291 l 2.972286,-0.076 z"
-           id="path8875-0"
-           inkscape:connector-curvature="0" /><path
+           id="path8875-0" /><path
            transform="matrix(1.029538,0,0,1.1281495,-39.928294,-1128.6206)"
            style="display:inline;opacity:0.485;fill:#808080;fill-opacity:1;stroke:#808080;stroke-width:0.783521px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter8871-1-6)"
            d="m 53.924652,1016.631 -0.152427,10.8222 c 2.375507,-3.3036 3.484206,-4.2052 2.972286,-9.2217 0.305009,-1.654 -1.117834,-1.7529 -2.819859,-1.6005 z"
-           id="path8861-7-0"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccc" /></g><g
+           id="path8861-7-0" /></g><g
          id="g11331-3-1-1"
          style="display:inline;stroke-width:0.908446"
          transform="matrix(0.92787456,0,0,0.92766861,-283.31685,-391.9053)"><g
@@ -1012,34 +539,23 @@
            transform="matrix(1.029538,0,0,1.1281495,-40.181606,-1129.0381)"
            style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.842937px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter8813)"
            d="m 53.577367,1026.9835 -0.152425,-8.8407 0.91455,-1.2194 3.124711,-0.076 0.07621,-0.9908 h 0.91455 l -0.07621,1.9054 -3.048499,1.2194 -0.152425,4.9538 z"
-           id="path8791"
-           inkscape:connector-curvature="0" /><path
+           id="path8791" /><path
            id="path8722-7"
            style="display:inline;opacity:1;fill:url(#linearGradient8769);fill-opacity:1;stroke:url(#linearGradient8753);stroke-width:0.908446;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="M 3.4999999,23.512598 V 25.5 H 14.5 V 21.525196 H 3.4999999 v 1.987402"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccccc" /><path
-           sodipodi:nodetypes="csssscsscccsssscsscc"
+           d="M 3.4999999,23.512598 V 25.5 H 14.5 V 21.525196 H 3.4999999 v 1.987402" /><path
            id="rect8645-3"
            style="display:inline;opacity:1;fill:url(#linearGradient8761);fill-opacity:1;stroke:#4d73ae;stroke-width:0.908446;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="M 25.499998,23.781495 25.5,15.413559 C 25.5,13.799403 24.568942,12.5 23.412427,12.5 h -2.424855 c -1.156515,0 -2.483072,1.299403 -2.483072,2.913559 v 1.599039 h -2.264856 c -0.963763,0 -1.739644,0.794104 -1.739644,1.780446 v 1.468512 3.519375 m 10.999998,5.64e-4 2e-6,8.367936 c 0,1.614156 -0.931058,2.913559 -2.087573,2.913559 h -2.424855 c -1.156515,0 -2.483072,-1.299403 -2.483072,-2.913559 V 30.550392 H 16.239644 C 15.275881,30.550392 14.5,29.756288 14.5,28.769946 v -1.468512 -3.519375"
-           inkscape:connector-curvature="0" /><path
-           sodipodi:nodetypes="cc"
-           inkscape:connector-curvature="0"
+           d="M 25.499998,23.781495 25.5,15.413559 C 25.5,13.799403 24.568942,12.5 23.412427,12.5 h -2.424855 c -1.156515,0 -2.483072,1.299403 -2.483072,2.913559 v 1.599039 h -2.264856 c -0.963763,0 -1.739644,0.794104 -1.739644,1.780446 v 1.468512 3.519375 m 10.999998,5.64e-4 2e-6,8.367936 c 0,1.614156 -0.931058,2.913559 -2.087573,2.913559 h -2.424855 c -1.156515,0 -2.483072,-1.299403 -2.483072,-2.913559 V 30.550392 H 16.239644 C 15.275881,30.550392 14.5,29.756288 14.5,28.769946 v -1.468512 -3.519375" /><path
            id="path2537"
            d="M 18.51661,16.539741 18.5464,30.705846"
            style="fill:none;stroke:url(#linearGradient2545);stroke-width:0.908446px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /><path
            id="rect8645-2-5"
            style="display:inline;opacity:1;fill:url(#linearGradient8779);fill-opacity:1;stroke:url(#linearGradient8787);stroke-width:0.908446;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="m 36.091538,26.489769 -10e-7,1.058985 c 0,1.06945 -0.863288,1.955925 -2.164732,1.930363 -1.301445,-0.02541 -1.941636,0 -1.941636,0 v 0.201512 c 0,1.544678 -1.158564,2.787985 -2.597679,2.788284 l -1.648306,2.98e-4 c -1.360345,3e-4 -1.22903,0.546236 -1.22903,-2.989646 V 17.520381 c 0,-3.536032 -0.205068,-2.989797 1.22903,-2.989797 h 1.648306 c 1.439115,0 2.597679,1.243607 2.597679,2.788284 v 0.201513 h 1.941637 c 1.199261,0 2.164732,0.860911 2.164732,1.930361 v 2.554332 z m 0.06454,-6.010119 h 8.461471 l -0.05085,6.010119 h -8.188123"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cczccssssssccsccccccc" /><path
+           d="m 36.091538,26.489769 -10e-7,1.058985 c 0,1.06945 -0.863288,1.955925 -2.164732,1.930363 -1.301445,-0.02541 -1.941636,0 -1.941636,0 v 0.201512 c 0,1.544678 -1.158564,2.787985 -2.597679,2.788284 l -1.648306,2.98e-4 c -1.360345,3e-4 -1.22903,0.546236 -1.22903,-2.989646 V 17.520381 c 0,-3.536032 -0.205068,-2.989797 1.22903,-2.989797 h 1.648306 c 1.439115,0 2.597679,1.243607 2.597679,2.788284 v 0.201513 h 1.941637 c 1.199261,0 2.164732,0.860911 2.164732,1.930361 v 2.554332 z m 0.06454,-6.010119 h 8.461471 l -0.05085,6.010119 h -8.188123" /><path
            transform="matrix(1.445753,0,0,1.3224494,-65.097292,-1327.9481)"
            style="opacity:0.794;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.656996px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter8871)"
            d="m 64.018476,1016.5423 -0.152427,10.8222 c 2.375507,-3.3036 3.484206,-4.2052 2.972286,-9.2217 0.305009,-1.654 -1.117834,-1.7529 -2.819859,-1.6005 z"
-           id="path8861"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccc" /><ellipse
+           id="path8861" /><ellipse
            transform="matrix(1.029538,0,0,1.1281495,-39.470994,-1128.0797)"
            style="opacity:0.828;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.842937;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter8835)"
            id="path8817"
@@ -1050,11 +566,8 @@
            transform="matrix(1.7350569,0,0,1.8824502,-91.814902,-1903.1505)"
            style="opacity:0.862;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.502667px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter2533)"
            d="m 70.953811,1023.4014 v -1.8291 l 2.972286,-0.076 z"
-           id="path8875"
-           inkscape:connector-curvature="0" /><path
+           id="path8875" /><path
            transform="matrix(1.029538,0,0,1.1281495,-39.928294,-1128.6206)"
            style="display:inline;opacity:0.485;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.842937px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter8871-1)"
            d="m 53.924652,1016.631 -0.152427,10.8222 c 2.375507,-3.3036 3.484206,-4.2052 2.972286,-9.2217 0.305009,-1.654 -1.117834,-1.7529 -2.819859,-1.6005 z"
-           id="path8861-7"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccc" /></g></g></g></svg>
+           id="path8861-7" /></g></g></g></svg>
diff --git a/ui/org.eclipse.pde.ui/icons/wizban/exp_deployfeat_wiz.svg b/ui/org.eclipse.pde.ui/icons/wizban/exp_deployfeat_wiz.svg
index 20e3a911182..d31162948b7 100644
--- a/ui/org.eclipse.pde.ui/icons/wizban/exp_deployfeat_wiz.svg
+++ b/ui/org.eclipse.pde.ui/icons/wizban/exp_deployfeat_wiz.svg
@@ -6,14 +6,7 @@
    height="66"
    id="svg2"
    version="1.1"
-   inkscape:version="1.3 (0e150ed, 2023-07-21)"
-   sodipodi:docname="exp_deployfeat_wiz.svg"
-   inkscape:export-filename="/Users/d021678/git/eclipse.jdt.ui/org.eclipse.jdt.ui/icons/full/wizban/newclass_wiz2.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90"
    xml:space="preserve"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:svg="http://www.w3.org/2000/svg"
@@ -21,307 +14,6 @@
    xmlns:cc="http://creativecommons.org/ns#"
    xmlns:dc="http://purl.org/dc/elements/1.1/"><defs
      id="defs4"><linearGradient
-       inkscape:collect="always"
-       id="linearGradient4541"><stop
-         style="stop-color:#a1adb2;stop-opacity:1"
-         offset="0"
-         id="stop4543" /><stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop4545" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       id="linearGradient4972"><stop
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0"
-         id="stop4974" /><stop
-         style="stop-color:#f5f8fd;stop-opacity:1"
-         offset="1"
-         id="stop4976" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       id="linearGradient4964"><stop
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0"
-         id="stop4966" /><stop
-         style="stop-color:#e8eefa;stop-opacity:1"
-         offset="1"
-         id="stop4968" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       id="linearGradient4956"><stop
-         style="stop-color:#fcfdfe;stop-opacity:1"
-         offset="0"
-         id="stop4958" /><stop
-         style="stop-color:#dee6f8;stop-opacity:1"
-         offset="1"
-         id="stop4960" /></linearGradient><filter
-       style="color-interpolation-filters:sRGB"
-       inkscape:label="Drop Shadow"
-       id="filter8854"><feFlood
-         flood-opacity="0.933333"
-         flood-color="rgb(244,248,254)"
-         result="flood"
-         id="feFlood8856" /><feComposite
-         in="flood"
-         in2="SourceGraphic"
-         operator="in"
-         result="composite1"
-         id="feComposite8858" /><feGaussianBlur
-         in="composite1"
-         stdDeviation="1.2"
-         result="blur"
-         id="feGaussianBlur8860" /><feOffset
-         dx="-1"
-         dy="3"
-         result="offset"
-         id="feOffset8862" /><feComposite
-         in="SourceGraphic"
-         in2="offset"
-         operator="over"
-         result="composite2"
-         id="feComposite8864" /></filter><linearGradient
-       id="linearGradient6122"><stop
-         style="stop-color:#c0c0c0;stop-opacity:1"
-         offset="0"
-         id="stop6124" /><stop
-         id="stop6132"
-         offset="0.5"
-         style="stop-color:#adadad;stop-opacity:1" /><stop
-         style="stop-color:#808080;stop-opacity:1"
-         offset="1"
-         id="stop6126" /></linearGradient><linearGradient
-       id="linearGradient7087"><stop
-         style="stop-color:#17325d;stop-opacity:1;"
-         offset="0"
-         id="stop7089" /><stop
-         id="stop7091"
-         offset="0.25"
-         style="stop-color:#b4d0e2;stop-opacity:1" /><stop
-         id="stop7093"
-         offset="0.5"
-         style="stop-color:#b7d2e4;stop-opacity:1" /><stop
-         style="stop-color:#acc9de;stop-opacity:1"
-         offset="0.75"
-         id="stop7095" /><stop
-         style="stop-color:#3e72a7;stop-opacity:1"
-         offset="1"
-         id="stop7097" /></linearGradient><mask
-       id="mask7366"
-       maskUnits="userSpaceOnUse"><path
-         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;display:inline"
-         d="m -16.593048,1040.862 9.990206,0 0,10.0018 -2.983353,3.0385 -5.966213,0 c -0.53033,-0.022 -1.04064,-0.5519 -1.04064,-1.0385 z"
-         id="path7368"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccccc" /></mask><linearGradient
-       id="linearGradient7584-5"><stop
-         id="stop7586-4"
-         offset="0"
-         style="stop-color:#f9cd5f;stop-opacity:1" /><stop
-         id="stop7588-5"
-         offset="1"
-         style="stop-color:#fbf0b4;stop-opacity:1" /></linearGradient><linearGradient
-       id="linearGradient7592-1"><stop
-         id="stop7594-6"
-         offset="0"
-         style="stop-color:#bd8416;stop-opacity:1" /><stop
-         id="stop7596-9"
-         offset="1"
-         style="stop-color:#a66b10;stop-opacity:1" /></linearGradient><linearGradient
-       id="linearGradient10798-1-9-3-7-6-6-6-2-6-7-98-9-4-1"><stop
-         style="stop-color:#5aad60;stop-opacity:1;"
-         offset="0"
-         id="stop10800-5-2-1-8-20-4-0-2-1-9-0-0-1-1" /><stop
-         id="stop10806-6-8-5-3-9-2-2-7-0-4-2-7-8-9"
-         offset="0.5"
-         style="stop-color:#5bb26a;stop-opacity:1;" /><stop
-         style="stop-color:#a4c589;stop-opacity:1"
-         offset="1"
-         id="stop10802-1-5-3-0-4-6-8-5-5-6-69-6-4-0" /></linearGradient><mask
-       maskUnits="userSpaceOnUse"
-       id="mask7366-4"><path
-         sodipodi:nodetypes="ccccccc"
-         inkscape:connector-curvature="0"
-         id="path7368-2"
-         d="m -16.593048,1040.862 9.990206,0 0,10.0018 -2.983353,3.0385 -5.966213,0 c -0.53033,-0.022 -1.04064,-0.5519 -1.04064,-1.0385 z"
-         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;display:inline" /></mask><linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient7087"
-       id="linearGradient9331"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-20,0)"
-       x1="4.7776356"
-       y1="1039.8118"
-       x2="4.7776356"
-       y2="1041.911" /><linearGradient
-       y2="1041.911"
-       x2="4.7776356"
-       y1="1039.8118"
-       x1="4.7776356"
-       gradientTransform="translate(-18,4.7e-5)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient9333"
-       xlink:href="#linearGradient7087"
-       inkscape:collect="always" /><linearGradient
-       y2="1041.911"
-       x2="4.7776356"
-       y1="1039.8118"
-       x1="4.7776356"
-       gradientTransform="translate(-16,4.7e-5)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient9335"
-       xlink:href="#linearGradient7087"
-       inkscape:collect="always" /><linearGradient
-       y2="1041.911"
-       x2="4.7776356"
-       y1="1039.8118"
-       x1="4.7776356"
-       gradientTransform="translate(-14,4.7e-5)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient9337"
-       xlink:href="#linearGradient7087"
-       inkscape:collect="always" /><linearGradient
-       y2="1041.911"
-       x2="4.7776356"
-       y1="1039.8118"
-       x1="4.7776356"
-       gradientTransform="translate(-12,4.7e-5)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient9339"
-       xlink:href="#linearGradient7087"
-       inkscape:collect="always" /><linearGradient
-       gradientTransform="translate(-80,0)"
-       gradientUnits="userSpaceOnUse"
-       y2="1042.7973"
-       x2="163.22012"
-       y1="1042.7973"
-       x1="88.220117"
-       id="linearGradient68073"
-       xlink:href="#linearGradient4956"
-       inkscape:collect="always" /><linearGradient
-       gradientTransform="translate(-80,0)"
-       gradientUnits="userSpaceOnUse"
-       y2="1032.2669"
-       x2="163.22012"
-       y1="1032.2668"
-       x1="94.469681"
-       id="linearGradient68075"
-       xlink:href="#linearGradient4964"
-       inkscape:collect="always" /><linearGradient
-       gradientTransform="translate(-80,0)"
-       gradientUnits="userSpaceOnUse"
-       y2="1032.2668"
-       x2="152.72206"
-       y1="1032.2668"
-       x1="88.220116"
-       id="linearGradient68077"
-       xlink:href="#linearGradient4972"
-       inkscape:collect="always" /><filter
-       id="filter8854-9"
-       inkscape:label="Drop Shadow"
-       style="color-interpolation-filters:sRGB"><feFlood
-         id="feFlood8856-0"
-         result="flood"
-         flood-color="rgb(244,248,254)"
-         flood-opacity="0.933333" /><feComposite
-         id="feComposite8858-2"
-         result="composite1"
-         operator="in"
-         in2="SourceGraphic"
-         in="flood" /><feGaussianBlur
-         id="feGaussianBlur8860-3"
-         result="blur"
-         stdDeviation="1.2"
-         in="composite1" /><feOffset
-         id="feOffset8862-2"
-         result="offset"
-         dy="3"
-         dx="-1" /><feComposite
-         id="feComposite8864-3"
-         result="composite2"
-         operator="over"
-         in2="offset"
-         in="SourceGraphic" /></filter><linearGradient
-       id="linearGradient10798-1-9-3-7-6-8-9-0-9-1"><stop
-         id="stop10800-5-2-1-8-20-6-4-9-8-2"
-         offset="0"
-         style="stop-color:#7564b1;stop-opacity:1" /><stop
-         style="stop-color:#5d4aa1;stop-opacity:1"
-         offset="0.5"
-         id="stop10806-6-8-5-3-9-24-8-4-3-2" /><stop
-         id="stop10802-1-5-3-0-4-8-4-2-9-2"
-         offset="1"
-         style="stop-color:#9283c3;stop-opacity:1" /></linearGradient><linearGradient
-       id="linearGradient7540-2-3-8-7"><stop
-         id="stop7542-8-7-5-3"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.502" /><stop
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0.47623286"
-         id="stop7544-8-2-0-5" /><stop
-         style="stop-color:#ffffff;stop-opacity:0"
-         offset="0.5"
-         id="stop7546-1-7-9-5" /><stop
-         id="stop7548-98-9-2-4"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       id="linearGradient7272-66-4-5-5-5-8"><stop
-         style="stop-color:#8f6c10;stop-opacity:1"
-         offset="0"
-         id="stop7274-6-0-1-7-4-7" /><stop
-         style="stop-color:#c9a645;stop-opacity:1"
-         offset="1"
-         id="stop7276-66-6-3-9-1-4" /></linearGradient><linearGradient
-       y2="1030.3411"
-       x2="-10.159802"
-       y1="1030.3411"
-       x1="-22.453552"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient10540"
-       xlink:href="#linearGradient7540-2-3-8-7"
-       inkscape:collect="always" /><linearGradient
-       y2="1030.3411"
-       x2="-10.159802"
-       y1="1030.3411"
-       x1="-22.453552"
-       gradientTransform="matrix(0,1,-1,0,1014.0344,1046.6478)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient10542"
-       xlink:href="#linearGradient7540-2-3-8-7"
-       inkscape:collect="always" /><linearGradient
-       y2="1023.2569"
-       x2="-15.945988"
-       y1="1037.4661"
-       x1="-15.945988"
-       gradientTransform="matrix(0.95585117,0,0,0.95585117,-0.71992063,45.488394)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient10544"
-       xlink:href="#linearGradient7272-66-4-5-5-5-8"
-       inkscape:collect="always" /><mask
-       id="mask10620"
-       maskUnits="userSpaceOnUse"><path
-         transform="matrix(0.55482947,0,0,0.55482947,-206.96039,787.08655)"
-         d="m 398.75,468.23718 a 10.625,10.625 0 1 1 -21.25,0 10.625,10.625 0 1 1 21.25,0 z"
-         sodipodi:ry="10.625"
-         sodipodi:rx="10.625"
-         sodipodi:cy="468.23718"
-         sodipodi:cx="388.125"
-         id="path10622"
-         style="font-size:13.58917427px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:2.16621375;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline;font-family:Sans"
-         sodipodi:type="arc" /></mask><linearGradient
-       id="linearGradient4528-9-5-7-9-7-3"><stop
-         id="stop4530-0-5-0-5-8-4"
-         offset="0"
-         style="stop-color:#e0c576;stop-opacity:1;" /><stop
-         id="stop4532-7-9-3-3-6-1"
-         offset="1"
-         style="stop-color:#9e7916;stop-opacity:1" /></linearGradient><linearGradient
-       id="linearGradient6281-8-0-1-6-6-4-2-8-0"><stop
-         style="stop-color:#f7f9fb;stop-opacity:1"
-         offset="0"
-         id="stop6283-0-2-2-1-2-0-1-6-0" /><stop
-         style="stop-color:#ffd680;stop-opacity:1"
-         offset="1"
-         id="stop6285-5-0-9-7-6-9-9-1-9" /></linearGradient><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4972-7"
        id="linearGradient4978"
        x1="88.220116"
@@ -330,7 +22,6 @@
        y2="1032.2668"
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-88.220116,-999.2669)" /><linearGradient
-       inkscape:collect="always"
        id="linearGradient4972-7"><stop
          style="stop-color:#b8ccf1;stop-opacity:0.10196079"
          offset="0"
@@ -338,7 +29,6 @@
          style="stop-color:#6e97e2;stop-opacity:0.10196079"
          offset="1"
          id="stop4976-1" /></linearGradient><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4964-3"
        id="linearGradient4970"
        x1="118.38584"
@@ -347,7 +37,6 @@
        y2="1032.2668"
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-88.220117,-999.2669)" /><linearGradient
-       inkscape:collect="always"
        id="linearGradient4964-3"><stop
          style="stop-color:#ffffff;stop-opacity:0.349"
          offset="0"
@@ -355,7 +44,6 @@
          style="stop-color:#91ade6;stop-opacity:1"
          offset="1"
          id="stop4968-1" /></linearGradient><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4956-2"
        id="linearGradient4962"
        x1="88.220116"
@@ -364,7 +52,6 @@
        y2="1042.7972"
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-88.220116,-999.2669)" /><linearGradient
-       inkscape:collect="always"
        id="linearGradient4956-2"><stop
          style="stop-color:#fcfdfe;stop-opacity:0.25641027"
          offset="0"
@@ -372,36 +59,6 @@
          style="stop-color:#98aae7;stop-opacity:0.40392157"
          offset="1"
          id="stop4960-6" /></linearGradient><linearGradient
-       id="linearGradient3827"><stop
-         id="stop3829"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0;" /><stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0.60149658"
-         id="stop3835" /><stop
-         id="stop3831"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" /></linearGradient><linearGradient
-       id="linearGradient10798-1-9-3-7-6-8-9-0-9-1-0"><stop
-         id="stop10800-5-2-1-8-20-6-4-9-8-2-9"
-         offset="0"
-         style="stop-color:#f3faed;stop-opacity:1" /><stop
-         style="stop-color:#e7f4da;stop-opacity:1"
-         offset="0.65917557"
-         id="stop10806-6-8-5-3-9-24-8-4-3-2-4" /><stop
-         id="stop10802-1-5-3-0-4-8-4-2-9-2-5"
-         offset="1"
-         style="stop-color:#67bf1f;stop-opacity:1" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4541"
-       id="linearGradient5885"
-       x1="41"
-       y1="1007.8622"
-       x2="60"
-       y2="1008.3622"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0,1,-1,0,1034.3618,967.36133)" /><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4894"
        id="linearGradient4884"
        x1="11.927121"
@@ -410,8 +67,7 @@
        y2="30.177986"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1.0044272,0,0,1.0089329,12.240489,972.30396)" /><linearGradient
-       id="linearGradient4894"
-       inkscape:collect="always"><stop
+       id="linearGradient4894"><stop
          id="stop4896"
          offset="0"
          style="stop-color:#000000;stop-opacity:1" /><stop
@@ -424,7 +80,6 @@
          id="stop4898"
          offset="1"
          style="stop-color:#ffffff;stop-opacity:1" /></linearGradient><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient5252"
        id="linearGradient5258"
        x1="5"
@@ -433,7 +88,6 @@
        y2="32"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1.0067589,0,0,1.0132311,12.139308,972.16609)" /><linearGradient
-       inkscape:collect="always"
        id="linearGradient5252"><stop
          style="stop-color:#5f443c;stop-opacity:1"
          offset="0"
@@ -441,7 +95,6 @@
          style="stop-color:#765d54;stop-opacity:1"
          offset="1"
          id="stop5256" /></linearGradient><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4199"
        id="linearGradient4205"
        x1="12"
@@ -450,7 +103,6 @@
        y2="21"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1.4358193,0,0,1.270043,-2.2403334,972.40079)" /><linearGradient
-       inkscape:collect="always"
        id="linearGradient4199"><stop
          style="stop-color:#765d54;stop-opacity:1;"
          offset="0"
@@ -461,7 +113,6 @@
          style="stop-color:#765d54;stop-opacity:1"
          offset="1"
          id="stop4203" /></linearGradient><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4944"
        id="linearGradient4936"
        gradientUnits="userSpaceOnUse"
@@ -470,7 +121,6 @@
        x2="49.569252"
        y2="40.099323"
        gradientTransform="matrix(0.99999827,0,0,1.0179001,543.11388,1106.9532)" /><linearGradient
-       inkscape:collect="always"
        id="linearGradient4944"><stop
          style="stop-color:#000000;stop-opacity:1"
          offset="0"
@@ -484,7 +134,6 @@
          style="stop-color:#ffffff;stop-opacity:1"
          offset="1"
          id="stop4910" /></linearGradient><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4950"
        id="linearGradient4956-9"
        x1="60.342896"
@@ -493,54 +142,21 @@
        y2="44.682102"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(0.99999827,0,0,1.0179001,543.11388,1106.9532)" /><linearGradient
-       inkscape:collect="always"
        id="linearGradient4950"><stop
          style="stop-color:#6a5148;stop-opacity:1;"
          offset="0"
          id="stop4952" /><stop
          style="stop-color:#978379;stop-opacity:1"
          offset="1"
-         id="stop4954" /></linearGradient><linearGradient
-       id="linearGradient11146-4-4-4-6-2"><stop
-         id="stop11150-4-72-3-9-7"
-         offset="0"
-         style="stop-color:#faefba;stop-opacity:1" /><stop
-         style="stop-color:#9e6542;stop-opacity:1"
-         offset="1"
-         id="stop11152-9-0-7-3-8" /></linearGradient><linearGradient
-       id="linearGradient10507"><stop
-         style="stop-color:#5f392d;stop-opacity:1"
-         offset="0"
-         id="stop10509" /><stop
-         id="stop10511"
-         offset="0.18181793"
-         style="stop-color:#9e7058;stop-opacity:1" /><stop
-         id="stop10513"
-         offset="0.36363617"
-         style="stop-color:#794f40;stop-opacity:1" /><stop
-         id="stop10515"
-         offset="0.49999985"
-         style="stop-color:#794f40;stop-opacity:1" /><stop
-         id="stop10517"
-         offset="0.63636351"
-         style="stop-color:#794f40;stop-opacity:1" /><stop
-         style="stop-color:#9e7058;stop-opacity:1"
-         offset="0.81818175"
-         id="stop10519" /><stop
-         style="stop-color:#5f392d;stop-opacity:1"
-         offset="1"
-         id="stop10522" /></linearGradient><filter
-       inkscape:collect="always"
+         id="stop4954" /></linearGradient><filter
        style="color-interpolation-filters:sRGB"
        id="filter5309"
        x="-0.41279999"
        width="1.8256"
        y="-0.68799998"
        height="2.376"><feGaussianBlur
-         inkscape:collect="always"
          stdDeviation="2.58"
          id="feGaussianBlur5311" /></filter><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4456"
        id="linearGradient4462"
        x1="63.734764"
@@ -549,7 +165,6 @@
        y2="1006.3618"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1,0,-0.72750163,1,733.40264,2.0004)" /><linearGradient
-       inkscape:collect="always"
        id="linearGradient4456"><stop
          style="stop-color:#ffffff;stop-opacity:0.659"
          offset="0"
@@ -557,46 +172,14 @@
          style="stop-color:#ffffff;stop-opacity:0.369"
          offset="1"
          id="stop4460" /></linearGradient><filter
-       inkscape:collect="always"
        style="color-interpolation-filters:sRGB"
        id="filter4606"
        x="-0.062976157"
        width="1.1259523"
        y="-0.10879013"
        height="1.2175803"><feGaussianBlur
-         inkscape:collect="always"
          stdDeviation="1.5412116"
          id="feGaussianBlur4608" /></filter><linearGradient
-       id="linearGradient11146-4-4-4-6-2-8"><stop
-         id="stop11150-4-72-3-9-7-2"
-         offset="0"
-         style="stop-color:#faefba;stop-opacity:1" /><stop
-         style="stop-color:#ad6e48;stop-opacity:1"
-         offset="1"
-         id="stop11152-9-0-7-3-8-0" /></linearGradient><linearGradient
-       id="linearGradient4368"><stop
-         id="stop4370"
-         offset="0"
-         style="stop-color:#9c7561;stop-opacity:1" /><stop
-         style="stop-color:#966d59;stop-opacity:1"
-         offset="0.18181793"
-         id="stop4372" /><stop
-         style="stop-color:#8c6250;stop-opacity:1"
-         offset="0.36363617"
-         id="stop4374" /><stop
-         style="stop-color:#794f40;stop-opacity:1"
-         offset="0.49999985"
-         id="stop4376" /><stop
-         style="stop-color:#8c6250;stop-opacity:1"
-         offset="0.63636351"
-         id="stop4378" /><stop
-         id="stop4380"
-         offset="0.81818175"
-         style="stop-color:#966d59;stop-opacity:1" /><stop
-         id="stop4382"
-         offset="1"
-         style="stop-color:#99705c;stop-opacity:1" /></linearGradient><linearGradient
-       inkscape:collect="always"
        id="linearGradient2543"><stop
          style="stop-color:#4f76b0;stop-opacity:1"
          offset="0"
@@ -607,8 +190,7 @@
          style="stop-color:#587cb2;stop-opacity:1"
          offset="1"
          id="stop2541" /></linearGradient><linearGradient
-       id="linearGradient8785"
-       inkscape:collect="always"><stop
+       id="linearGradient8785"><stop
          id="stop8781"
          offset="0"
          style="stop-color:#bb8d2d;stop-opacity:1" /><stop
@@ -618,113 +200,34 @@
          id="stop8783"
          offset="1"
          style="stop-color:#b07905;stop-opacity:1" /></linearGradient><linearGradient
-       id="linearGradient8777"
-       inkscape:collect="always"><stop
+       id="linearGradient8777"><stop
          id="stop8773"
          offset="0"
          style="stop-color:#fbeaab;stop-opacity:1;" /><stop
          id="stop8775"
          offset="1"
          style="stop-color:#deb241;stop-opacity:1" /></linearGradient><linearGradient
-       id="linearGradient8767"
-       inkscape:collect="always"><stop
+       id="linearGradient8767"><stop
          id="stop8763"
          offset="0"
          style="stop-color:#6a8ec1;stop-opacity:1" /><stop
          id="stop8765"
          offset="1"
          style="stop-color:#80a1cf;stop-opacity:1" /></linearGradient><linearGradient
-       id="linearGradient8759"
-       inkscape:collect="always"><stop
+       id="linearGradient8759"><stop
          id="stop8755"
          offset="0"
          style="stop-color:#d3e0eb;stop-opacity:1" /><stop
          id="stop8757"
          offset="1"
          style="stop-color:#5179b5;stop-opacity:1" /></linearGradient><linearGradient
-       id="linearGradient8751"
-       inkscape:collect="always"><stop
+       id="linearGradient8751"><stop
          id="stop8747"
          offset="0"
          style="stop-color:#2e5d8f;stop-opacity:1" /><stop
          id="stop8749"
          offset="1"
-         style="stop-color:#6085bb;stop-opacity:1" /></linearGradient><filter
-       id="filter8854-7"
-       inkscape:label="Drop Shadow"
-       style="color-interpolation-filters:sRGB"><feFlood
-         id="feFlood8856-03"
-         result="flood"
-         flood-color="rgb(244,248,254)"
-         flood-opacity="0.933333" /><feComposite
-         id="feComposite8858-9"
-         result="composite1"
-         operator="in"
-         in2="SourceGraphic"
-         in="flood" /><feGaussianBlur
-         id="feGaussianBlur8860-9"
-         result="blur"
-         stdDeviation="1.2"
-         in="composite1" /><feOffset
-         id="feOffset8862-9"
-         result="offset"
-         dy="3"
-         dx="-1" /><feComposite
-         id="feComposite8864-1"
-         result="composite2"
-         operator="over"
-         in2="offset"
-         in="SourceGraphic" /></filter><mask
-       maskUnits="userSpaceOnUse"
-       id="mask7366-47"><path
-         sodipodi:nodetypes="ccccccc"
-         inkscape:connector-curvature="0"
-         id="path7368-1"
-         d="m -16.593048,1040.862 9.990206,0 0,10.0018 -2.983353,3.0385 -5.966213,0 c -0.53033,-0.022 -1.04064,-0.5519 -1.04064,-1.0385 z"
-         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;display:inline" /></mask><mask
-       id="mask7366-4-0"
-       maskUnits="userSpaceOnUse"><path
-         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;display:inline"
-         d="m -16.593048,1040.862 9.990206,0 0,10.0018 -2.983353,3.0385 -5.966213,0 c -0.53033,-0.022 -1.04064,-0.5519 -1.04064,-1.0385 z"
-         id="path7368-2-3"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccccc" /></mask><filter
-       style="color-interpolation-filters:sRGB"
-       inkscape:label="Drop Shadow"
-       id="filter8854-9-2"><feFlood
-         flood-opacity="0.933333"
-         flood-color="rgb(244,248,254)"
-         result="flood"
-         id="feFlood8856-0-6" /><feComposite
-         in="flood"
-         in2="SourceGraphic"
-         operator="in"
-         result="composite1"
-         id="feComposite8858-2-9" /><feGaussianBlur
-         in="composite1"
-         stdDeviation="1.2"
-         result="blur"
-         id="feGaussianBlur8860-3-4" /><feOffset
-         dx="-1"
-         dy="3"
-         result="offset"
-         id="feOffset8862-2-1" /><feComposite
-         in="SourceGraphic"
-         in2="offset"
-         operator="over"
-         result="composite2"
-         id="feComposite8864-3-3" /></filter><mask
-       maskUnits="userSpaceOnUse"
-       id="mask10620-4"><path
-         sodipodi:type="arc"
-         style="font-size:13.58917427px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:2.16621375;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline;font-family:Sans"
-         id="path10622-3"
-         sodipodi:cx="388.125"
-         sodipodi:cy="468.23718"
-         sodipodi:rx="10.625"
-         sodipodi:ry="10.625"
-         d="m 398.75,468.23718 a 10.625,10.625 0 1 1 -21.25,0 10.625,10.625 0 1 1 21.25,0 z"
-         transform="matrix(0.55482947,0,0,0.55482947,-206.96039,787.08655)" /></mask><linearGradient
+         style="stop-color:#6085bb;stop-opacity:1" /></linearGradient><linearGradient
        gradientUnits="userSpaceOnUse"
        y2="1024.3622"
        x2="50"
@@ -732,7 +235,6 @@
        x1="50"
        id="linearGradient8753"
        xlink:href="#linearGradient8751"
-       inkscape:collect="always"
        gradientTransform="matrix(2.7500001,0,0,0.99370101,-129.87501,-991.91286)" /><linearGradient
        gradientUnits="userSpaceOnUse"
        y2="1030.3622"
@@ -741,7 +243,6 @@
        x1="57"
        id="linearGradient8761"
        xlink:href="#linearGradient8759"
-       inkscape:collect="always"
        gradientTransform="matrix(1.0999999,0,0,1.1281495,-43.249997,-1129.0318)" /><linearGradient
        gradientUnits="userSpaceOnUse"
        y2="1023.234"
@@ -750,7 +251,6 @@
        x1="51.658199"
        id="linearGradient8769"
        xlink:href="#linearGradient8767"
-       inkscape:collect="always"
        gradientTransform="matrix(2.7500001,0,0,0.99370101,-129.87501,-991.91286)" /><linearGradient
        gradientUnits="userSpaceOnUse"
        y2="1026.0538"
@@ -759,7 +259,6 @@
        x1="63.98344"
        id="linearGradient8779"
        xlink:href="#linearGradient8777"
-       inkscape:collect="always"
        gradientTransform="matrix(1.3687895,0,0,1.494898,-60.408122,-1504.0798)" /><linearGradient
        gradientUnits="userSpaceOnUse"
        y2="1028.4165"
@@ -768,59 +267,47 @@
        x1="68.47998"
        id="linearGradient8787"
        xlink:href="#linearGradient8785"
-       inkscape:collect="always"
        gradientTransform="matrix(1.3687895,0,0,1.494898,-60.408122,-1504.0798)" /><filter
        height="1.4861495"
        y="-0.24307477"
        width="2.0754105"
        x="-0.53770523"
        id="filter8813"
-       style="color-interpolation-filters:sRGB"
-       inkscape:collect="always"><feGaussianBlur
+       style="color-interpolation-filters:sRGB"><feGaussianBlur
          id="feGaussianBlur8815"
-         stdDeviation="1.1269452"
-         inkscape:collect="always" /></filter><filter
+         stdDeviation="1.1269452" /></filter><filter
        height="1.6025846"
        y="-0.30129232"
        width="1.626688"
        x="-0.313344"
        id="filter8835"
-       style="color-interpolation-filters:sRGB"
-       inkscape:collect="always"><feGaussianBlur
+       style="color-interpolation-filters:sRGB"><feGaussianBlur
          id="feGaussianBlur8837"
-         stdDeviation="0.49751501"
-         inkscape:collect="always" /></filter><filter
+         stdDeviation="0.49751501" /></filter><filter
        height="1.2365698"
        y="-0.11828489"
        width="1.8310951"
        x="-0.41554753"
        id="filter8871"
-       style="color-interpolation-filters:sRGB"
-       inkscape:collect="always"><feGaussianBlur
+       style="color-interpolation-filters:sRGB"><feGaussianBlur
          id="feGaussianBlur8873"
-         stdDeviation="0.53588249"
-         inkscape:collect="always" /></filter><filter
+         stdDeviation="0.53588249" /></filter><filter
        height="1.2365698"
        y="-0.11828489"
        width="1.8310951"
        x="-0.41554753"
        id="filter8871-1"
-       style="color-interpolation-filters:sRGB"
-       inkscape:collect="always"><feGaussianBlur
+       style="color-interpolation-filters:sRGB"><feGaussianBlur
          id="feGaussianBlur8873-8"
-         stdDeviation="0.53588249"
-         inkscape:collect="always" /></filter><filter
-       inkscape:collect="always"
+         stdDeviation="0.53588249" /></filter><filter
        style="color-interpolation-filters:sRGB"
        id="filter2533"
        x="-0.59377657"
        width="2.1875531"
        y="-0.92639431"
        height="2.8527886"><feGaussianBlur
-         inkscape:collect="always"
          stdDeviation="0.73536407"
          id="feGaussianBlur2535" /></filter><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient2543"
        id="linearGradient2545"
        x1="18.423391"
@@ -833,62 +320,49 @@
        width="2.2508695"
        x="-0.62393297"
        id="filter8813-5"
-       style="color-interpolation-filters:sRGB"
-       inkscape:collect="always"><feGaussianBlur
+       style="color-interpolation-filters:sRGB"><feGaussianBlur
          id="feGaussianBlur8815-0"
-         stdDeviation="1.1269452"
-         inkscape:collect="always" /></filter><filter
+         stdDeviation="1.1269452" /></filter><filter
        height="1.3657107"
-       y="-0.14956415"
-       width="2.0529235"
+       y="-0.14956416"
+       width="2.0529236"
        x="-0.5290004"
        id="filter8871-4"
-       style="color-interpolation-filters:sRGB"
-       inkscape:collect="always"><feGaussianBlur
+       style="color-interpolation-filters:sRGB"><feGaussianBlur
          id="feGaussianBlur8873-9"
-         stdDeviation="0.53588249"
-         inkscape:collect="always" /></filter><filter
+         stdDeviation="0.53588249" /></filter><filter
        height="1.8202161"
        y="-0.41010804"
        width="1.8530247"
        x="-0.42651235"
        id="filter8835-5"
-       style="color-interpolation-filters:sRGB"
-       inkscape:collect="always"><feGaussianBlur
+       style="color-interpolation-filters:sRGB"><feGaussianBlur
          id="feGaussianBlur8837-4"
-         stdDeviation="0.49751501"
-         inkscape:collect="always" /></filter><filter
-       inkscape:collect="always"
+         stdDeviation="0.49751501" /></filter><filter
        style="color-interpolation-filters:sRGB"
        id="filter2533-6"
        x="-0.68029651"
        width="2.5817097"
        y="-1.073697"
        height="3.2469451"><feGaussianBlur
-         inkscape:collect="always"
          stdDeviation="0.73536407"
          id="feGaussianBlur2535-0" /></filter><filter
-       height="1.402261"
-       y="-0.15841809"
+       height="1.4022611"
+       y="-0.1584181"
        width="2.1157048"
        x="-0.56110931"
        id="filter8871-1-6"
-       style="color-interpolation-filters:sRGB"
-       inkscape:collect="always"><feGaussianBlur
+       style="color-interpolation-filters:sRGB"><feGaussianBlur
          id="feGaussianBlur8873-8-9"
-         stdDeviation="0.53588249"
-         inkscape:collect="always" /></filter><filter
-       inkscape:collect="always"
+         stdDeviation="0.53588249" /></filter><filter
        style="color-interpolation-filters:sRGB"
        id="filter2728"
        x="-0.06427016"
        width="1.1285403"
        y="-0.1171224"
        height="1.2342448"><feGaussianBlur
-         inkscape:collect="always"
          stdDeviation="0.90744768"
          id="feGaussianBlur2730" /></filter><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4496"
        id="linearGradient4494"
        x1="8"
@@ -897,8 +371,7 @@
        y2="1024.3622"
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-2.7510542,20.904378)" /><linearGradient
-       id="linearGradient4496"
-       inkscape:collect="always"><stop
+       id="linearGradient4496"><stop
          id="stop4498"
          offset="0"
          style="stop-color:#6885b2;stop-opacity:1" /><stop
@@ -911,7 +384,6 @@
          id="stop4502"
          offset="1"
          style="stop-color:#2c4a81;stop-opacity:1" /></linearGradient><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4504"
        id="linearGradient4510"
        x1="3.2928932"
@@ -920,7 +392,6 @@
        y2="1020.7158"
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-2.7510542,20.904378)" /><linearGradient
-       inkscape:collect="always"
        id="linearGradient4504"><stop
          style="stop-color:#b0c1db;stop-opacity:1"
          offset="0"
@@ -933,62 +404,17 @@
        width="1.0967932"
        x="-0.048396592"
        id="filter4285-9-8"
-       style="color-interpolation-filters:sRGB"
-       inkscape:collect="always"><feGaussianBlur
+       style="color-interpolation-filters:sRGB"><feGaussianBlur
          id="feGaussianBlur4287-9-5"
-         stdDeviation="0.10000000000000001"
-         inkscape:collect="always" /></filter></defs><sodipodi:namedview
-     id="base"
-     pagecolor="#bcbcbc"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7.185918"
-     inkscape:cx="61.787513"
-     inkscape:cy="24.77067"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1728"
-     inkscape:window-height="1051"
-     inkscape:window-x="0"
-     inkscape:window-y="38"
-     inkscape:window-maximized="1"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="true"
-     inkscape:snap-bbox="true"
-     inkscape:bbox-nodes="true"
-     inkscape:showpageshadow="2"
-     inkscape:pagecheckerboard="0"
-     inkscape:deskcolor="#d1d1d1"><inkscape:grid
-       type="xygrid"
-       id="grid4112"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       originx="0"
-       originy="0"
-       spacingy="1"
-       spacingx="1"
-       units="px" /></sodipodi:namedview><metadata
+         stdDeviation="0.10000000000000001" /></filter></defs><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" /></cc:Work></rdf:RDF></metadata><g
-     inkscape:groupmode="layer"
      id="layer2"
-     inkscape:label="Background"
-     style="display:inline"
-     sodipodi:insensitive="true"><path
-       sodipodi:nodetypes="cccc"
-       inkscape:connector-curvature="0"
+     style="display:inline"><path
        id="rect4113-1"
        d="M 75,0 75,66 1e-6,66 C 1e-6,41.2048 50.00969,0 75,0 Z"
        style="display:inline;fill:url(#linearGradient4978);fill-opacity:1;stroke:none" /><path
-       sodipodi:nodetypes="cccc"
-       inkscape:connector-curvature="0"
        id="rect4113-1-0"
        d="M 75,21.0607 75,66 1e-6,66 C 10.625001,47.804 43.509694,25.4357 75,21.0607 Z"
        style="display:inline;opacity:0.40400002;fill:url(#linearGradient4962);fill-opacity:1;stroke:none" /><g
@@ -997,38 +423,26 @@
        transform="matrix(0.27903303,0,0,0.27903303,-14.618136,-107.52874)"><g
          style="fill:#737986;fill-opacity:1;stroke:#595e68;stroke-opacity:1"
          id="g13408-8-2" /></g><path
-       sodipodi:nodetypes="cccc"
-       inkscape:connector-curvature="0"
        id="rect4113-1-7"
        d="M 75,4.0000001e-7 75,66 30.000003,66 C 30.000003,46.1545 47.70944,9.2500004 75,4e-7 Z"
        style="display:inline;opacity:0.18399999;fill:url(#linearGradient4970);fill-opacity:1;stroke:none" /></g><g
-     inkscape:label="Foreground"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-986.3622)"><path
        style="font-style:normal;font-weight:normal;font-size:13.5892px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;display:inline;fill:url(#linearGradient4462);fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;filter:url(#filter4606)"
        d="m 47.000294,1007.3622 -12.319149,16.9335 -12.416197,17.0669 h 16.933329 17.066666 l 12.416197,-17.0669 0.09676,-0.133 L 81,1007.3626 H 63.933334 47.000005 Z"
        id="rect10961-8-3-6-1"
-       inkscape:connector-curvature="0"
-       transform="matrix(1.1726471,0,0.08958029,0.36603268,-106.67986,656.22486)"
-       inkscape:transform-center-x="4.353394"
-       inkscape:transform-center-y="0.53407509"
-       inkscape:label="shadow" /><path
-       sodipodi:nodetypes="ccccc"
-       inkscape:connector-curvature="0"
+       transform="matrix(1.1726471,0,0.08958029,0.36603268,-106.67986,656.22486)" /><path
        id="path5250"
        d="m 15.662119,1005.2334 3.760586,-4.9642 h 16.536798 l 3.904558,4.9642 z"
-       style="fill:#fffabf;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4205);stroke-width:1;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       inkscape:label="tab-shadow" /><ellipse
+       style="fill:#fffabf;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4205);stroke-width:1;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /><ellipse
        transform="matrix(0.99999827,0,0,0.38855855,0.10308655,1000.4091)"
        ry="4.5"
        rx="7.5"
        cy="8.3080006"
        cx="23.691999"
        id="path5111"
-       style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;filter:url(#filter5309)"
-       inkscape:label="tab" /><rect
+       style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;filter:url(#filter5309)" /><rect
        ry="2.0792062"
        y="1005.2515"
        x="12.898687"
@@ -1036,45 +450,32 @@
        width="41.860336"
        id="rect4876"
        style="fill:url(#linearGradient4884);fill-opacity:1;stroke:url(#linearGradient5258);stroke-width:1;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       inkscape:label="back"
        rx="2.0792062" /><g
        id="g2"
-       transform="matrix(0.99999827,0,0,1,26.716405,980.90101)"
-       inkscape:label="plug"><g
+       transform="matrix(0.99999827,0,0,1,26.716405,980.90101)"><g
          transform="matrix(1.0729615,0,0,1.0787087,-1.2096914,-0.17204372)"
          id="g2558-4"
          style="opacity:0.503;fill:#808080;stroke:#808080;stroke-width:0.929514;filter:url(#filter2728)"><path
            transform="matrix(1.029538,0,0,1.1281495,-40.181606,-1129.0381)"
            style="fill:#808080;fill-opacity:1;stroke:#808080;stroke-width:0.862484px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter8813-5)"
            d="m 53.577367,1026.9835 -0.152425,-8.8407 0.91455,-1.2194 3.124711,-0.076 0.07621,-0.9908 h 0.91455 l -0.07621,1.9054 -3.048499,1.2194 -0.152425,4.9538 z"
-           id="path8791-1"
-           inkscape:connector-curvature="0" /><path
+           id="path8791-1" /><path
            id="path8722-7-8"
            style="display:inline;opacity:1;fill:#808080;fill-opacity:1;stroke:#808080;stroke-width:0.929514;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="M 3.4999999,23.512598 V 25.5 H 14.5 V 21.525196 H 3.4999999 v 1.987402"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccccc" /><path
-           sodipodi:nodetypes="csssscsscccsssscsscc"
+           d="M 3.4999999,23.512598 V 25.5 H 14.5 V 21.525196 H 3.4999999 v 1.987402" /><path
            id="rect8645-3-9"
            style="display:inline;opacity:1;fill:#808080;fill-opacity:1;stroke:#808080;stroke-width:0.929514;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="M 25.499998,23.781495 25.5,15.413559 C 25.5,13.799403 24.568942,12.5 23.412427,12.5 h -2.424855 c -1.156515,0 -2.483072,1.299403 -2.483072,2.913559 v 1.599039 h -2.264856 c -0.963763,0 -1.739644,0.794104 -1.739644,1.780446 v 1.468512 3.519375 m 10.999998,5.64e-4 2e-6,8.367936 c 0,1.614156 -0.931058,2.913559 -2.087573,2.913559 h -2.424855 c -1.156515,0 -2.483072,-1.299403 -2.483072,-2.913559 V 30.550392 H 16.239644 C 15.275881,30.550392 14.5,29.756288 14.5,28.769946 v -1.468512 -3.519375"
-           inkscape:connector-curvature="0" /><path
-           sodipodi:nodetypes="cc"
-           inkscape:connector-curvature="0"
+           d="M 25.499998,23.781495 25.5,15.413559 C 25.5,13.799403 24.568942,12.5 23.412427,12.5 h -2.424855 c -1.156515,0 -2.483072,1.299403 -2.483072,2.913559 v 1.599039 h -2.264856 c -0.963763,0 -1.739644,0.794104 -1.739644,1.780446 v 1.468512 3.519375 m 10.999998,5.64e-4 2e-6,8.367936 c 0,1.614156 -0.931058,2.913559 -2.087573,2.913559 h -2.424855 c -1.156515,0 -2.483072,-1.299403 -2.483072,-2.913559 V 30.550392 H 16.239644 C 15.275881,30.550392 14.5,29.756288 14.5,28.769946 v -1.468512 -3.519375" /><path
            id="path2537-0"
            d="M 18.51661,16.539741 18.5464,30.705846"
            style="fill:#808080;stroke:#808080;stroke-width:0.929514px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /><path
            id="rect8645-2-5-2"
            style="display:inline;opacity:1;fill:#808080;fill-opacity:1;stroke:#808080;stroke-width:0.929514;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="m 36.091538,26.489769 -10e-7,1.058985 c 0,1.06945 -0.863288,1.955925 -2.164732,1.930363 -1.301445,-0.02541 -1.941636,0 -1.941636,0 v 0.201512 c 0,1.544678 -1.158564,2.787985 -2.597679,2.788284 l -1.648306,2.98e-4 c -1.360345,3e-4 -1.22903,0.546236 -1.22903,-2.989646 V 17.520381 c 0,-3.536032 -0.205068,-2.989797 1.22903,-2.989797 h 1.648306 c 1.439115,0 2.597679,1.243607 2.597679,2.788284 v 0.201513 h 1.941637 c 1.199261,0 2.164732,0.860911 2.164732,1.930361 v 2.554332 z m 0.06454,-6.010119 h 8.461471 l -0.05085,6.010119 h -8.188123"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cczccssssssccsccccccc" /><path
+           d="m 36.091538,26.489769 -10e-7,1.058985 c 0,1.06945 -0.863288,1.955925 -2.164732,1.930363 -1.301445,-0.02541 -1.941636,0 -1.941636,0 v 0.201512 c 0,1.544678 -1.158564,2.787985 -2.597679,2.788284 l -1.648306,2.98e-4 c -1.360345,3e-4 -1.22903,0.546236 -1.22903,-2.989646 V 17.520381 c 0,-3.536032 -0.205068,-2.989797 1.22903,-2.989797 h 1.648306 c 1.439115,0 2.597679,1.243607 2.597679,2.788284 v 0.201513 h 1.941637 c 1.199261,0 2.164732,0.860911 2.164732,1.930361 v 2.554332 z m 0.06454,-6.010119 h 8.461471 l -0.05085,6.010119 h -8.188123" /><path
            transform="matrix(1.445753,0,0,1.3224494,-65.097292,-1327.9481)"
            style="opacity:0.794;fill:#808080;fill-opacity:1;stroke:#808080;stroke-width:0.672232px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter8871-4)"
            d="m 64.018476,1016.5423 -0.152427,10.8222 c 2.375507,-3.3036 3.484206,-4.2052 2.972286,-9.2217 0.305009,-1.654 -1.117834,-1.7529 -2.819859,-1.6005 z"
-           id="path8861-9"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccc" /><ellipse
+           id="path8861-9" /><ellipse
            transform="matrix(1.029538,0,0,1.1281495,-39.470994,-1128.0797)"
            style="opacity:0.828;fill:#808080;fill-opacity:1;stroke:#808080;stroke-width:0.862484;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter8835-5)"
            id="path8817-1"
@@ -1085,14 +486,11 @@
            transform="matrix(1.7350569,0,0,1.8824502,-91.814902,-1903.1505)"
            style="opacity:0.862;fill:#808080;fill-opacity:1;stroke:#808080;stroke-width:0.514324px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter2533-6)"
            d="m 70.953811,1023.4014 v -1.8291 l 2.972286,-0.076 z"
-           id="path8875-0"
-           inkscape:connector-curvature="0" /><path
+           id="path8875-0" /><path
            transform="matrix(1.029538,0,0,1.1281495,-39.928294,-1128.6206)"
            style="display:inline;opacity:0.485;fill:#808080;fill-opacity:1;stroke:#808080;stroke-width:0.862484px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter8871-1-6)"
            d="m 53.924652,1016.631 -0.152427,10.8222 c 2.375507,-3.3036 3.484206,-4.2052 2.972286,-9.2217 0.305009,-1.654 -1.117834,-1.7529 -2.819859,-1.6005 z"
-           id="path8861-7-0"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccc" /></g><g
+           id="path8861-7-0" /></g><g
          id="g11331-3-1-1"
          style="display:inline"
          transform="matrix(0.92787456,0,0,0.92766861,-283.31685,-391.9053)"><g
@@ -1124,34 +522,23 @@
            transform="matrix(1.029538,0,0,1.1281495,-40.181606,-1129.0381)"
            style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.927888px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter8813)"
            d="m 53.577367,1026.9835 -0.152425,-8.8407 0.91455,-1.2194 3.124711,-0.076 0.07621,-0.9908 h 0.91455 l -0.07621,1.9054 -3.048499,1.2194 -0.152425,4.9538 z"
-           id="path8791"
-           inkscape:connector-curvature="0" /><path
+           id="path8791" /><path
            id="path8722-7"
            style="display:inline;opacity:1;fill:url(#linearGradient8769);fill-opacity:1;stroke:url(#linearGradient8753);stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="M 3.4999999,23.512598 V 25.5 H 14.5 V 21.525196 H 3.4999999 v 1.987402"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccccc" /><path
-           sodipodi:nodetypes="csssscsscccsssscsscc"
+           d="M 3.4999999,23.512598 V 25.5 H 14.5 V 21.525196 H 3.4999999 v 1.987402" /><path
            id="rect8645-3"
            style="display:inline;opacity:1;fill:url(#linearGradient8761);fill-opacity:1;stroke:#4d73ae;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="M 25.499998,23.781495 25.5,15.413559 C 25.5,13.799403 24.568942,12.5 23.412427,12.5 h -2.424855 c -1.156515,0 -2.483072,1.299403 -2.483072,2.913559 v 1.599039 h -2.264856 c -0.963763,0 -1.739644,0.794104 -1.739644,1.780446 v 1.468512 3.519375 m 10.999998,5.64e-4 2e-6,8.367936 c 0,1.614156 -0.931058,2.913559 -2.087573,2.913559 h -2.424855 c -1.156515,0 -2.483072,-1.299403 -2.483072,-2.913559 V 30.550392 H 16.239644 C 15.275881,30.550392 14.5,29.756288 14.5,28.769946 v -1.468512 -3.519375"
-           inkscape:connector-curvature="0" /><path
-           sodipodi:nodetypes="cc"
-           inkscape:connector-curvature="0"
+           d="M 25.499998,23.781495 25.5,15.413559 C 25.5,13.799403 24.568942,12.5 23.412427,12.5 h -2.424855 c -1.156515,0 -2.483072,1.299403 -2.483072,2.913559 v 1.599039 h -2.264856 c -0.963763,0 -1.739644,0.794104 -1.739644,1.780446 v 1.468512 3.519375 m 10.999998,5.64e-4 2e-6,8.367936 c 0,1.614156 -0.931058,2.913559 -2.087573,2.913559 h -2.424855 c -1.156515,0 -2.483072,-1.299403 -2.483072,-2.913559 V 30.550392 H 16.239644 C 15.275881,30.550392 14.5,29.756288 14.5,28.769946 v -1.468512 -3.519375" /><path
            id="path2537"
            d="M 18.51661,16.539741 18.5464,30.705846"
            style="fill:none;stroke:url(#linearGradient2545);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /><path
            id="rect8645-2-5"
            style="display:inline;opacity:1;fill:url(#linearGradient8779);fill-opacity:1;stroke:url(#linearGradient8787);stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="m 36.091538,26.489769 -10e-7,1.058985 c 0,1.06945 -0.863288,1.955925 -2.164732,1.930363 -1.301445,-0.02541 -1.941636,0 -1.941636,0 v 0.201512 c 0,1.544678 -1.158564,2.787985 -2.597679,2.788284 l -1.648306,2.98e-4 c -1.360345,3e-4 -1.22903,0.546236 -1.22903,-2.989646 V 17.520381 c 0,-3.536032 -0.205068,-2.989797 1.22903,-2.989797 h 1.648306 c 1.439115,0 2.597679,1.243607 2.597679,2.788284 v 0.201513 h 1.941637 c 1.199261,0 2.164732,0.860911 2.164732,1.930361 v 2.554332 z m 0.06454,-6.010119 h 8.461471 l -0.05085,6.010119 h -8.188123"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cczccssssssccsccccccc" /><path
+           d="m 36.091538,26.489769 -10e-7,1.058985 c 0,1.06945 -0.863288,1.955925 -2.164732,1.930363 -1.301445,-0.02541 -1.941636,0 -1.941636,0 v 0.201512 c 0,1.544678 -1.158564,2.787985 -2.597679,2.788284 l -1.648306,2.98e-4 c -1.360345,3e-4 -1.22903,0.546236 -1.22903,-2.989646 V 17.520381 c 0,-3.536032 -0.205068,-2.989797 1.22903,-2.989797 h 1.648306 c 1.439115,0 2.597679,1.243607 2.597679,2.788284 v 0.201513 h 1.941637 c 1.199261,0 2.164732,0.860911 2.164732,1.930361 v 2.554332 z m 0.06454,-6.010119 h 8.461471 l -0.05085,6.010119 h -8.188123" /><path
            transform="matrix(1.445753,0,0,1.3224494,-65.097292,-1327.9481)"
            style="opacity:0.794;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.723208px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter8871)"
            d="m 64.018476,1016.5423 -0.152427,10.8222 c 2.375507,-3.3036 3.484206,-4.2052 2.972286,-9.2217 0.305009,-1.654 -1.117834,-1.7529 -2.819859,-1.6005 z"
-           id="path8861"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccc" /><ellipse
+           id="path8861" /><ellipse
            transform="matrix(1.029538,0,0,1.1281495,-39.470994,-1128.0797)"
            style="opacity:0.828;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.927888;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter8835)"
            id="path8817"
@@ -1162,14 +549,11 @@
            transform="matrix(1.7350569,0,0,1.8824502,-91.814902,-1903.1505)"
            style="opacity:0.862;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.553326px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter2533)"
            d="m 70.953811,1023.4014 v -1.8291 l 2.972286,-0.076 z"
-           id="path8875"
-           inkscape:connector-curvature="0" /><path
+           id="path8875" /><path
            transform="matrix(1.029538,0,0,1.1281495,-39.928294,-1128.6206)"
            style="display:inline;opacity:0.485;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.927888px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter8871-1)"
            d="m 53.924652,1016.631 -0.152427,10.8222 c 2.375507,-3.3036 3.484206,-4.2052 2.972286,-9.2217 0.305009,-1.654 -1.117834,-1.7529 -2.819859,-1.6005 z"
-           id="path8861-7"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccc" /></g></g><rect
+           id="path8861-7" /></g></g><rect
        transform="matrix(1,0,-0.47943667,0.87757648,0,0)"
        style="display:inline;fill:url(#linearGradient4936);fill-opacity:1;stroke:url(#linearGradient4956-9);stroke-width:1.06747;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect4932"
@@ -1178,30 +562,12 @@
        x="579.31567"
        y="1153.4384"
        ry="1.8222821"
-       inkscape:label="front"
        rx="1.8222821" /><g
-       id="g1"
-       inkscape:label="export-triangle"><path
+       id="g1"><path
          style="display:inline;fill:url(#linearGradient4494);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4510);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
          d="M 1.7489458,1033.7666 H 16.748946 v 15 z"
-         id="path4478"
-         inkscape:connector-curvature="0"
-         inkscape:label="triangle" /><path
-         sodipodi:type="star"
+         id="path4478" /><path
          style="display:inline;opacity:0.9;fill:#ffffff;fill-opacity:0.815842;stroke:none;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;filter:url(#filter4285-9-8)"
          id="path4252-6-0"
-         sodipodi:sides="4"
-         sodipodi:cx="4.7729707"
-         sodipodi:cy="1041.2474"
-         sodipodi:r1="3.3255017"
-         sodipodi:r2="0.49178758"
-         sodipodi:arg1="2.432965"
-         sodipodi:arg2="-3.0800218"
-         inkscape:flatsided="false"
-         inkscape:rounded="0"
-         inkscape:randomized="-0.017554997"
          d="m 2.2999628,1043.3702 1.9823895,-2.1047 -1.6734053,-2.5419 2.1987064,2.0209 2.4513363,-1.6427 -2.0383649,2.1623 1.7419712,2.4882 -2.2030799,-2.0431 z"
-         transform="matrix(-0.82539295,1.4154894,-1.2829533,-1.0100615,1348.392,2086.9405)"
-         inkscape:transform-center-x="0.19603188"
-         inkscape:transform-center-y="0.38464271"
-         inkscape:label="star" /></g></g></svg>
+         transform="matrix(-0.82539295,1.4154894,-1.2829533,-1.0100615,1348.392,2086.9405)" /></g></g></svg>
diff --git a/ui/org.eclipse.pde.ui/icons/wizban/exp_deployplug_wiz.svg b/ui/org.eclipse.pde.ui/icons/wizban/exp_deployplug_wiz.svg
index d11011c2163..69ac8d3e5f4 100644
--- a/ui/org.eclipse.pde.ui/icons/wizban/exp_deployplug_wiz.svg
+++ b/ui/org.eclipse.pde.ui/icons/wizban/exp_deployplug_wiz.svg
@@ -6,14 +6,7 @@
    height="66"
    id="svg2"
    version="1.1"
-   inkscape:version="1.3 (0e150ed, 2023-07-21)"
-   sodipodi:docname="exp_deployplug_wiz.svg"
-   inkscape:export-filename="/Users/d021678/git/eclipse.jdt.ui/org.eclipse.jdt.ui/icons/full/wizban/newclass_wiz2.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90"
    xml:space="preserve"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:svg="http://www.w3.org/2000/svg"
@@ -21,7 +14,6 @@
    xmlns:cc="http://creativecommons.org/ns#"
    xmlns:dc="http://purl.org/dc/elements/1.1/"><defs
      id="defs4"><linearGradient
-       inkscape:collect="always"
        id="linearGradient10"><stop
          style="stop-color:#9454ac;stop-opacity:1;"
          offset="0"
@@ -32,331 +24,27 @@
          style="stop-color:#995cb0;stop-opacity:1;"
          offset="1"
          id="stop10" /></linearGradient><linearGradient
-       id="linearGradient7"
-       inkscape:collect="always"><stop
+       id="linearGradient7"><stop
          id="stop6"
          offset="0"
          style="stop-color:#762894;stop-opacity:1;" /><stop
          id="stop7"
          offset="1"
          style="stop-color:#9a5fb1;stop-opacity:1;" /></linearGradient><linearGradient
-       id="linearGradient5"
-       inkscape:collect="always"><stop
+       id="linearGradient5"><stop
          id="stop4"
          offset="0"
          style="stop-color:#ad7bc1;stop-opacity:1;" /><stop
          id="stop5"
          offset="1"
          style="stop-color:#9a5fb1;stop-opacity:1;" /></linearGradient><linearGradient
-       id="linearGradient3"
-       inkscape:collect="always"><stop
+       id="linearGradient3"><stop
          id="stop2"
          offset="0"
          style="stop-color:#dbc3e6;stop-opacity:1;" /><stop
          id="stop3"
          offset="1"
          style="stop-color:#84489e;stop-opacity:1;" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       id="linearGradient4541"><stop
-         style="stop-color:#a1adb2;stop-opacity:1"
-         offset="0"
-         id="stop4543" /><stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop4545" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       id="linearGradient4972"><stop
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0"
-         id="stop4974" /><stop
-         style="stop-color:#f5f8fd;stop-opacity:1"
-         offset="1"
-         id="stop4976" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       id="linearGradient4964"><stop
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0"
-         id="stop4966" /><stop
-         style="stop-color:#e8eefa;stop-opacity:1"
-         offset="1"
-         id="stop4968" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       id="linearGradient4956"><stop
-         style="stop-color:#fcfdfe;stop-opacity:1"
-         offset="0"
-         id="stop4958" /><stop
-         style="stop-color:#dee6f8;stop-opacity:1"
-         offset="1"
-         id="stop4960" /></linearGradient><filter
-       style="color-interpolation-filters:sRGB"
-       inkscape:label="Drop Shadow"
-       id="filter8854"><feFlood
-         flood-opacity="0.933333"
-         flood-color="rgb(244,248,254)"
-         result="flood"
-         id="feFlood8856" /><feComposite
-         in="flood"
-         in2="SourceGraphic"
-         operator="in"
-         result="composite1"
-         id="feComposite8858" /><feGaussianBlur
-         in="composite1"
-         stdDeviation="1.2"
-         result="blur"
-         id="feGaussianBlur8860" /><feOffset
-         dx="-1"
-         dy="3"
-         result="offset"
-         id="feOffset8862" /><feComposite
-         in="SourceGraphic"
-         in2="offset"
-         operator="over"
-         result="composite2"
-         id="feComposite8864" /></filter><linearGradient
-       id="linearGradient6122"><stop
-         style="stop-color:#c0c0c0;stop-opacity:1"
-         offset="0"
-         id="stop6124" /><stop
-         id="stop6132"
-         offset="0.5"
-         style="stop-color:#adadad;stop-opacity:1" /><stop
-         style="stop-color:#808080;stop-opacity:1"
-         offset="1"
-         id="stop6126" /></linearGradient><linearGradient
-       id="linearGradient7087"><stop
-         style="stop-color:#17325d;stop-opacity:1;"
-         offset="0"
-         id="stop7089" /><stop
-         id="stop7091"
-         offset="0.25"
-         style="stop-color:#b4d0e2;stop-opacity:1" /><stop
-         id="stop7093"
-         offset="0.5"
-         style="stop-color:#b7d2e4;stop-opacity:1" /><stop
-         style="stop-color:#acc9de;stop-opacity:1"
-         offset="0.75"
-         id="stop7095" /><stop
-         style="stop-color:#3e72a7;stop-opacity:1"
-         offset="1"
-         id="stop7097" /></linearGradient><mask
-       id="mask7366"
-       maskUnits="userSpaceOnUse"><path
-         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;display:inline"
-         d="m -16.593048,1040.862 9.990206,0 0,10.0018 -2.983353,3.0385 -5.966213,0 c -0.53033,-0.022 -1.04064,-0.5519 -1.04064,-1.0385 z"
-         id="path7368"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccccc" /></mask><linearGradient
-       id="linearGradient7584-5"><stop
-         id="stop7586-4"
-         offset="0"
-         style="stop-color:#f9cd5f;stop-opacity:1" /><stop
-         id="stop7588-5"
-         offset="1"
-         style="stop-color:#fbf0b4;stop-opacity:1" /></linearGradient><linearGradient
-       id="linearGradient7592-1"><stop
-         id="stop7594-6"
-         offset="0"
-         style="stop-color:#bd8416;stop-opacity:1" /><stop
-         id="stop7596-9"
-         offset="1"
-         style="stop-color:#a66b10;stop-opacity:1" /></linearGradient><linearGradient
-       id="linearGradient10798-1-9-3-7-6-6-6-2-6-7-98-9-4-1"><stop
-         style="stop-color:#5aad60;stop-opacity:1;"
-         offset="0"
-         id="stop10800-5-2-1-8-20-4-0-2-1-9-0-0-1-1" /><stop
-         id="stop10806-6-8-5-3-9-2-2-7-0-4-2-7-8-9"
-         offset="0.5"
-         style="stop-color:#5bb26a;stop-opacity:1;" /><stop
-         style="stop-color:#a4c589;stop-opacity:1"
-         offset="1"
-         id="stop10802-1-5-3-0-4-6-8-5-5-6-69-6-4-0" /></linearGradient><mask
-       maskUnits="userSpaceOnUse"
-       id="mask7366-4"><path
-         sodipodi:nodetypes="ccccccc"
-         inkscape:connector-curvature="0"
-         id="path7368-2"
-         d="m -16.593048,1040.862 9.990206,0 0,10.0018 -2.983353,3.0385 -5.966213,0 c -0.53033,-0.022 -1.04064,-0.5519 -1.04064,-1.0385 z"
-         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;display:inline" /></mask><linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient7087"
-       id="linearGradient9331"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-20,0)"
-       x1="4.7776356"
-       y1="1039.8118"
-       x2="4.7776356"
-       y2="1041.911" /><linearGradient
-       y2="1041.911"
-       x2="4.7776356"
-       y1="1039.8118"
-       x1="4.7776356"
-       gradientTransform="translate(-18,4.7e-5)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient9333"
-       xlink:href="#linearGradient7087"
-       inkscape:collect="always" /><linearGradient
-       y2="1041.911"
-       x2="4.7776356"
-       y1="1039.8118"
-       x1="4.7776356"
-       gradientTransform="translate(-16,4.7e-5)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient9335"
-       xlink:href="#linearGradient7087"
-       inkscape:collect="always" /><linearGradient
-       y2="1041.911"
-       x2="4.7776356"
-       y1="1039.8118"
-       x1="4.7776356"
-       gradientTransform="translate(-14,4.7e-5)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient9337"
-       xlink:href="#linearGradient7087"
-       inkscape:collect="always" /><linearGradient
-       y2="1041.911"
-       x2="4.7776356"
-       y1="1039.8118"
-       x1="4.7776356"
-       gradientTransform="translate(-12,4.7e-5)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient9339"
-       xlink:href="#linearGradient7087"
-       inkscape:collect="always" /><linearGradient
-       gradientTransform="translate(-80,0)"
-       gradientUnits="userSpaceOnUse"
-       y2="1042.7973"
-       x2="163.22012"
-       y1="1042.7973"
-       x1="88.220117"
-       id="linearGradient68073"
-       xlink:href="#linearGradient4956"
-       inkscape:collect="always" /><linearGradient
-       gradientTransform="translate(-80,0)"
-       gradientUnits="userSpaceOnUse"
-       y2="1032.2669"
-       x2="163.22012"
-       y1="1032.2668"
-       x1="94.469681"
-       id="linearGradient68075"
-       xlink:href="#linearGradient4964"
-       inkscape:collect="always" /><linearGradient
-       gradientTransform="translate(-80,0)"
-       gradientUnits="userSpaceOnUse"
-       y2="1032.2668"
-       x2="152.72206"
-       y1="1032.2668"
-       x1="88.220116"
-       id="linearGradient68077"
-       xlink:href="#linearGradient4972"
-       inkscape:collect="always" /><filter
-       id="filter8854-9"
-       inkscape:label="Drop Shadow"
-       style="color-interpolation-filters:sRGB"><feFlood
-         id="feFlood8856-0"
-         result="flood"
-         flood-color="rgb(244,248,254)"
-         flood-opacity="0.933333" /><feComposite
-         id="feComposite8858-2"
-         result="composite1"
-         operator="in"
-         in2="SourceGraphic"
-         in="flood" /><feGaussianBlur
-         id="feGaussianBlur8860-3"
-         result="blur"
-         stdDeviation="1.2"
-         in="composite1" /><feOffset
-         id="feOffset8862-2"
-         result="offset"
-         dy="3"
-         dx="-1" /><feComposite
-         id="feComposite8864-3"
-         result="composite2"
-         operator="over"
-         in2="offset"
-         in="SourceGraphic" /></filter><linearGradient
-       id="linearGradient10798-1-9-3-7-6-8-9-0-9-1"><stop
-         id="stop10800-5-2-1-8-20-6-4-9-8-2"
-         offset="0"
-         style="stop-color:#7564b1;stop-opacity:1" /><stop
-         style="stop-color:#5d4aa1;stop-opacity:1"
-         offset="0.5"
-         id="stop10806-6-8-5-3-9-24-8-4-3-2" /><stop
-         id="stop10802-1-5-3-0-4-8-4-2-9-2"
-         offset="1"
-         style="stop-color:#9283c3;stop-opacity:1" /></linearGradient><linearGradient
-       id="linearGradient7540-2-3-8-7"><stop
-         id="stop7542-8-7-5-3"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.502" /><stop
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0.47623286"
-         id="stop7544-8-2-0-5" /><stop
-         style="stop-color:#ffffff;stop-opacity:0"
-         offset="0.5"
-         id="stop7546-1-7-9-5" /><stop
-         id="stop7548-98-9-2-4"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       id="linearGradient7272-66-4-5-5-5-8"><stop
-         style="stop-color:#8f6c10;stop-opacity:1"
-         offset="0"
-         id="stop7274-6-0-1-7-4-7" /><stop
-         style="stop-color:#c9a645;stop-opacity:1"
-         offset="1"
-         id="stop7276-66-6-3-9-1-4" /></linearGradient><linearGradient
-       y2="1030.3411"
-       x2="-10.159802"
-       y1="1030.3411"
-       x1="-22.453552"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient10540"
-       xlink:href="#linearGradient7540-2-3-8-7"
-       inkscape:collect="always" /><linearGradient
-       y2="1030.3411"
-       x2="-10.159802"
-       y1="1030.3411"
-       x1="-22.453552"
-       gradientTransform="matrix(0,1,-1,0,1014.0344,1046.6478)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient10542"
-       xlink:href="#linearGradient7540-2-3-8-7"
-       inkscape:collect="always" /><linearGradient
-       y2="1023.2569"
-       x2="-15.945988"
-       y1="1037.4661"
-       x1="-15.945988"
-       gradientTransform="matrix(0.95585117,0,0,0.95585117,-0.71992063,45.488394)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient10544"
-       xlink:href="#linearGradient7272-66-4-5-5-5-8"
-       inkscape:collect="always" /><mask
-       id="mask10620"
-       maskUnits="userSpaceOnUse"><path
-         transform="matrix(0.55482947,0,0,0.55482947,-206.96039,787.08655)"
-         d="m 398.75,468.23718 a 10.625,10.625 0 1 1 -21.25,0 10.625,10.625 0 1 1 21.25,0 z"
-         sodipodi:ry="10.625"
-         sodipodi:rx="10.625"
-         sodipodi:cy="468.23718"
-         sodipodi:cx="388.125"
-         id="path10622"
-         style="font-size:13.58917427px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:2.16621375;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline;font-family:Sans"
-         sodipodi:type="arc" /></mask><linearGradient
-       id="linearGradient4528-9-5-7-9-7-3"><stop
-         id="stop4530-0-5-0-5-8-4"
-         offset="0"
-         style="stop-color:#e0c576;stop-opacity:1;" /><stop
-         id="stop4532-7-9-3-3-6-1"
-         offset="1"
-         style="stop-color:#9e7916;stop-opacity:1" /></linearGradient><linearGradient
-       id="linearGradient6281-8-0-1-6-6-4-2-8-0"><stop
-         style="stop-color:#f7f9fb;stop-opacity:1"
-         offset="0"
-         id="stop6283-0-2-2-1-2-0-1-6-0" /><stop
-         style="stop-color:#ffd680;stop-opacity:1"
-         offset="1"
-         id="stop6285-5-0-9-7-6-9-9-1-9" /></linearGradient><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4972-7"
        id="linearGradient4978"
        x1="88.220116"
@@ -365,7 +53,6 @@
        y2="1032.2668"
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-88.220116,-999.2669)" /><linearGradient
-       inkscape:collect="always"
        id="linearGradient4972-7"><stop
          style="stop-color:#b8ccf1;stop-opacity:0.10196079"
          offset="0"
@@ -373,7 +60,6 @@
          style="stop-color:#6e97e2;stop-opacity:0.10196079"
          offset="1"
          id="stop4976-1" /></linearGradient><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4964-3"
        id="linearGradient4970"
        x1="118.38584"
@@ -382,7 +68,6 @@
        y2="1032.2668"
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-88.220117,-999.2669)" /><linearGradient
-       inkscape:collect="always"
        id="linearGradient4964-3"><stop
          style="stop-color:#ffffff;stop-opacity:0.349"
          offset="0"
@@ -390,7 +75,6 @@
          style="stop-color:#91ade6;stop-opacity:1"
          offset="1"
          id="stop4968-1" /></linearGradient><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4956-2"
        id="linearGradient4962"
        x1="88.220116"
@@ -399,7 +83,6 @@
        y2="1042.7972"
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-88.220116,-999.2669)" /><linearGradient
-       inkscape:collect="always"
        id="linearGradient4956-2"><stop
          style="stop-color:#fcfdfe;stop-opacity:0.25641027"
          offset="0"
@@ -407,94 +90,6 @@
          style="stop-color:#98aae7;stop-opacity:0.40392157"
          offset="1"
          id="stop4960-6" /></linearGradient><linearGradient
-       id="linearGradient3827"><stop
-         id="stop3829"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0;" /><stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0.60149658"
-         id="stop3835" /><stop
-         id="stop3831"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" /></linearGradient><linearGradient
-       id="linearGradient10798-1-9-3-7-6-8-9-0-9-1-0"><stop
-         id="stop10800-5-2-1-8-20-6-4-9-8-2-9"
-         offset="0"
-         style="stop-color:#f3faed;stop-opacity:1" /><stop
-         style="stop-color:#e7f4da;stop-opacity:1"
-         offset="0.65917557"
-         id="stop10806-6-8-5-3-9-24-8-4-3-2-4" /><stop
-         id="stop10802-1-5-3-0-4-8-4-2-9-2-5"
-         offset="1"
-         style="stop-color:#67bf1f;stop-opacity:1" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4541"
-       id="linearGradient5885"
-       x1="41"
-       y1="1007.8622"
-       x2="60"
-       y2="1008.3622"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0,1,-1,0,1034.3618,967.36133)" /><linearGradient
-       id="linearGradient11146-4-4-4-6-2"><stop
-         id="stop11150-4-72-3-9-7"
-         offset="0"
-         style="stop-color:#faefba;stop-opacity:1" /><stop
-         style="stop-color:#9e6542;stop-opacity:1"
-         offset="1"
-         id="stop11152-9-0-7-3-8" /></linearGradient><linearGradient
-       id="linearGradient10507"><stop
-         style="stop-color:#5f392d;stop-opacity:1"
-         offset="0"
-         id="stop10509" /><stop
-         id="stop10511"
-         offset="0.18181793"
-         style="stop-color:#9e7058;stop-opacity:1" /><stop
-         id="stop10513"
-         offset="0.36363617"
-         style="stop-color:#794f40;stop-opacity:1" /><stop
-         id="stop10515"
-         offset="0.49999985"
-         style="stop-color:#794f40;stop-opacity:1" /><stop
-         id="stop10517"
-         offset="0.63636351"
-         style="stop-color:#794f40;stop-opacity:1" /><stop
-         style="stop-color:#9e7058;stop-opacity:1"
-         offset="0.81818175"
-         id="stop10519" /><stop
-         style="stop-color:#5f392d;stop-opacity:1"
-         offset="1"
-         id="stop10522" /></linearGradient><linearGradient
-       id="linearGradient11146-4-4-4-6-2-8"><stop
-         id="stop11150-4-72-3-9-7-2"
-         offset="0"
-         style="stop-color:#faefba;stop-opacity:1" /><stop
-         style="stop-color:#ad6e48;stop-opacity:1"
-         offset="1"
-         id="stop11152-9-0-7-3-8-0" /></linearGradient><linearGradient
-       id="linearGradient4368"><stop
-         id="stop4370"
-         offset="0"
-         style="stop-color:#9c7561;stop-opacity:1" /><stop
-         style="stop-color:#966d59;stop-opacity:1"
-         offset="0.18181793"
-         id="stop4372" /><stop
-         style="stop-color:#8c6250;stop-opacity:1"
-         offset="0.36363617"
-         id="stop4374" /><stop
-         style="stop-color:#794f40;stop-opacity:1"
-         offset="0.49999985"
-         id="stop4376" /><stop
-         style="stop-color:#8c6250;stop-opacity:1"
-         offset="0.63636351"
-         id="stop4378" /><stop
-         id="stop4380"
-         offset="0.81818175"
-         style="stop-color:#966d59;stop-opacity:1" /><stop
-         id="stop4382"
-         offset="1"
-         style="stop-color:#99705c;stop-opacity:1" /></linearGradient><linearGradient
-       inkscape:collect="always"
        id="linearGradient2543"><stop
          style="stop-color:#4f76b0;stop-opacity:1"
          offset="0"
@@ -505,8 +100,7 @@
          style="stop-color:#587cb2;stop-opacity:1"
          offset="1"
          id="stop2541" /></linearGradient><linearGradient
-       id="linearGradient8785"
-       inkscape:collect="always"><stop
+       id="linearGradient8785"><stop
          id="stop8781"
          offset="0"
          style="stop-color:#bb8d2d;stop-opacity:1" /><stop
@@ -516,113 +110,34 @@
          id="stop8783"
          offset="1"
          style="stop-color:#b07905;stop-opacity:1" /></linearGradient><linearGradient
-       id="linearGradient8777"
-       inkscape:collect="always"><stop
+       id="linearGradient8777"><stop
          id="stop8773"
          offset="0"
          style="stop-color:#fbeaab;stop-opacity:1;" /><stop
          id="stop8775"
          offset="1"
          style="stop-color:#deb241;stop-opacity:1" /></linearGradient><linearGradient
-       id="linearGradient8767"
-       inkscape:collect="always"><stop
+       id="linearGradient8767"><stop
          id="stop8763"
          offset="0"
          style="stop-color:#6a8ec1;stop-opacity:1" /><stop
          id="stop8765"
          offset="1"
          style="stop-color:#80a1cf;stop-opacity:1" /></linearGradient><linearGradient
-       id="linearGradient8759"
-       inkscape:collect="always"><stop
+       id="linearGradient8759"><stop
          id="stop8755"
          offset="0"
          style="stop-color:#d3e0eb;stop-opacity:1" /><stop
          id="stop8757"
          offset="1"
          style="stop-color:#5179b5;stop-opacity:1" /></linearGradient><linearGradient
-       id="linearGradient8751"
-       inkscape:collect="always"><stop
+       id="linearGradient8751"><stop
          id="stop8747"
          offset="0"
          style="stop-color:#2e5d8f;stop-opacity:1" /><stop
          id="stop8749"
          offset="1"
-         style="stop-color:#6085bb;stop-opacity:1" /></linearGradient><filter
-       id="filter8854-7"
-       inkscape:label="Drop Shadow"
-       style="color-interpolation-filters:sRGB"><feFlood
-         id="feFlood8856-03"
-         result="flood"
-         flood-color="rgb(244,248,254)"
-         flood-opacity="0.933333" /><feComposite
-         id="feComposite8858-9"
-         result="composite1"
-         operator="in"
-         in2="SourceGraphic"
-         in="flood" /><feGaussianBlur
-         id="feGaussianBlur8860-9"
-         result="blur"
-         stdDeviation="1.2"
-         in="composite1" /><feOffset
-         id="feOffset8862-9"
-         result="offset"
-         dy="3"
-         dx="-1" /><feComposite
-         id="feComposite8864-1"
-         result="composite2"
-         operator="over"
-         in2="offset"
-         in="SourceGraphic" /></filter><mask
-       maskUnits="userSpaceOnUse"
-       id="mask7366-47"><path
-         sodipodi:nodetypes="ccccccc"
-         inkscape:connector-curvature="0"
-         id="path7368-1"
-         d="m -16.593048,1040.862 9.990206,0 0,10.0018 -2.983353,3.0385 -5.966213,0 c -0.53033,-0.022 -1.04064,-0.5519 -1.04064,-1.0385 z"
-         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;display:inline" /></mask><mask
-       id="mask7366-4-0"
-       maskUnits="userSpaceOnUse"><path
-         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;display:inline"
-         d="m -16.593048,1040.862 9.990206,0 0,10.0018 -2.983353,3.0385 -5.966213,0 c -0.53033,-0.022 -1.04064,-0.5519 -1.04064,-1.0385 z"
-         id="path7368-2-3"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccccc" /></mask><filter
-       style="color-interpolation-filters:sRGB"
-       inkscape:label="Drop Shadow"
-       id="filter8854-9-2"><feFlood
-         flood-opacity="0.933333"
-         flood-color="rgb(244,248,254)"
-         result="flood"
-         id="feFlood8856-0-6" /><feComposite
-         in="flood"
-         in2="SourceGraphic"
-         operator="in"
-         result="composite1"
-         id="feComposite8858-2-9" /><feGaussianBlur
-         in="composite1"
-         stdDeviation="1.2"
-         result="blur"
-         id="feGaussianBlur8860-3-4" /><feOffset
-         dx="-1"
-         dy="3"
-         result="offset"
-         id="feOffset8862-2-1" /><feComposite
-         in="SourceGraphic"
-         in2="offset"
-         operator="over"
-         result="composite2"
-         id="feComposite8864-3-3" /></filter><mask
-       maskUnits="userSpaceOnUse"
-       id="mask10620-4"><path
-         sodipodi:type="arc"
-         style="font-size:13.58917427px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:2.16621375;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline;font-family:Sans"
-         id="path10622-3"
-         sodipodi:cx="388.125"
-         sodipodi:cy="468.23718"
-         sodipodi:rx="10.625"
-         sodipodi:ry="10.625"
-         d="m 398.75,468.23718 a 10.625,10.625 0 1 1 -21.25,0 10.625,10.625 0 1 1 21.25,0 z"
-         transform="matrix(0.55482947,0,0,0.55482947,-206.96039,787.08655)" /></mask><linearGradient
+         style="stop-color:#6085bb;stop-opacity:1" /></linearGradient><linearGradient
        gradientUnits="userSpaceOnUse"
        y2="1024.3622"
        x2="50"
@@ -630,7 +145,6 @@
        x1="50"
        id="linearGradient8753"
        xlink:href="#linearGradient8751"
-       inkscape:collect="always"
        gradientTransform="matrix(2.7500001,0,0,0.99370101,-129.87501,-991.91286)" /><linearGradient
        gradientUnits="userSpaceOnUse"
        y2="1030.3622"
@@ -639,7 +153,6 @@
        x1="57"
        id="linearGradient8761"
        xlink:href="#linearGradient8759"
-       inkscape:collect="always"
        gradientTransform="matrix(1.0999999,0,0,1.1281495,-43.249997,-1129.0318)" /><linearGradient
        gradientUnits="userSpaceOnUse"
        y2="1023.234"
@@ -648,7 +161,6 @@
        x1="51.658199"
        id="linearGradient8769"
        xlink:href="#linearGradient8767"
-       inkscape:collect="always"
        gradientTransform="matrix(2.7500001,0,0,0.99370101,-129.87501,-991.91286)" /><linearGradient
        gradientUnits="userSpaceOnUse"
        y2="1026.0538"
@@ -657,7 +169,6 @@
        x1="63.98344"
        id="linearGradient8779"
        xlink:href="#linearGradient8777"
-       inkscape:collect="always"
        gradientTransform="matrix(1.3687895,0,0,1.494898,-60.408122,-1504.0798)" /><linearGradient
        gradientUnits="userSpaceOnUse"
        y2="1028.4165"
@@ -666,49 +177,39 @@
        x1="68.47998"
        id="linearGradient8787"
        xlink:href="#linearGradient8785"
-       inkscape:collect="always"
        gradientTransform="matrix(1.3687895,0,0,1.494898,-60.408122,-1504.0798)" /><filter
        height="1.6025846"
        y="-0.30129232"
        width="1.626688"
        x="-0.313344"
        id="filter8835"
-       style="color-interpolation-filters:sRGB"
-       inkscape:collect="always"><feGaussianBlur
+       style="color-interpolation-filters:sRGB"><feGaussianBlur
          id="feGaussianBlur8837"
-         stdDeviation="0.49751501"
-         inkscape:collect="always" /></filter><filter
+         stdDeviation="0.49751501" /></filter><filter
        height="1.2365698"
        y="-0.11828489"
        width="1.8310951"
        x="-0.41554753"
        id="filter8871"
-       style="color-interpolation-filters:sRGB"
-       inkscape:collect="always"><feGaussianBlur
+       style="color-interpolation-filters:sRGB"><feGaussianBlur
          id="feGaussianBlur8873"
-         stdDeviation="0.53588249"
-         inkscape:collect="always" /></filter><filter
+         stdDeviation="0.53588249" /></filter><filter
        height="1.2365698"
        y="-0.11828489"
        width="1.8310951"
        x="-0.41554753"
        id="filter8871-1"
-       style="color-interpolation-filters:sRGB"
-       inkscape:collect="always"><feGaussianBlur
+       style="color-interpolation-filters:sRGB"><feGaussianBlur
          id="feGaussianBlur8873-8"
-         stdDeviation="0.53588249"
-         inkscape:collect="always" /></filter><filter
-       inkscape:collect="always"
+         stdDeviation="0.53588249" /></filter><filter
        style="color-interpolation-filters:sRGB"
        id="filter2533"
        x="-0.59377657"
        width="2.1875531"
        y="-0.92639431"
        height="2.8527886"><feGaussianBlur
-         inkscape:collect="always"
          stdDeviation="0.73536407"
          id="feGaussianBlur2535" /></filter><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient2543"
        id="linearGradient2545"
        x1="18.423391"
@@ -716,18 +217,15 @@
        x2="18.436228"
        y2="30.334658"
        gradientUnits="userSpaceOnUse" /><filter
-       inkscape:collect="always"
        style="color-interpolation-filters:sRGB"
        id="filter2728"
        x="-0.063527558"
        width="1.1270551"
        y="-0.11576912"
        height="1.2315382"><feGaussianBlur
-         inkscape:collect="always"
          stdDeviation="0.90744768"
          id="feGaussianBlur2730" /></filter><linearGradient
-       id="linearGradient4496"
-       inkscape:collect="always"><stop
+       id="linearGradient4496"><stop
          id="stop4498"
          offset="0"
          style="stop-color:#6885b2;stop-opacity:1" /><stop
@@ -740,7 +238,6 @@
          id="stop4502"
          offset="1"
          style="stop-color:#2c4a81;stop-opacity:1" /></linearGradient><linearGradient
-       inkscape:collect="always"
        id="linearGradient4504"><stop
          style="stop-color:#b0c1db;stop-opacity:1"
          offset="0"
@@ -748,14 +245,12 @@
          style="stop-color:#8299c2;stop-opacity:1"
          offset="1"
          id="stop4508" /></linearGradient><filter
-       inkscape:collect="always"
        style="color-interpolation-filters:sRGB"
        id="filter2728-6"
        x="-0.063527558"
        width="1.1270551"
-       y="-0.11576912"
-       height="1.2315382"><feGaussianBlur
-         inkscape:collect="always"
+       y="-0.1326247"
+       height="1.2655597"><feGaussianBlur
          stdDeviation="0.90744768"
          id="feGaussianBlur2730-2" /></filter><linearGradient
        gradientUnits="userSpaceOnUse"
@@ -765,7 +260,6 @@
        x1="51.658199"
        id="linearGradient8769-0"
        xlink:href="#linearGradient5"
-       inkscape:collect="always"
        gradientTransform="matrix(2.7500001,0,0,0.99370101,-129.87501,-991.91286)" /><linearGradient
        gradientUnits="userSpaceOnUse"
        y2="1024.3622"
@@ -774,9 +268,7 @@
        x1="50"
        id="linearGradient8753-0"
        xlink:href="#linearGradient7"
-       inkscape:collect="always"
        gradientTransform="matrix(2.7500001,0,0,0.99370101,-129.87501,-991.91286)" /><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10"
        id="linearGradient2545-3"
        x1="18.423391"
@@ -792,7 +284,6 @@
        x1="63.98344"
        id="linearGradient8779-0"
        xlink:href="#linearGradient8777"
-       inkscape:collect="always"
        gradientTransform="matrix(1.3687895,0,0,1.494898,-60.915436,-1504.7782)" /><linearGradient
        gradientUnits="userSpaceOnUse"
        y2="1028.4165"
@@ -801,26 +292,21 @@
        x1="68.47998"
        id="linearGradient8787-7"
        xlink:href="#linearGradient8785"
-       inkscape:collect="always"
        gradientTransform="matrix(1.3687895,0,0,1.494898,-60.915436,-1504.7782)" /><filter
        height="1.2365698"
        y="-0.11828489"
        width="1.8310951"
        x="-0.41554753"
        id="filter8871-9"
-       style="color-interpolation-filters:sRGB"
-       inkscape:collect="always"><feGaussianBlur
+       style="color-interpolation-filters:sRGB"><feGaussianBlur
          id="feGaussianBlur8873-7"
-         stdDeviation="0.53588249"
-         inkscape:collect="always" /></filter><filter
-       inkscape:collect="always"
+         stdDeviation="0.53588249" /></filter><filter
        style="color-interpolation-filters:sRGB"
        id="filter2533-3"
        x="-0.59377657"
        width="2.1875531"
        y="-0.92639431"
        height="2.8527886"><feGaussianBlur
-         inkscape:collect="always"
          stdDeviation="0.73536407"
          id="feGaussianBlur2535-04" /></filter><filter
        height="1.2365698"
@@ -828,22 +314,17 @@
        width="1.8310951"
        x="-0.41554753"
        id="filter8871-1-8"
-       style="color-interpolation-filters:sRGB"
-       inkscape:collect="always"><feGaussianBlur
+       style="color-interpolation-filters:sRGB"><feGaussianBlur
          id="feGaussianBlur8873-8-5"
-         stdDeviation="0.53588249"
-         inkscape:collect="always" /></filter><filter
+         stdDeviation="0.53588249" /></filter><filter
        height="1.0954513"
        y="-0.047725668"
        width="1.0967932"
        x="-0.048396592"
        id="filter4285-9-8-4"
-       style="color-interpolation-filters:sRGB"
-       inkscape:collect="always"><feGaussianBlur
+       style="color-interpolation-filters:sRGB"><feGaussianBlur
          id="feGaussianBlur4287-9-5-4"
-         stdDeviation="0.10000000000000001"
-         inkscape:collect="always" /></filter><linearGradient
-       inkscape:collect="always"
+         stdDeviation="0.10000000000000001" /></filter><linearGradient
        xlink:href="#linearGradient4496"
        id="linearGradient1"
        gradientUnits="userSpaceOnUse"
@@ -852,7 +333,6 @@
        y1="1013.3622"
        x2="19"
        y2="1024.3622" /><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4504"
        id="linearGradient2"
        gradientUnits="userSpaceOnUse"
@@ -861,7 +341,6 @@
        y1="1020.7158"
        x2="20"
        y2="1020.7158" /><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient3"
        id="linearGradient11"
        gradientUnits="userSpaceOnUse"
@@ -869,58 +348,15 @@
        x1="57"
        y1="1019.3622"
        x2="62"
-       y2="1030.3622" /></defs><sodipodi:namedview
-     id="base"
-     pagecolor="#bcbcbc"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="5.1127142"
-     inkscape:cx="88.70044"
-     inkscape:cy="47.724162"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1728"
-     inkscape:window-height="1051"
-     inkscape:window-x="0"
-     inkscape:window-y="38"
-     inkscape:window-maximized="1"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="true"
-     inkscape:snap-bbox="true"
-     inkscape:bbox-nodes="true"
-     inkscape:showpageshadow="2"
-     inkscape:pagecheckerboard="0"
-     inkscape:deskcolor="#d1d1d1"><inkscape:grid
-       type="xygrid"
-       id="grid4112"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       originx="0"
-       originy="0"
-       spacingy="1"
-       spacingx="1"
-       units="px" /></sodipodi:namedview><metadata
+       y2="1030.3622" /></defs><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" /></cc:Work></rdf:RDF></metadata><g
-     inkscape:groupmode="layer"
      id="layer2"
-     inkscape:label="Background"
-     style="display:inline"
-     sodipodi:insensitive="true"><path
-       sodipodi:nodetypes="cccc"
-       inkscape:connector-curvature="0"
+     style="display:inline"><path
        id="rect4113-1"
        d="M 75,0 75,66 1e-6,66 C 1e-6,41.2048 50.00969,0 75,0 Z"
        style="display:inline;fill:url(#linearGradient4978);fill-opacity:1;stroke:none" /><path
-       sodipodi:nodetypes="cccc"
-       inkscape:connector-curvature="0"
        id="rect4113-1-0"
        d="M 75,21.0607 75,66 1e-6,66 C 10.625001,47.804 43.509694,25.4357 75,21.0607 Z"
        style="display:inline;opacity:0.40400002;fill:url(#linearGradient4962);fill-opacity:1;stroke:none" /><g
@@ -929,188 +365,108 @@
        transform="matrix(0.27903303,0,0,0.27903303,-14.618136,-107.52874)"><g
          style="fill:#737986;fill-opacity:1;stroke:#595e68;stroke-opacity:1"
          id="g13408-8-2" /></g><path
-       sodipodi:nodetypes="cccc"
-       inkscape:connector-curvature="0"
        id="rect4113-1-7"
        d="M 75,4.0000001e-7 75,66 30.000003,66 C 30.000003,46.1545 47.70944,9.2500004 75,4e-7 Z"
        style="display:inline;opacity:0.18399999;fill:url(#linearGradient4970);fill-opacity:1;stroke:none" /></g><g
-     inkscape:label="Foreground"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-986.3622)"><g
        id="g2-5"
        transform="matrix(1.0558482,0,0,1.0849851,23.04189,1006.3512)"
-       inkscape:label="plug-purple"
        style="display:inline;stroke-width:0.934301"><g
          transform="matrix(1.0729615,0,0,1.0787087,-1.2096914,-0.17204372)"
          id="g2558-4-4"
-         style="display:inline;opacity:0.503;fill:#808080;stroke:#808080;stroke-width:0.868446;filter:url(#filter2728-6)"
-         inkscape:label="shadow"><path
+         style="display:inline;opacity:0.503;fill:#808080;stroke:#808080;stroke-width:0.868446;filter:url(#filter2728-6)"><path
            id="path8722-7-8-1"
            style="display:inline;opacity:1;fill:#808080;fill-opacity:1;stroke:#808080;stroke-width:0.868446;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="M 3.4999999,23.512598 V 25.5 H 14.5 V 21.525196 H 3.4999999 v 1.987402"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccccc" /><path
-           sodipodi:nodetypes="cscccsssscsscc"
+           d="M 3.4999999,23.512598 V 25.5 H 14.5 V 21.525196 H 3.4999999 v 1.987402" /><path
            id="rect8645-3-9-9"
            style="display:inline;opacity:1;fill:#808080;fill-opacity:1;stroke:#808080;stroke-width:0.868446;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="m 25.499998,23.781495 2e-6,-8.367936 c -1e-6,2.603078 -9.194589,4.450864 -11,4.847997 v 3.519375 m 10.999998,5.64e-4 2e-6,8.367936 c 0,1.614156 -0.931058,2.913559 -2.087573,2.913559 h -2.424855 c -1.156515,0 -2.483072,-1.299403 -2.483072,-2.913559 V 30.550392 H 16.239644 C 15.275881,30.550392 14.5,29.756288 14.5,28.769946 v -1.468512 -3.519375"
-           inkscape:connector-curvature="0" /><path
+           d="m 25.499998,23.781495 2e-6,-8.367936 c -1e-6,2.603078 -9.194589,4.450864 -11,4.847997 v 3.519375 m 10.999998,5.64e-4 2e-6,8.367936 c 0,1.614156 -0.931058,2.913559 -2.087573,2.913559 h -2.424855 c -1.156515,0 -2.483072,-1.299403 -2.483072,-2.913559 V 30.550392 H 16.239644 C 15.275881,30.550392 14.5,29.756288 14.5,28.769946 v -1.468512 -3.519375" /><path
            id="rect8645-2-5-2-4"
            style="display:inline;opacity:1;fill:#808080;fill-opacity:1;stroke:#808080;stroke-width:0.868446;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="m 36.091538,26.489769 -10e-7,1.058985 c 0,1.06945 -0.863288,1.955925 -2.164732,1.930363 -1.301445,-0.02541 -1.941636,0 -1.941636,0 v 0.201512 c 0,1.544678 -1.158564,2.787985 -2.597679,2.788284 l -1.648306,2.98e-4 c -1.360345,3e-4 -1.894397,0.487086 -1.22903,-2.989646 l 1.605386,-8.388592 c 4.307956,0 7.975998,-2.709681 7.975998,-1.640231 v 2.554332 z m 0.06454,-6.010119 h 8.461471 l -0.05085,6.010119 h -8.188123"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cczccssscccccccc" /></g><g
+           d="m 36.091538,26.489769 -10e-7,1.058985 c 0,1.06945 -0.863288,1.955925 -2.164732,1.930363 -1.301445,-0.02541 -1.941636,0 -1.941636,0 v 0.201512 c 0,1.544678 -1.158564,2.787985 -2.597679,2.788284 l -1.648306,2.98e-4 c -1.360345,3e-4 -1.894397,0.487086 -1.22903,-2.989646 l 1.605386,-8.388592 c 4.307956,0 7.975998,-2.709681 7.975998,-1.640231 v 2.554332 z m 0.06454,-6.010119 h 8.461471 l -0.05085,6.010119 h -8.188123" /></g><g
          id="g2558-8"
-         style="display:inline;stroke-width:0.934301"
-         inkscape:label="plug"><path
+         style="display:inline;stroke-width:0.934301"><path
            id="path8722-7-1"
            style="display:inline;opacity:1;fill:url(#linearGradient8769-0);fill-opacity:1;stroke:url(#linearGradient8753-0);stroke-width:0.934301;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="M 3.4999999,23.512598 V 25.5 H 14.5 V 21.525196 H 3.4999999 v 1.987402"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccccc"
-           inkscape:label="cord" /><path
-           sodipodi:nodetypes="csscssccccccsssscsscc"
+           d="M 3.4999999,23.512598 V 25.5 H 14.5 V 21.525196 H 3.4999999 v 1.987402" /><path
            id="rect8645-3-5-6"
            style="display:inline;fill:url(#linearGradient11);fill-opacity:1;stroke:#9454ac;stroke-width:0.934301;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="M 25.5,23.781491 25.4936,18.23846 c -0.0019,-1.614155 -0.650924,-2.542218 -1.638414,-1.956396 l -0.595274,2.47471 -1.583604,-1.182104 c -0.917642,-0.684987 0.603801,2.235437 -0.908819,1.573079 l -1.377472,-0.603178 -0.592212,2.34584 c -0.963763,0 -1.592058,0.171739 -1.592058,1.158081 -2.036015,-1.123034 -1.623448,0.308424 -2.705747,0.02333 v 1.709109 m 10.999998,5.64e-4 2e-6,8.367936 c 0,1.614156 -0.931058,2.913559 -2.087573,2.913559 h -2.424855 c -1.156515,0 -2.483072,-1.299403 -2.483072,-2.913559 V 30.550392 H 16.239644 C 15.275881,30.550392 14.5,29.756288 14.5,28.769946 v -1.468512 -3.519375"
-           inkscape:connector-curvature="0"
-           inkscape:label="plug" /><path
-           sodipodi:nodetypes="cc"
-           inkscape:connector-curvature="0"
+           d="M 25.5,23.781491 25.4936,18.23846 c -0.0019,-1.614155 -0.650924,-2.542218 -1.638414,-1.956396 l -0.595274,2.47471 -1.583604,-1.182104 c -0.917642,-0.684987 0.603801,2.235437 -0.908819,1.573079 l -1.377472,-0.603178 -0.592212,2.34584 c -0.963763,0 -1.592058,0.171739 -1.592058,1.158081 -2.036015,-1.123034 -1.623448,0.308424 -2.705747,0.02333 v 1.709109 m 10.999998,5.64e-4 2e-6,8.367936 c 0,1.614156 -0.931058,2.913559 -2.087573,2.913559 h -2.424855 c -1.156515,0 -2.483072,-1.299403 -2.483072,-2.913559 V 30.550392 H 16.239644 C 15.275881,30.550392 14.5,29.756288 14.5,28.769946 v -1.468512 -3.519375" /><path
            id="path2537-5"
            d="m 18.516609,21.210096 0.02986,9.214752"
-           style="fill:none;stroke:url(#linearGradient2545-3);stroke-width:0.9343px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-           inkscape:label="line" /><path
+           style="fill:none;stroke:url(#linearGradient2545-3);stroke-width:0.9343px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /><path
            id="rect8645-2-5-8"
            style="display:inline;opacity:1;fill:url(#linearGradient8779-0);fill-opacity:1;stroke:url(#linearGradient8787-7);stroke-width:0.934301;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="m 35.584224,25.791351 v 1.058985 c 0,1.06945 -0.86329,1.955925 -2.16474,1.930363 -1.30144,-0.02541 -1.94163,0 -1.94163,0 v 0.201512 c 0,1.544678 -1.15857,2.787985 -2.59768,2.788284 l -1.64831,2.98e-4 c -1.36034,3e-4 -1.22903,0.546236 -1.22903,-2.989646 v -8.697694 l 1.0001,-0.451316 c 0.73866,-0.333337 0.24318,-1.03959 0.77485,-1.523121 0.14263,-0.129715 1.05499,0.929393 1.52937,0.6759 0.45561,-0.243458 0.32468,-1.571886 1.05063,-1.470834 l 1.3916,0.729993 1.6701,-1.222114 c 0.95852,-0.701405 2.16474,0.860911 2.16474,1.930361 v 2.554332 z m 0.0645,-6.010119 h 8.46147 l -0.0509,6.010119 h -8.18813"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cczccssscsssccsccccccc"
-           inkscape:label="socket" /><path
+           d="m 35.584224,25.791351 v 1.058985 c 0,1.06945 -0.86329,1.955925 -2.16474,1.930363 -1.30144,-0.02541 -1.94163,0 -1.94163,0 v 0.201512 c 0,1.544678 -1.15857,2.787985 -2.59768,2.788284 l -1.64831,2.98e-4 c -1.36034,3e-4 -1.22903,0.546236 -1.22903,-2.989646 v -8.697694 l 1.0001,-0.451316 c 0.73866,-0.333337 0.24318,-1.03959 0.77485,-1.523121 0.14263,-0.129715 1.05499,0.929393 1.52937,0.6759 0.45561,-0.243458 0.32468,-1.571886 1.05063,-1.470834 l 1.3916,0.729993 1.6701,-1.222114 c 0.95852,-0.701405 2.16474,0.860911 2.16474,1.930361 v 2.554332 z m 0.0645,-6.010119 h 8.46147 l -0.0509,6.010119 h -8.18813" /><path
            transform="matrix(1.445753,0,0,1.0582384,-65.097292,-1055.8857)"
            style="opacity:0.794;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.755349px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter8871-9)"
            d="m 64.018476,1016.5423 -0.152427,10.8222 c 2.375507,-3.3036 3.484206,-4.2052 2.972286,-9.2217 0.305009,-1.654 -1.117834,-1.7529 -2.819859,-1.6005 z"
-           id="path8861-5"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccc"
-           inkscape:label="highlight" /><path
+           id="path8861-5" /><path
            transform="matrix(1.7350569,0,0,1.2551252,-91.814902,-1260.0381)"
            style="opacity:0.862;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.63312px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter2533-3)"
            d="m 70.953811,1023.4014 v -1.8291 l 2.972286,-0.076 z"
-           id="path8875-7"
-           inkscape:connector-curvature="0"
-           inkscape:label="highlight" /><path
+           id="path8875-7" /><path
            transform="matrix(1.029538,0,0,0.78990616,-39.928294,-780.65638)"
            style="display:inline;opacity:0.485;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.03604px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter8871-1-8)"
            d="m 53.924652,1016.631 -0.152427,10.8222 c 2.375507,-3.3036 3.484206,-4.2052 2.972286,-9.2217 0.305009,-1.654 -1.117834,-1.7529 -2.819859,-1.6005 z"
-           id="path8861-7-9"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccc"
-           inkscape:label="highlight" /></g></g><g
+           id="path8861-7-9" /></g></g><g
        id="g2"
        transform="matrix(1.0558482,0,0,1.0849851,6.0137165,982.95176)"
-       inkscape:label="plug-blue"
        style="stroke-width:0.934301"><g
          transform="matrix(1.0729615,0,0,1.0787087,-1.2096914,-0.17204372)"
          id="g2558-4"
-         style="display:inline;opacity:0.503;fill:#808080;stroke:#808080;stroke-width:0.868446;filter:url(#filter2728)"
-         inkscape:label="shadow"><path
+         style="display:inline;opacity:0.503;fill:#808080;stroke:#808080;stroke-width:0.868446;filter:url(#filter2728)"><path
            id="path8722-7-8"
            style="display:inline;opacity:1;fill:#808080;fill-opacity:1;stroke:#808080;stroke-width:0.868446;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="M 3.4999999,23.512598 V 25.5 H 14.5 V 21.525196 H 3.4999999 v 1.987402"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccccc" /><path
-           sodipodi:nodetypes="csssscsscccsssscsscc"
+           d="M 3.4999999,23.512598 V 25.5 H 14.5 V 21.525196 H 3.4999999 v 1.987402" /><path
            id="rect8645-3-9"
            style="display:inline;opacity:1;fill:#808080;fill-opacity:1;stroke:#808080;stroke-width:0.868446;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="M 25.499998,23.781495 25.5,15.413559 C 25.5,13.799403 24.568942,12.5 23.412427,12.5 h -2.424855 c -1.156515,0 -2.483072,1.299403 -2.483072,2.913559 v 1.599039 h -2.264856 c -0.963763,0 -1.739644,0.794104 -1.739644,1.780446 v 1.468512 3.519375 m 10.999998,5.64e-4 2e-6,8.367936 c 0,1.614156 -0.931058,2.913559 -2.087573,2.913559 h -2.424855 c -1.156515,0 -2.483072,-1.299403 -2.483072,-2.913559 V 30.550392 H 16.239644 C 15.275881,30.550392 14.5,29.756288 14.5,28.769946 v -1.468512 -3.519375"
-           inkscape:connector-curvature="0" /><path
+           d="M 25.499998,23.781495 25.5,15.413559 C 25.5,13.799403 24.568942,12.5 23.412427,12.5 h -2.424855 c -1.156515,0 -2.483072,1.299403 -2.483072,2.913559 v 1.599039 h -2.264856 c -0.963763,0 -1.739644,0.794104 -1.739644,1.780446 v 1.468512 3.519375 m 10.999998,5.64e-4 2e-6,8.367936 c 0,1.614156 -0.931058,2.913559 -2.087573,2.913559 h -2.424855 c -1.156515,0 -2.483072,-1.299403 -2.483072,-2.913559 V 30.550392 H 16.239644 C 15.275881,30.550392 14.5,29.756288 14.5,28.769946 v -1.468512 -3.519375" /><path
            id="rect8645-2-5-2"
            style="display:inline;opacity:1;fill:#808080;fill-opacity:1;stroke:#808080;stroke-width:0.868446;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="m 36.091538,26.489769 -10e-7,1.058985 c 0,1.06945 -0.863288,1.955925 -2.164732,1.930363 -1.301445,-0.02541 -1.941636,0 -1.941636,0 v 0.201512 c 0,1.544678 -1.158564,2.787985 -2.597679,2.788284 l -1.648306,2.98e-4 c -1.360345,3e-4 -1.22903,0.546236 -1.22903,-2.989646 V 17.520381 c 0,-3.536032 -0.205068,-2.989797 1.22903,-2.989797 h 1.648306 c 1.439115,0 2.597679,1.243607 2.597679,2.788284 v 0.201513 h 1.941637 c 1.199261,0 2.164732,0.860911 2.164732,1.930361 v 2.554332 z m 0.06454,-6.010119 h 8.461471 l -0.05085,6.010119 h -8.188123"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cczccssssssccsccccccc" /></g><g
+           d="m 36.091538,26.489769 -10e-7,1.058985 c 0,1.06945 -0.863288,1.955925 -2.164732,1.930363 -1.301445,-0.02541 -1.941636,0 -1.941636,0 v 0.201512 c 0,1.544678 -1.158564,2.787985 -2.597679,2.788284 l -1.648306,2.98e-4 c -1.360345,3e-4 -1.22903,0.546236 -1.22903,-2.989646 V 17.520381 c 0,-3.536032 -0.205068,-2.989797 1.22903,-2.989797 h 1.648306 c 1.439115,0 2.597679,1.243607 2.597679,2.788284 v 0.201513 h 1.941637 c 1.199261,0 2.164732,0.860911 2.164732,1.930361 v 2.554332 z m 0.06454,-6.010119 h 8.461471 l -0.05085,6.010119 h -8.188123" /></g><g
          id="g2558"
-         style="stroke-width:0.934301"
-         inkscape:label="plug"><path
+         style="stroke-width:0.934301"><path
            id="path8722-7"
            style="display:inline;opacity:1;fill:url(#linearGradient8769);fill-opacity:1;stroke:url(#linearGradient8753);stroke-width:0.934301;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="M 3.4999999,23.512598 V 25.5 H 14.5 V 21.525196 H 3.4999999 v 1.987402"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccccc"
-           inkscape:label="cord" /><path
-           sodipodi:nodetypes="csssscsscccsssscsscc"
+           d="M 3.4999999,23.512598 V 25.5 H 14.5 V 21.525196 H 3.4999999 v 1.987402" /><path
            id="rect8645-3"
            style="display:inline;opacity:1;fill:url(#linearGradient8761);fill-opacity:1;stroke:#4d73ae;stroke-width:0.934301;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="M 25.499998,23.781495 25.5,15.413559 C 25.5,13.799403 24.568942,12.5 23.412427,12.5 h -2.424855 c -1.156515,0 -2.483072,1.299403 -2.483072,2.913559 v 1.599039 h -2.264856 c -0.963763,0 -1.739644,0.794104 -1.739644,1.780446 v 1.468512 3.519375 m 10.999998,5.64e-4 2e-6,8.367936 c 0,1.614156 -0.931058,2.913559 -2.087573,2.913559 h -2.424855 c -1.156515,0 -2.483072,-1.299403 -2.483072,-2.913559 V 30.550392 H 16.239644 C 15.275881,30.550392 14.5,29.756288 14.5,28.769946 v -1.468512 -3.519375"
-           inkscape:connector-curvature="0"
-           inkscape:label="plug" /><path
-           sodipodi:nodetypes="cc"
-           inkscape:connector-curvature="0"
+           d="M 25.499998,23.781495 25.5,15.413559 C 25.5,13.799403 24.568942,12.5 23.412427,12.5 h -2.424855 c -1.156515,0 -2.483072,1.299403 -2.483072,2.913559 v 1.599039 h -2.264856 c -0.963763,0 -1.739644,0.794104 -1.739644,1.780446 v 1.468512 3.519375 m 10.999998,5.64e-4 2e-6,8.367936 c 0,1.614156 -0.931058,2.913559 -2.087573,2.913559 h -2.424855 c -1.156515,0 -2.483072,-1.299403 -2.483072,-2.913559 V 30.550392 H 16.239644 C 15.275881,30.550392 14.5,29.756288 14.5,28.769946 v -1.468512 -3.519375" /><path
            id="path2537"
            d="M 18.51661,16.539741 18.5464,30.705846"
-           style="display:inline;fill:none;stroke:url(#linearGradient2545);stroke-width:0.934301px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-           inkscape:label="line" /><path
+           style="display:inline;fill:none;stroke:url(#linearGradient2545);stroke-width:0.934301px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /><path
            id="rect8645-2-5"
            style="display:inline;opacity:1;fill:url(#linearGradient8779);fill-opacity:1;stroke:url(#linearGradient8787);stroke-width:0.934301;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="m 36.091538,26.489769 -10e-7,1.058985 c 0,1.06945 -0.863288,1.955925 -2.164732,1.930363 -1.301445,-0.02541 -1.941636,0 -1.941636,0 v 0.201512 c 0,1.544678 -1.158564,2.787985 -2.597679,2.788284 l -1.648306,2.98e-4 c -1.360345,3e-4 -1.22903,0.546236 -1.22903,-2.989646 V 17.520381 c 0,-3.536032 -0.205068,-2.989797 1.22903,-2.989797 h 1.648306 c 1.439115,0 2.597679,1.243607 2.597679,2.788284 v 0.201513 h 1.941637 c 1.199261,0 2.164732,0.860911 2.164732,1.930361 v 2.554332 z m 0.06454,-6.010119 h 8.461471 l -0.05085,6.010119 h -8.188123"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cczccssssssccsccccccc"
-           inkscape:label="socket" /><path
+           d="m 36.091538,26.489769 -10e-7,1.058985 c 0,1.06945 -0.863288,1.955925 -2.164732,1.930363 -1.301445,-0.02541 -1.941636,0 -1.941636,0 v 0.201512 c 0,1.544678 -1.158564,2.787985 -2.597679,2.788284 l -1.648306,2.98e-4 c -1.360345,3e-4 -1.22903,0.546236 -1.22903,-2.989646 V 17.520381 c 0,-3.536032 -0.205068,-2.989797 1.22903,-2.989797 h 1.648306 c 1.439115,0 2.597679,1.243607 2.597679,2.788284 v 0.201513 h 1.941637 c 1.199261,0 2.164732,0.860911 2.164732,1.930361 v 2.554332 z m 0.06454,-6.010119 h 8.461471 l -0.05085,6.010119 h -8.188123" /><path
            transform="matrix(1.445753,0,0,1.3224494,-65.097292,-1327.9481)"
            style="display:inline;opacity:0.794;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.675694px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter8871)"
            d="m 64.018476,1016.5423 -0.152427,10.8222 c 2.375507,-3.3036 3.484206,-4.2052 2.972286,-9.2217 0.305009,-1.654 -1.117834,-1.7529 -2.819859,-1.6005 z"
-           id="path8861"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccc"
-           inkscape:label="highlight" /><ellipse
+           id="path8861" /><ellipse
            transform="matrix(1.029538,0,0,1.1281495,-39.470994,-1128.0797)"
            style="opacity:0.828;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.866927;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter8835)"
            id="path8817"
            cx="59.521938"
            cy="1014.637"
            rx="1.9053118"
-           ry="1.9815242"
-           inkscape:label="highlight" /><path
+           ry="1.9815242" /><path
            transform="matrix(1.7350569,0,0,1.8824502,-91.814902,-1903.1505)"
            style="display:inline;opacity:0.862;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.516973px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter2533)"
            d="m 70.953811,1023.4014 v -1.8291 l 2.972286,-0.076 z"
-           id="path8875"
-           inkscape:connector-curvature="0"
-           inkscape:label="highlight" /><path
+           id="path8875" /><path
            transform="matrix(1.029538,0,0,1.1281495,-39.928294,-1128.6206)"
            style="display:inline;opacity:0.485;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.866927px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter8871-1)"
            d="m 53.924652,1016.631 -0.152427,10.8222 c 2.375507,-3.3036 3.484206,-4.2052 2.972286,-9.2217 0.305009,-1.654 -1.117834,-1.7529 -2.819859,-1.6005 z"
-           id="path8861-7"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccc"
-           inkscape:label="highlight" /></g></g><g
+           id="path8861-7" /></g></g><g
        id="g2-9"
-       inkscape:label="export-triangle"
        style="display:inline"
        transform="translate(2.0022445,-0.5594677)"><path
          style="display:inline;fill:url(#linearGradient1);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient2);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
          d="M 1.7489458,1033.7666 H 16.748946 v 15 z"
-         id="path4478-7"
-         inkscape:connector-curvature="0"
-         inkscape:label="triangle" /><path
-         sodipodi:type="star"
+         id="path4478-7" /><path
          style="display:inline;opacity:0.9;fill:#ffffff;fill-opacity:0.815842;stroke:none;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;filter:url(#filter4285-9-8-4)"
          id="path4252-6-0-5"
-         sodipodi:sides="4"
-         sodipodi:cx="4.7729707"
-         sodipodi:cy="1041.2474"
-         sodipodi:r1="3.3255017"
-         sodipodi:r2="0.49178758"
-         sodipodi:arg1="2.432965"
-         sodipodi:arg2="-3.0800218"
-         inkscape:flatsided="false"
-         inkscape:rounded="0"
-         inkscape:randomized="-0.017554997"
          d="m 2.2999628,1043.3702 1.9823895,-2.1047 -1.6734053,-2.5419 2.1987064,2.0209 2.4513363,-1.6427 -2.0383649,2.1623 1.7419712,2.4882 -2.2030799,-2.0431 z"
-         transform="matrix(-0.82539295,1.4154894,-1.2829533,-1.0100615,1348.392,2086.9405)"
-         inkscape:transform-center-x="0.19603188"
-         inkscape:transform-center-y="0.38464271"
-         inkscape:label="star" /></g></g></svg>
+         transform="matrix(-0.82539295,1.4154894,-1.2829533,-1.0100615,1348.392,2086.9405)" /></g></g></svg>
diff --git a/ui/org.eclipse.pde.ui/icons/wizban/exp_product.svg b/ui/org.eclipse.pde.ui/icons/wizban/exp_product.svg
index 28f9b1d4d60..f2d10a80cc1 100644
--- a/ui/org.eclipse.pde.ui/icons/wizban/exp_product.svg
+++ b/ui/org.eclipse.pde.ui/icons/wizban/exp_product.svg
@@ -6,14 +6,7 @@
    height="66"
    id="svg2"
    version="1.1"
-   inkscape:version="1.3 (0e150ed, 2023-07-21)"
-   sodipodi:docname="exp_product.svg"
-   inkscape:export-filename="/Users/d021678/git/eclipse.jdt.ui/org.eclipse.jdt.ui/icons/full/wizban/newclass_wiz2.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90"
    xml:space="preserve"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:svg="http://www.w3.org/2000/svg"
@@ -21,23 +14,20 @@
    xmlns:cc="http://creativecommons.org/ns#"
    xmlns:dc="http://purl.org/dc/elements/1.1/"><defs
      id="defs4"><linearGradient
-       id="linearGradient5904"
-       inkscape:collect="always"><stop
+       id="linearGradient5904"><stop
          id="stop5906"
          offset="0"
          style="stop-color:#c5c6c6;stop-opacity:1" /><stop
          id="stop5908"
          offset="1"
          style="stop-color:#000000;stop-opacity:0;" /></linearGradient><linearGradient
-       id="linearGradient5898"
-       inkscape:collect="always"><stop
+       id="linearGradient5898"><stop
          id="stop5900"
          offset="0"
          style="stop-color:#c0c1c1;stop-opacity:1" /><stop
          id="stop5902"
          offset="1"
          style="stop-color:#000000;stop-opacity:0;" /></linearGradient><linearGradient
-       inkscape:collect="always"
        id="linearGradient4581"><stop
          style="stop-color:#dddddd;stop-opacity:1"
          offset="0"
@@ -45,7 +35,6 @@
          style="stop-color:#9f9f9f;stop-opacity:1"
          offset="1"
          id="stop4585" /></linearGradient><linearGradient
-       inkscape:collect="always"
        id="linearGradient4541"><stop
          style="stop-color:#a1adb2;stop-opacity:1"
          offset="0"
@@ -53,7 +42,6 @@
          style="stop-color:#000000;stop-opacity:0;"
          offset="1"
          id="stop4545" /></linearGradient><linearGradient
-       inkscape:collect="always"
        id="linearGradient4461"><stop
          style="stop-color:#d8d8d8;stop-opacity:1"
          offset="0"
@@ -67,7 +55,6 @@
          style="stop-color:#b4b4b4;stop-opacity:1"
          offset="1"
          id="stop4465" /></linearGradient><linearGradient
-       inkscape:collect="always"
        id="linearGradient4504"><stop
          style="stop-color:#b0c1db;stop-opacity:1"
          offset="0"
@@ -75,8 +62,7 @@
          style="stop-color:#8299c2;stop-opacity:1"
          offset="1"
          id="stop4508" /></linearGradient><linearGradient
-       id="linearGradient4496"
-       inkscape:collect="always"><stop
+       id="linearGradient4496"><stop
          id="stop4498"
          offset="0"
          style="stop-color:#6885b2;stop-opacity:1" /><stop
@@ -89,299 +75,6 @@
          id="stop4502"
          offset="1"
          style="stop-color:#2c4a81;stop-opacity:1" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       id="linearGradient4972"><stop
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0"
-         id="stop4974" /><stop
-         style="stop-color:#f5f8fd;stop-opacity:1"
-         offset="1"
-         id="stop4976" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       id="linearGradient4964"><stop
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0"
-         id="stop4966" /><stop
-         style="stop-color:#e8eefa;stop-opacity:1"
-         offset="1"
-         id="stop4968" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       id="linearGradient4956"><stop
-         style="stop-color:#fcfdfe;stop-opacity:1"
-         offset="0"
-         id="stop4958" /><stop
-         style="stop-color:#dee6f8;stop-opacity:1"
-         offset="1"
-         id="stop4960" /></linearGradient><filter
-       style="color-interpolation-filters:sRGB"
-       inkscape:label="Drop Shadow"
-       id="filter8854"><feFlood
-         flood-opacity="0.933333"
-         flood-color="rgb(244,248,254)"
-         result="flood"
-         id="feFlood8856" /><feComposite
-         in="flood"
-         in2="SourceGraphic"
-         operator="in"
-         result="composite1"
-         id="feComposite8858" /><feGaussianBlur
-         in="composite1"
-         stdDeviation="1.2"
-         result="blur"
-         id="feGaussianBlur8860" /><feOffset
-         dx="-1"
-         dy="3"
-         result="offset"
-         id="feOffset8862" /><feComposite
-         in="SourceGraphic"
-         in2="offset"
-         operator="over"
-         result="composite2"
-         id="feComposite8864" /></filter><linearGradient
-       id="linearGradient6122"><stop
-         style="stop-color:#c0c0c0;stop-opacity:1"
-         offset="0"
-         id="stop6124" /><stop
-         id="stop6132"
-         offset="0.5"
-         style="stop-color:#adadad;stop-opacity:1" /><stop
-         style="stop-color:#808080;stop-opacity:1"
-         offset="1"
-         id="stop6126" /></linearGradient><linearGradient
-       id="linearGradient7087"><stop
-         style="stop-color:#17325d;stop-opacity:1;"
-         offset="0"
-         id="stop7089" /><stop
-         id="stop7091"
-         offset="0.25"
-         style="stop-color:#b4d0e2;stop-opacity:1" /><stop
-         id="stop7093"
-         offset="0.5"
-         style="stop-color:#b7d2e4;stop-opacity:1" /><stop
-         style="stop-color:#acc9de;stop-opacity:1"
-         offset="0.75"
-         id="stop7095" /><stop
-         style="stop-color:#3e72a7;stop-opacity:1"
-         offset="1"
-         id="stop7097" /></linearGradient><mask
-       id="mask7366"
-       maskUnits="userSpaceOnUse"><path
-         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;display:inline"
-         d="m -16.593048,1040.862 9.990206,0 0,10.0018 -2.983353,3.0385 -5.966213,0 c -0.53033,-0.022 -1.04064,-0.5519 -1.04064,-1.0385 z"
-         id="path7368"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccccc" /></mask><linearGradient
-       id="linearGradient7584-5"><stop
-         id="stop7586-4"
-         offset="0"
-         style="stop-color:#f9cd5f;stop-opacity:1" /><stop
-         id="stop7588-5"
-         offset="1"
-         style="stop-color:#fbf0b4;stop-opacity:1" /></linearGradient><linearGradient
-       id="linearGradient7592-1"><stop
-         id="stop7594-6"
-         offset="0"
-         style="stop-color:#bd8416;stop-opacity:1" /><stop
-         id="stop7596-9"
-         offset="1"
-         style="stop-color:#a66b10;stop-opacity:1" /></linearGradient><linearGradient
-       id="linearGradient10798-1-9-3-7-6-6-6-2-6-7-98-9-4-1"><stop
-         style="stop-color:#5aad60;stop-opacity:1;"
-         offset="0"
-         id="stop10800-5-2-1-8-20-4-0-2-1-9-0-0-1-1" /><stop
-         id="stop10806-6-8-5-3-9-2-2-7-0-4-2-7-8-9"
-         offset="0.5"
-         style="stop-color:#5bb26a;stop-opacity:1;" /><stop
-         style="stop-color:#a4c589;stop-opacity:1"
-         offset="1"
-         id="stop10802-1-5-3-0-4-6-8-5-5-6-69-6-4-0" /></linearGradient><mask
-       maskUnits="userSpaceOnUse"
-       id="mask7366-4"><path
-         sodipodi:nodetypes="ccccccc"
-         inkscape:connector-curvature="0"
-         id="path7368-2"
-         d="m -16.593048,1040.862 9.990206,0 0,10.0018 -2.983353,3.0385 -5.966213,0 c -0.53033,-0.022 -1.04064,-0.5519 -1.04064,-1.0385 z"
-         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;display:inline" /></mask><linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient7087"
-       id="linearGradient9331"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-20,0)"
-       x1="4.7776356"
-       y1="1039.8118"
-       x2="4.7776356"
-       y2="1041.911" /><linearGradient
-       y2="1041.911"
-       x2="4.7776356"
-       y1="1039.8118"
-       x1="4.7776356"
-       gradientTransform="translate(-18,4.7e-5)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient9333"
-       xlink:href="#linearGradient7087"
-       inkscape:collect="always" /><linearGradient
-       y2="1041.911"
-       x2="4.7776356"
-       y1="1039.8118"
-       x1="4.7776356"
-       gradientTransform="translate(-16,4.7e-5)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient9335"
-       xlink:href="#linearGradient7087"
-       inkscape:collect="always" /><linearGradient
-       y2="1041.911"
-       x2="4.7776356"
-       y1="1039.8118"
-       x1="4.7776356"
-       gradientTransform="translate(-14,4.7e-5)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient9337"
-       xlink:href="#linearGradient7087"
-       inkscape:collect="always" /><linearGradient
-       y2="1041.911"
-       x2="4.7776356"
-       y1="1039.8118"
-       x1="4.7776356"
-       gradientTransform="translate(-12,4.7e-5)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient9339"
-       xlink:href="#linearGradient7087"
-       inkscape:collect="always" /><linearGradient
-       gradientTransform="translate(-80,0)"
-       gradientUnits="userSpaceOnUse"
-       y2="1042.7973"
-       x2="163.22012"
-       y1="1042.7973"
-       x1="88.220117"
-       id="linearGradient68073"
-       xlink:href="#linearGradient4956"
-       inkscape:collect="always" /><linearGradient
-       gradientTransform="translate(-80,0)"
-       gradientUnits="userSpaceOnUse"
-       y2="1032.2669"
-       x2="163.22012"
-       y1="1032.2668"
-       x1="94.469681"
-       id="linearGradient68075"
-       xlink:href="#linearGradient4964"
-       inkscape:collect="always" /><linearGradient
-       gradientTransform="translate(-80,0)"
-       gradientUnits="userSpaceOnUse"
-       y2="1032.2668"
-       x2="152.72206"
-       y1="1032.2668"
-       x1="88.220116"
-       id="linearGradient68077"
-       xlink:href="#linearGradient4972"
-       inkscape:collect="always" /><filter
-       id="filter8854-9"
-       inkscape:label="Drop Shadow"
-       style="color-interpolation-filters:sRGB"><feFlood
-         id="feFlood8856-0"
-         result="flood"
-         flood-color="rgb(244,248,254)"
-         flood-opacity="0.933333" /><feComposite
-         id="feComposite8858-2"
-         result="composite1"
-         operator="in"
-         in2="SourceGraphic"
-         in="flood" /><feGaussianBlur
-         id="feGaussianBlur8860-3"
-         result="blur"
-         stdDeviation="1.2"
-         in="composite1" /><feOffset
-         id="feOffset8862-2"
-         result="offset"
-         dy="3"
-         dx="-1" /><feComposite
-         id="feComposite8864-3"
-         result="composite2"
-         operator="over"
-         in2="offset"
-         in="SourceGraphic" /></filter><linearGradient
-       id="linearGradient10798-1-9-3-7-6-8-9-0-9-1"><stop
-         id="stop10800-5-2-1-8-20-6-4-9-8-2"
-         offset="0"
-         style="stop-color:#7564b1;stop-opacity:1" /><stop
-         style="stop-color:#5d4aa1;stop-opacity:1"
-         offset="0.5"
-         id="stop10806-6-8-5-3-9-24-8-4-3-2" /><stop
-         id="stop10802-1-5-3-0-4-8-4-2-9-2"
-         offset="1"
-         style="stop-color:#9283c3;stop-opacity:1" /></linearGradient><linearGradient
-       id="linearGradient7540-2-3-8-7"><stop
-         id="stop7542-8-7-5-3"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.502" /><stop
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0.47623286"
-         id="stop7544-8-2-0-5" /><stop
-         style="stop-color:#ffffff;stop-opacity:0"
-         offset="0.5"
-         id="stop7546-1-7-9-5" /><stop
-         id="stop7548-98-9-2-4"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       id="linearGradient7272-66-4-5-5-5-8"><stop
-         style="stop-color:#8f6c10;stop-opacity:1"
-         offset="0"
-         id="stop7274-6-0-1-7-4-7" /><stop
-         style="stop-color:#c9a645;stop-opacity:1"
-         offset="1"
-         id="stop7276-66-6-3-9-1-4" /></linearGradient><linearGradient
-       y2="1030.3411"
-       x2="-10.159802"
-       y1="1030.3411"
-       x1="-22.453552"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient10540"
-       xlink:href="#linearGradient7540-2-3-8-7"
-       inkscape:collect="always" /><linearGradient
-       y2="1030.3411"
-       x2="-10.159802"
-       y1="1030.3411"
-       x1="-22.453552"
-       gradientTransform="matrix(0,1,-1,0,1014.0344,1046.6478)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient10542"
-       xlink:href="#linearGradient7540-2-3-8-7"
-       inkscape:collect="always" /><linearGradient
-       y2="1023.2569"
-       x2="-15.945988"
-       y1="1037.4661"
-       x1="-15.945988"
-       gradientTransform="matrix(0.95585117,0,0,0.95585117,-0.71992063,45.488394)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient10544"
-       xlink:href="#linearGradient7272-66-4-5-5-5-8"
-       inkscape:collect="always" /><mask
-       id="mask10620"
-       maskUnits="userSpaceOnUse"><path
-         transform="matrix(0.55482947,0,0,0.55482947,-206.96039,787.08655)"
-         d="m 398.75,468.23718 a 10.625,10.625 0 1 1 -21.25,0 10.625,10.625 0 1 1 21.25,0 z"
-         sodipodi:ry="10.625"
-         sodipodi:rx="10.625"
-         sodipodi:cy="468.23718"
-         sodipodi:cx="388.125"
-         id="path10622"
-         style="font-size:13.58917427px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:2.16621375;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline;font-family:Sans"
-         sodipodi:type="arc" /></mask><linearGradient
-       id="linearGradient4528-9-5-7-9-7-3"><stop
-         id="stop4530-0-5-0-5-8-4"
-         offset="0"
-         style="stop-color:#e0c576;stop-opacity:1;" /><stop
-         id="stop4532-7-9-3-3-6-1"
-         offset="1"
-         style="stop-color:#9e7916;stop-opacity:1" /></linearGradient><linearGradient
-       id="linearGradient6281-8-0-1-6-6-4-2-8-0"><stop
-         style="stop-color:#f7f9fb;stop-opacity:1"
-         offset="0"
-         id="stop6283-0-2-2-1-2-0-1-6-0" /><stop
-         style="stop-color:#ffd680;stop-opacity:1"
-         offset="1"
-         id="stop6285-5-0-9-7-6-9-9-1-9" /></linearGradient><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4972-7"
        id="linearGradient4978"
        x1="88.220116"
@@ -390,7 +83,6 @@
        y2="1032.2668"
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-88.220116,-999.2669)" /><linearGradient
-       inkscape:collect="always"
        id="linearGradient4972-7"><stop
          style="stop-color:#b8ccf1;stop-opacity:0.10196079"
          offset="0"
@@ -398,7 +90,6 @@
          style="stop-color:#6e97e2;stop-opacity:0.10196079"
          offset="1"
          id="stop4976-1" /></linearGradient><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4964-3"
        id="linearGradient4970"
        x1="118.38584"
@@ -407,7 +98,6 @@
        y2="1032.2668"
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-88.220117,-999.2669)" /><linearGradient
-       inkscape:collect="always"
        id="linearGradient4964-3"><stop
          style="stop-color:#ffffff;stop-opacity:0.349"
          offset="0"
@@ -415,7 +105,6 @@
          style="stop-color:#91ade6;stop-opacity:1"
          offset="1"
          id="stop4968-1" /></linearGradient><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4956-2"
        id="linearGradient4962"
        x1="88.220116"
@@ -424,7 +113,6 @@
        y2="1042.7972"
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-88.220116,-999.2669)" /><linearGradient
-       inkscape:collect="always"
        id="linearGradient4956-2"><stop
          style="stop-color:#fcfdfe;stop-opacity:0.25641027"
          offset="0"
@@ -432,27 +120,6 @@
          style="stop-color:#98aae7;stop-opacity:0.40392157"
          offset="1"
          id="stop4960-6" /></linearGradient><linearGradient
-       id="linearGradient3827"><stop
-         id="stop3829"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0;" /><stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0.60149658"
-         id="stop3835" /><stop
-         id="stop3831"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" /></linearGradient><linearGradient
-       id="linearGradient10798-1-9-3-7-6-8-9-0-9-1-0"><stop
-         id="stop10800-5-2-1-8-20-6-4-9-8-2-9"
-         offset="0"
-         style="stop-color:#f3faed;stop-opacity:1" /><stop
-         style="stop-color:#e7f4da;stop-opacity:1"
-         offset="0.65917557"
-         id="stop10806-6-8-5-3-9-24-8-4-3-2-4" /><stop
-         id="stop10802-1-5-3-0-4-8-4-2-9-2-5"
-         offset="1"
-         style="stop-color:#67bf1f;stop-opacity:1" /></linearGradient><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4994"
        id="linearGradient6375-6"
        x1="50.702839"
@@ -461,15 +128,13 @@
        y2="1011.338"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1.1849336,0,0,0.66623436,3.388291,334.57319)" /><linearGradient
-       id="linearGradient4994"
-       inkscape:collect="always"><stop
+       id="linearGradient4994"><stop
          id="stop4996"
          offset="0"
          style="stop-color:#ffffff;stop-opacity:1" /><stop
          id="stop4998"
          offset="1"
          style="stop-color:#d2f1ff;stop-opacity:1" /></linearGradient><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4902"
        id="linearGradient4238"
        gradientUnits="userSpaceOnUse"
@@ -478,8 +143,7 @@
        y1="1039.059"
        x2="10.632975"
        y2="1051.5835" /><linearGradient
-       id="linearGradient4902"
-       inkscape:collect="always"><stop
+       id="linearGradient4902"><stop
          id="stop4904"
          offset="0"
          style="stop-color:#777777;stop-opacity:0.74901962" /><stop
@@ -489,7 +153,6 @@
          id="stop4906"
          offset="1"
          style="stop-color:#939195;stop-opacity:0.93333334" /></linearGradient><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4496"
        id="linearGradient4494"
        x1="8"
@@ -498,7 +161,6 @@
        y2="1024.3622"
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(0,20)" /><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4504"
        id="linearGradient4510"
        x1="3.2928932"
@@ -512,12 +174,9 @@
        width="1.0967932"
        x="-0.048396592"
        id="filter4285-9-8"
-       style="color-interpolation-filters:sRGB"
-       inkscape:collect="always"><feGaussianBlur
+       style="color-interpolation-filters:sRGB"><feGaussianBlur
          id="feGaussianBlur4287-9-5"
-         stdDeviation="0.10000000000000001"
-         inkscape:collect="always" /></filter><linearGradient
-       inkscape:collect="always"
+         stdDeviation="0.10000000000000001" /></filter><linearGradient
        xlink:href="#linearGradient4461"
        id="linearGradient4467"
        x1="60.069771"
@@ -526,7 +185,6 @@
        y2="997.19556"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(0.99999996,0,0,1.2,-15.999595,-199.27331)" /><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4541"
        id="linearGradient4547"
        x1="41"
@@ -535,7 +193,6 @@
        y2="1008.3622"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1.3158111,0,0,1.3158111,-28.947849,-318.29488)" /><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4541"
        id="linearGradient4547-0"
        x1="41"
@@ -544,7 +201,6 @@
        y2="1008.3622"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(0,1.2632053,-1.2632053,0,1298.6373,956.56996)" /><radialGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4581"
        id="radialGradient4587"
        cx="68.5"
@@ -555,7 +211,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-15.999595,-8.6771508e-4)" /><radialGradient
        gradientTransform="translate(-10.999595,-8.6771508e-4)"
-       inkscape:collect="always"
        xlink:href="#linearGradient4581"
        id="radialGradient4587-5"
        cx="68.5"
@@ -565,7 +220,6 @@
        r="1.5"
        gradientUnits="userSpaceOnUse" /><radialGradient
        gradientTransform="translate(-5.999595,-8.6771508e-4)"
-       inkscape:collect="always"
        xlink:href="#linearGradient4581"
        id="radialGradient4587-0"
        cx="68.5"
@@ -574,16 +228,6 @@
        fy="1004.8622"
        r="1.5"
        gradientUnits="userSpaceOnUse" /><linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4541"
-       id="linearGradient5885"
-       x1="41"
-       y1="1007.8622"
-       x2="60"
-       y2="1008.3622"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0,1,-1,0,1034.3618,967.36133)" /><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient5904"
        id="linearGradient5890"
        gradientUnits="userSpaceOnUse"
@@ -592,7 +236,6 @@
        y1="1007.8622"
        x2="60.03624"
        y2="1007.8358" /><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient5898"
        id="linearGradient5892"
        gradientUnits="userSpaceOnUse"
@@ -601,7 +244,6 @@
        y1="1007.8622"
        x2="59.944244"
        y2="1007.8496" /><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient5517"
        id="linearGradient6406"
        gradientUnits="userSpaceOnUse"
@@ -609,75 +251,29 @@
        y1="1041.0833"
        x2="75.020309"
        y2="1023.2908" /><filter
-       inkscape:collect="always"
        style="color-interpolation-filters:sRGB"
        id="filter4344"
        x="-0.027383926"
        width="1.0547679"
        y="-0.085576576"
        height="1.1711532"><feGaussianBlur
-         inkscape:collect="always"
          stdDeviation="0.57051052"
          id="feGaussianBlur4346" /></filter><linearGradient
-       id="linearGradient5517"
-       inkscape:collect="always"><stop
+       id="linearGradient5517"><stop
          id="stop5519"
          offset="0"
          style="stop-color:#c5c3d4;stop-opacity:0.72941178" /><stop
          id="stop5521"
          offset="1"
-         style="stop-color:#c5c3d4;stop-opacity:0.72941178" /></linearGradient></defs><sodipodi:namedview
-     id="base"
-     pagecolor="#bcbcbc"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="9.4642314"
-     inkscape:cx="26.362415"
-     inkscape:cy="21.44918"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1728"
-     inkscape:window-height="1051"
-     inkscape:window-x="0"
-     inkscape:window-y="38"
-     inkscape:window-maximized="1"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="true"
-     inkscape:snap-bbox="true"
-     inkscape:bbox-nodes="true"
-     inkscape:showpageshadow="2"
-     inkscape:pagecheckerboard="0"
-     inkscape:deskcolor="#d1d1d1"><inkscape:grid
-       type="xygrid"
-       id="grid4112"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       originx="0"
-       originy="0"
-       spacingy="1"
-       spacingx="1"
-       units="px" /></sodipodi:namedview><metadata
+         style="stop-color:#c5c3d4;stop-opacity:0.72941178" /></linearGradient></defs><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" /></cc:Work></rdf:RDF></metadata><g
-     inkscape:groupmode="layer"
      id="layer2"
-     inkscape:label="Background"
-     style="display:inline"
-     sodipodi:insensitive="true"><path
-       sodipodi:nodetypes="cccc"
-       inkscape:connector-curvature="0"
+     style="display:inline"><path
        id="rect4113-1"
        d="M 75,0 75,66 1e-6,66 C 1e-6,41.2048 50.00969,0 75,0 Z"
        style="display:inline;fill:url(#linearGradient4978);fill-opacity:1;stroke:none" /><path
-       sodipodi:nodetypes="cccc"
-       inkscape:connector-curvature="0"
        id="rect4113-1-0"
        d="M 75,21.0607 75,66 1e-6,66 C 10.625001,47.804 43.509694,25.4357 75,21.0607 Z"
        style="display:inline;opacity:0.40400002;fill:url(#linearGradient4962);fill-opacity:1;stroke:none" /><g
@@ -686,122 +282,63 @@
        transform="matrix(0.27903303,0,0,0.27903303,-14.618136,-107.52874)"><g
          style="fill:#737986;fill-opacity:1;stroke:#595e68;stroke-opacity:1"
          id="g13408-8-2" /></g><path
-       sodipodi:nodetypes="cccc"
-       inkscape:connector-curvature="0"
        id="rect4113-1-7"
        d="M 75,4.0000001e-7 75,66 30.000003,66 C 30.000003,46.1545 47.70944,9.2500004 75,4e-7 Z"
        style="display:inline;opacity:0.18399999;fill:url(#linearGradient4970);fill-opacity:1;stroke:none" /></g><g
-     inkscape:label="Foreground"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-986.3622)"><path
-       sodipodi:nodetypes="cccccc"
-       inkscape:connector-curvature="0"
        id="rect4001-3-4-5"
        d="m 61.725004,1022.8099 21.27431,-0.1009 1.654984,3.7793 -20.678174,12.1198 -29.322882,0.1009 z"
        style="display:inline;opacity:0.62999998;fill:url(#linearGradient6406);fill-opacity:1.0;stroke:none;filter:url(#filter4344)"
-       transform="matrix(1.4111948,0,0,0.94753947,-25.395948,53.893899)"
-       inkscape:label="shadow" /><path
+       transform="matrix(1.4111948,0,0,0.94753947,-25.395948,53.893899)" /><path
        style="display:inline;fill:url(#linearGradient4494);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4510);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
        d="m 4.5,1032.8622 h 15 v 15 z"
-       id="path4478"
-       inkscape:connector-curvature="0"
-       inkscape:label="triangle" /><path
-       sodipodi:type="star"
+       id="path4478" /><path
        style="display:inline;opacity:0.9;fill:#ffffff;fill-opacity:0.81584156;stroke:none;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;filter:url(#filter4285-9-8)"
        id="path4252-6-0"
-       sodipodi:sides="4"
-       sodipodi:cx="4.7729707"
-       sodipodi:cy="1041.2474"
-       sodipodi:r1="3.3255017"
-       sodipodi:r2="0.49178758"
-       sodipodi:arg1="2.432965"
-       sodipodi:arg2="-3.0800218"
-       inkscape:flatsided="false"
-       inkscape:rounded="0"
-       inkscape:randomized="-0.017554997"
        d="m 2.2999628,1043.3702 1.9823895,-2.1047 -1.6734053,-2.5419 2.1987064,2.0209 2.4513363,-1.6427 -2.0383649,2.1623 1.7419712,2.4882 -2.2030799,-2.0431 z"
-       transform="matrix(-0.82539295,1.4154894,-1.2829533,-1.0100615,1351.1431,2086.0361)"
-       inkscape:transform-center-x="0.19603188"
-       inkscape:transform-center-y="0.38464271"
-       inkscape:label="start" /><g
-       id="g8799"
-       inkscape:label="window"><path
+       transform="matrix(-0.82539295,1.4154894,-1.2829533,-1.0100615,1351.1431,2086.0361)" /><g
+       id="g8799"><path
          style="display:inline;fill:url(#linearGradient6375-6);fill-opacity:1;stroke:none"
          d="m 25.000405,1007.361 41,3e-4 c 0,0 -0.06713,15.3717 0,29 h -41 z"
-         id="rect4001-3-4"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc"
-         inkscape:label="background" /><path
-         inkscape:connector-curvature="0"
+         id="rect4001-3-4" /><path
          id="path4539-4-7"
          d="m 39.47337,1008.3613 v 27.0009"
-         style="display:inline;fill:none;fill-rule:evenodd;stroke:#a1a2a7;stroke-width:0.999999px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.894118"
-         inkscape:label="grid-middle" /><path
-         inkscape:connector-curvature="0"
+         style="display:inline;fill:none;fill-rule:evenodd;stroke:#a1a2a7;stroke-width:0.999999px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.894118" /><path
          id="path4539-4-7-6"
          d="M 38.973372,1024.8622 H 26"
-         style="display:inline;fill:none;fill-rule:evenodd;stroke:#a1a2a7;stroke-width:0.999995px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.894118"
-         inkscape:label="grid-right" /><path
-         inkscape:connector-curvature="0"
+         style="display:inline;fill:none;fill-rule:evenodd;stroke:#a1a2a7;stroke-width:0.999995px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.894118" /><path
          id="path4539-4-7-6-3"
          d="M 65,1019.8622 H 39.973369"
-         style="display:inline;fill:none;fill-rule:evenodd;stroke:#a1a2a7;stroke-width:0.999998px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.894118"
-         inkscape:label="grid-right" /><path
+         style="display:inline;fill:none;fill-rule:evenodd;stroke:#a1a2a7;stroke-width:0.999998px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.894118" /><path
          style="display:inline;fill:none;stroke:url(#linearGradient4238);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1"
          d="m 24.5,995.86533 c 18.334725,0.11446 42.000815,0 42.000815,0 v 40.99577 H 24.5 Z"
-         id="rect4001-1"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc"
-         inkscape:label="outer_box" /><path
-         inkscape:connector-curvature="0"
+         id="rect4001-1" /><path
          id="path4539"
          d="m 25.000406,1007.8613 25.000411,0"
-         style="fill:none;fill-rule:evenodd;stroke:url(#linearGradient4547);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         inkscape:label="box-acent" /><path
-         inkscape:connector-curvature="0"
+         style="fill:none;fill-rule:evenodd;stroke:url(#linearGradient4547);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /><path
          id="path4539-4"
          d="m 25.500406,1008.3613 0,24.0009"
-         style="display:inline;fill:none;fill-rule:evenodd;stroke:url(#linearGradient4547-0);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         inkscape:label="box-acent" /><path
-         inkscape:connector-curvature="0"
+         style="display:inline;fill:none;fill-rule:evenodd;stroke:url(#linearGradient4547-0);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /><path
          id="path4539-6"
          d="m 66.000816,1035.8622 -40,0"
-         style="fill:none;fill-rule:evenodd;stroke:url(#linearGradient5890);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         inkscape:label="box-acent" /><path
-         inkscape:connector-curvature="0"
+         style="fill:none;fill-rule:evenodd;stroke:url(#linearGradient5890);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /><path
          id="path4539-4-6"
          d="m 65.500818,1035.3623 0,-26.0001"
-         style="display:inline;fill:none;fill-rule:evenodd;stroke:url(#linearGradient5892);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         inkscape:label="box-acent" /><path
+         style="display:inline;fill:none;fill-rule:evenodd;stroke:url(#linearGradient5892);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /><path
          style="display:inline;fill:#ffffff;fill-opacity:1;stroke:none"
          d="m 25.000405,1001.3613 41,10e-5 c 0,0 -0.06713,3.1803 0,5.9999 l -41,0 z"
-         id="rect4001-3-4-1"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc"
-         inkscape:label="toolbar" /><path
+         id="rect4001-3-4-1" /><path
          style="display:inline;fill:url(#radialGradient4587);fill-opacity:1;stroke:none"
          d="m 51.000405,1003.3613 3,10e-5 c 0,0 -0.005,1.5901 0,2.9999 l -3,0 z"
-         id="rect4001-3-4-1-1-8"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc"
-         inkscape:label="toolbar-item" /><path
+         id="rect4001-3-4-1-1-8" /><path
          style="display:inline;fill:url(#radialGradient4587-5);fill-opacity:1;stroke:none"
          d="m 56.000405,1003.3613 3,10e-5 c 0,0 -0.005,1.5901 0,2.9999 l -3,0 z"
-         id="rect4001-3-4-1-1-8-5"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc"
-         inkscape:label="toolbar-item" /><path
+         id="rect4001-3-4-1-1-8-5" /><path
          style="display:inline;fill:url(#radialGradient4587-0);fill-opacity:1;stroke:none"
          d="m 61.000405,1003.3613 3,10e-5 c 0,0 -0.005,1.5901 0,2.9999 l -3,0 z"
-         id="rect4001-3-4-1-1-8-3"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc"
-         inkscape:label="toobar-item" /><path
+         id="rect4001-3-4-1-1-8-3" /><path
          style="display:inline;fill:url(#linearGradient4467);fill-opacity:1;stroke:none"
          d="m 25.000405,996.36133 41,1e-4 c 0,0 -0.0671,3.1803 0,5.99987 l -41,0 z"
-         id="rect4001-3-4-1-6"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc"
-         inkscape:label="window-title" /></g></g></svg>
+         id="rect4001-3-4-1-6" /></g></g></svg>
diff --git a/ui/org.eclipse.pde.ui/icons/wizban/extstr_wiz.svg b/ui/org.eclipse.pde.ui/icons/wizban/extstr_wiz.svg
index f0c086e63f7..0c71eb009d5 100644
--- a/ui/org.eclipse.pde.ui/icons/wizban/extstr_wiz.svg
+++ b/ui/org.eclipse.pde.ui/icons/wizban/extstr_wiz.svg
@@ -6,13 +6,6 @@
    height="66"
    id="svg2"
    version="1.1"
-   inkscape:version="1.3 (0e150ed, 2023-07-21)"
-   sodipodi:docname="extstr_wiz.svg"
-   inkscape:export-filename="/Users/d021678/git/eclipse.jdt.ui/org.eclipse.jdt.ui/icons/full/wizban/newclass_wiz2.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:svg="http://www.w3.org/2000/svg"
@@ -22,7 +15,6 @@
   <defs
      id="defs4">
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4688">
       <stop
          style="stop-color:#ffffff;stop-opacity:1;"
@@ -34,7 +26,6 @@
          id="stop4692" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4680">
       <stop
          style="stop-color:#ffffff;stop-opacity:1;"
@@ -46,7 +37,6 @@
          id="stop4684" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4672">
       <stop
          style="stop-color:#ffffff;stop-opacity:1;"
@@ -58,393 +48,6 @@
          id="stop4676" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       id="linearGradient4972">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0"
-         id="stop4974" />
-      <stop
-         style="stop-color:#f5f8fd;stop-opacity:1"
-         offset="1"
-         id="stop4976" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient4964">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0"
-         id="stop4966" />
-      <stop
-         style="stop-color:#e8eefa;stop-opacity:1"
-         offset="1"
-         id="stop4968" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient4956">
-      <stop
-         style="stop-color:#fcfdfe;stop-opacity:1"
-         offset="0"
-         id="stop4958" />
-      <stop
-         style="stop-color:#dee6f8;stop-opacity:1"
-         offset="1"
-         id="stop4960" />
-    </linearGradient>
-    <filter
-       style="color-interpolation-filters:sRGB"
-       inkscape:label="Drop Shadow"
-       id="filter8854">
-      <feFlood
-         flood-opacity="0.933333"
-         flood-color="rgb(244,248,254)"
-         result="flood"
-         id="feFlood8856" />
-      <feComposite
-         in="flood"
-         in2="SourceGraphic"
-         operator="in"
-         result="composite1"
-         id="feComposite8858" />
-      <feGaussianBlur
-         in="composite1"
-         stdDeviation="1.2"
-         result="blur"
-         id="feGaussianBlur8860" />
-      <feOffset
-         dx="-1"
-         dy="3"
-         result="offset"
-         id="feOffset8862" />
-      <feComposite
-         in="SourceGraphic"
-         in2="offset"
-         operator="over"
-         result="composite2"
-         id="feComposite8864" />
-    </filter>
-    <linearGradient
-       id="linearGradient6122">
-      <stop
-         style="stop-color:#c0c0c0;stop-opacity:1"
-         offset="0"
-         id="stop6124" />
-      <stop
-         id="stop6132"
-         offset="0.5"
-         style="stop-color:#adadad;stop-opacity:1" />
-      <stop
-         style="stop-color:#808080;stop-opacity:1"
-         offset="1"
-         id="stop6126" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient7087">
-      <stop
-         style="stop-color:#17325d;stop-opacity:1;"
-         offset="0"
-         id="stop7089" />
-      <stop
-         id="stop7091"
-         offset="0.25"
-         style="stop-color:#b4d0e2;stop-opacity:1" />
-      <stop
-         id="stop7093"
-         offset="0.5"
-         style="stop-color:#b7d2e4;stop-opacity:1" />
-      <stop
-         style="stop-color:#acc9de;stop-opacity:1"
-         offset="0.75"
-         id="stop7095" />
-      <stop
-         style="stop-color:#3e72a7;stop-opacity:1"
-         offset="1"
-         id="stop7097" />
-    </linearGradient>
-    <mask
-       id="mask7366"
-       maskUnits="userSpaceOnUse">
-      <path
-         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;display:inline"
-         d="m -16.593048,1040.862 9.990206,0 0,10.0018 -2.983353,3.0385 -5.966213,0 c -0.53033,-0.022 -1.04064,-0.5519 -1.04064,-1.0385 z"
-         id="path7368"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccccc" />
-    </mask>
-    <linearGradient
-       id="linearGradient7584-5">
-      <stop
-         id="stop7586-4"
-         offset="0"
-         style="stop-color:#f9cd5f;stop-opacity:1" />
-      <stop
-         id="stop7588-5"
-         offset="1"
-         style="stop-color:#fbf0b4;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient7592-1">
-      <stop
-         id="stop7594-6"
-         offset="0"
-         style="stop-color:#bd8416;stop-opacity:1" />
-      <stop
-         id="stop7596-9"
-         offset="1"
-         style="stop-color:#a66b10;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10798-1-9-3-7-6-6-6-2-6-7-98-9-4-1">
-      <stop
-         style="stop-color:#5aad60;stop-opacity:1;"
-         offset="0"
-         id="stop10800-5-2-1-8-20-4-0-2-1-9-0-0-1-1" />
-      <stop
-         id="stop10806-6-8-5-3-9-2-2-7-0-4-2-7-8-9"
-         offset="0.5"
-         style="stop-color:#5bb26a;stop-opacity:1;" />
-      <stop
-         style="stop-color:#a4c589;stop-opacity:1"
-         offset="1"
-         id="stop10802-1-5-3-0-4-6-8-5-5-6-69-6-4-0" />
-    </linearGradient>
-    <mask
-       maskUnits="userSpaceOnUse"
-       id="mask7366-4">
-      <path
-         sodipodi:nodetypes="ccccccc"
-         inkscape:connector-curvature="0"
-         id="path7368-2"
-         d="m -16.593048,1040.862 9.990206,0 0,10.0018 -2.983353,3.0385 -5.966213,0 c -0.53033,-0.022 -1.04064,-0.5519 -1.04064,-1.0385 z"
-         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;display:inline" />
-    </mask>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient7087"
-       id="linearGradient9331"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-20,0)"
-       x1="4.7776356"
-       y1="1039.8118"
-       x2="4.7776356"
-       y2="1041.911" />
-    <linearGradient
-       y2="1041.911"
-       x2="4.7776356"
-       y1="1039.8118"
-       x1="4.7776356"
-       gradientTransform="translate(-18,4.7e-5)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient9333"
-       xlink:href="#linearGradient7087"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="1041.911"
-       x2="4.7776356"
-       y1="1039.8118"
-       x1="4.7776356"
-       gradientTransform="translate(-16,4.7e-5)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient9335"
-       xlink:href="#linearGradient7087"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="1041.911"
-       x2="4.7776356"
-       y1="1039.8118"
-       x1="4.7776356"
-       gradientTransform="translate(-14,4.7e-5)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient9337"
-       xlink:href="#linearGradient7087"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="1041.911"
-       x2="4.7776356"
-       y1="1039.8118"
-       x1="4.7776356"
-       gradientTransform="translate(-12,4.7e-5)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient9339"
-       xlink:href="#linearGradient7087"
-       inkscape:collect="always" />
-    <linearGradient
-       gradientTransform="translate(-80,0)"
-       gradientUnits="userSpaceOnUse"
-       y2="1042.7973"
-       x2="163.22012"
-       y1="1042.7973"
-       x1="88.220117"
-       id="linearGradient68073"
-       xlink:href="#linearGradient4956"
-       inkscape:collect="always" />
-    <linearGradient
-       gradientTransform="translate(-80,0)"
-       gradientUnits="userSpaceOnUse"
-       y2="1032.2669"
-       x2="163.22012"
-       y1="1032.2668"
-       x1="94.469681"
-       id="linearGradient68075"
-       xlink:href="#linearGradient4964"
-       inkscape:collect="always" />
-    <linearGradient
-       gradientTransform="translate(-80,0)"
-       gradientUnits="userSpaceOnUse"
-       y2="1032.2668"
-       x2="152.72206"
-       y1="1032.2668"
-       x1="88.220116"
-       id="linearGradient68077"
-       xlink:href="#linearGradient4972"
-       inkscape:collect="always" />
-    <filter
-       id="filter8854-9"
-       inkscape:label="Drop Shadow"
-       style="color-interpolation-filters:sRGB">
-      <feFlood
-         id="feFlood8856-0"
-         result="flood"
-         flood-color="rgb(244,248,254)"
-         flood-opacity="0.933333" />
-      <feComposite
-         id="feComposite8858-2"
-         result="composite1"
-         operator="in"
-         in2="SourceGraphic"
-         in="flood" />
-      <feGaussianBlur
-         id="feGaussianBlur8860-3"
-         result="blur"
-         stdDeviation="1.2"
-         in="composite1" />
-      <feOffset
-         id="feOffset8862-2"
-         result="offset"
-         dy="3"
-         dx="-1" />
-      <feComposite
-         id="feComposite8864-3"
-         result="composite2"
-         operator="over"
-         in2="offset"
-         in="SourceGraphic" />
-    </filter>
-    <linearGradient
-       id="linearGradient10798-1-9-3-7-6-8-9-0-9-1">
-      <stop
-         id="stop10800-5-2-1-8-20-6-4-9-8-2"
-         offset="0"
-         style="stop-color:#7564b1;stop-opacity:1" />
-      <stop
-         style="stop-color:#5d4aa1;stop-opacity:1"
-         offset="0.5"
-         id="stop10806-6-8-5-3-9-24-8-4-3-2" />
-      <stop
-         id="stop10802-1-5-3-0-4-8-4-2-9-2"
-         offset="1"
-         style="stop-color:#9283c3;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient7540-2-3-8-7">
-      <stop
-         id="stop7542-8-7-5-3"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.502" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0.47623286"
-         id="stop7544-8-2-0-5" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0"
-         offset="0.5"
-         id="stop7546-1-7-9-5" />
-      <stop
-         id="stop7548-98-9-2-4"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient7272-66-4-5-5-5-8">
-      <stop
-         style="stop-color:#8f6c10;stop-opacity:1"
-         offset="0"
-         id="stop7274-6-0-1-7-4-7" />
-      <stop
-         style="stop-color:#c9a645;stop-opacity:1"
-         offset="1"
-         id="stop7276-66-6-3-9-1-4" />
-    </linearGradient>
-    <linearGradient
-       y2="1030.3411"
-       x2="-10.159802"
-       y1="1030.3411"
-       x1="-22.453552"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient10540"
-       xlink:href="#linearGradient7540-2-3-8-7"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="1030.3411"
-       x2="-10.159802"
-       y1="1030.3411"
-       x1="-22.453552"
-       gradientTransform="matrix(0,1,-1,0,1014.0344,1046.6478)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient10542"
-       xlink:href="#linearGradient7540-2-3-8-7"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="1023.2569"
-       x2="-15.945988"
-       y1="1037.4661"
-       x1="-15.945988"
-       gradientTransform="matrix(0.95585117,0,0,0.95585117,-0.71992063,45.488394)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient10544"
-       xlink:href="#linearGradient7272-66-4-5-5-5-8"
-       inkscape:collect="always" />
-    <mask
-       id="mask10620"
-       maskUnits="userSpaceOnUse">
-      <path
-         transform="matrix(0.55482947,0,0,0.55482947,-206.96039,787.08655)"
-         d="m 398.75,468.23718 a 10.625,10.625 0 1 1 -21.25,0 10.625,10.625 0 1 1 21.25,0 z"
-         sodipodi:ry="10.625"
-         sodipodi:rx="10.625"
-         sodipodi:cy="468.23718"
-         sodipodi:cx="388.125"
-         id="path10622"
-         style="font-size:13.58917427px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:2.16621375;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline;font-family:Sans"
-         sodipodi:type="arc" />
-    </mask>
-    <linearGradient
-       id="linearGradient4528-9-5-7-9-7-3">
-      <stop
-         id="stop4530-0-5-0-5-8-4"
-         offset="0"
-         style="stop-color:#e0c576;stop-opacity:1;" />
-      <stop
-         id="stop4532-7-9-3-3-6-1"
-         offset="1"
-         style="stop-color:#9e7916;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient6281-8-0-1-6-6-4-2-8-0">
-      <stop
-         style="stop-color:#f7f9fb;stop-opacity:1"
-         offset="0"
-         id="stop6283-0-2-2-1-2-0-1-6-0" />
-      <stop
-         style="stop-color:#ffd680;stop-opacity:1"
-         offset="1"
-         id="stop6285-5-0-9-7-6-9-9-1-9" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4972-7"
        id="linearGradient4978"
        x1="88.220116"
@@ -454,7 +57,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-88.220116,-999.2669)" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4972-7">
       <stop
          style="stop-color:#b8ccf1;stop-opacity:0.10196079"
@@ -466,7 +68,6 @@
          id="stop4976-1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4964-3"
        id="linearGradient4970"
        x1="118.38584"
@@ -476,7 +77,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-88.220117,-999.2669)" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4964-3">
       <stop
          style="stop-color:#ffffff;stop-opacity:0.349"
@@ -488,7 +88,6 @@
          id="stop4968-1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4956-2"
        id="linearGradient4962"
        x1="88.220116"
@@ -498,7 +97,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-88.220116,-999.2669)" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4956-2">
       <stop
          style="stop-color:#fcfdfe;stop-opacity:0.25641027"
@@ -510,37 +108,6 @@
          id="stop4960-6" />
     </linearGradient>
     <linearGradient
-       id="linearGradient3827">
-      <stop
-         id="stop3829"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0.60149658"
-         id="stop3835" />
-      <stop
-         id="stop3831"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10798-1-9-3-7-6-8-9-0-9-1-0">
-      <stop
-         id="stop10800-5-2-1-8-20-6-4-9-8-2-9"
-         offset="0"
-         style="stop-color:#f3faed;stop-opacity:1" />
-      <stop
-         style="stop-color:#e7f4da;stop-opacity:1"
-         offset="0.65917557"
-         id="stop10806-6-8-5-3-9-24-8-4-3-2-4" />
-      <stop
-         id="stop10802-1-5-3-0-4-8-4-2-9-2-5"
-         offset="1"
-         style="stop-color:#67bf1f;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4994"
        id="linearGradient6375-6"
        x1="50.702839"
@@ -550,8 +117,7 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(0.85795717,0,0,0.86673383,1.4946755,125.93864)" />
     <linearGradient
-       id="linearGradient4994"
-       inkscape:collect="always">
+       id="linearGradient4994">
       <stop
          id="stop4996"
          offset="0"
@@ -562,7 +128,6 @@
          style="stop-color:#dbe2eb;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4902"
        id="linearGradient4238"
        gradientUnits="userSpaceOnUse"
@@ -572,8 +137,7 @@
        x2="10.544736"
        y2="1052.3228" />
     <linearGradient
-       id="linearGradient4902"
-       inkscape:collect="always">
+       id="linearGradient4902">
       <stop
          id="stop4904"
          offset="0"
@@ -584,7 +148,6 @@
          style="stop-color:#9a9a8f;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient6411"
        id="linearGradient4240"
        gradientUnits="userSpaceOnUse"
@@ -594,7 +157,6 @@
        x2="47.429596"
        y2="1023.1616" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient6411">
       <stop
          style="stop-color:#4f605c;stop-opacity:1"
@@ -606,7 +168,6 @@
          id="stop6415" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4258"
        id="linearGradient4264"
        x1="59.220116"
@@ -616,7 +177,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1.5443229,0,0,1.5602978,-49.962286,-590.70164)" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4258">
       <stop
          style="stop-color:#f4ae5f;stop-opacity:1;"
@@ -637,15 +197,12 @@
        width="1.0967932"
        x="-0.048396592"
        id="filter4285-9"
-       style="color-interpolation-filters:sRGB"
-       inkscape:collect="always">
+       style="color-interpolation-filters:sRGB">
       <feGaussianBlur
          id="feGaussianBlur4287-9"
-         stdDeviation="0.10000000000000001"
-         inkscape:collect="always" />
+         stdDeviation="0.10000000000000001" />
     </filter>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4527"
        id="linearGradient4533"
        x1="29.521629"
@@ -655,7 +212,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(-1,0,0,1,42.021149,982.96231)" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4527">
       <stop
          style="stop-color:#68b367;stop-opacity:1"
@@ -667,7 +223,6 @@
          id="stop4531" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4578"
        id="linearGradient4584"
        x1="42.780308"
@@ -677,7 +232,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(-1,0,0,1,50.241266,-16.304589)" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4578">
       <stop
          style="stop-color:#c5f0b4;stop-opacity:1"
@@ -689,7 +243,6 @@
          id="stop4582" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4672"
        id="linearGradient4678"
        x1="8"
@@ -699,7 +252,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1.625,0,0,1.25,10.687504,979.2372)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4680"
        id="linearGradient4686"
        x1="11"
@@ -709,7 +261,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1.4444444,0,0,1.25,11.888889,982.9872)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4688"
        id="linearGradient4694"
        x1="8"
@@ -719,7 +270,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1.4444444,0,0,1.25,12.222223,985.4872)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4308"
        id="linearGradient6406"
        gradientUnits="userSpaceOnUse"
@@ -728,7 +278,6 @@
        x2="75.020309"
        y2="1023.2908" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4308">
       <stop
          style="stop-color:#d5d2d9;stop-opacity:1"
@@ -740,7 +289,6 @@
          id="stop4312" />
     </linearGradient>
     <filter
-       inkscape:collect="always"
        style="color-interpolation-filters:sRGB"
        id="filter4344"
        x="-0.027383926"
@@ -748,50 +296,10 @@
        y="-0.085576576"
        height="1.1711532">
       <feGaussianBlur
-         inkscape:collect="always"
          stdDeviation="0.57051052"
          id="feGaussianBlur4346" />
     </filter>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#bcbcbc"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="17.060606"
-     inkscape:cx="23.064831"
-     inkscape:cy="33"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1728"
-     inkscape:window-height="1051"
-     inkscape:window-x="0"
-     inkscape:window-y="38"
-     inkscape:window-maximized="1"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="true"
-     inkscape:snap-bbox="true"
-     inkscape:bbox-nodes="true"
-     inkscape:showpageshadow="2"
-     inkscape:pagecheckerboard="0"
-     inkscape:deskcolor="#d1d1d1">
-    <inkscape:grid
-       type="xygrid"
-       id="grid4112"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       originx="0"
-       originy="0"
-       spacingy="1"
-       spacingx="1"
-       units="px" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -804,20 +312,13 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:groupmode="layer"
      id="layer2"
-     inkscape:label="Background"
-     style="display:inline"
-     sodipodi:insensitive="true">
+     style="display:inline">
     <path
-       sodipodi:nodetypes="cccc"
-       inkscape:connector-curvature="0"
        id="rect4113-1"
        d="M 75,0 75,66 1e-6,66 C 1e-6,41.2048 50.00969,0 75,0 Z"
        style="display:inline;fill:url(#linearGradient4978);fill-opacity:1;stroke:none" />
     <path
-       sodipodi:nodetypes="cccc"
-       inkscape:connector-curvature="0"
        id="rect4113-1-0"
        d="M 75,21.0607 75,66 1e-6,66 C 10.625001,47.804 43.509694,25.4357 75,21.0607 Z"
        style="display:inline;opacity:0.40400002;fill:url(#linearGradient4962);fill-opacity:1;stroke:none" />
@@ -830,96 +331,62 @@
          id="g13408-8-2" />
     </g>
     <path
-       sodipodi:nodetypes="cccc"
-       inkscape:connector-curvature="0"
        id="rect4113-1-7"
        d="M 75,4.0000001e-7 75,66 30.000003,66 C 30.000003,46.1545 47.70944,9.2500004 75,4e-7 Z"
        style="display:inline;opacity:0.18399999;fill:url(#linearGradient4970);fill-opacity:1;stroke:none" />
   </g>
   <g
-     inkscape:label="Foreground"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-986.3622)">
     <path
-       sodipodi:nodetypes="cccccc"
-       inkscape:connector-curvature="0"
        id="rect4001-3-4-5"
        d="m 61.725004,1022.8099 21.27431,-0.1009 1.654984,3.7793 -20.678174,12.1198 -29.322882,0.1009 z"
        style="display:inline;opacity:0.62999998;fill:url(#linearGradient6406);fill-opacity:1;stroke:none;filter:url(#filter4344)"
        transform="matrix(1.0651476,0,0,0.83720885,-20.627749,171.5995)" />
     <path
-       sodipodi:nodetypes="cccccc"
-       inkscape:connector-curvature="0"
        id="rect4001-3-4"
        d="m 17.521367,1001.8104 21.101588,-0.2393 8.127498,8.9678 0.07889,28.7592 -29.150165,0.2393 z"
        style="display:inline;fill:url(#linearGradient6375-6);fill-opacity:1;stroke:none" />
     <path
-       sodipodi:nodetypes="ccscccc"
-       inkscape:connector-curvature="0"
        id="rect4001-1"
        d="m 17.573537,1001.9048 20.815528,0 c 0,0 6.258643,1.2418 4.67143,4.1027 -0.04922,0.089 4.305074,4.8782 4.305074,4.8782 l 0,28.9757 -29.792032,0 z"
        style="fill:none;stroke:url(#linearGradient4238);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1" />
     <path
-       sodipodi:nodetypes="cccccc"
-       inkscape:connector-curvature="0"
        id="rect4001-3-9-0"
        d="m 38.622955,1001.8786 8.09496,8.7405 0,9.0835 -11.87985,-7.9457 c 1.558087,-3.1863 2.686865,-6.5145 3.784826,-9.8783 z"
        style="display:inline;fill:url(#linearGradient4240);fill-opacity:1;stroke:none" />
     <path
-       sodipodi:nodetypes="cccc"
        id="path5675-4"
        d="m 38.406517,1001.2577 c 1.746747,2.2938 3.85314,5.2283 2.291931,10.242 3.592494,-1.9589 7.314773,-0.9199 7.314773,-0.9199 0,-4.6807 -5.894868,-9.5428 -9.606704,-9.3221 z"
-       style="display:inline;fill:url(#linearGradient4264);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       inkscape:connector-curvature="0" />
+       style="display:inline;fill:url(#linearGradient4264);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
     <path
-       sodipodi:type="star"
        style="display:inline;opacity:0.9;fill:#ffffff;fill-opacity:0.81584156;stroke:none;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;filter:url(#filter4285-9)"
        id="path4252-6"
-       sodipodi:sides="4"
-       sodipodi:cx="4.7729707"
-       sodipodi:cy="1041.2474"
-       sodipodi:r1="3.3255017"
-       sodipodi:r2="0.49178758"
-       sodipodi:arg1="2.432965"
-       sodipodi:arg2="-3.0800218"
-       inkscape:flatsided="false"
-       inkscape:rounded="0"
-       inkscape:randomized="-0.017554997"
        d="m 2.2999628,1043.3702 1.9823895,-2.1047 -1.6734053,-2.5419 2.1987064,2.0209 2.4513363,-1.6427 -2.0383649,2.1623 1.7419712,2.4882 -2.2030799,-2.0431 z"
-       transform="matrix(0,0.85573635,-0.89764149,0,977.61121,1002.1769)"
-       inkscape:transform-center-x="-0.020119543"
-       inkscape:transform-center-y="0.26977445" />
+       transform="matrix(0,0.85573635,-0.89764149,0,977.61121,1002.1769)" />
     <path
        style="display:inline;opacity:1;fill:url(#linearGradient4678);fill-opacity:1;stroke:#596d8c;stroke-width:0.99999994;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        d="m 24.500004,1009.8622 12.999996,0 0,5 -12.999996,0 z"
-       id="rect4645"
-       inkscape:connector-curvature="0" />
+       id="rect4645" />
     <path
        style="display:inline;opacity:1;fill:url(#linearGradient4686);fill-opacity:1;stroke:#596d8c;stroke-width:0.99999988;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        d="m 28.5,1019.8622 13,0 0,5 -13,0 z"
-       id="rect4645-1"
-       inkscape:connector-curvature="0" />
+       id="rect4645-1" />
     <path
        style="display:inline;opacity:1;fill:url(#linearGradient4694);fill-opacity:1;stroke:#596d8c;stroke-width:0.99999988;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        d="m 24.5,1029.8622 13,0 0,5 -13,0 z"
-       id="rect4645-5"
-       inkscape:connector-curvature="0" />
+       id="rect4645-5" />
     <g
        id="g4307">
       <path
          style="fill:url(#linearGradient4533);fill-opacity:1;fill-rule:evenodd;stroke:#398a43;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
          d="m 1.356263,1009.9318 c 0.24182,-0.7378 4.276215,4.6418 4.276215,4.6418 11.44876,-7.9356 17.573348,1.4122 16.632852,8.3285 -0.287455,2.114 -2.873263,-9.5491 -13.24418,-4.9398 0,0 6.161054,4.0913 5.456972,5.1523 -0.390532,0.5886 -13.008987,0.7195 -13.731155,-0.03 -0.722169,-0.75 0.343071,-12.3401 0.609296,-13.1524 z"
-         id="path4522"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="scscszs" />
+         id="path4522" />
       <path
          style="display:inline;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4584);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
          d="m 1.57134,1022.8745 c -0.335464,-3.4409 0.540551,-10.8513 0.558812,-11.097 0.130143,0.1351 3.305251,4.1177 3.305251,4.1177 13.489832,-9.4517 15.979945,3.8837 15.944315,4.5632 0,0 -4.159907,-8.1407 -14.425918,-2.5964 3.722931,2.2 6.36447,4.7334 6.416153,4.8694"
-         id="path4522-3"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccscc" />
+         id="path4522-3" />
     </g>
   </g>
 </svg>
diff --git a/ui/org.eclipse.pde.ui/icons/wizban/imp_extfeat_wiz.svg b/ui/org.eclipse.pde.ui/icons/wizban/imp_extfeat_wiz.svg
index 6355dddc664..146d68ce372 100644
--- a/ui/org.eclipse.pde.ui/icons/wizban/imp_extfeat_wiz.svg
+++ b/ui/org.eclipse.pde.ui/icons/wizban/imp_extfeat_wiz.svg
@@ -6,14 +6,7 @@
    height="66"
    id="svg2"
    version="1.1"
-   inkscape:version="1.3 (0e150ed, 2023-07-21)"
-   sodipodi:docname="imp_extfeat_wiz.svg"
-   inkscape:export-filename="/Users/d021678/git/eclipse.jdt.ui/org.eclipse.jdt.ui/icons/full/wizban/newclass_wiz2.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90"
    xml:space="preserve"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:svg="http://www.w3.org/2000/svg"
@@ -21,307 +14,6 @@
    xmlns:cc="http://creativecommons.org/ns#"
    xmlns:dc="http://purl.org/dc/elements/1.1/"><defs
      id="defs4"><linearGradient
-       inkscape:collect="always"
-       id="linearGradient4541"><stop
-         style="stop-color:#a1adb2;stop-opacity:1"
-         offset="0"
-         id="stop4543" /><stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop4545" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       id="linearGradient4972"><stop
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0"
-         id="stop4974" /><stop
-         style="stop-color:#f5f8fd;stop-opacity:1"
-         offset="1"
-         id="stop4976" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       id="linearGradient4964"><stop
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0"
-         id="stop4966" /><stop
-         style="stop-color:#e8eefa;stop-opacity:1"
-         offset="1"
-         id="stop4968" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       id="linearGradient4956"><stop
-         style="stop-color:#fcfdfe;stop-opacity:1"
-         offset="0"
-         id="stop4958" /><stop
-         style="stop-color:#dee6f8;stop-opacity:1"
-         offset="1"
-         id="stop4960" /></linearGradient><filter
-       style="color-interpolation-filters:sRGB"
-       inkscape:label="Drop Shadow"
-       id="filter8854"><feFlood
-         flood-opacity="0.933333"
-         flood-color="rgb(244,248,254)"
-         result="flood"
-         id="feFlood8856" /><feComposite
-         in="flood"
-         in2="SourceGraphic"
-         operator="in"
-         result="composite1"
-         id="feComposite8858" /><feGaussianBlur
-         in="composite1"
-         stdDeviation="1.2"
-         result="blur"
-         id="feGaussianBlur8860" /><feOffset
-         dx="-1"
-         dy="3"
-         result="offset"
-         id="feOffset8862" /><feComposite
-         in="SourceGraphic"
-         in2="offset"
-         operator="over"
-         result="composite2"
-         id="feComposite8864" /></filter><linearGradient
-       id="linearGradient6122"><stop
-         style="stop-color:#c0c0c0;stop-opacity:1"
-         offset="0"
-         id="stop6124" /><stop
-         id="stop6132"
-         offset="0.5"
-         style="stop-color:#adadad;stop-opacity:1" /><stop
-         style="stop-color:#808080;stop-opacity:1"
-         offset="1"
-         id="stop6126" /></linearGradient><linearGradient
-       id="linearGradient7087"><stop
-         style="stop-color:#17325d;stop-opacity:1;"
-         offset="0"
-         id="stop7089" /><stop
-         id="stop7091"
-         offset="0.25"
-         style="stop-color:#b4d0e2;stop-opacity:1" /><stop
-         id="stop7093"
-         offset="0.5"
-         style="stop-color:#b7d2e4;stop-opacity:1" /><stop
-         style="stop-color:#acc9de;stop-opacity:1"
-         offset="0.75"
-         id="stop7095" /><stop
-         style="stop-color:#3e72a7;stop-opacity:1"
-         offset="1"
-         id="stop7097" /></linearGradient><mask
-       id="mask7366"
-       maskUnits="userSpaceOnUse"><path
-         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;display:inline"
-         d="m -16.593048,1040.862 9.990206,0 0,10.0018 -2.983353,3.0385 -5.966213,0 c -0.53033,-0.022 -1.04064,-0.5519 -1.04064,-1.0385 z"
-         id="path7368"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccccc" /></mask><linearGradient
-       id="linearGradient7584-5"><stop
-         id="stop7586-4"
-         offset="0"
-         style="stop-color:#f9cd5f;stop-opacity:1" /><stop
-         id="stop7588-5"
-         offset="1"
-         style="stop-color:#fbf0b4;stop-opacity:1" /></linearGradient><linearGradient
-       id="linearGradient7592-1"><stop
-         id="stop7594-6"
-         offset="0"
-         style="stop-color:#bd8416;stop-opacity:1" /><stop
-         id="stop7596-9"
-         offset="1"
-         style="stop-color:#a66b10;stop-opacity:1" /></linearGradient><linearGradient
-       id="linearGradient10798-1-9-3-7-6-6-6-2-6-7-98-9-4-1"><stop
-         style="stop-color:#5aad60;stop-opacity:1;"
-         offset="0"
-         id="stop10800-5-2-1-8-20-4-0-2-1-9-0-0-1-1" /><stop
-         id="stop10806-6-8-5-3-9-2-2-7-0-4-2-7-8-9"
-         offset="0.5"
-         style="stop-color:#5bb26a;stop-opacity:1;" /><stop
-         style="stop-color:#a4c589;stop-opacity:1"
-         offset="1"
-         id="stop10802-1-5-3-0-4-6-8-5-5-6-69-6-4-0" /></linearGradient><mask
-       maskUnits="userSpaceOnUse"
-       id="mask7366-4"><path
-         sodipodi:nodetypes="ccccccc"
-         inkscape:connector-curvature="0"
-         id="path7368-2"
-         d="m -16.593048,1040.862 9.990206,0 0,10.0018 -2.983353,3.0385 -5.966213,0 c -0.53033,-0.022 -1.04064,-0.5519 -1.04064,-1.0385 z"
-         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;display:inline" /></mask><linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient7087"
-       id="linearGradient9331"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-20,0)"
-       x1="4.7776356"
-       y1="1039.8118"
-       x2="4.7776356"
-       y2="1041.911" /><linearGradient
-       y2="1041.911"
-       x2="4.7776356"
-       y1="1039.8118"
-       x1="4.7776356"
-       gradientTransform="translate(-18,4.7e-5)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient9333"
-       xlink:href="#linearGradient7087"
-       inkscape:collect="always" /><linearGradient
-       y2="1041.911"
-       x2="4.7776356"
-       y1="1039.8118"
-       x1="4.7776356"
-       gradientTransform="translate(-16,4.7e-5)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient9335"
-       xlink:href="#linearGradient7087"
-       inkscape:collect="always" /><linearGradient
-       y2="1041.911"
-       x2="4.7776356"
-       y1="1039.8118"
-       x1="4.7776356"
-       gradientTransform="translate(-14,4.7e-5)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient9337"
-       xlink:href="#linearGradient7087"
-       inkscape:collect="always" /><linearGradient
-       y2="1041.911"
-       x2="4.7776356"
-       y1="1039.8118"
-       x1="4.7776356"
-       gradientTransform="translate(-12,4.7e-5)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient9339"
-       xlink:href="#linearGradient7087"
-       inkscape:collect="always" /><linearGradient
-       gradientTransform="translate(-80,0)"
-       gradientUnits="userSpaceOnUse"
-       y2="1042.7973"
-       x2="163.22012"
-       y1="1042.7973"
-       x1="88.220117"
-       id="linearGradient68073"
-       xlink:href="#linearGradient4956"
-       inkscape:collect="always" /><linearGradient
-       gradientTransform="translate(-80,0)"
-       gradientUnits="userSpaceOnUse"
-       y2="1032.2669"
-       x2="163.22012"
-       y1="1032.2668"
-       x1="94.469681"
-       id="linearGradient68075"
-       xlink:href="#linearGradient4964"
-       inkscape:collect="always" /><linearGradient
-       gradientTransform="translate(-80,0)"
-       gradientUnits="userSpaceOnUse"
-       y2="1032.2668"
-       x2="152.72206"
-       y1="1032.2668"
-       x1="88.220116"
-       id="linearGradient68077"
-       xlink:href="#linearGradient4972"
-       inkscape:collect="always" /><filter
-       id="filter8854-9"
-       inkscape:label="Drop Shadow"
-       style="color-interpolation-filters:sRGB"><feFlood
-         id="feFlood8856-0"
-         result="flood"
-         flood-color="rgb(244,248,254)"
-         flood-opacity="0.933333" /><feComposite
-         id="feComposite8858-2"
-         result="composite1"
-         operator="in"
-         in2="SourceGraphic"
-         in="flood" /><feGaussianBlur
-         id="feGaussianBlur8860-3"
-         result="blur"
-         stdDeviation="1.2"
-         in="composite1" /><feOffset
-         id="feOffset8862-2"
-         result="offset"
-         dy="3"
-         dx="-1" /><feComposite
-         id="feComposite8864-3"
-         result="composite2"
-         operator="over"
-         in2="offset"
-         in="SourceGraphic" /></filter><linearGradient
-       id="linearGradient10798-1-9-3-7-6-8-9-0-9-1"><stop
-         id="stop10800-5-2-1-8-20-6-4-9-8-2"
-         offset="0"
-         style="stop-color:#7564b1;stop-opacity:1" /><stop
-         style="stop-color:#5d4aa1;stop-opacity:1"
-         offset="0.5"
-         id="stop10806-6-8-5-3-9-24-8-4-3-2" /><stop
-         id="stop10802-1-5-3-0-4-8-4-2-9-2"
-         offset="1"
-         style="stop-color:#9283c3;stop-opacity:1" /></linearGradient><linearGradient
-       id="linearGradient7540-2-3-8-7"><stop
-         id="stop7542-8-7-5-3"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.502" /><stop
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0.47623286"
-         id="stop7544-8-2-0-5" /><stop
-         style="stop-color:#ffffff;stop-opacity:0"
-         offset="0.5"
-         id="stop7546-1-7-9-5" /><stop
-         id="stop7548-98-9-2-4"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       id="linearGradient7272-66-4-5-5-5-8"><stop
-         style="stop-color:#8f6c10;stop-opacity:1"
-         offset="0"
-         id="stop7274-6-0-1-7-4-7" /><stop
-         style="stop-color:#c9a645;stop-opacity:1"
-         offset="1"
-         id="stop7276-66-6-3-9-1-4" /></linearGradient><linearGradient
-       y2="1030.3411"
-       x2="-10.159802"
-       y1="1030.3411"
-       x1="-22.453552"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient10540"
-       xlink:href="#linearGradient7540-2-3-8-7"
-       inkscape:collect="always" /><linearGradient
-       y2="1030.3411"
-       x2="-10.159802"
-       y1="1030.3411"
-       x1="-22.453552"
-       gradientTransform="matrix(0,1,-1,0,1014.0344,1046.6478)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient10542"
-       xlink:href="#linearGradient7540-2-3-8-7"
-       inkscape:collect="always" /><linearGradient
-       y2="1023.2569"
-       x2="-15.945988"
-       y1="1037.4661"
-       x1="-15.945988"
-       gradientTransform="matrix(0.95585117,0,0,0.95585117,-0.71992063,45.488394)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient10544"
-       xlink:href="#linearGradient7272-66-4-5-5-5-8"
-       inkscape:collect="always" /><mask
-       id="mask10620"
-       maskUnits="userSpaceOnUse"><path
-         transform="matrix(0.55482947,0,0,0.55482947,-206.96039,787.08655)"
-         d="m 398.75,468.23718 a 10.625,10.625 0 1 1 -21.25,0 10.625,10.625 0 1 1 21.25,0 z"
-         sodipodi:ry="10.625"
-         sodipodi:rx="10.625"
-         sodipodi:cy="468.23718"
-         sodipodi:cx="388.125"
-         id="path10622"
-         style="font-size:13.58917427px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:2.16621375;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline;font-family:Sans"
-         sodipodi:type="arc" /></mask><linearGradient
-       id="linearGradient4528-9-5-7-9-7-3"><stop
-         id="stop4530-0-5-0-5-8-4"
-         offset="0"
-         style="stop-color:#e0c576;stop-opacity:1;" /><stop
-         id="stop4532-7-9-3-3-6-1"
-         offset="1"
-         style="stop-color:#9e7916;stop-opacity:1" /></linearGradient><linearGradient
-       id="linearGradient6281-8-0-1-6-6-4-2-8-0"><stop
-         style="stop-color:#f7f9fb;stop-opacity:1"
-         offset="0"
-         id="stop6283-0-2-2-1-2-0-1-6-0" /><stop
-         style="stop-color:#ffd680;stop-opacity:1"
-         offset="1"
-         id="stop6285-5-0-9-7-6-9-9-1-9" /></linearGradient><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4972-7"
        id="linearGradient4978"
        x1="88.220116"
@@ -330,7 +22,6 @@
        y2="1032.2668"
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-88.220116,-999.2669)" /><linearGradient
-       inkscape:collect="always"
        id="linearGradient4972-7"><stop
          style="stop-color:#b8ccf1;stop-opacity:0.10196079"
          offset="0"
@@ -338,7 +29,6 @@
          style="stop-color:#6e97e2;stop-opacity:0.10196079"
          offset="1"
          id="stop4976-1" /></linearGradient><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4964-3"
        id="linearGradient4970"
        x1="118.38584"
@@ -347,7 +37,6 @@
        y2="1032.2668"
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-88.220117,-999.2669)" /><linearGradient
-       inkscape:collect="always"
        id="linearGradient4964-3"><stop
          style="stop-color:#ffffff;stop-opacity:0.349"
          offset="0"
@@ -355,7 +44,6 @@
          style="stop-color:#91ade6;stop-opacity:1"
          offset="1"
          id="stop4968-1" /></linearGradient><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4956-2"
        id="linearGradient4962"
        x1="88.220116"
@@ -364,7 +52,6 @@
        y2="1042.7972"
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-88.220116,-999.2669)" /><linearGradient
-       inkscape:collect="always"
        id="linearGradient4956-2"><stop
          style="stop-color:#fcfdfe;stop-opacity:0.25641027"
          offset="0"
@@ -372,36 +59,6 @@
          style="stop-color:#98aae7;stop-opacity:0.40392157"
          offset="1"
          id="stop4960-6" /></linearGradient><linearGradient
-       id="linearGradient3827"><stop
-         id="stop3829"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0;" /><stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0.60149658"
-         id="stop3835" /><stop
-         id="stop3831"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" /></linearGradient><linearGradient
-       id="linearGradient10798-1-9-3-7-6-8-9-0-9-1-0"><stop
-         id="stop10800-5-2-1-8-20-6-4-9-8-2-9"
-         offset="0"
-         style="stop-color:#f3faed;stop-opacity:1" /><stop
-         style="stop-color:#e7f4da;stop-opacity:1"
-         offset="0.65917557"
-         id="stop10806-6-8-5-3-9-24-8-4-3-2-4" /><stop
-         id="stop10802-1-5-3-0-4-8-4-2-9-2-5"
-         offset="1"
-         style="stop-color:#67bf1f;stop-opacity:1" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4541"
-       id="linearGradient5885"
-       x1="41"
-       y1="1007.8622"
-       x2="60"
-       y2="1008.3622"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0,1,-1,0,1034.3618,967.36133)" /><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4894"
        id="linearGradient4884"
        x1="11.927121"
@@ -410,8 +67,7 @@
        y2="30.177986"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1.0044272,0,0,1.0089329,5.2404816,972.30396)" /><linearGradient
-       id="linearGradient4894"
-       inkscape:collect="always"><stop
+       id="linearGradient4894"><stop
          id="stop4896"
          offset="0"
          style="stop-color:#000000;stop-opacity:1" /><stop
@@ -424,7 +80,6 @@
          id="stop4898"
          offset="1"
          style="stop-color:#ffffff;stop-opacity:1" /></linearGradient><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient5252"
        id="linearGradient5258"
        x1="5"
@@ -433,7 +88,6 @@
        y2="32"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1.0067589,0,0,1.0132311,5.1393006,972.16609)" /><linearGradient
-       inkscape:collect="always"
        id="linearGradient5252"><stop
          style="stop-color:#5f443c;stop-opacity:1"
          offset="0"
@@ -441,7 +95,6 @@
          style="stop-color:#765d54;stop-opacity:1"
          offset="1"
          id="stop5256" /></linearGradient><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4199"
        id="linearGradient4205"
        x1="12"
@@ -450,7 +103,6 @@
        y2="21"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1.4358193,0,0,1.270043,-9.2403406,972.40079)" /><linearGradient
-       inkscape:collect="always"
        id="linearGradient4199"><stop
          style="stop-color:#765d54;stop-opacity:1;"
          offset="0"
@@ -461,7 +113,6 @@
          style="stop-color:#765d54;stop-opacity:1"
          offset="1"
          id="stop4203" /></linearGradient><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4944"
        id="linearGradient4936"
        gradientUnits="userSpaceOnUse"
@@ -470,7 +121,6 @@
        x2="49.569252"
        y2="40.099323"
        gradientTransform="matrix(0.99999827,0,0,1.0179001,536.11388,1106.9532)" /><linearGradient
-       inkscape:collect="always"
        id="linearGradient4944"><stop
          style="stop-color:#000000;stop-opacity:1"
          offset="0"
@@ -484,7 +134,6 @@
          style="stop-color:#ffffff;stop-opacity:1"
          offset="1"
          id="stop4910" /></linearGradient><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4950"
        id="linearGradient4956-9"
        x1="60.342896"
@@ -493,54 +142,21 @@
        y2="44.682102"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(0.99999827,0,0,1.0179001,536.11388,1106.9532)" /><linearGradient
-       inkscape:collect="always"
        id="linearGradient4950"><stop
          style="stop-color:#6a5148;stop-opacity:1;"
          offset="0"
          id="stop4952" /><stop
          style="stop-color:#978379;stop-opacity:1"
          offset="1"
-         id="stop4954" /></linearGradient><linearGradient
-       id="linearGradient11146-4-4-4-6-2"><stop
-         id="stop11150-4-72-3-9-7"
-         offset="0"
-         style="stop-color:#faefba;stop-opacity:1" /><stop
-         style="stop-color:#9e6542;stop-opacity:1"
-         offset="1"
-         id="stop11152-9-0-7-3-8" /></linearGradient><linearGradient
-       id="linearGradient10507"><stop
-         style="stop-color:#5f392d;stop-opacity:1"
-         offset="0"
-         id="stop10509" /><stop
-         id="stop10511"
-         offset="0.18181793"
-         style="stop-color:#9e7058;stop-opacity:1" /><stop
-         id="stop10513"
-         offset="0.36363617"
-         style="stop-color:#794f40;stop-opacity:1" /><stop
-         id="stop10515"
-         offset="0.49999985"
-         style="stop-color:#794f40;stop-opacity:1" /><stop
-         id="stop10517"
-         offset="0.63636351"
-         style="stop-color:#794f40;stop-opacity:1" /><stop
-         style="stop-color:#9e7058;stop-opacity:1"
-         offset="0.81818175"
-         id="stop10519" /><stop
-         style="stop-color:#5f392d;stop-opacity:1"
-         offset="1"
-         id="stop10522" /></linearGradient><filter
-       inkscape:collect="always"
+         id="stop4954" /></linearGradient><filter
        style="color-interpolation-filters:sRGB"
        id="filter5309"
        x="-0.41279999"
        width="1.8256"
        y="-0.68799998"
        height="2.376"><feGaussianBlur
-         inkscape:collect="always"
          stdDeviation="2.58"
          id="feGaussianBlur5311" /></filter><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4456"
        id="linearGradient4462"
        x1="63.734764"
@@ -549,7 +165,6 @@
        y2="1006.3618"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1,0,-0.72750163,1,733.40264,2.0004)" /><linearGradient
-       inkscape:collect="always"
        id="linearGradient4456"><stop
          style="stop-color:#ffffff;stop-opacity:0.659"
          offset="0"
@@ -557,46 +172,14 @@
          style="stop-color:#ffffff;stop-opacity:0.369"
          offset="1"
          id="stop4460" /></linearGradient><filter
-       inkscape:collect="always"
        style="color-interpolation-filters:sRGB"
        id="filter4606"
        x="-0.062976157"
        width="1.1259523"
        y="-0.10879013"
        height="1.2175803"><feGaussianBlur
-         inkscape:collect="always"
          stdDeviation="1.5412116"
          id="feGaussianBlur4608" /></filter><linearGradient
-       id="linearGradient11146-4-4-4-6-2-8"><stop
-         id="stop11150-4-72-3-9-7-2"
-         offset="0"
-         style="stop-color:#faefba;stop-opacity:1" /><stop
-         style="stop-color:#ad6e48;stop-opacity:1"
-         offset="1"
-         id="stop11152-9-0-7-3-8-0" /></linearGradient><linearGradient
-       id="linearGradient4368"><stop
-         id="stop4370"
-         offset="0"
-         style="stop-color:#9c7561;stop-opacity:1" /><stop
-         style="stop-color:#966d59;stop-opacity:1"
-         offset="0.18181793"
-         id="stop4372" /><stop
-         style="stop-color:#8c6250;stop-opacity:1"
-         offset="0.36363617"
-         id="stop4374" /><stop
-         style="stop-color:#794f40;stop-opacity:1"
-         offset="0.49999985"
-         id="stop4376" /><stop
-         style="stop-color:#8c6250;stop-opacity:1"
-         offset="0.63636351"
-         id="stop4378" /><stop
-         id="stop4380"
-         offset="0.81818175"
-         style="stop-color:#966d59;stop-opacity:1" /><stop
-         id="stop4382"
-         offset="1"
-         style="stop-color:#99705c;stop-opacity:1" /></linearGradient><linearGradient
-       inkscape:collect="always"
        id="linearGradient2543"><stop
          style="stop-color:#4f76b0;stop-opacity:1"
          offset="0"
@@ -607,8 +190,7 @@
          style="stop-color:#587cb2;stop-opacity:1"
          offset="1"
          id="stop2541" /></linearGradient><linearGradient
-       id="linearGradient8785"
-       inkscape:collect="always"><stop
+       id="linearGradient8785"><stop
          id="stop8781"
          offset="0"
          style="stop-color:#bb8d2d;stop-opacity:1" /><stop
@@ -618,113 +200,34 @@
          id="stop8783"
          offset="1"
          style="stop-color:#b07905;stop-opacity:1" /></linearGradient><linearGradient
-       id="linearGradient8777"
-       inkscape:collect="always"><stop
+       id="linearGradient8777"><stop
          id="stop8773"
          offset="0"
          style="stop-color:#fbeaab;stop-opacity:1;" /><stop
          id="stop8775"
          offset="1"
          style="stop-color:#deb241;stop-opacity:1" /></linearGradient><linearGradient
-       id="linearGradient8767"
-       inkscape:collect="always"><stop
+       id="linearGradient8767"><stop
          id="stop8763"
          offset="0"
          style="stop-color:#6a8ec1;stop-opacity:1" /><stop
          id="stop8765"
          offset="1"
          style="stop-color:#80a1cf;stop-opacity:1" /></linearGradient><linearGradient
-       id="linearGradient8759"
-       inkscape:collect="always"><stop
+       id="linearGradient8759"><stop
          id="stop8755"
          offset="0"
          style="stop-color:#d3e0eb;stop-opacity:1" /><stop
          id="stop8757"
          offset="1"
          style="stop-color:#5179b5;stop-opacity:1" /></linearGradient><linearGradient
-       id="linearGradient8751"
-       inkscape:collect="always"><stop
+       id="linearGradient8751"><stop
          id="stop8747"
          offset="0"
          style="stop-color:#2e5d8f;stop-opacity:1" /><stop
          id="stop8749"
          offset="1"
-         style="stop-color:#6085bb;stop-opacity:1" /></linearGradient><filter
-       id="filter8854-7"
-       inkscape:label="Drop Shadow"
-       style="color-interpolation-filters:sRGB"><feFlood
-         id="feFlood8856-03"
-         result="flood"
-         flood-color="rgb(244,248,254)"
-         flood-opacity="0.933333" /><feComposite
-         id="feComposite8858-9"
-         result="composite1"
-         operator="in"
-         in2="SourceGraphic"
-         in="flood" /><feGaussianBlur
-         id="feGaussianBlur8860-9"
-         result="blur"
-         stdDeviation="1.2"
-         in="composite1" /><feOffset
-         id="feOffset8862-9"
-         result="offset"
-         dy="3"
-         dx="-1" /><feComposite
-         id="feComposite8864-1"
-         result="composite2"
-         operator="over"
-         in2="offset"
-         in="SourceGraphic" /></filter><mask
-       maskUnits="userSpaceOnUse"
-       id="mask7366-47"><path
-         sodipodi:nodetypes="ccccccc"
-         inkscape:connector-curvature="0"
-         id="path7368-1"
-         d="m -16.593048,1040.862 9.990206,0 0,10.0018 -2.983353,3.0385 -5.966213,0 c -0.53033,-0.022 -1.04064,-0.5519 -1.04064,-1.0385 z"
-         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;display:inline" /></mask><mask
-       id="mask7366-4-0"
-       maskUnits="userSpaceOnUse"><path
-         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;display:inline"
-         d="m -16.593048,1040.862 9.990206,0 0,10.0018 -2.983353,3.0385 -5.966213,0 c -0.53033,-0.022 -1.04064,-0.5519 -1.04064,-1.0385 z"
-         id="path7368-2-3"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccccc" /></mask><filter
-       style="color-interpolation-filters:sRGB"
-       inkscape:label="Drop Shadow"
-       id="filter8854-9-2"><feFlood
-         flood-opacity="0.933333"
-         flood-color="rgb(244,248,254)"
-         result="flood"
-         id="feFlood8856-0-6" /><feComposite
-         in="flood"
-         in2="SourceGraphic"
-         operator="in"
-         result="composite1"
-         id="feComposite8858-2-9" /><feGaussianBlur
-         in="composite1"
-         stdDeviation="1.2"
-         result="blur"
-         id="feGaussianBlur8860-3-4" /><feOffset
-         dx="-1"
-         dy="3"
-         result="offset"
-         id="feOffset8862-2-1" /><feComposite
-         in="SourceGraphic"
-         in2="offset"
-         operator="over"
-         result="composite2"
-         id="feComposite8864-3-3" /></filter><mask
-       maskUnits="userSpaceOnUse"
-       id="mask10620-4"><path
-         sodipodi:type="arc"
-         style="font-size:13.58917427px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:2.16621375;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline;font-family:Sans"
-         id="path10622-3"
-         sodipodi:cx="388.125"
-         sodipodi:cy="468.23718"
-         sodipodi:rx="10.625"
-         sodipodi:ry="10.625"
-         d="m 398.75,468.23718 a 10.625,10.625 0 1 1 -21.25,0 10.625,10.625 0 1 1 21.25,0 z"
-         transform="matrix(0.55482947,0,0,0.55482947,-206.96039,787.08655)" /></mask><linearGradient
+         style="stop-color:#6085bb;stop-opacity:1" /></linearGradient><linearGradient
        gradientUnits="userSpaceOnUse"
        y2="1024.3622"
        x2="50"
@@ -732,7 +235,6 @@
        x1="50"
        id="linearGradient8753"
        xlink:href="#linearGradient8751"
-       inkscape:collect="always"
        gradientTransform="matrix(2.7500001,0,0,0.99370101,-129.87501,-991.91286)" /><linearGradient
        gradientUnits="userSpaceOnUse"
        y2="1030.3622"
@@ -741,7 +243,6 @@
        x1="57"
        id="linearGradient8761"
        xlink:href="#linearGradient8759"
-       inkscape:collect="always"
        gradientTransform="matrix(1.0999999,0,0,1.1281495,-43.249997,-1129.0318)" /><linearGradient
        gradientUnits="userSpaceOnUse"
        y2="1023.234"
@@ -750,7 +251,6 @@
        x1="51.658199"
        id="linearGradient8769"
        xlink:href="#linearGradient8767"
-       inkscape:collect="always"
        gradientTransform="matrix(2.7500001,0,0,0.99370101,-129.87501,-991.91286)" /><linearGradient
        gradientUnits="userSpaceOnUse"
        y2="1026.0538"
@@ -759,7 +259,6 @@
        x1="63.98344"
        id="linearGradient8779"
        xlink:href="#linearGradient8777"
-       inkscape:collect="always"
        gradientTransform="matrix(1.3687895,0,0,1.494898,-60.408122,-1504.0798)" /><linearGradient
        gradientUnits="userSpaceOnUse"
        y2="1028.4165"
@@ -768,59 +267,47 @@
        x1="68.47998"
        id="linearGradient8787"
        xlink:href="#linearGradient8785"
-       inkscape:collect="always"
        gradientTransform="matrix(1.3687895,0,0,1.494898,-60.408122,-1504.0798)" /><filter
        height="1.4861495"
        y="-0.24307477"
        width="2.0754105"
        x="-0.53770523"
        id="filter8813"
-       style="color-interpolation-filters:sRGB"
-       inkscape:collect="always"><feGaussianBlur
+       style="color-interpolation-filters:sRGB"><feGaussianBlur
          id="feGaussianBlur8815"
-         stdDeviation="1.1269452"
-         inkscape:collect="always" /></filter><filter
+         stdDeviation="1.1269452" /></filter><filter
        height="1.6025846"
        y="-0.30129232"
        width="1.626688"
        x="-0.313344"
        id="filter8835"
-       style="color-interpolation-filters:sRGB"
-       inkscape:collect="always"><feGaussianBlur
+       style="color-interpolation-filters:sRGB"><feGaussianBlur
          id="feGaussianBlur8837"
-         stdDeviation="0.49751501"
-         inkscape:collect="always" /></filter><filter
+         stdDeviation="0.49751501" /></filter><filter
        height="1.2365698"
        y="-0.11828489"
        width="1.8310951"
        x="-0.41554753"
        id="filter8871"
-       style="color-interpolation-filters:sRGB"
-       inkscape:collect="always"><feGaussianBlur
+       style="color-interpolation-filters:sRGB"><feGaussianBlur
          id="feGaussianBlur8873"
-         stdDeviation="0.53588249"
-         inkscape:collect="always" /></filter><filter
+         stdDeviation="0.53588249" /></filter><filter
        height="1.2365698"
        y="-0.11828489"
        width="1.8310951"
        x="-0.41554753"
        id="filter8871-1"
-       style="color-interpolation-filters:sRGB"
-       inkscape:collect="always"><feGaussianBlur
+       style="color-interpolation-filters:sRGB"><feGaussianBlur
          id="feGaussianBlur8873-8"
-         stdDeviation="0.53588249"
-         inkscape:collect="always" /></filter><filter
-       inkscape:collect="always"
+         stdDeviation="0.53588249" /></filter><filter
        style="color-interpolation-filters:sRGB"
        id="filter2533"
        x="-0.59377657"
        width="2.1875531"
        y="-0.92639431"
        height="2.8527886"><feGaussianBlur
-         inkscape:collect="always"
          stdDeviation="0.73536407"
          id="feGaussianBlur2535" /></filter><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient2543"
        id="linearGradient2545"
        x1="18.423391"
@@ -833,62 +320,49 @@
        width="2.2508695"
        x="-0.62393297"
        id="filter8813-5"
-       style="color-interpolation-filters:sRGB"
-       inkscape:collect="always"><feGaussianBlur
+       style="color-interpolation-filters:sRGB"><feGaussianBlur
          id="feGaussianBlur8815-0"
-         stdDeviation="1.1269452"
-         inkscape:collect="always" /></filter><filter
+         stdDeviation="1.1269452" /></filter><filter
        height="1.3657107"
-       y="-0.14956415"
-       width="2.0529235"
+       y="-0.14956416"
+       width="2.0529236"
        x="-0.5290004"
        id="filter8871-4"
-       style="color-interpolation-filters:sRGB"
-       inkscape:collect="always"><feGaussianBlur
+       style="color-interpolation-filters:sRGB"><feGaussianBlur
          id="feGaussianBlur8873-9"
-         stdDeviation="0.53588249"
-         inkscape:collect="always" /></filter><filter
+         stdDeviation="0.53588249" /></filter><filter
        height="1.8202161"
        y="-0.41010804"
        width="1.8530247"
        x="-0.42651235"
        id="filter8835-5"
-       style="color-interpolation-filters:sRGB"
-       inkscape:collect="always"><feGaussianBlur
+       style="color-interpolation-filters:sRGB"><feGaussianBlur
          id="feGaussianBlur8837-4"
-         stdDeviation="0.49751501"
-         inkscape:collect="always" /></filter><filter
-       inkscape:collect="always"
+         stdDeviation="0.49751501" /></filter><filter
        style="color-interpolation-filters:sRGB"
        id="filter2533-6"
        x="-0.68029651"
        width="2.5817097"
        y="-1.073697"
        height="3.2469451"><feGaussianBlur
-         inkscape:collect="always"
          stdDeviation="0.73536407"
          id="feGaussianBlur2535-0" /></filter><filter
-       height="1.402261"
-       y="-0.15841809"
+       height="1.4022611"
+       y="-0.1584181"
        width="2.1157048"
        x="-0.56110931"
        id="filter8871-1-6"
-       style="color-interpolation-filters:sRGB"
-       inkscape:collect="always"><feGaussianBlur
+       style="color-interpolation-filters:sRGB"><feGaussianBlur
          id="feGaussianBlur8873-8-9"
-         stdDeviation="0.53588249"
-         inkscape:collect="always" /></filter><filter
-       inkscape:collect="always"
+         stdDeviation="0.53588249" /></filter><filter
        style="color-interpolation-filters:sRGB"
        id="filter2728"
        x="-0.06427016"
        width="1.1285403"
        y="-0.1171224"
        height="1.2342448"><feGaussianBlur
-         inkscape:collect="always"
          stdDeviation="0.90744768"
          id="feGaussianBlur2730" /></filter><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4496"
        id="linearGradient4494"
        x1="8"
@@ -897,8 +371,7 @@
        y2="1024.3622"
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-2.7510542,20.904378)" /><linearGradient
-       id="linearGradient4496"
-       inkscape:collect="always"><stop
+       id="linearGradient4496"><stop
          id="stop4498"
          offset="0"
          style="stop-color:#6885b2;stop-opacity:1" /><stop
@@ -911,7 +384,6 @@
          id="stop4502"
          offset="1"
          style="stop-color:#2c4a81;stop-opacity:1" /></linearGradient><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4504"
        id="linearGradient4510"
        x1="3.2928932"
@@ -920,7 +392,6 @@
        y2="1020.7158"
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-2.7510542,20.904378)" /><linearGradient
-       inkscape:collect="always"
        id="linearGradient4504"><stop
          style="stop-color:#b0c1db;stop-opacity:1"
          offset="0"
@@ -933,62 +404,17 @@
        width="1.0967932"
        x="-0.048396592"
        id="filter4285-9-8"
-       style="color-interpolation-filters:sRGB"
-       inkscape:collect="always"><feGaussianBlur
+       style="color-interpolation-filters:sRGB"><feGaussianBlur
          id="feGaussianBlur4287-9-5"
-         stdDeviation="0.10000000000000001"
-         inkscape:collect="always" /></filter></defs><sodipodi:namedview
-     id="base"
-     pagecolor="#bcbcbc"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7.185918"
-     inkscape:cx="61.787513"
-     inkscape:cy="24.77067"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1728"
-     inkscape:window-height="1051"
-     inkscape:window-x="0"
-     inkscape:window-y="38"
-     inkscape:window-maximized="1"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="true"
-     inkscape:snap-bbox="true"
-     inkscape:bbox-nodes="true"
-     inkscape:showpageshadow="2"
-     inkscape:pagecheckerboard="0"
-     inkscape:deskcolor="#d1d1d1"><inkscape:grid
-       type="xygrid"
-       id="grid4112"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       originx="0"
-       originy="0"
-       spacingy="1"
-       spacingx="1"
-       units="px" /></sodipodi:namedview><metadata
+         stdDeviation="0.10000000000000001" /></filter></defs><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" /></cc:Work></rdf:RDF></metadata><g
-     inkscape:groupmode="layer"
      id="layer2"
-     inkscape:label="Background"
-     style="display:inline"
-     sodipodi:insensitive="true"><path
-       sodipodi:nodetypes="cccc"
-       inkscape:connector-curvature="0"
+     style="display:inline"><path
        id="rect4113-1"
        d="M 75,0 75,66 1e-6,66 C 1e-6,41.2048 50.00969,0 75,0 Z"
        style="display:inline;fill:url(#linearGradient4978);fill-opacity:1;stroke:none" /><path
-       sodipodi:nodetypes="cccc"
-       inkscape:connector-curvature="0"
        id="rect4113-1-0"
        d="M 75,21.0607 75,66 1e-6,66 C 10.625001,47.804 43.509694,25.4357 75,21.0607 Z"
        style="display:inline;opacity:0.40400002;fill:url(#linearGradient4962);fill-opacity:1;stroke:none" /><g
@@ -997,38 +423,26 @@
        transform="matrix(0.27903303,0,0,0.27903303,-14.618136,-107.52874)"><g
          style="fill:#737986;fill-opacity:1;stroke:#595e68;stroke-opacity:1"
          id="g13408-8-2" /></g><path
-       sodipodi:nodetypes="cccc"
-       inkscape:connector-curvature="0"
        id="rect4113-1-7"
        d="M 75,4.0000001e-7 75,66 30.000003,66 C 30.000003,46.1545 47.70944,9.2500004 75,4e-7 Z"
        style="display:inline;opacity:0.18399999;fill:url(#linearGradient4970);fill-opacity:1;stroke:none" /></g><g
-     inkscape:label="Foreground"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-986.3622)"><path
        style="font-style:normal;font-weight:normal;font-size:13.5892px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;display:inline;fill:url(#linearGradient4462);fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;filter:url(#filter4606)"
        d="m 47.000294,1007.3622 -12.319149,16.9335 -12.416197,17.0669 h 16.933329 17.066666 l 12.416197,-17.0669 0.09676,-0.133 L 81,1007.3626 H 63.933334 47.000005 Z"
        id="rect10961-8-3-6-1"
-       inkscape:connector-curvature="0"
-       transform="matrix(1.1726471,0,0.08958029,0.36603268,-113.67986,656.22486)"
-       inkscape:transform-center-x="4.353394"
-       inkscape:transform-center-y="0.53407509"
-       inkscape:label="shadow" /><path
-       sodipodi:nodetypes="ccccc"
-       inkscape:connector-curvature="0"
+       transform="matrix(1.1726471,0,0.08958029,0.36603268,-113.67986,656.22486)" /><path
        id="path5250"
        d="m 8.6621112,1005.2334 3.7605858,-4.9642 h 16.536798 l 3.904558,4.9642 z"
-       style="fill:#fffabf;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4205);stroke-width:1;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       inkscape:label="tab-shadow" /><ellipse
+       style="fill:#fffabf;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4205);stroke-width:1;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /><ellipse
        transform="matrix(0.99999827,0,0,0.38855855,-6.8969206,1000.4091)"
        ry="4.5"
        rx="7.5"
        cy="8.3080006"
        cx="23.691999"
        id="path5111"
-       style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;filter:url(#filter5309)"
-       inkscape:label="tab" /><rect
+       style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;filter:url(#filter5309)" /><rect
        ry="2.0792062"
        y="1005.2515"
        x="5.8986797"
@@ -1036,45 +450,32 @@
        width="41.860336"
        id="rect4876"
        style="fill:url(#linearGradient4884);fill-opacity:1;stroke:url(#linearGradient5258);stroke-width:1;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       inkscape:label="back"
        rx="2.0792062" /><g
        id="g2"
-       transform="matrix(0.99999827,0,0,1,19.716397,980.90101)"
-       inkscape:label="plug"><g
+       transform="matrix(0.99999827,0,0,1,19.716397,980.90101)"><g
          transform="matrix(1.0729615,0,0,1.0787087,-1.2096914,-0.17204372)"
          id="g2558-4"
          style="opacity:0.503;fill:#808080;stroke:#808080;stroke-width:0.929514;filter:url(#filter2728)"><path
            transform="matrix(1.029538,0,0,1.1281495,-40.181606,-1129.0381)"
            style="fill:#808080;fill-opacity:1;stroke:#808080;stroke-width:0.862484px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter8813-5)"
            d="m 53.577367,1026.9835 -0.152425,-8.8407 0.91455,-1.2194 3.124711,-0.076 0.07621,-0.9908 h 0.91455 l -0.07621,1.9054 -3.048499,1.2194 -0.152425,4.9538 z"
-           id="path8791-1"
-           inkscape:connector-curvature="0" /><path
+           id="path8791-1" /><path
            id="path8722-7-8"
            style="display:inline;opacity:1;fill:#808080;fill-opacity:1;stroke:#808080;stroke-width:0.929514;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="M 3.4999999,23.512598 V 25.5 H 14.5 V 21.525196 H 3.4999999 v 1.987402"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccccc" /><path
-           sodipodi:nodetypes="csssscsscccsssscsscc"
+           d="M 3.4999999,23.512598 V 25.5 H 14.5 V 21.525196 H 3.4999999 v 1.987402" /><path
            id="rect8645-3-9"
            style="display:inline;opacity:1;fill:#808080;fill-opacity:1;stroke:#808080;stroke-width:0.929514;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="M 25.499998,23.781495 25.5,15.413559 C 25.5,13.799403 24.568942,12.5 23.412427,12.5 h -2.424855 c -1.156515,0 -2.483072,1.299403 -2.483072,2.913559 v 1.599039 h -2.264856 c -0.963763,0 -1.739644,0.794104 -1.739644,1.780446 v 1.468512 3.519375 m 10.999998,5.64e-4 2e-6,8.367936 c 0,1.614156 -0.931058,2.913559 -2.087573,2.913559 h -2.424855 c -1.156515,0 -2.483072,-1.299403 -2.483072,-2.913559 V 30.550392 H 16.239644 C 15.275881,30.550392 14.5,29.756288 14.5,28.769946 v -1.468512 -3.519375"
-           inkscape:connector-curvature="0" /><path
-           sodipodi:nodetypes="cc"
-           inkscape:connector-curvature="0"
+           d="M 25.499998,23.781495 25.5,15.413559 C 25.5,13.799403 24.568942,12.5 23.412427,12.5 h -2.424855 c -1.156515,0 -2.483072,1.299403 -2.483072,2.913559 v 1.599039 h -2.264856 c -0.963763,0 -1.739644,0.794104 -1.739644,1.780446 v 1.468512 3.519375 m 10.999998,5.64e-4 2e-6,8.367936 c 0,1.614156 -0.931058,2.913559 -2.087573,2.913559 h -2.424855 c -1.156515,0 -2.483072,-1.299403 -2.483072,-2.913559 V 30.550392 H 16.239644 C 15.275881,30.550392 14.5,29.756288 14.5,28.769946 v -1.468512 -3.519375" /><path
            id="path2537-0"
            d="M 18.51661,16.539741 18.5464,30.705846"
            style="fill:#808080;stroke:#808080;stroke-width:0.929514px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /><path
            id="rect8645-2-5-2"
            style="display:inline;opacity:1;fill:#808080;fill-opacity:1;stroke:#808080;stroke-width:0.929514;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="m 36.091538,26.489769 -10e-7,1.058985 c 0,1.06945 -0.863288,1.955925 -2.164732,1.930363 -1.301445,-0.02541 -1.941636,0 -1.941636,0 v 0.201512 c 0,1.544678 -1.158564,2.787985 -2.597679,2.788284 l -1.648306,2.98e-4 c -1.360345,3e-4 -1.22903,0.546236 -1.22903,-2.989646 V 17.520381 c 0,-3.536032 -0.205068,-2.989797 1.22903,-2.989797 h 1.648306 c 1.439115,0 2.597679,1.243607 2.597679,2.788284 v 0.201513 h 1.941637 c 1.199261,0 2.164732,0.860911 2.164732,1.930361 v 2.554332 z m 0.06454,-6.010119 h 8.461471 l -0.05085,6.010119 h -8.188123"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cczccssssssccsccccccc" /><path
+           d="m 36.091538,26.489769 -10e-7,1.058985 c 0,1.06945 -0.863288,1.955925 -2.164732,1.930363 -1.301445,-0.02541 -1.941636,0 -1.941636,0 v 0.201512 c 0,1.544678 -1.158564,2.787985 -2.597679,2.788284 l -1.648306,2.98e-4 c -1.360345,3e-4 -1.22903,0.546236 -1.22903,-2.989646 V 17.520381 c 0,-3.536032 -0.205068,-2.989797 1.22903,-2.989797 h 1.648306 c 1.439115,0 2.597679,1.243607 2.597679,2.788284 v 0.201513 h 1.941637 c 1.199261,0 2.164732,0.860911 2.164732,1.930361 v 2.554332 z m 0.06454,-6.010119 h 8.461471 l -0.05085,6.010119 h -8.188123" /><path
            transform="matrix(1.445753,0,0,1.3224494,-65.097292,-1327.9481)"
            style="opacity:0.794;fill:#808080;fill-opacity:1;stroke:#808080;stroke-width:0.672232px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter8871-4)"
            d="m 64.018476,1016.5423 -0.152427,10.8222 c 2.375507,-3.3036 3.484206,-4.2052 2.972286,-9.2217 0.305009,-1.654 -1.117834,-1.7529 -2.819859,-1.6005 z"
-           id="path8861-9"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccc" /><ellipse
+           id="path8861-9" /><ellipse
            transform="matrix(1.029538,0,0,1.1281495,-39.470994,-1128.0797)"
            style="opacity:0.828;fill:#808080;fill-opacity:1;stroke:#808080;stroke-width:0.862484;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter8835-5)"
            id="path8817-1"
@@ -1085,14 +486,11 @@
            transform="matrix(1.7350569,0,0,1.8824502,-91.814902,-1903.1505)"
            style="opacity:0.862;fill:#808080;fill-opacity:1;stroke:#808080;stroke-width:0.514324px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter2533-6)"
            d="m 70.953811,1023.4014 v -1.8291 l 2.972286,-0.076 z"
-           id="path8875-0"
-           inkscape:connector-curvature="0" /><path
+           id="path8875-0" /><path
            transform="matrix(1.029538,0,0,1.1281495,-39.928294,-1128.6206)"
            style="display:inline;opacity:0.485;fill:#808080;fill-opacity:1;stroke:#808080;stroke-width:0.862484px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter8871-1-6)"
            d="m 53.924652,1016.631 -0.152427,10.8222 c 2.375507,-3.3036 3.484206,-4.2052 2.972286,-9.2217 0.305009,-1.654 -1.117834,-1.7529 -2.819859,-1.6005 z"
-           id="path8861-7-0"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccc" /></g><g
+           id="path8861-7-0" /></g><g
          id="g11331-3-1-1"
          style="display:inline"
          transform="matrix(0.92787456,0,0,0.92766861,-283.31685,-391.9053)"><g
@@ -1124,34 +522,23 @@
            transform="matrix(1.029538,0,0,1.1281495,-40.181606,-1129.0381)"
            style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.927888px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter8813)"
            d="m 53.577367,1026.9835 -0.152425,-8.8407 0.91455,-1.2194 3.124711,-0.076 0.07621,-0.9908 h 0.91455 l -0.07621,1.9054 -3.048499,1.2194 -0.152425,4.9538 z"
-           id="path8791"
-           inkscape:connector-curvature="0" /><path
+           id="path8791" /><path
            id="path8722-7"
            style="display:inline;opacity:1;fill:url(#linearGradient8769);fill-opacity:1;stroke:url(#linearGradient8753);stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="M 3.4999999,23.512598 V 25.5 H 14.5 V 21.525196 H 3.4999999 v 1.987402"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccccc" /><path
-           sodipodi:nodetypes="csssscsscccsssscsscc"
+           d="M 3.4999999,23.512598 V 25.5 H 14.5 V 21.525196 H 3.4999999 v 1.987402" /><path
            id="rect8645-3"
            style="display:inline;opacity:1;fill:url(#linearGradient8761);fill-opacity:1;stroke:#4d73ae;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="M 25.499998,23.781495 25.5,15.413559 C 25.5,13.799403 24.568942,12.5 23.412427,12.5 h -2.424855 c -1.156515,0 -2.483072,1.299403 -2.483072,2.913559 v 1.599039 h -2.264856 c -0.963763,0 -1.739644,0.794104 -1.739644,1.780446 v 1.468512 3.519375 m 10.999998,5.64e-4 2e-6,8.367936 c 0,1.614156 -0.931058,2.913559 -2.087573,2.913559 h -2.424855 c -1.156515,0 -2.483072,-1.299403 -2.483072,-2.913559 V 30.550392 H 16.239644 C 15.275881,30.550392 14.5,29.756288 14.5,28.769946 v -1.468512 -3.519375"
-           inkscape:connector-curvature="0" /><path
-           sodipodi:nodetypes="cc"
-           inkscape:connector-curvature="0"
+           d="M 25.499998,23.781495 25.5,15.413559 C 25.5,13.799403 24.568942,12.5 23.412427,12.5 h -2.424855 c -1.156515,0 -2.483072,1.299403 -2.483072,2.913559 v 1.599039 h -2.264856 c -0.963763,0 -1.739644,0.794104 -1.739644,1.780446 v 1.468512 3.519375 m 10.999998,5.64e-4 2e-6,8.367936 c 0,1.614156 -0.931058,2.913559 -2.087573,2.913559 h -2.424855 c -1.156515,0 -2.483072,-1.299403 -2.483072,-2.913559 V 30.550392 H 16.239644 C 15.275881,30.550392 14.5,29.756288 14.5,28.769946 v -1.468512 -3.519375" /><path
            id="path2537"
            d="M 18.51661,16.539741 18.5464,30.705846"
            style="fill:none;stroke:url(#linearGradient2545);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /><path
            id="rect8645-2-5"
            style="display:inline;opacity:1;fill:url(#linearGradient8779);fill-opacity:1;stroke:url(#linearGradient8787);stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="m 36.091538,26.489769 -10e-7,1.058985 c 0,1.06945 -0.863288,1.955925 -2.164732,1.930363 -1.301445,-0.02541 -1.941636,0 -1.941636,0 v 0.201512 c 0,1.544678 -1.158564,2.787985 -2.597679,2.788284 l -1.648306,2.98e-4 c -1.360345,3e-4 -1.22903,0.546236 -1.22903,-2.989646 V 17.520381 c 0,-3.536032 -0.205068,-2.989797 1.22903,-2.989797 h 1.648306 c 1.439115,0 2.597679,1.243607 2.597679,2.788284 v 0.201513 h 1.941637 c 1.199261,0 2.164732,0.860911 2.164732,1.930361 v 2.554332 z m 0.06454,-6.010119 h 8.461471 l -0.05085,6.010119 h -8.188123"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cczccssssssccsccccccc" /><path
+           d="m 36.091538,26.489769 -10e-7,1.058985 c 0,1.06945 -0.863288,1.955925 -2.164732,1.930363 -1.301445,-0.02541 -1.941636,0 -1.941636,0 v 0.201512 c 0,1.544678 -1.158564,2.787985 -2.597679,2.788284 l -1.648306,2.98e-4 c -1.360345,3e-4 -1.22903,0.546236 -1.22903,-2.989646 V 17.520381 c 0,-3.536032 -0.205068,-2.989797 1.22903,-2.989797 h 1.648306 c 1.439115,0 2.597679,1.243607 2.597679,2.788284 v 0.201513 h 1.941637 c 1.199261,0 2.164732,0.860911 2.164732,1.930361 v 2.554332 z m 0.06454,-6.010119 h 8.461471 l -0.05085,6.010119 h -8.188123" /><path
            transform="matrix(1.445753,0,0,1.3224494,-65.097292,-1327.9481)"
            style="opacity:0.794;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.723208px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter8871)"
            d="m 64.018476,1016.5423 -0.152427,10.8222 c 2.375507,-3.3036 3.484206,-4.2052 2.972286,-9.2217 0.305009,-1.654 -1.117834,-1.7529 -2.819859,-1.6005 z"
-           id="path8861"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccc" /><ellipse
+           id="path8861" /><ellipse
            transform="matrix(1.029538,0,0,1.1281495,-39.470994,-1128.0797)"
            style="opacity:0.828;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.927888;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter8835)"
            id="path8817"
@@ -1162,14 +549,11 @@
            transform="matrix(1.7350569,0,0,1.8824502,-91.814902,-1903.1505)"
            style="opacity:0.862;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.553326px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter2533)"
            d="m 70.953811,1023.4014 v -1.8291 l 2.972286,-0.076 z"
-           id="path8875"
-           inkscape:connector-curvature="0" /><path
+           id="path8875" /><path
            transform="matrix(1.029538,0,0,1.1281495,-39.928294,-1128.6206)"
            style="display:inline;opacity:0.485;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.927888px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter8871-1)"
            d="m 53.924652,1016.631 -0.152427,10.8222 c 2.375507,-3.3036 3.484206,-4.2052 2.972286,-9.2217 0.305009,-1.654 -1.117834,-1.7529 -2.819859,-1.6005 z"
-           id="path8861-7"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccc" /></g></g><rect
+           id="path8861-7" /></g></g><rect
        transform="matrix(1,0,-0.47943667,0.87757648,0,0)"
        style="display:inline;fill:url(#linearGradient4936);fill-opacity:1;stroke:url(#linearGradient4956-9);stroke-width:1.06747;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect4932"
@@ -1178,31 +562,13 @@
        x="572.31567"
        y="1153.4384"
        ry="1.8222821"
-       inkscape:label="front"
        rx="1.8222821" /><g
        id="g1"
-       inkscape:label="export-triangle"
        transform="rotate(90,37.404605,1065.2607)"><path
          style="display:inline;fill:url(#linearGradient4494);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4510);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
          d="M 1.7489458,1033.7666 H 16.748946 v 15 z"
-         id="path4478"
-         inkscape:connector-curvature="0"
-         inkscape:label="triangle" /><path
-         sodipodi:type="star"
+         id="path4478" /><path
          style="display:inline;opacity:0.9;fill:#ffffff;fill-opacity:0.815842;stroke:none;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;filter:url(#filter4285-9-8)"
          id="path4252-6-0"
-         sodipodi:sides="4"
-         sodipodi:cx="4.7729707"
-         sodipodi:cy="1041.2474"
-         sodipodi:r1="3.3255017"
-         sodipodi:r2="0.49178758"
-         sodipodi:arg1="2.432965"
-         sodipodi:arg2="-3.0800218"
-         inkscape:flatsided="false"
-         inkscape:rounded="0"
-         inkscape:randomized="-0.017554997"
          d="m 2.2999628,1043.3702 1.9823895,-2.1047 -1.6734053,-2.5419 2.1987064,2.0209 2.4513363,-1.6427 -2.0383649,2.1623 1.7419712,2.4882 -2.2030799,-2.0431 z"
-         transform="matrix(-0.82539295,1.4154894,-1.2829533,-1.0100615,1348.392,2086.9405)"
-         inkscape:transform-center-x="0.19603188"
-         inkscape:transform-center-y="0.38464271"
-         inkscape:label="star" /></g></g></svg>
+         transform="matrix(-0.82539295,1.4154894,-1.2829533,-1.0100615,1348.392,2086.9405)" /></g></g></svg>
diff --git a/ui/org.eclipse.pde.ui/icons/wizban/imp_extplug_wiz.svg b/ui/org.eclipse.pde.ui/icons/wizban/imp_extplug_wiz.svg
index c5c2c4befb8..8a675416183 100644
--- a/ui/org.eclipse.pde.ui/icons/wizban/imp_extplug_wiz.svg
+++ b/ui/org.eclipse.pde.ui/icons/wizban/imp_extplug_wiz.svg
@@ -6,14 +6,7 @@
    height="66"
    id="svg2"
    version="1.1"
-   inkscape:version="1.3 (0e150ed, 2023-07-21)"
-   sodipodi:docname="imp_extplug_wiz.svg"
-   inkscape:export-filename="/Users/d021678/git/eclipse.jdt.ui/org.eclipse.jdt.ui/icons/full/wizban/newclass_wiz2.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90"
    xml:space="preserve"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:svg="http://www.w3.org/2000/svg"
@@ -21,7 +14,6 @@
    xmlns:cc="http://creativecommons.org/ns#"
    xmlns:dc="http://purl.org/dc/elements/1.1/"><defs
      id="defs4"><linearGradient
-       inkscape:collect="always"
        id="linearGradient10"><stop
          style="stop-color:#9454ac;stop-opacity:1;"
          offset="0"
@@ -32,331 +24,27 @@
          style="stop-color:#995cb0;stop-opacity:1;"
          offset="1"
          id="stop10" /></linearGradient><linearGradient
-       id="linearGradient7"
-       inkscape:collect="always"><stop
+       id="linearGradient7"><stop
          id="stop6"
          offset="0"
          style="stop-color:#762894;stop-opacity:1;" /><stop
          id="stop7"
          offset="1"
          style="stop-color:#9a5fb1;stop-opacity:1;" /></linearGradient><linearGradient
-       id="linearGradient5"
-       inkscape:collect="always"><stop
+       id="linearGradient5"><stop
          id="stop4"
          offset="0"
          style="stop-color:#ad7bc1;stop-opacity:1;" /><stop
          id="stop5"
          offset="1"
          style="stop-color:#9a5fb1;stop-opacity:1;" /></linearGradient><linearGradient
-       id="linearGradient3"
-       inkscape:collect="always"><stop
+       id="linearGradient3"><stop
          id="stop2"
          offset="0"
          style="stop-color:#dbc3e6;stop-opacity:1;" /><stop
          id="stop3"
          offset="1"
          style="stop-color:#84489e;stop-opacity:1;" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       id="linearGradient4541"><stop
-         style="stop-color:#a1adb2;stop-opacity:1"
-         offset="0"
-         id="stop4543" /><stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop4545" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       id="linearGradient4972"><stop
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0"
-         id="stop4974" /><stop
-         style="stop-color:#f5f8fd;stop-opacity:1"
-         offset="1"
-         id="stop4976" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       id="linearGradient4964"><stop
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0"
-         id="stop4966" /><stop
-         style="stop-color:#e8eefa;stop-opacity:1"
-         offset="1"
-         id="stop4968" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       id="linearGradient4956"><stop
-         style="stop-color:#fcfdfe;stop-opacity:1"
-         offset="0"
-         id="stop4958" /><stop
-         style="stop-color:#dee6f8;stop-opacity:1"
-         offset="1"
-         id="stop4960" /></linearGradient><filter
-       style="color-interpolation-filters:sRGB"
-       inkscape:label="Drop Shadow"
-       id="filter8854"><feFlood
-         flood-opacity="0.933333"
-         flood-color="rgb(244,248,254)"
-         result="flood"
-         id="feFlood8856" /><feComposite
-         in="flood"
-         in2="SourceGraphic"
-         operator="in"
-         result="composite1"
-         id="feComposite8858" /><feGaussianBlur
-         in="composite1"
-         stdDeviation="1.2"
-         result="blur"
-         id="feGaussianBlur8860" /><feOffset
-         dx="-1"
-         dy="3"
-         result="offset"
-         id="feOffset8862" /><feComposite
-         in="SourceGraphic"
-         in2="offset"
-         operator="over"
-         result="composite2"
-         id="feComposite8864" /></filter><linearGradient
-       id="linearGradient6122"><stop
-         style="stop-color:#c0c0c0;stop-opacity:1"
-         offset="0"
-         id="stop6124" /><stop
-         id="stop6132"
-         offset="0.5"
-         style="stop-color:#adadad;stop-opacity:1" /><stop
-         style="stop-color:#808080;stop-opacity:1"
-         offset="1"
-         id="stop6126" /></linearGradient><linearGradient
-       id="linearGradient7087"><stop
-         style="stop-color:#17325d;stop-opacity:1;"
-         offset="0"
-         id="stop7089" /><stop
-         id="stop7091"
-         offset="0.25"
-         style="stop-color:#b4d0e2;stop-opacity:1" /><stop
-         id="stop7093"
-         offset="0.5"
-         style="stop-color:#b7d2e4;stop-opacity:1" /><stop
-         style="stop-color:#acc9de;stop-opacity:1"
-         offset="0.75"
-         id="stop7095" /><stop
-         style="stop-color:#3e72a7;stop-opacity:1"
-         offset="1"
-         id="stop7097" /></linearGradient><mask
-       id="mask7366"
-       maskUnits="userSpaceOnUse"><path
-         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;display:inline"
-         d="m -16.593048,1040.862 9.990206,0 0,10.0018 -2.983353,3.0385 -5.966213,0 c -0.53033,-0.022 -1.04064,-0.5519 -1.04064,-1.0385 z"
-         id="path7368"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccccc" /></mask><linearGradient
-       id="linearGradient7584-5"><stop
-         id="stop7586-4"
-         offset="0"
-         style="stop-color:#f9cd5f;stop-opacity:1" /><stop
-         id="stop7588-5"
-         offset="1"
-         style="stop-color:#fbf0b4;stop-opacity:1" /></linearGradient><linearGradient
-       id="linearGradient7592-1"><stop
-         id="stop7594-6"
-         offset="0"
-         style="stop-color:#bd8416;stop-opacity:1" /><stop
-         id="stop7596-9"
-         offset="1"
-         style="stop-color:#a66b10;stop-opacity:1" /></linearGradient><linearGradient
-       id="linearGradient10798-1-9-3-7-6-6-6-2-6-7-98-9-4-1"><stop
-         style="stop-color:#5aad60;stop-opacity:1;"
-         offset="0"
-         id="stop10800-5-2-1-8-20-4-0-2-1-9-0-0-1-1" /><stop
-         id="stop10806-6-8-5-3-9-2-2-7-0-4-2-7-8-9"
-         offset="0.5"
-         style="stop-color:#5bb26a;stop-opacity:1;" /><stop
-         style="stop-color:#a4c589;stop-opacity:1"
-         offset="1"
-         id="stop10802-1-5-3-0-4-6-8-5-5-6-69-6-4-0" /></linearGradient><mask
-       maskUnits="userSpaceOnUse"
-       id="mask7366-4"><path
-         sodipodi:nodetypes="ccccccc"
-         inkscape:connector-curvature="0"
-         id="path7368-2"
-         d="m -16.593048,1040.862 9.990206,0 0,10.0018 -2.983353,3.0385 -5.966213,0 c -0.53033,-0.022 -1.04064,-0.5519 -1.04064,-1.0385 z"
-         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;display:inline" /></mask><linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient7087"
-       id="linearGradient9331"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-20,0)"
-       x1="4.7776356"
-       y1="1039.8118"
-       x2="4.7776356"
-       y2="1041.911" /><linearGradient
-       y2="1041.911"
-       x2="4.7776356"
-       y1="1039.8118"
-       x1="4.7776356"
-       gradientTransform="translate(-18,4.7e-5)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient9333"
-       xlink:href="#linearGradient7087"
-       inkscape:collect="always" /><linearGradient
-       y2="1041.911"
-       x2="4.7776356"
-       y1="1039.8118"
-       x1="4.7776356"
-       gradientTransform="translate(-16,4.7e-5)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient9335"
-       xlink:href="#linearGradient7087"
-       inkscape:collect="always" /><linearGradient
-       y2="1041.911"
-       x2="4.7776356"
-       y1="1039.8118"
-       x1="4.7776356"
-       gradientTransform="translate(-14,4.7e-5)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient9337"
-       xlink:href="#linearGradient7087"
-       inkscape:collect="always" /><linearGradient
-       y2="1041.911"
-       x2="4.7776356"
-       y1="1039.8118"
-       x1="4.7776356"
-       gradientTransform="translate(-12,4.7e-5)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient9339"
-       xlink:href="#linearGradient7087"
-       inkscape:collect="always" /><linearGradient
-       gradientTransform="translate(-80,0)"
-       gradientUnits="userSpaceOnUse"
-       y2="1042.7973"
-       x2="163.22012"
-       y1="1042.7973"
-       x1="88.220117"
-       id="linearGradient68073"
-       xlink:href="#linearGradient4956"
-       inkscape:collect="always" /><linearGradient
-       gradientTransform="translate(-80,0)"
-       gradientUnits="userSpaceOnUse"
-       y2="1032.2669"
-       x2="163.22012"
-       y1="1032.2668"
-       x1="94.469681"
-       id="linearGradient68075"
-       xlink:href="#linearGradient4964"
-       inkscape:collect="always" /><linearGradient
-       gradientTransform="translate(-80,0)"
-       gradientUnits="userSpaceOnUse"
-       y2="1032.2668"
-       x2="152.72206"
-       y1="1032.2668"
-       x1="88.220116"
-       id="linearGradient68077"
-       xlink:href="#linearGradient4972"
-       inkscape:collect="always" /><filter
-       id="filter8854-9"
-       inkscape:label="Drop Shadow"
-       style="color-interpolation-filters:sRGB"><feFlood
-         id="feFlood8856-0"
-         result="flood"
-         flood-color="rgb(244,248,254)"
-         flood-opacity="0.933333" /><feComposite
-         id="feComposite8858-2"
-         result="composite1"
-         operator="in"
-         in2="SourceGraphic"
-         in="flood" /><feGaussianBlur
-         id="feGaussianBlur8860-3"
-         result="blur"
-         stdDeviation="1.2"
-         in="composite1" /><feOffset
-         id="feOffset8862-2"
-         result="offset"
-         dy="3"
-         dx="-1" /><feComposite
-         id="feComposite8864-3"
-         result="composite2"
-         operator="over"
-         in2="offset"
-         in="SourceGraphic" /></filter><linearGradient
-       id="linearGradient10798-1-9-3-7-6-8-9-0-9-1"><stop
-         id="stop10800-5-2-1-8-20-6-4-9-8-2"
-         offset="0"
-         style="stop-color:#7564b1;stop-opacity:1" /><stop
-         style="stop-color:#5d4aa1;stop-opacity:1"
-         offset="0.5"
-         id="stop10806-6-8-5-3-9-24-8-4-3-2" /><stop
-         id="stop10802-1-5-3-0-4-8-4-2-9-2"
-         offset="1"
-         style="stop-color:#9283c3;stop-opacity:1" /></linearGradient><linearGradient
-       id="linearGradient7540-2-3-8-7"><stop
-         id="stop7542-8-7-5-3"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.502" /><stop
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0.47623286"
-         id="stop7544-8-2-0-5" /><stop
-         style="stop-color:#ffffff;stop-opacity:0"
-         offset="0.5"
-         id="stop7546-1-7-9-5" /><stop
-         id="stop7548-98-9-2-4"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       id="linearGradient7272-66-4-5-5-5-8"><stop
-         style="stop-color:#8f6c10;stop-opacity:1"
-         offset="0"
-         id="stop7274-6-0-1-7-4-7" /><stop
-         style="stop-color:#c9a645;stop-opacity:1"
-         offset="1"
-         id="stop7276-66-6-3-9-1-4" /></linearGradient><linearGradient
-       y2="1030.3411"
-       x2="-10.159802"
-       y1="1030.3411"
-       x1="-22.453552"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient10540"
-       xlink:href="#linearGradient7540-2-3-8-7"
-       inkscape:collect="always" /><linearGradient
-       y2="1030.3411"
-       x2="-10.159802"
-       y1="1030.3411"
-       x1="-22.453552"
-       gradientTransform="matrix(0,1,-1,0,1014.0344,1046.6478)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient10542"
-       xlink:href="#linearGradient7540-2-3-8-7"
-       inkscape:collect="always" /><linearGradient
-       y2="1023.2569"
-       x2="-15.945988"
-       y1="1037.4661"
-       x1="-15.945988"
-       gradientTransform="matrix(0.95585117,0,0,0.95585117,-0.71992063,45.488394)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient10544"
-       xlink:href="#linearGradient7272-66-4-5-5-5-8"
-       inkscape:collect="always" /><mask
-       id="mask10620"
-       maskUnits="userSpaceOnUse"><path
-         transform="matrix(0.55482947,0,0,0.55482947,-206.96039,787.08655)"
-         d="m 398.75,468.23718 a 10.625,10.625 0 1 1 -21.25,0 10.625,10.625 0 1 1 21.25,0 z"
-         sodipodi:ry="10.625"
-         sodipodi:rx="10.625"
-         sodipodi:cy="468.23718"
-         sodipodi:cx="388.125"
-         id="path10622"
-         style="font-size:13.58917427px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:2.16621375;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline;font-family:Sans"
-         sodipodi:type="arc" /></mask><linearGradient
-       id="linearGradient4528-9-5-7-9-7-3"><stop
-         id="stop4530-0-5-0-5-8-4"
-         offset="0"
-         style="stop-color:#e0c576;stop-opacity:1;" /><stop
-         id="stop4532-7-9-3-3-6-1"
-         offset="1"
-         style="stop-color:#9e7916;stop-opacity:1" /></linearGradient><linearGradient
-       id="linearGradient6281-8-0-1-6-6-4-2-8-0"><stop
-         style="stop-color:#f7f9fb;stop-opacity:1"
-         offset="0"
-         id="stop6283-0-2-2-1-2-0-1-6-0" /><stop
-         style="stop-color:#ffd680;stop-opacity:1"
-         offset="1"
-         id="stop6285-5-0-9-7-6-9-9-1-9" /></linearGradient><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4972-7"
        id="linearGradient4978"
        x1="88.220116"
@@ -365,7 +53,6 @@
        y2="1032.2668"
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-88.220116,-999.2669)" /><linearGradient
-       inkscape:collect="always"
        id="linearGradient4972-7"><stop
          style="stop-color:#b8ccf1;stop-opacity:0.10196079"
          offset="0"
@@ -373,7 +60,6 @@
          style="stop-color:#6e97e2;stop-opacity:0.10196079"
          offset="1"
          id="stop4976-1" /></linearGradient><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4964-3"
        id="linearGradient4970"
        x1="118.38584"
@@ -382,7 +68,6 @@
        y2="1032.2668"
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-88.220117,-999.2669)" /><linearGradient
-       inkscape:collect="always"
        id="linearGradient4964-3"><stop
          style="stop-color:#ffffff;stop-opacity:0.349"
          offset="0"
@@ -390,7 +75,6 @@
          style="stop-color:#91ade6;stop-opacity:1"
          offset="1"
          id="stop4968-1" /></linearGradient><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4956-2"
        id="linearGradient4962"
        x1="88.220116"
@@ -399,7 +83,6 @@
        y2="1042.7972"
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-88.220116,-999.2669)" /><linearGradient
-       inkscape:collect="always"
        id="linearGradient4956-2"><stop
          style="stop-color:#fcfdfe;stop-opacity:0.25641027"
          offset="0"
@@ -407,94 +90,6 @@
          style="stop-color:#98aae7;stop-opacity:0.40392157"
          offset="1"
          id="stop4960-6" /></linearGradient><linearGradient
-       id="linearGradient3827"><stop
-         id="stop3829"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0;" /><stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0.60149658"
-         id="stop3835" /><stop
-         id="stop3831"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" /></linearGradient><linearGradient
-       id="linearGradient10798-1-9-3-7-6-8-9-0-9-1-0"><stop
-         id="stop10800-5-2-1-8-20-6-4-9-8-2-9"
-         offset="0"
-         style="stop-color:#f3faed;stop-opacity:1" /><stop
-         style="stop-color:#e7f4da;stop-opacity:1"
-         offset="0.65917557"
-         id="stop10806-6-8-5-3-9-24-8-4-3-2-4" /><stop
-         id="stop10802-1-5-3-0-4-8-4-2-9-2-5"
-         offset="1"
-         style="stop-color:#67bf1f;stop-opacity:1" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4541"
-       id="linearGradient5885"
-       x1="41"
-       y1="1007.8622"
-       x2="60"
-       y2="1008.3622"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0,1,-1,0,1034.3618,967.36133)" /><linearGradient
-       id="linearGradient11146-4-4-4-6-2"><stop
-         id="stop11150-4-72-3-9-7"
-         offset="0"
-         style="stop-color:#faefba;stop-opacity:1" /><stop
-         style="stop-color:#9e6542;stop-opacity:1"
-         offset="1"
-         id="stop11152-9-0-7-3-8" /></linearGradient><linearGradient
-       id="linearGradient10507"><stop
-         style="stop-color:#5f392d;stop-opacity:1"
-         offset="0"
-         id="stop10509" /><stop
-         id="stop10511"
-         offset="0.18181793"
-         style="stop-color:#9e7058;stop-opacity:1" /><stop
-         id="stop10513"
-         offset="0.36363617"
-         style="stop-color:#794f40;stop-opacity:1" /><stop
-         id="stop10515"
-         offset="0.49999985"
-         style="stop-color:#794f40;stop-opacity:1" /><stop
-         id="stop10517"
-         offset="0.63636351"
-         style="stop-color:#794f40;stop-opacity:1" /><stop
-         style="stop-color:#9e7058;stop-opacity:1"
-         offset="0.81818175"
-         id="stop10519" /><stop
-         style="stop-color:#5f392d;stop-opacity:1"
-         offset="1"
-         id="stop10522" /></linearGradient><linearGradient
-       id="linearGradient11146-4-4-4-6-2-8"><stop
-         id="stop11150-4-72-3-9-7-2"
-         offset="0"
-         style="stop-color:#faefba;stop-opacity:1" /><stop
-         style="stop-color:#ad6e48;stop-opacity:1"
-         offset="1"
-         id="stop11152-9-0-7-3-8-0" /></linearGradient><linearGradient
-       id="linearGradient4368"><stop
-         id="stop4370"
-         offset="0"
-         style="stop-color:#9c7561;stop-opacity:1" /><stop
-         style="stop-color:#966d59;stop-opacity:1"
-         offset="0.18181793"
-         id="stop4372" /><stop
-         style="stop-color:#8c6250;stop-opacity:1"
-         offset="0.36363617"
-         id="stop4374" /><stop
-         style="stop-color:#794f40;stop-opacity:1"
-         offset="0.49999985"
-         id="stop4376" /><stop
-         style="stop-color:#8c6250;stop-opacity:1"
-         offset="0.63636351"
-         id="stop4378" /><stop
-         id="stop4380"
-         offset="0.81818175"
-         style="stop-color:#966d59;stop-opacity:1" /><stop
-         id="stop4382"
-         offset="1"
-         style="stop-color:#99705c;stop-opacity:1" /></linearGradient><linearGradient
-       inkscape:collect="always"
        id="linearGradient2543"><stop
          style="stop-color:#4f76b0;stop-opacity:1"
          offset="0"
@@ -505,8 +100,7 @@
          style="stop-color:#587cb2;stop-opacity:1"
          offset="1"
          id="stop2541" /></linearGradient><linearGradient
-       id="linearGradient8785"
-       inkscape:collect="always"><stop
+       id="linearGradient8785"><stop
          id="stop8781"
          offset="0"
          style="stop-color:#bb8d2d;stop-opacity:1" /><stop
@@ -516,113 +110,34 @@
          id="stop8783"
          offset="1"
          style="stop-color:#b07905;stop-opacity:1" /></linearGradient><linearGradient
-       id="linearGradient8777"
-       inkscape:collect="always"><stop
+       id="linearGradient8777"><stop
          id="stop8773"
          offset="0"
          style="stop-color:#fbeaab;stop-opacity:1;" /><stop
          id="stop8775"
          offset="1"
          style="stop-color:#deb241;stop-opacity:1" /></linearGradient><linearGradient
-       id="linearGradient8767"
-       inkscape:collect="always"><stop
+       id="linearGradient8767"><stop
          id="stop8763"
          offset="0"
          style="stop-color:#6a8ec1;stop-opacity:1" /><stop
          id="stop8765"
          offset="1"
          style="stop-color:#80a1cf;stop-opacity:1" /></linearGradient><linearGradient
-       id="linearGradient8759"
-       inkscape:collect="always"><stop
+       id="linearGradient8759"><stop
          id="stop8755"
          offset="0"
          style="stop-color:#d3e0eb;stop-opacity:1" /><stop
          id="stop8757"
          offset="1"
          style="stop-color:#5179b5;stop-opacity:1" /></linearGradient><linearGradient
-       id="linearGradient8751"
-       inkscape:collect="always"><stop
+       id="linearGradient8751"><stop
          id="stop8747"
          offset="0"
          style="stop-color:#2e5d8f;stop-opacity:1" /><stop
          id="stop8749"
          offset="1"
-         style="stop-color:#6085bb;stop-opacity:1" /></linearGradient><filter
-       id="filter8854-7"
-       inkscape:label="Drop Shadow"
-       style="color-interpolation-filters:sRGB"><feFlood
-         id="feFlood8856-03"
-         result="flood"
-         flood-color="rgb(244,248,254)"
-         flood-opacity="0.933333" /><feComposite
-         id="feComposite8858-9"
-         result="composite1"
-         operator="in"
-         in2="SourceGraphic"
-         in="flood" /><feGaussianBlur
-         id="feGaussianBlur8860-9"
-         result="blur"
-         stdDeviation="1.2"
-         in="composite1" /><feOffset
-         id="feOffset8862-9"
-         result="offset"
-         dy="3"
-         dx="-1" /><feComposite
-         id="feComposite8864-1"
-         result="composite2"
-         operator="over"
-         in2="offset"
-         in="SourceGraphic" /></filter><mask
-       maskUnits="userSpaceOnUse"
-       id="mask7366-47"><path
-         sodipodi:nodetypes="ccccccc"
-         inkscape:connector-curvature="0"
-         id="path7368-1"
-         d="m -16.593048,1040.862 9.990206,0 0,10.0018 -2.983353,3.0385 -5.966213,0 c -0.53033,-0.022 -1.04064,-0.5519 -1.04064,-1.0385 z"
-         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;display:inline" /></mask><mask
-       id="mask7366-4-0"
-       maskUnits="userSpaceOnUse"><path
-         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;display:inline"
-         d="m -16.593048,1040.862 9.990206,0 0,10.0018 -2.983353,3.0385 -5.966213,0 c -0.53033,-0.022 -1.04064,-0.5519 -1.04064,-1.0385 z"
-         id="path7368-2-3"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccccc" /></mask><filter
-       style="color-interpolation-filters:sRGB"
-       inkscape:label="Drop Shadow"
-       id="filter8854-9-2"><feFlood
-         flood-opacity="0.933333"
-         flood-color="rgb(244,248,254)"
-         result="flood"
-         id="feFlood8856-0-6" /><feComposite
-         in="flood"
-         in2="SourceGraphic"
-         operator="in"
-         result="composite1"
-         id="feComposite8858-2-9" /><feGaussianBlur
-         in="composite1"
-         stdDeviation="1.2"
-         result="blur"
-         id="feGaussianBlur8860-3-4" /><feOffset
-         dx="-1"
-         dy="3"
-         result="offset"
-         id="feOffset8862-2-1" /><feComposite
-         in="SourceGraphic"
-         in2="offset"
-         operator="over"
-         result="composite2"
-         id="feComposite8864-3-3" /></filter><mask
-       maskUnits="userSpaceOnUse"
-       id="mask10620-4"><path
-         sodipodi:type="arc"
-         style="font-size:13.58917427px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:2.16621375;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline;font-family:Sans"
-         id="path10622-3"
-         sodipodi:cx="388.125"
-         sodipodi:cy="468.23718"
-         sodipodi:rx="10.625"
-         sodipodi:ry="10.625"
-         d="m 398.75,468.23718 a 10.625,10.625 0 1 1 -21.25,0 10.625,10.625 0 1 1 21.25,0 z"
-         transform="matrix(0.55482947,0,0,0.55482947,-206.96039,787.08655)" /></mask><linearGradient
+         style="stop-color:#6085bb;stop-opacity:1" /></linearGradient><linearGradient
        gradientUnits="userSpaceOnUse"
        y2="1024.3622"
        x2="50"
@@ -630,7 +145,6 @@
        x1="50"
        id="linearGradient8753"
        xlink:href="#linearGradient8751"
-       inkscape:collect="always"
        gradientTransform="matrix(2.7500001,0,0,0.99370101,-129.87501,-991.91286)" /><linearGradient
        gradientUnits="userSpaceOnUse"
        y2="1030.3622"
@@ -639,7 +153,6 @@
        x1="57"
        id="linearGradient8761"
        xlink:href="#linearGradient8759"
-       inkscape:collect="always"
        gradientTransform="matrix(1.0999999,0,0,1.1281495,-43.249997,-1129.0318)" /><linearGradient
        gradientUnits="userSpaceOnUse"
        y2="1023.234"
@@ -648,7 +161,6 @@
        x1="51.658199"
        id="linearGradient8769"
        xlink:href="#linearGradient8767"
-       inkscape:collect="always"
        gradientTransform="matrix(2.7500001,0,0,0.99370101,-129.87501,-991.91286)" /><linearGradient
        gradientUnits="userSpaceOnUse"
        y2="1026.0538"
@@ -657,7 +169,6 @@
        x1="63.98344"
        id="linearGradient8779"
        xlink:href="#linearGradient8777"
-       inkscape:collect="always"
        gradientTransform="matrix(1.3687895,0,0,1.494898,-60.408122,-1504.0798)" /><linearGradient
        gradientUnits="userSpaceOnUse"
        y2="1028.4165"
@@ -666,49 +177,39 @@
        x1="68.47998"
        id="linearGradient8787"
        xlink:href="#linearGradient8785"
-       inkscape:collect="always"
        gradientTransform="matrix(1.3687895,0,0,1.494898,-60.408122,-1504.0798)" /><filter
        height="1.6025846"
        y="-0.30129232"
        width="1.626688"
        x="-0.313344"
        id="filter8835"
-       style="color-interpolation-filters:sRGB"
-       inkscape:collect="always"><feGaussianBlur
+       style="color-interpolation-filters:sRGB"><feGaussianBlur
          id="feGaussianBlur8837"
-         stdDeviation="0.49751501"
-         inkscape:collect="always" /></filter><filter
+         stdDeviation="0.49751501" /></filter><filter
        height="1.2365698"
        y="-0.11828489"
        width="1.8310951"
        x="-0.41554753"
        id="filter8871"
-       style="color-interpolation-filters:sRGB"
-       inkscape:collect="always"><feGaussianBlur
+       style="color-interpolation-filters:sRGB"><feGaussianBlur
          id="feGaussianBlur8873"
-         stdDeviation="0.53588249"
-         inkscape:collect="always" /></filter><filter
+         stdDeviation="0.53588249" /></filter><filter
        height="1.2365698"
        y="-0.11828489"
        width="1.8310951"
        x="-0.41554753"
        id="filter8871-1"
-       style="color-interpolation-filters:sRGB"
-       inkscape:collect="always"><feGaussianBlur
+       style="color-interpolation-filters:sRGB"><feGaussianBlur
          id="feGaussianBlur8873-8"
-         stdDeviation="0.53588249"
-         inkscape:collect="always" /></filter><filter
-       inkscape:collect="always"
+         stdDeviation="0.53588249" /></filter><filter
        style="color-interpolation-filters:sRGB"
        id="filter2533"
        x="-0.59377657"
        width="2.1875531"
        y="-0.92639431"
        height="2.8527886"><feGaussianBlur
-         inkscape:collect="always"
          stdDeviation="0.73536407"
          id="feGaussianBlur2535" /></filter><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient2543"
        id="linearGradient2545"
        x1="18.423391"
@@ -716,18 +217,15 @@
        x2="18.436228"
        y2="30.334658"
        gradientUnits="userSpaceOnUse" /><filter
-       inkscape:collect="always"
        style="color-interpolation-filters:sRGB"
        id="filter2728"
        x="-0.063527558"
        width="1.1270551"
        y="-0.11576912"
        height="1.2315382"><feGaussianBlur
-         inkscape:collect="always"
          stdDeviation="0.90744768"
          id="feGaussianBlur2730" /></filter><linearGradient
-       id="linearGradient4496"
-       inkscape:collect="always"><stop
+       id="linearGradient4496"><stop
          id="stop4498"
          offset="0"
          style="stop-color:#6885b2;stop-opacity:1" /><stop
@@ -740,7 +238,6 @@
          id="stop4502"
          offset="1"
          style="stop-color:#2c4a81;stop-opacity:1" /></linearGradient><linearGradient
-       inkscape:collect="always"
        id="linearGradient4504"><stop
          style="stop-color:#b0c1db;stop-opacity:1"
          offset="0"
@@ -748,14 +245,12 @@
          style="stop-color:#8299c2;stop-opacity:1"
          offset="1"
          id="stop4508" /></linearGradient><filter
-       inkscape:collect="always"
        style="color-interpolation-filters:sRGB"
        id="filter2728-6"
        x="-0.063527558"
        width="1.1270551"
-       y="-0.11576912"
-       height="1.2315382"><feGaussianBlur
-         inkscape:collect="always"
+       y="-0.1326247"
+       height="1.2655597"><feGaussianBlur
          stdDeviation="0.90744768"
          id="feGaussianBlur2730-2" /></filter><linearGradient
        gradientUnits="userSpaceOnUse"
@@ -765,7 +260,6 @@
        x1="51.658199"
        id="linearGradient8769-0"
        xlink:href="#linearGradient5"
-       inkscape:collect="always"
        gradientTransform="matrix(2.7500001,0,0,0.99370101,-129.87501,-991.91286)" /><linearGradient
        gradientUnits="userSpaceOnUse"
        y2="1024.3622"
@@ -774,9 +268,7 @@
        x1="50"
        id="linearGradient8753-0"
        xlink:href="#linearGradient7"
-       inkscape:collect="always"
        gradientTransform="matrix(2.7500001,0,0,0.99370101,-129.87501,-991.91286)" /><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10"
        id="linearGradient2545-3"
        x1="18.423391"
@@ -792,7 +284,6 @@
        x1="63.98344"
        id="linearGradient8779-0"
        xlink:href="#linearGradient8777"
-       inkscape:collect="always"
        gradientTransform="matrix(1.3687895,0,0,1.494898,-60.915436,-1504.7782)" /><linearGradient
        gradientUnits="userSpaceOnUse"
        y2="1028.4165"
@@ -801,26 +292,21 @@
        x1="68.47998"
        id="linearGradient8787-7"
        xlink:href="#linearGradient8785"
-       inkscape:collect="always"
        gradientTransform="matrix(1.3687895,0,0,1.494898,-60.915436,-1504.7782)" /><filter
        height="1.2365698"
        y="-0.11828489"
        width="1.8310951"
        x="-0.41554753"
        id="filter8871-9"
-       style="color-interpolation-filters:sRGB"
-       inkscape:collect="always"><feGaussianBlur
+       style="color-interpolation-filters:sRGB"><feGaussianBlur
          id="feGaussianBlur8873-7"
-         stdDeviation="0.53588249"
-         inkscape:collect="always" /></filter><filter
-       inkscape:collect="always"
+         stdDeviation="0.53588249" /></filter><filter
        style="color-interpolation-filters:sRGB"
        id="filter2533-3"
        x="-0.59377657"
        width="2.1875531"
        y="-0.92639431"
        height="2.8527886"><feGaussianBlur
-         inkscape:collect="always"
          stdDeviation="0.73536407"
          id="feGaussianBlur2535-04" /></filter><filter
        height="1.2365698"
@@ -828,22 +314,17 @@
        width="1.8310951"
        x="-0.41554753"
        id="filter8871-1-8"
-       style="color-interpolation-filters:sRGB"
-       inkscape:collect="always"><feGaussianBlur
+       style="color-interpolation-filters:sRGB"><feGaussianBlur
          id="feGaussianBlur8873-8-5"
-         stdDeviation="0.53588249"
-         inkscape:collect="always" /></filter><filter
+         stdDeviation="0.53588249" /></filter><filter
        height="1.0954513"
        y="-0.047725668"
        width="1.0967932"
        x="-0.048396592"
        id="filter4285-9-8-4"
-       style="color-interpolation-filters:sRGB"
-       inkscape:collect="always"><feGaussianBlur
+       style="color-interpolation-filters:sRGB"><feGaussianBlur
          id="feGaussianBlur4287-9-5-4"
-         stdDeviation="0.10000000000000001"
-         inkscape:collect="always" /></filter><linearGradient
-       inkscape:collect="always"
+         stdDeviation="0.10000000000000001" /></filter><linearGradient
        xlink:href="#linearGradient4496"
        id="linearGradient1"
        gradientUnits="userSpaceOnUse"
@@ -852,7 +333,6 @@
        y1="1013.3622"
        x2="19"
        y2="1024.3622" /><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4504"
        id="linearGradient2"
        gradientUnits="userSpaceOnUse"
@@ -861,7 +341,6 @@
        y1="1020.7158"
        x2="20"
        y2="1020.7158" /><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient3"
        id="linearGradient11"
        gradientUnits="userSpaceOnUse"
@@ -869,58 +348,15 @@
        x1="57"
        y1="1019.3622"
        x2="62"
-       y2="1030.3622" /></defs><sodipodi:namedview
-     id="base"
-     pagecolor="#bcbcbc"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="6.822541"
-     inkscape:cx="77.830239"
-     inkscape:cy="49.10194"
-     inkscape:document-units="px"
-     inkscape:current-layer="svg2"
-     showgrid="true"
-     inkscape:window-width="1728"
-     inkscape:window-height="1051"
-     inkscape:window-x="0"
-     inkscape:window-y="38"
-     inkscape:window-maximized="1"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="true"
-     inkscape:snap-bbox="true"
-     inkscape:bbox-nodes="true"
-     inkscape:showpageshadow="2"
-     inkscape:pagecheckerboard="0"
-     inkscape:deskcolor="#d1d1d1"><inkscape:grid
-       type="xygrid"
-       id="grid4112"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       originx="0"
-       originy="0"
-       spacingy="1"
-       spacingx="1"
-       units="px" /></sodipodi:namedview><metadata
+       y2="1030.3622" /></defs><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" /></cc:Work></rdf:RDF></metadata><g
-     inkscape:groupmode="layer"
      id="layer2"
-     inkscape:label="Background"
-     style="display:inline"
-     sodipodi:insensitive="true"><path
-       sodipodi:nodetypes="cccc"
-       inkscape:connector-curvature="0"
+     style="display:inline"><path
        id="rect4113-1"
        d="M 75,0 75,66 1e-6,66 C 1e-6,41.2048 50.00969,0 75,0 Z"
        style="display:inline;fill:url(#linearGradient4978);fill-opacity:1;stroke:none" /><path
-       sodipodi:nodetypes="cccc"
-       inkscape:connector-curvature="0"
        id="rect4113-1-0"
        d="M 75,21.0607 75,66 1e-6,66 C 10.625001,47.804 43.509694,25.4357 75,21.0607 Z"
        style="display:inline;opacity:0.40400002;fill:url(#linearGradient4962);fill-opacity:1;stroke:none" /><g
@@ -929,188 +365,108 @@
        transform="matrix(0.27903303,0,0,0.27903303,-14.618136,-107.52874)"><g
          style="fill:#737986;fill-opacity:1;stroke:#595e68;stroke-opacity:1"
          id="g13408-8-2" /></g><path
-       sodipodi:nodetypes="cccc"
-       inkscape:connector-curvature="0"
        id="rect4113-1-7"
        d="M 75,4.0000001e-7 75,66 30.000003,66 C 30.000003,46.1545 47.70944,9.2500004 75,4e-7 Z"
        style="display:inline;opacity:0.18399999;fill:url(#linearGradient4970);fill-opacity:1;stroke:none" /></g><g
-     inkscape:label="Foreground"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-986.3622)"><g
        id="g2-5"
        transform="matrix(1.0558482,0,0,1.0849851,11.521441,1005.854)"
-       inkscape:label="plug-purple"
        style="display:inline;stroke-width:0.934301"><g
          transform="matrix(1.0729615,0,0,1.0787087,-1.2096914,-0.17204372)"
          id="g2558-4-4"
-         style="display:inline;opacity:0.503;fill:#808080;stroke:#808080;stroke-width:0.868446;filter:url(#filter2728-6)"
-         inkscape:label="shadow"><path
+         style="display:inline;opacity:0.503;fill:#808080;stroke:#808080;stroke-width:0.868446;filter:url(#filter2728-6)"><path
            id="path8722-7-8-1"
            style="display:inline;opacity:1;fill:#808080;fill-opacity:1;stroke:#808080;stroke-width:0.868446;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="M 3.4999999,23.512598 V 25.5 H 14.5 V 21.525196 H 3.4999999 v 1.987402"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccccc" /><path
-           sodipodi:nodetypes="cscccsssscsscc"
+           d="M 3.4999999,23.512598 V 25.5 H 14.5 V 21.525196 H 3.4999999 v 1.987402" /><path
            id="rect8645-3-9-9"
            style="display:inline;opacity:1;fill:#808080;fill-opacity:1;stroke:#808080;stroke-width:0.868446;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="m 25.499998,23.781495 2e-6,-8.367936 c -1e-6,2.603078 -9.194589,4.450864 -11,4.847997 v 3.519375 m 10.999998,5.64e-4 2e-6,8.367936 c 0,1.614156 -0.931058,2.913559 -2.087573,2.913559 h -2.424855 c -1.156515,0 -2.483072,-1.299403 -2.483072,-2.913559 V 30.550392 H 16.239644 C 15.275881,30.550392 14.5,29.756288 14.5,28.769946 v -1.468512 -3.519375"
-           inkscape:connector-curvature="0" /><path
+           d="m 25.499998,23.781495 2e-6,-8.367936 c -1e-6,2.603078 -9.194589,4.450864 -11,4.847997 v 3.519375 m 10.999998,5.64e-4 2e-6,8.367936 c 0,1.614156 -0.931058,2.913559 -2.087573,2.913559 h -2.424855 c -1.156515,0 -2.483072,-1.299403 -2.483072,-2.913559 V 30.550392 H 16.239644 C 15.275881,30.550392 14.5,29.756288 14.5,28.769946 v -1.468512 -3.519375" /><path
            id="rect8645-2-5-2-4"
            style="display:inline;opacity:1;fill:#808080;fill-opacity:1;stroke:#808080;stroke-width:0.868446;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="m 36.091538,26.489769 -10e-7,1.058985 c 0,1.06945 -0.863288,1.955925 -2.164732,1.930363 -1.301445,-0.02541 -1.941636,0 -1.941636,0 v 0.201512 c 0,1.544678 -1.158564,2.787985 -2.597679,2.788284 l -1.648306,2.98e-4 c -1.360345,3e-4 -1.894397,0.487086 -1.22903,-2.989646 l 1.605386,-8.388592 c 4.307956,0 7.975998,-2.709681 7.975998,-1.640231 v 2.554332 z m 0.06454,-6.010119 h 8.461471 l -0.05085,6.010119 h -8.188123"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cczccssscccccccc" /></g><g
+           d="m 36.091538,26.489769 -10e-7,1.058985 c 0,1.06945 -0.863288,1.955925 -2.164732,1.930363 -1.301445,-0.02541 -1.941636,0 -1.941636,0 v 0.201512 c 0,1.544678 -1.158564,2.787985 -2.597679,2.788284 l -1.648306,2.98e-4 c -1.360345,3e-4 -1.894397,0.487086 -1.22903,-2.989646 l 1.605386,-8.388592 c 4.307956,0 7.975998,-2.709681 7.975998,-1.640231 v 2.554332 z m 0.06454,-6.010119 h 8.461471 l -0.05085,6.010119 h -8.188123" /></g><g
          id="g2558-8"
-         style="display:inline;stroke-width:0.934301"
-         inkscape:label="plug"><path
+         style="display:inline;stroke-width:0.934301"><path
            id="path8722-7-1"
            style="display:inline;opacity:1;fill:url(#linearGradient8769-0);fill-opacity:1;stroke:url(#linearGradient8753-0);stroke-width:0.934301;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="M 3.4999999,23.512598 V 25.5 H 14.5 V 21.525196 H 3.4999999 v 1.987402"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccccc"
-           inkscape:label="cord" /><path
-           sodipodi:nodetypes="csscssccccccsssscsscc"
+           d="M 3.4999999,23.512598 V 25.5 H 14.5 V 21.525196 H 3.4999999 v 1.987402" /><path
            id="rect8645-3-5-6"
            style="display:inline;fill:url(#linearGradient11);fill-opacity:1;stroke:#9454ac;stroke-width:0.934301;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="M 25.5,23.781491 25.4936,18.23846 c -0.0019,-1.614155 -0.650924,-2.542218 -1.638414,-1.956396 l -0.595274,2.47471 -1.583604,-1.182104 c -0.917642,-0.684987 0.603801,2.235437 -0.908819,1.573079 l -1.377472,-0.603178 -0.592212,2.34584 c -0.963763,0 -1.592058,0.171739 -1.592058,1.158081 -2.036015,-1.123034 -1.623448,0.308424 -2.705747,0.02333 v 1.709109 m 10.999998,5.64e-4 2e-6,8.367936 c 0,1.614156 -0.931058,2.913559 -2.087573,2.913559 h -2.424855 c -1.156515,0 -2.483072,-1.299403 -2.483072,-2.913559 V 30.550392 H 16.239644 C 15.275881,30.550392 14.5,29.756288 14.5,28.769946 v -1.468512 -3.519375"
-           inkscape:connector-curvature="0"
-           inkscape:label="plug" /><path
-           sodipodi:nodetypes="cc"
-           inkscape:connector-curvature="0"
+           d="M 25.5,23.781491 25.4936,18.23846 c -0.0019,-1.614155 -0.650924,-2.542218 -1.638414,-1.956396 l -0.595274,2.47471 -1.583604,-1.182104 c -0.917642,-0.684987 0.603801,2.235437 -0.908819,1.573079 l -1.377472,-0.603178 -0.592212,2.34584 c -0.963763,0 -1.592058,0.171739 -1.592058,1.158081 -2.036015,-1.123034 -1.623448,0.308424 -2.705747,0.02333 v 1.709109 m 10.999998,5.64e-4 2e-6,8.367936 c 0,1.614156 -0.931058,2.913559 -2.087573,2.913559 h -2.424855 c -1.156515,0 -2.483072,-1.299403 -2.483072,-2.913559 V 30.550392 H 16.239644 C 15.275881,30.550392 14.5,29.756288 14.5,28.769946 v -1.468512 -3.519375" /><path
            id="path2537-5"
            d="m 18.516609,21.210096 0.02986,9.214752"
-           style="fill:none;stroke:url(#linearGradient2545-3);stroke-width:0.9343px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-           inkscape:label="line" /><path
+           style="fill:none;stroke:url(#linearGradient2545-3);stroke-width:0.9343px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /><path
            id="rect8645-2-5-8"
            style="display:inline;opacity:1;fill:url(#linearGradient8779-0);fill-opacity:1;stroke:url(#linearGradient8787-7);stroke-width:0.934301;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="m 35.584224,25.791351 v 1.058985 c 0,1.06945 -0.86329,1.955925 -2.16474,1.930363 -1.30144,-0.02541 -1.94163,0 -1.94163,0 v 0.201512 c 0,1.544678 -1.15857,2.787985 -2.59768,2.788284 l -1.64831,2.98e-4 c -1.36034,3e-4 -1.22903,0.546236 -1.22903,-2.989646 v -8.697694 l 1.0001,-0.451316 c 0.73866,-0.333337 0.24318,-1.03959 0.77485,-1.523121 0.14263,-0.129715 1.05499,0.929393 1.52937,0.6759 0.45561,-0.243458 0.32468,-1.571886 1.05063,-1.470834 l 1.3916,0.729993 1.6701,-1.222114 c 0.95852,-0.701405 2.16474,0.860911 2.16474,1.930361 v 2.554332 z m 0.0645,-6.010119 h 8.46147 l -0.0509,6.010119 h -8.18813"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cczccssscsssccsccccccc"
-           inkscape:label="socket" /><path
+           d="m 35.584224,25.791351 v 1.058985 c 0,1.06945 -0.86329,1.955925 -2.16474,1.930363 -1.30144,-0.02541 -1.94163,0 -1.94163,0 v 0.201512 c 0,1.544678 -1.15857,2.787985 -2.59768,2.788284 l -1.64831,2.98e-4 c -1.36034,3e-4 -1.22903,0.546236 -1.22903,-2.989646 v -8.697694 l 1.0001,-0.451316 c 0.73866,-0.333337 0.24318,-1.03959 0.77485,-1.523121 0.14263,-0.129715 1.05499,0.929393 1.52937,0.6759 0.45561,-0.243458 0.32468,-1.571886 1.05063,-1.470834 l 1.3916,0.729993 1.6701,-1.222114 c 0.95852,-0.701405 2.16474,0.860911 2.16474,1.930361 v 2.554332 z m 0.0645,-6.010119 h 8.46147 l -0.0509,6.010119 h -8.18813" /><path
            transform="matrix(1.445753,0,0,1.0582384,-65.097292,-1055.8857)"
            style="opacity:0.794;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.755349px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter8871-9)"
            d="m 64.018476,1016.5423 -0.152427,10.8222 c 2.375507,-3.3036 3.484206,-4.2052 2.972286,-9.2217 0.305009,-1.654 -1.117834,-1.7529 -2.819859,-1.6005 z"
-           id="path8861-5"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccc"
-           inkscape:label="highlight" /><path
+           id="path8861-5" /><path
            transform="matrix(1.7350569,0,0,1.2551252,-91.814902,-1260.0381)"
            style="opacity:0.862;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.63312px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter2533-3)"
            d="m 70.953811,1023.4014 v -1.8291 l 2.972286,-0.076 z"
-           id="path8875-7"
-           inkscape:connector-curvature="0"
-           inkscape:label="highlight" /><path
+           id="path8875-7" /><path
            transform="matrix(1.029538,0,0,0.78990616,-39.928294,-780.65638)"
            style="display:inline;opacity:0.485;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.03604px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter8871-1-8)"
            d="m 53.924652,1016.631 -0.152427,10.8222 c 2.375507,-3.3036 3.484206,-4.2052 2.972286,-9.2217 0.305009,-1.654 -1.117834,-1.7529 -2.819859,-1.6005 z"
-           id="path8861-7-9"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccc"
-           inkscape:label="highlight" /></g></g><g
+           id="path8861-7-9" /></g></g><g
        id="g2"
        transform="matrix(1.0558482,0,0,1.0849851,0.20053114,982.60116)"
-       inkscape:label="plug-blue"
        style="stroke-width:0.934301"><g
          transform="matrix(1.0729615,0,0,1.0787087,-1.2096914,-0.17204372)"
          id="g2558-4"
-         style="display:inline;opacity:0.503;fill:#808080;stroke:#808080;stroke-width:0.868446;filter:url(#filter2728)"
-         inkscape:label="shadow"><path
+         style="display:inline;opacity:0.503;fill:#808080;stroke:#808080;stroke-width:0.868446;filter:url(#filter2728)"><path
            id="path8722-7-8"
            style="display:inline;opacity:1;fill:#808080;fill-opacity:1;stroke:#808080;stroke-width:0.868446;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="M 3.4999999,23.512598 V 25.5 H 14.5 V 21.525196 H 3.4999999 v 1.987402"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccccc" /><path
-           sodipodi:nodetypes="csssscsscccsssscsscc"
+           d="M 3.4999999,23.512598 V 25.5 H 14.5 V 21.525196 H 3.4999999 v 1.987402" /><path
            id="rect8645-3-9"
            style="display:inline;opacity:1;fill:#808080;fill-opacity:1;stroke:#808080;stroke-width:0.868446;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="M 25.499998,23.781495 25.5,15.413559 C 25.5,13.799403 24.568942,12.5 23.412427,12.5 h -2.424855 c -1.156515,0 -2.483072,1.299403 -2.483072,2.913559 v 1.599039 h -2.264856 c -0.963763,0 -1.739644,0.794104 -1.739644,1.780446 v 1.468512 3.519375 m 10.999998,5.64e-4 2e-6,8.367936 c 0,1.614156 -0.931058,2.913559 -2.087573,2.913559 h -2.424855 c -1.156515,0 -2.483072,-1.299403 -2.483072,-2.913559 V 30.550392 H 16.239644 C 15.275881,30.550392 14.5,29.756288 14.5,28.769946 v -1.468512 -3.519375"
-           inkscape:connector-curvature="0" /><path
+           d="M 25.499998,23.781495 25.5,15.413559 C 25.5,13.799403 24.568942,12.5 23.412427,12.5 h -2.424855 c -1.156515,0 -2.483072,1.299403 -2.483072,2.913559 v 1.599039 h -2.264856 c -0.963763,0 -1.739644,0.794104 -1.739644,1.780446 v 1.468512 3.519375 m 10.999998,5.64e-4 2e-6,8.367936 c 0,1.614156 -0.931058,2.913559 -2.087573,2.913559 h -2.424855 c -1.156515,0 -2.483072,-1.299403 -2.483072,-2.913559 V 30.550392 H 16.239644 C 15.275881,30.550392 14.5,29.756288 14.5,28.769946 v -1.468512 -3.519375" /><path
            id="rect8645-2-5-2"
            style="display:inline;opacity:1;fill:#808080;fill-opacity:1;stroke:#808080;stroke-width:0.868446;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="m 36.091538,26.489769 -10e-7,1.058985 c 0,1.06945 -0.863288,1.955925 -2.164732,1.930363 -1.301445,-0.02541 -1.941636,0 -1.941636,0 v 0.201512 c 0,1.544678 -1.158564,2.787985 -2.597679,2.788284 l -1.648306,2.98e-4 c -1.360345,3e-4 -1.22903,0.546236 -1.22903,-2.989646 V 17.520381 c 0,-3.536032 -0.205068,-2.989797 1.22903,-2.989797 h 1.648306 c 1.439115,0 2.597679,1.243607 2.597679,2.788284 v 0.201513 h 1.941637 c 1.199261,0 2.164732,0.860911 2.164732,1.930361 v 2.554332 z m 0.06454,-6.010119 h 8.461471 l -0.05085,6.010119 h -8.188123"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cczccssssssccsccccccc" /></g><g
+           d="m 36.091538,26.489769 -10e-7,1.058985 c 0,1.06945 -0.863288,1.955925 -2.164732,1.930363 -1.301445,-0.02541 -1.941636,0 -1.941636,0 v 0.201512 c 0,1.544678 -1.158564,2.787985 -2.597679,2.788284 l -1.648306,2.98e-4 c -1.360345,3e-4 -1.22903,0.546236 -1.22903,-2.989646 V 17.520381 c 0,-3.536032 -0.205068,-2.989797 1.22903,-2.989797 h 1.648306 c 1.439115,0 2.597679,1.243607 2.597679,2.788284 v 0.201513 h 1.941637 c 1.199261,0 2.164732,0.860911 2.164732,1.930361 v 2.554332 z m 0.06454,-6.010119 h 8.461471 l -0.05085,6.010119 h -8.188123" /></g><g
          id="g2558"
-         style="stroke-width:0.934301"
-         inkscape:label="plug"><path
+         style="stroke-width:0.934301"><path
            id="path8722-7"
            style="display:inline;opacity:1;fill:url(#linearGradient8769);fill-opacity:1;stroke:url(#linearGradient8753);stroke-width:0.934301;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="M 3.4999999,23.512598 V 25.5 H 14.5 V 21.525196 H 3.4999999 v 1.987402"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccccc"
-           inkscape:label="cord" /><path
-           sodipodi:nodetypes="csssscsscccsssscsscc"
+           d="M 3.4999999,23.512598 V 25.5 H 14.5 V 21.525196 H 3.4999999 v 1.987402" /><path
            id="rect8645-3"
            style="display:inline;opacity:1;fill:url(#linearGradient8761);fill-opacity:1;stroke:#4d73ae;stroke-width:0.934301;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="M 25.499998,23.781495 25.5,15.413559 C 25.5,13.799403 24.568942,12.5 23.412427,12.5 h -2.424855 c -1.156515,0 -2.483072,1.299403 -2.483072,2.913559 v 1.599039 h -2.264856 c -0.963763,0 -1.739644,0.794104 -1.739644,1.780446 v 1.468512 3.519375 m 10.999998,5.64e-4 2e-6,8.367936 c 0,1.614156 -0.931058,2.913559 -2.087573,2.913559 h -2.424855 c -1.156515,0 -2.483072,-1.299403 -2.483072,-2.913559 V 30.550392 H 16.239644 C 15.275881,30.550392 14.5,29.756288 14.5,28.769946 v -1.468512 -3.519375"
-           inkscape:connector-curvature="0"
-           inkscape:label="plug" /><path
-           sodipodi:nodetypes="cc"
-           inkscape:connector-curvature="0"
+           d="M 25.499998,23.781495 25.5,15.413559 C 25.5,13.799403 24.568942,12.5 23.412427,12.5 h -2.424855 c -1.156515,0 -2.483072,1.299403 -2.483072,2.913559 v 1.599039 h -2.264856 c -0.963763,0 -1.739644,0.794104 -1.739644,1.780446 v 1.468512 3.519375 m 10.999998,5.64e-4 2e-6,8.367936 c 0,1.614156 -0.931058,2.913559 -2.087573,2.913559 h -2.424855 c -1.156515,0 -2.483072,-1.299403 -2.483072,-2.913559 V 30.550392 H 16.239644 C 15.275881,30.550392 14.5,29.756288 14.5,28.769946 v -1.468512 -3.519375" /><path
            id="path2537"
            d="M 18.51661,16.539741 18.5464,30.705846"
-           style="display:inline;fill:none;stroke:url(#linearGradient2545);stroke-width:0.934301px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-           inkscape:label="line" /><path
+           style="display:inline;fill:none;stroke:url(#linearGradient2545);stroke-width:0.934301px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /><path
            id="rect8645-2-5"
            style="display:inline;opacity:1;fill:url(#linearGradient8779);fill-opacity:1;stroke:url(#linearGradient8787);stroke-width:0.934301;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="m 36.091538,26.489769 -10e-7,1.058985 c 0,1.06945 -0.863288,1.955925 -2.164732,1.930363 -1.301445,-0.02541 -1.941636,0 -1.941636,0 v 0.201512 c 0,1.544678 -1.158564,2.787985 -2.597679,2.788284 l -1.648306,2.98e-4 c -1.360345,3e-4 -1.22903,0.546236 -1.22903,-2.989646 V 17.520381 c 0,-3.536032 -0.205068,-2.989797 1.22903,-2.989797 h 1.648306 c 1.439115,0 2.597679,1.243607 2.597679,2.788284 v 0.201513 h 1.941637 c 1.199261,0 2.164732,0.860911 2.164732,1.930361 v 2.554332 z m 0.06454,-6.010119 h 8.461471 l -0.05085,6.010119 h -8.188123"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cczccssssssccsccccccc"
-           inkscape:label="socket" /><path
+           d="m 36.091538,26.489769 -10e-7,1.058985 c 0,1.06945 -0.863288,1.955925 -2.164732,1.930363 -1.301445,-0.02541 -1.941636,0 -1.941636,0 v 0.201512 c 0,1.544678 -1.158564,2.787985 -2.597679,2.788284 l -1.648306,2.98e-4 c -1.360345,3e-4 -1.22903,0.546236 -1.22903,-2.989646 V 17.520381 c 0,-3.536032 -0.205068,-2.989797 1.22903,-2.989797 h 1.648306 c 1.439115,0 2.597679,1.243607 2.597679,2.788284 v 0.201513 h 1.941637 c 1.199261,0 2.164732,0.860911 2.164732,1.930361 v 2.554332 z m 0.06454,-6.010119 h 8.461471 l -0.05085,6.010119 h -8.188123" /><path
            transform="matrix(1.445753,0,0,1.3224494,-65.097292,-1327.9481)"
            style="display:inline;opacity:0.794;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.675694px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter8871)"
            d="m 64.018476,1016.5423 -0.152427,10.8222 c 2.375507,-3.3036 3.484206,-4.2052 2.972286,-9.2217 0.305009,-1.654 -1.117834,-1.7529 -2.819859,-1.6005 z"
-           id="path8861"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccc"
-           inkscape:label="highlight" /><ellipse
+           id="path8861" /><ellipse
            transform="matrix(1.029538,0,0,1.1281495,-39.470994,-1128.0797)"
            style="opacity:0.828;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.866927;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter8835)"
            id="path8817"
            cx="59.521938"
            cy="1014.637"
            rx="1.9053118"
-           ry="1.9815242"
-           inkscape:label="highlight" /><path
+           ry="1.9815242" /><path
            transform="matrix(1.7350569,0,0,1.8824502,-91.814902,-1903.1505)"
            style="display:inline;opacity:0.862;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.516973px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter2533)"
            d="m 70.953811,1023.4014 v -1.8291 l 2.972286,-0.076 z"
-           id="path8875"
-           inkscape:connector-curvature="0"
-           inkscape:label="highlight" /><path
+           id="path8875" /><path
            transform="matrix(1.029538,0,0,1.1281495,-39.928294,-1128.6206)"
            style="display:inline;opacity:0.485;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.866927px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter8871-1)"
            d="m 53.924652,1016.631 -0.152427,10.8222 c 2.375507,-3.3036 3.484206,-4.2052 2.972286,-9.2217 0.305009,-1.654 -1.117834,-1.7529 -2.819859,-1.6005 z"
-           id="path8861-7"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccc"
-           inkscape:label="highlight" /></g></g><g
+           id="path8861-7" /></g></g><g
        id="g2-9"
-       inkscape:label="export-triangle"
        style="display:inline"
        transform="rotate(90,36.280367,1066.2511)"><path
          style="display:inline;fill:url(#linearGradient1);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient2);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
          d="M 1.7489458,1033.7666 H 16.748946 v 15 z"
-         id="path4478-7"
-         inkscape:connector-curvature="0"
-         inkscape:label="triangle" /><path
-         sodipodi:type="star"
+         id="path4478-7" /><path
          style="display:inline;opacity:0.9;fill:#ffffff;fill-opacity:0.815842;stroke:none;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;filter:url(#filter4285-9-8-4)"
          id="path4252-6-0-5"
-         sodipodi:sides="4"
-         sodipodi:cx="4.7729707"
-         sodipodi:cy="1041.2474"
-         sodipodi:r1="3.3255017"
-         sodipodi:r2="0.49178758"
-         sodipodi:arg1="2.432965"
-         sodipodi:arg2="-3.0800218"
-         inkscape:flatsided="false"
-         inkscape:rounded="0"
-         inkscape:randomized="-0.017554997"
          d="m 2.2999628,1043.3702 1.9823895,-2.1047 -1.6734053,-2.5419 2.1987064,2.0209 2.4513363,-1.6427 -2.0383649,2.1623 1.7419712,2.4882 -2.2030799,-2.0431 z"
-         transform="matrix(-0.82539295,1.4154894,-1.2829533,-1.0100615,1348.392,2086.9405)"
-         inkscape:transform-center-x="0.19603188"
-         inkscape:transform-center-y="0.38464271"
-         inkscape:label="star" /></g></g></svg>
+         transform="matrix(-0.82539295,1.4154894,-1.2829533,-1.0100615,1348.392,2086.9405)" /></g></g></svg>
diff --git a/ui/org.eclipse.pde.ui/icons/wizban/jarToPlugin_wiz.svg b/ui/org.eclipse.pde.ui/icons/wizban/jarToPlugin_wiz.svg
index fe3333b5ae9..94f5350e751 100644
--- a/ui/org.eclipse.pde.ui/icons/wizban/jarToPlugin_wiz.svg
+++ b/ui/org.eclipse.pde.ui/icons/wizban/jarToPlugin_wiz.svg
@@ -6,14 +6,7 @@
    height="66"
    id="svg2"
    version="1.1"
-   inkscape:version="1.3 (0e150ed, 2023-07-21)"
-   sodipodi:docname="jarToPlugin_wiz.svg"
-   inkscape:export-filename="/Users/d021678/git/eclipse.jdt.ui/org.eclipse.jdt.ui/icons/full/wizban/newclass_wiz2.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90"
    xml:space="preserve"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:svg="http://www.w3.org/2000/svg"
@@ -21,299 +14,6 @@
    xmlns:cc="http://creativecommons.org/ns#"
    xmlns:dc="http://purl.org/dc/elements/1.1/"><defs
      id="defs4"><linearGradient
-       inkscape:collect="always"
-       id="linearGradient4972"><stop
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0"
-         id="stop4974" /><stop
-         style="stop-color:#f5f8fd;stop-opacity:1"
-         offset="1"
-         id="stop4976" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       id="linearGradient4964"><stop
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0"
-         id="stop4966" /><stop
-         style="stop-color:#e8eefa;stop-opacity:1"
-         offset="1"
-         id="stop4968" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       id="linearGradient4956"><stop
-         style="stop-color:#fcfdfe;stop-opacity:1"
-         offset="0"
-         id="stop4958" /><stop
-         style="stop-color:#dee6f8;stop-opacity:1"
-         offset="1"
-         id="stop4960" /></linearGradient><filter
-       style="color-interpolation-filters:sRGB"
-       inkscape:label="Drop Shadow"
-       id="filter8854"><feFlood
-         flood-opacity="0.933333"
-         flood-color="rgb(244,248,254)"
-         result="flood"
-         id="feFlood8856" /><feComposite
-         in="flood"
-         in2="SourceGraphic"
-         operator="in"
-         result="composite1"
-         id="feComposite8858" /><feGaussianBlur
-         in="composite1"
-         stdDeviation="1.2"
-         result="blur"
-         id="feGaussianBlur8860" /><feOffset
-         dx="-1"
-         dy="3"
-         result="offset"
-         id="feOffset8862" /><feComposite
-         in="SourceGraphic"
-         in2="offset"
-         operator="over"
-         result="composite2"
-         id="feComposite8864" /></filter><linearGradient
-       id="linearGradient6122"><stop
-         style="stop-color:#c0c0c0;stop-opacity:1"
-         offset="0"
-         id="stop6124" /><stop
-         id="stop6132"
-         offset="0.5"
-         style="stop-color:#adadad;stop-opacity:1" /><stop
-         style="stop-color:#808080;stop-opacity:1"
-         offset="1"
-         id="stop6126" /></linearGradient><linearGradient
-       id="linearGradient7087"><stop
-         style="stop-color:#17325d;stop-opacity:1;"
-         offset="0"
-         id="stop7089" /><stop
-         id="stop7091"
-         offset="0.25"
-         style="stop-color:#b4d0e2;stop-opacity:1" /><stop
-         id="stop7093"
-         offset="0.5"
-         style="stop-color:#b7d2e4;stop-opacity:1" /><stop
-         style="stop-color:#acc9de;stop-opacity:1"
-         offset="0.75"
-         id="stop7095" /><stop
-         style="stop-color:#3e72a7;stop-opacity:1"
-         offset="1"
-         id="stop7097" /></linearGradient><mask
-       id="mask7366"
-       maskUnits="userSpaceOnUse"><path
-         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;display:inline"
-         d="m -16.593048,1040.862 9.990206,0 0,10.0018 -2.983353,3.0385 -5.966213,0 c -0.53033,-0.022 -1.04064,-0.5519 -1.04064,-1.0385 z"
-         id="path7368"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccccc" /></mask><linearGradient
-       id="linearGradient7584-5"><stop
-         id="stop7586-4"
-         offset="0"
-         style="stop-color:#f9cd5f;stop-opacity:1" /><stop
-         id="stop7588-5"
-         offset="1"
-         style="stop-color:#fbf0b4;stop-opacity:1" /></linearGradient><linearGradient
-       id="linearGradient7592-1"><stop
-         id="stop7594-6"
-         offset="0"
-         style="stop-color:#bd8416;stop-opacity:1" /><stop
-         id="stop7596-9"
-         offset="1"
-         style="stop-color:#a66b10;stop-opacity:1" /></linearGradient><linearGradient
-       id="linearGradient10798-1-9-3-7-6-6-6-2-6-7-98-9-4-1"><stop
-         style="stop-color:#5aad60;stop-opacity:1;"
-         offset="0"
-         id="stop10800-5-2-1-8-20-4-0-2-1-9-0-0-1-1" /><stop
-         id="stop10806-6-8-5-3-9-2-2-7-0-4-2-7-8-9"
-         offset="0.5"
-         style="stop-color:#5bb26a;stop-opacity:1;" /><stop
-         style="stop-color:#a4c589;stop-opacity:1"
-         offset="1"
-         id="stop10802-1-5-3-0-4-6-8-5-5-6-69-6-4-0" /></linearGradient><mask
-       maskUnits="userSpaceOnUse"
-       id="mask7366-4"><path
-         sodipodi:nodetypes="ccccccc"
-         inkscape:connector-curvature="0"
-         id="path7368-2"
-         d="m -16.593048,1040.862 9.990206,0 0,10.0018 -2.983353,3.0385 -5.966213,0 c -0.53033,-0.022 -1.04064,-0.5519 -1.04064,-1.0385 z"
-         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;display:inline" /></mask><linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient7087"
-       id="linearGradient9331"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-20,0)"
-       x1="4.7776356"
-       y1="1039.8118"
-       x2="4.7776356"
-       y2="1041.911" /><linearGradient
-       y2="1041.911"
-       x2="4.7776356"
-       y1="1039.8118"
-       x1="4.7776356"
-       gradientTransform="translate(-18,4.7e-5)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient9333"
-       xlink:href="#linearGradient7087"
-       inkscape:collect="always" /><linearGradient
-       y2="1041.911"
-       x2="4.7776356"
-       y1="1039.8118"
-       x1="4.7776356"
-       gradientTransform="translate(-16,4.7e-5)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient9335"
-       xlink:href="#linearGradient7087"
-       inkscape:collect="always" /><linearGradient
-       y2="1041.911"
-       x2="4.7776356"
-       y1="1039.8118"
-       x1="4.7776356"
-       gradientTransform="translate(-14,4.7e-5)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient9337"
-       xlink:href="#linearGradient7087"
-       inkscape:collect="always" /><linearGradient
-       y2="1041.911"
-       x2="4.7776356"
-       y1="1039.8118"
-       x1="4.7776356"
-       gradientTransform="translate(-12,4.7e-5)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient9339"
-       xlink:href="#linearGradient7087"
-       inkscape:collect="always" /><linearGradient
-       gradientTransform="translate(-80,0)"
-       gradientUnits="userSpaceOnUse"
-       y2="1042.7973"
-       x2="163.22012"
-       y1="1042.7973"
-       x1="88.220117"
-       id="linearGradient68073"
-       xlink:href="#linearGradient4956"
-       inkscape:collect="always" /><linearGradient
-       gradientTransform="translate(-80,0)"
-       gradientUnits="userSpaceOnUse"
-       y2="1032.2669"
-       x2="163.22012"
-       y1="1032.2668"
-       x1="94.469681"
-       id="linearGradient68075"
-       xlink:href="#linearGradient4964"
-       inkscape:collect="always" /><linearGradient
-       gradientTransform="translate(-80,0)"
-       gradientUnits="userSpaceOnUse"
-       y2="1032.2668"
-       x2="152.72206"
-       y1="1032.2668"
-       x1="88.220116"
-       id="linearGradient68077"
-       xlink:href="#linearGradient4972"
-       inkscape:collect="always" /><filter
-       id="filter8854-9"
-       inkscape:label="Drop Shadow"
-       style="color-interpolation-filters:sRGB"><feFlood
-         id="feFlood8856-0"
-         result="flood"
-         flood-color="rgb(244,248,254)"
-         flood-opacity="0.933333" /><feComposite
-         id="feComposite8858-2"
-         result="composite1"
-         operator="in"
-         in2="SourceGraphic"
-         in="flood" /><feGaussianBlur
-         id="feGaussianBlur8860-3"
-         result="blur"
-         stdDeviation="1.2"
-         in="composite1" /><feOffset
-         id="feOffset8862-2"
-         result="offset"
-         dy="3"
-         dx="-1" /><feComposite
-         id="feComposite8864-3"
-         result="composite2"
-         operator="over"
-         in2="offset"
-         in="SourceGraphic" /></filter><linearGradient
-       id="linearGradient10798-1-9-3-7-6-8-9-0-9-1"><stop
-         id="stop10800-5-2-1-8-20-6-4-9-8-2"
-         offset="0"
-         style="stop-color:#7564b1;stop-opacity:1" /><stop
-         style="stop-color:#5d4aa1;stop-opacity:1"
-         offset="0.5"
-         id="stop10806-6-8-5-3-9-24-8-4-3-2" /><stop
-         id="stop10802-1-5-3-0-4-8-4-2-9-2"
-         offset="1"
-         style="stop-color:#9283c3;stop-opacity:1" /></linearGradient><linearGradient
-       id="linearGradient7540-2-3-8-7"><stop
-         id="stop7542-8-7-5-3"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.502" /><stop
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0.47623286"
-         id="stop7544-8-2-0-5" /><stop
-         style="stop-color:#ffffff;stop-opacity:0"
-         offset="0.5"
-         id="stop7546-1-7-9-5" /><stop
-         id="stop7548-98-9-2-4"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       id="linearGradient7272-66-4-5-5-5-8"><stop
-         style="stop-color:#8f6c10;stop-opacity:1"
-         offset="0"
-         id="stop7274-6-0-1-7-4-7" /><stop
-         style="stop-color:#c9a645;stop-opacity:1"
-         offset="1"
-         id="stop7276-66-6-3-9-1-4" /></linearGradient><linearGradient
-       y2="1030.3411"
-       x2="-10.159802"
-       y1="1030.3411"
-       x1="-22.453552"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient10540"
-       xlink:href="#linearGradient7540-2-3-8-7"
-       inkscape:collect="always" /><linearGradient
-       y2="1030.3411"
-       x2="-10.159802"
-       y1="1030.3411"
-       x1="-22.453552"
-       gradientTransform="matrix(0,1,-1,0,1014.0344,1046.6478)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient10542"
-       xlink:href="#linearGradient7540-2-3-8-7"
-       inkscape:collect="always" /><linearGradient
-       y2="1023.2569"
-       x2="-15.945988"
-       y1="1037.4661"
-       x1="-15.945988"
-       gradientTransform="matrix(0.95585117,0,0,0.95585117,-0.71992063,45.488394)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient10544"
-       xlink:href="#linearGradient7272-66-4-5-5-5-8"
-       inkscape:collect="always" /><mask
-       id="mask10620"
-       maskUnits="userSpaceOnUse"><path
-         transform="matrix(0.55482947,0,0,0.55482947,-206.96039,787.08655)"
-         d="m 398.75,468.23718 a 10.625,10.625 0 1 1 -21.25,0 10.625,10.625 0 1 1 21.25,0 z"
-         sodipodi:ry="10.625"
-         sodipodi:rx="10.625"
-         sodipodi:cy="468.23718"
-         sodipodi:cx="388.125"
-         id="path10622"
-         style="font-size:13.58917427px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:2.16621375;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline;font-family:Sans"
-         sodipodi:type="arc" /></mask><linearGradient
-       id="linearGradient4528-9-5-7-9-7-3"><stop
-         id="stop4530-0-5-0-5-8-4"
-         offset="0"
-         style="stop-color:#e0c576;stop-opacity:1;" /><stop
-         id="stop4532-7-9-3-3-6-1"
-         offset="1"
-         style="stop-color:#9e7916;stop-opacity:1" /></linearGradient><linearGradient
-       id="linearGradient6281-8-0-1-6-6-4-2-8-0"><stop
-         style="stop-color:#f7f9fb;stop-opacity:1"
-         offset="0"
-         id="stop6283-0-2-2-1-2-0-1-6-0" /><stop
-         style="stop-color:#ffd680;stop-opacity:1"
-         offset="1"
-         id="stop6285-5-0-9-7-6-9-9-1-9" /></linearGradient><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4972-7"
        id="linearGradient4978"
        x1="88.220116"
@@ -322,7 +22,6 @@
        y2="1032.2668"
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-88.220116,-999.2669)" /><linearGradient
-       inkscape:collect="always"
        id="linearGradient4972-7"><stop
          style="stop-color:#b8ccf1;stop-opacity:0.10196079"
          offset="0"
@@ -330,7 +29,6 @@
          style="stop-color:#6e97e2;stop-opacity:0.10196079"
          offset="1"
          id="stop4976-1" /></linearGradient><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4964-3"
        id="linearGradient4970"
        x1="118.38584"
@@ -339,7 +37,6 @@
        y2="1032.2668"
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-88.220117,-999.2669)" /><linearGradient
-       inkscape:collect="always"
        id="linearGradient4964-3"><stop
          style="stop-color:#ffffff;stop-opacity:0.349"
          offset="0"
@@ -347,7 +44,6 @@
          style="stop-color:#91ade6;stop-opacity:1"
          offset="1"
          id="stop4968-1" /></linearGradient><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4956-2"
        id="linearGradient4962"
        x1="88.220116"
@@ -356,45 +52,13 @@
        y2="1042.7972"
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-88.220116,-999.2669)" /><linearGradient
-       inkscape:collect="always"
        id="linearGradient4956-2"><stop
          style="stop-color:#fcfdfe;stop-opacity:0.25641027"
          offset="0"
          id="stop4958-5" /><stop
          style="stop-color:#98aae7;stop-opacity:0.40392157"
          offset="1"
-         id="stop4960-6" /></linearGradient><linearGradient
-       id="linearGradient3827"><stop
-         id="stop3829"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0;" /><stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0.60149658"
-         id="stop3835" /><stop
-         id="stop3831"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" /></linearGradient><linearGradient
-       id="linearGradient10798-1-9-3-7-6-8-9-0-9-1-0"><stop
-         id="stop10800-5-2-1-8-20-6-4-9-8-2-9"
-         offset="0"
-         style="stop-color:#f3faed;stop-opacity:1" /><stop
-         style="stop-color:#e7f4da;stop-opacity:1"
-         offset="0.65917557"
-         id="stop10806-6-8-5-3-9-24-8-4-3-2-4" /><stop
-         id="stop10802-1-5-3-0-4-8-4-2-9-2-5"
-         offset="1"
-         style="stop-color:#67bf1f;stop-opacity:1" /></linearGradient><linearGradient
-       id="linearGradient4847"><stop
-         style="stop-color:#d2e0f1;stop-opacity:1"
-         offset="0"
-         id="stop4849" /><stop
-         id="stop4855"
-         offset="0.84137291"
-         style="stop-color:#d2e0f1;stop-opacity:1" /><stop
-         style="stop-color:#e8edec;stop-opacity:1"
-         offset="1"
-         id="stop4851" /></linearGradient><radialGradient
-       inkscape:collect="always"
+         id="stop4960-6" /></linearGradient><radialGradient
        xlink:href="#linearGradient4960"
        id="radialGradient4091"
        gradientUnits="userSpaceOnUse"
@@ -414,7 +78,6 @@
          id="stop4966-2"
          offset="1"
          style="stop-color:#d2e0f1;stop-opacity:0" /></linearGradient><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4968"
        id="linearGradient4093"
        gradientUnits="userSpaceOnUse"
@@ -439,7 +102,6 @@
          id="stop4978"
          offset="1"
          style="stop-color:#7995b8;stop-opacity:1" /></linearGradient><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4817"
        id="linearGradient4095"
        gradientUnits="userSpaceOnUse"
@@ -448,7 +110,6 @@
        y1="1038.8719"
        x2="31.931776"
        y2="1038.8719" /><linearGradient
-       inkscape:collect="always"
        id="linearGradient4817"><stop
          style="stop-color:#fefdef;stop-opacity:1;"
          offset="0"
@@ -459,7 +120,6 @@
          style="stop-color:#fefae5;stop-opacity:1"
          offset="1"
          id="stop4821" /></linearGradient><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4825"
        id="linearGradient4097"
        gradientUnits="userSpaceOnUse"
@@ -468,7 +128,6 @@
        y1="1037.7671"
        x2="27.425272"
        y2="1039.8464" /><linearGradient
-       inkscape:collect="always"
        id="linearGradient4825"><stop
          style="stop-color:#f2da9b;stop-opacity:1"
          offset="0"
@@ -482,24 +141,20 @@
          style="stop-color:#d3af2e;stop-opacity:0.93725491"
          offset="1"
          id="stop4829" /></linearGradient><filter
-       inkscape:collect="always"
        style="color-interpolation-filters:sRGB"
        id="filter5127"
        x="-0.080611625"
        width="1.1612232"
        y="-0.02336289"
        height="1.0467258"><feGaussianBlur
-         inkscape:collect="always"
          stdDeviation="0.19684756"
          id="feGaussianBlur5129" /></filter><filter
-       inkscape:collect="always"
        style="color-interpolation-filters:sRGB"
        id="filter5127-8"
        x="-0.077586246"
        width="1.1551725"
        y="-0.023437493"
        height="1.046875"><feGaussianBlur
-         inkscape:collect="always"
          stdDeviation="0.19684756"
          id="feGaussianBlur5129-7" /></filter><filter
        height="1.0954513"
@@ -507,59 +162,47 @@
        width="1.0967932"
        x="-0.048396592"
        id="filter4285-9-8-5"
-       style="color-interpolation-filters:sRGB"
-       inkscape:collect="always"><feGaussianBlur
+       style="color-interpolation-filters:sRGB"><feGaussianBlur
          id="feGaussianBlur4287-9-5-9"
-         stdDeviation="0.10000000000000001"
-         inkscape:collect="always" /></filter><filter
-       inkscape:collect="always"
+         stdDeviation="0.10000000000000001" /></filter><filter
        style="color-interpolation-filters:sRGB"
        id="filter5205"
        x="-0.060432654"
        width="1.1208653"
        y="-0.25260428"
        height="1.5052086"><feGaussianBlur
-         inkscape:collect="always"
          stdDeviation="0.41863303"
          id="feGaussianBlur5207" /></filter><filter
-       inkscape:collect="always"
        style="color-interpolation-filters:sRGB"
        id="filter5214"
        x="-0.02976"
        width="1.05952"
        y="-0.124"
        height="1.248"><feGaussianBlur
-         inkscape:collect="always"
          stdDeviation="0.31"
          id="feGaussianBlur5216" /></filter><filter
-       inkscape:collect="always"
        style="color-interpolation-filters:sRGB"
        id="filter5311"
        x="-0.092446772"
        width="1.19776"
        y="-1.221447"
        height="3.4748984"><feGaussianBlur
-         inkscape:collect="always"
          stdDeviation="0.58979378"
          id="feGaussianBlur5313" /></filter><filter
-       inkscape:collect="always"
        style="color-interpolation-filters:sRGB"
        id="filter5355"
-       x="-0.43218655"
-       width="1.8418253"
+       x="-0.43218668"
+       width="1.8418255"
        y="-0.067001072"
        height="1.1385281"><feGaussianBlur
-         inkscape:collect="always"
          stdDeviation="0.58073084"
          id="feGaussianBlur5357" /></filter><filter
-       inkscape:collect="always"
        style="color-interpolation-filters:sRGB"
        id="filter5535"
        x="-0.48403505"
        width="1.9680701"
        y="-0.56926341"
        height="2.1385268"><feGaussianBlur
-         inkscape:collect="always"
          stdDeviation="5.2543488"
          id="feGaussianBlur5537" /></filter><linearGradient
        gradientUnits="userSpaceOnUse"
@@ -569,10 +212,8 @@
        x1="51.658199"
        id="linearGradient8769"
        xlink:href="#linearGradient8767"
-       inkscape:collect="always"
        gradientTransform="matrix(2.7500001,0,0,0.99370101,-129.87501,-991.91286)" /><linearGradient
-       id="linearGradient8767"
-       inkscape:collect="always"><stop
+       id="linearGradient8767"><stop
          id="stop8763"
          offset="0"
          style="stop-color:#6a8ec1;stop-opacity:1" /><stop
@@ -586,10 +227,8 @@
        x1="50"
        id="linearGradient8753"
        xlink:href="#linearGradient8751"
-       inkscape:collect="always"
        gradientTransform="matrix(2.7500001,0,0,0.99370101,-129.87501,-991.91286)" /><linearGradient
-       id="linearGradient8751"
-       inkscape:collect="always"><stop
+       id="linearGradient8751"><stop
          id="stop8747"
          offset="0"
          style="stop-color:#2e5d8f;stop-opacity:1" /><stop
@@ -603,17 +242,14 @@
        x1="57"
        id="linearGradient8761"
        xlink:href="#linearGradient8759"
-       inkscape:collect="always"
        gradientTransform="matrix(1.0999999,0,0,1.1281495,-43.249997,-1129.0318)" /><linearGradient
-       id="linearGradient8759"
-       inkscape:collect="always"><stop
+       id="linearGradient8759"><stop
          id="stop8755"
          offset="0"
          style="stop-color:#d3e0eb;stop-opacity:1" /><stop
          id="stop8757"
          offset="1"
          style="stop-color:#5179b5;stop-opacity:1" /></linearGradient><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient2543"
        id="linearGradient2545"
        x1="18.423391"
@@ -621,7 +257,6 @@
        x2="18.436228"
        y2="30.334658"
        gradientUnits="userSpaceOnUse" /><linearGradient
-       inkscape:collect="always"
        id="linearGradient2543"><stop
          style="stop-color:#4f76b0;stop-opacity:1"
          offset="0"
@@ -639,10 +274,8 @@
        x1="63.98344"
        id="linearGradient8779"
        xlink:href="#linearGradient8777"
-       inkscape:collect="always"
        gradientTransform="matrix(1.3687895,0,0,1.494898,-60.408122,-1504.0798)" /><linearGradient
-       id="linearGradient8777"
-       inkscape:collect="always"><stop
+       id="linearGradient8777"><stop
          id="stop8773"
          offset="0"
          style="stop-color:#fbeaab;stop-opacity:1;" /><stop
@@ -656,10 +289,8 @@
        x1="68.47998"
        id="linearGradient8787"
        xlink:href="#linearGradient8785"
-       inkscape:collect="always"
        gradientTransform="matrix(1.3687895,0,0,1.494898,-60.408122,-1504.0798)" /><linearGradient
-       id="linearGradient8785"
-       inkscape:collect="always"><stop
+       id="linearGradient8785"><stop
          id="stop8781"
          offset="0"
          style="stop-color:#bb8d2d;stop-opacity:1" /><stop
@@ -674,29 +305,23 @@
        width="1.8310951"
        x="-0.41554753"
        id="filter8871"
-       style="color-interpolation-filters:sRGB"
-       inkscape:collect="always"><feGaussianBlur
+       style="color-interpolation-filters:sRGB"><feGaussianBlur
          id="feGaussianBlur8873"
-         stdDeviation="0.53588249"
-         inkscape:collect="always" /></filter><filter
+         stdDeviation="0.53588249" /></filter><filter
        height="1.6025846"
        y="-0.30129232"
        width="1.626688"
        x="-0.313344"
        id="filter8835"
-       style="color-interpolation-filters:sRGB"
-       inkscape:collect="always"><feGaussianBlur
+       style="color-interpolation-filters:sRGB"><feGaussianBlur
          id="feGaussianBlur8837"
-         stdDeviation="0.49751501"
-         inkscape:collect="always" /></filter><filter
-       inkscape:collect="always"
+         stdDeviation="0.49751501" /></filter><filter
        style="color-interpolation-filters:sRGB"
        id="filter2533"
        x="-0.59377657"
        width="2.1875531"
        y="-0.92639431"
        height="2.8527886"><feGaussianBlur
-         inkscape:collect="always"
          stdDeviation="0.73536407"
          id="feGaussianBlur2535" /></filter><filter
        height="1.2365698"
@@ -704,12 +329,9 @@
        width="1.8310951"
        x="-0.41554753"
        id="filter8871-1"
-       style="color-interpolation-filters:sRGB"
-       inkscape:collect="always"><feGaussianBlur
+       style="color-interpolation-filters:sRGB"><feGaussianBlur
          id="feGaussianBlur8873-8"
-         stdDeviation="0.53588249"
-         inkscape:collect="always" /></filter><linearGradient
-       inkscape:collect="always"
+         stdDeviation="0.53588249" /></filter><linearGradient
        xlink:href="#linearGradient4527"
        id="linearGradient4533"
        x1="29.521629"
@@ -718,7 +340,6 @@
        y2="39.175972"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(-1,0,0,1,42.021149,982.96231)" /><linearGradient
-       inkscape:collect="always"
        id="linearGradient4527"><stop
          style="stop-color:#68b367;stop-opacity:1"
          offset="0"
@@ -726,7 +347,6 @@
          style="stop-color:#5eaa6e;stop-opacity:1"
          offset="1"
          id="stop4531" /></linearGradient><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4578"
        id="linearGradient4584"
        x1="42.780308"
@@ -735,65 +355,21 @@
        y2="1039.7532"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(-1,0,0,1,50.241266,-16.304589)" /><linearGradient
-       inkscape:collect="always"
        id="linearGradient4578"><stop
          style="stop-color:#c5f0b4;stop-opacity:1"
          offset="0"
          id="stop4580" /><stop
          style="stop-color:#80c171;stop-opacity:1"
          offset="1"
-         id="stop4582" /></linearGradient></defs><sodipodi:namedview
-     id="base"
-     pagecolor="#bcbcbc"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7.5774531"
-     inkscape:cx="70.736169"
-     inkscape:cy="32.992616"
-     inkscape:document-units="px"
-     inkscape:current-layer="svg2"
-     showgrid="true"
-     inkscape:window-width="1728"
-     inkscape:window-height="1051"
-     inkscape:window-x="0"
-     inkscape:window-y="38"
-     inkscape:window-maximized="1"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="true"
-     inkscape:snap-bbox="true"
-     inkscape:bbox-nodes="true"
-     inkscape:showpageshadow="2"
-     inkscape:pagecheckerboard="0"
-     inkscape:deskcolor="#d1d1d1"><inkscape:grid
-       type="xygrid"
-       id="grid4112"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       originx="0"
-       originy="0"
-       spacingy="1"
-       spacingx="1"
-       units="px" /></sodipodi:namedview><metadata
+         id="stop4582" /></linearGradient></defs><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" /></cc:Work></rdf:RDF></metadata><g
-     inkscape:groupmode="layer"
      id="layer2"
-     inkscape:label="Background"
-     style="display:inline"
-     sodipodi:insensitive="true"><path
-       sodipodi:nodetypes="cccc"
-       inkscape:connector-curvature="0"
+     style="display:inline"><path
        id="rect4113-1"
        d="M 75,0 75,66 1e-6,66 C 1e-6,41.2048 50.00969,0 75,0 Z"
        style="display:inline;fill:url(#linearGradient4978);fill-opacity:1;stroke:none" /><path
-       sodipodi:nodetypes="cccc"
-       inkscape:connector-curvature="0"
        id="rect4113-1-0"
        d="M 75,21.0607 75,66 1e-6,66 C 10.625001,47.804 43.509694,25.4357 75,21.0607 Z"
        style="display:inline;opacity:0.40400002;fill:url(#linearGradient4962);fill-opacity:1;stroke:none" /><g
@@ -802,85 +378,54 @@
        transform="matrix(0.27903303,0,0,0.27903303,-14.618136,-107.52874)"><g
          style="fill:#737986;fill-opacity:1;stroke:#595e68;stroke-opacity:1"
          id="g13408-8-2" /></g><path
-       sodipodi:nodetypes="cccc"
-       inkscape:connector-curvature="0"
        id="rect4113-1-7"
        d="M 75,4.0000001e-7 75,66 30.000003,66 C 30.000003,46.1545 47.70944,9.2500004 75,4e-7 Z"
        style="display:inline;opacity:0.18399999;fill:url(#linearGradient4970);fill-opacity:1;stroke:none" /></g><g
      id="g2558"
      style="display:inline;stroke-width:1.09684"
-     inkscape:label="plug"
      transform="matrix(0.87153648,0,0,0.95373736,24.818022,-8.9309189)"><path
        id="path8722-7"
        style="display:inline;opacity:1;fill:url(#linearGradient8769);fill-opacity:1;stroke:url(#linearGradient8753);stroke-width:1.09684;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 3.4999999,23.512598 V 25.5 H 14.5 V 21.525196 H 3.4999999 v 1.987402"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccc"
-       inkscape:label="cord" /><path
-       sodipodi:nodetypes="csssscsscccsssscsscc"
+       d="M 3.4999999,23.512598 V 25.5 H 14.5 V 21.525196 H 3.4999999 v 1.987402" /><path
        id="rect8645-3"
        style="display:inline;opacity:1;fill:url(#linearGradient8761);fill-opacity:1;stroke:#4d73ae;stroke-width:1.09684;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 25.499998,23.781495 25.5,15.413559 C 25.5,13.799403 24.568942,12.5 23.412427,12.5 h -2.424855 c -1.156515,0 -2.483072,1.299403 -2.483072,2.913559 v 1.599039 h -2.264856 c -0.963763,0 -1.739644,0.794104 -1.739644,1.780446 v 1.468512 3.519375 m 10.999998,5.64e-4 2e-6,8.367936 c 0,1.614156 -0.931058,2.913559 -2.087573,2.913559 h -2.424855 c -1.156515,0 -2.483072,-1.299403 -2.483072,-2.913559 V 30.550392 H 16.239644 C 15.275881,30.550392 14.5,29.756288 14.5,28.769946 v -1.468512 -3.519375"
-       inkscape:connector-curvature="0"
-       inkscape:label="plug" /><path
-       sodipodi:nodetypes="cc"
-       inkscape:connector-curvature="0"
+       d="M 25.499998,23.781495 25.5,15.413559 C 25.5,13.799403 24.568942,12.5 23.412427,12.5 h -2.424855 c -1.156515,0 -2.483072,1.299403 -2.483072,2.913559 v 1.599039 h -2.264856 c -0.963763,0 -1.739644,0.794104 -1.739644,1.780446 v 1.468512 3.519375 m 10.999998,5.64e-4 2e-6,8.367936 c 0,1.614156 -0.931058,2.913559 -2.087573,2.913559 h -2.424855 c -1.156515,0 -2.483072,-1.299403 -2.483072,-2.913559 V 30.550392 H 16.239644 C 15.275881,30.550392 14.5,29.756288 14.5,28.769946 v -1.468512 -3.519375" /><path
        id="path2537"
        d="M 18.51661,16.539741 18.5464,30.705846"
-       style="display:inline;fill:none;stroke:url(#linearGradient2545);stroke-width:1.09684px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       inkscape:label="line" /><path
+       style="display:inline;fill:none;stroke:url(#linearGradient2545);stroke-width:1.09684px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /><path
        id="rect8645-2-5"
        style="display:inline;opacity:1;fill:url(#linearGradient8779);fill-opacity:1;stroke:url(#linearGradient8787);stroke-width:1.09684;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 36.091538,26.489769 -10e-7,1.058985 c 0,1.06945 -0.863288,1.955925 -2.164732,1.930363 -1.301445,-0.02541 -1.941636,0 -1.941636,0 v 0.201512 c 0,1.544678 -1.158564,2.787985 -2.597679,2.788284 l -1.648306,2.98e-4 c -1.360345,3e-4 -1.22903,0.546236 -1.22903,-2.989646 V 17.520381 c 0,-3.536032 -0.205068,-2.989797 1.22903,-2.989797 h 1.648306 c 1.439115,0 2.597679,1.243607 2.597679,2.788284 v 0.201513 h 1.941637 c 1.199261,0 2.164732,0.860911 2.164732,1.930361 v 2.554332 z m 0.06454,-6.010119 h 8.461471 l -0.05085,6.010119 h -8.188123"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cczccssssssccsccccccc"
-       inkscape:label="socket" /><path
+       d="m 36.091538,26.489769 -10e-7,1.058985 c 0,1.06945 -0.863288,1.955925 -2.164732,1.930363 -1.301445,-0.02541 -1.941636,0 -1.941636,0 v 0.201512 c 0,1.544678 -1.158564,2.787985 -2.597679,2.788284 l -1.648306,2.98e-4 c -1.360345,3e-4 -1.22903,0.546236 -1.22903,-2.989646 V 17.520381 c 0,-3.536032 -0.205068,-2.989797 1.22903,-2.989797 h 1.648306 c 1.439115,0 2.597679,1.243607 2.597679,2.788284 v 0.201513 h 1.941637 c 1.199261,0 2.164732,0.860911 2.164732,1.930361 v 2.554332 z m 0.06454,-6.010119 h 8.461471 l -0.05085,6.010119 h -8.188123" /><path
        transform="matrix(1.445753,0,0,1.3224494,-65.097292,-1327.9481)"
        style="display:inline;opacity:0.794;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.793242px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter8871)"
        d="m 64.018476,1016.5423 -0.152427,10.8222 c 2.375507,-3.3036 3.484206,-4.2052 2.972286,-9.2217 0.305009,-1.654 -1.117834,-1.7529 -2.819859,-1.6005 z"
-       id="path8861"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccc"
-       inkscape:label="highlight" /><ellipse
+       id="path8861" /><ellipse
        transform="matrix(1.029538,0,0,1.1281495,-39.470994,-1128.0797)"
        style="opacity:0.828;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.01774;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter8835)"
        id="path8817"
        cx="59.521938"
        cy="1014.637"
        rx="1.9053118"
-       ry="1.9815242"
-       inkscape:label="highlight" /><path
+       ry="1.9815242" /><path
        transform="matrix(1.7350569,0,0,1.8824502,-91.814902,-1903.1505)"
        style="display:inline;opacity:0.862;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.606909px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter2533)"
        d="m 70.953811,1023.4014 v -1.8291 l 2.972286,-0.076 z"
-       id="path8875"
-       inkscape:connector-curvature="0"
-       inkscape:label="highlight" /><path
+       id="path8875" /><path
        transform="matrix(1.029538,0,0,1.1281495,-39.928294,-1128.6206)"
        style="display:inline;opacity:0.485;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.01774px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter8871-1)"
        d="m 53.924652,1016.631 -0.152427,10.8222 c 2.375507,-3.3036 3.484206,-4.2052 2.972286,-9.2217 0.305009,-1.654 -1.117834,-1.7529 -2.819859,-1.6005 z"
-       id="path8861-7"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccc"
-       inkscape:label="highlight" /></g><g
-     inkscape:label="Foreground"
-     inkscape:groupmode="layer"
+       id="path8861-7" /></g><g
      id="layer1"
      style="display:inline"
      transform="translate(0,-986.3622)"><g
        id="g1"
-       inkscape:label="jar"
        transform="translate(-20.000001,7.9532006)"><path
          style="display:inline;fill:#b3c7de;fill-opacity:1;stroke:none"
          d="m 32.18464,1002.9251 h 14.173328 c 1.424449,5.2237 8.684639,8.0056 8.684639,15.8058 v 11.6063 c 0,4.7278 -3.873347,8.534 -8.684639,8.534 H 32.18464 c -4.811293,0 -8.68464,-3.8062 -8.68464,-8.534 v -11.6063 c 0,-8.005 7.34086,-10.8778 8.68464,-15.8058 z"
-         id="rect4044"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccssssssc" /><path
+         id="rect4044" /><path
          style="display:inline;fill:url(#radialGradient4091);fill-opacity:1;stroke:none"
          d="m 32.008972,1002.4886 h 14.17333 c 1.42445,5.2237 8.68464,8.0057 8.68464,15.8058 v 11.6064 c 0,4.7278 -3.87335,8.534 -8.68464,8.534 h -14.17333 c -4.811293,0 -8.68464,-3.8062 -8.68464,-8.534 v -11.6064 c 0,-8.005 7.34086,-10.8778 8.68464,-15.8058 z"
-         id="rect4044-7"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccssssssc" /><ellipse
+         id="rect4044-7" /><ellipse
          style="display:inline;opacity:0.607;fill:#edf3f8;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;filter:url(#filter5214)"
          id="path5100"
          cx="39.495609"
@@ -890,57 +435,32 @@
          style="display:inline;fill:#a2bcd8;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter5127-8)"
          d="m 105.07875,49.208627 c -8.837942,6.696584 -5.930277,-17.257825 -4.27177,-18.978844 l 0.36615,13.791701 c 0,0 0.061,4.576891 3.90562,5.187143 z"
          id="path5113-6"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccc"
          transform="matrix(-1,0,0,1,153.66201,984.35274)" /><path
          style="display:inline;opacity:1;fill:#d1d5ce;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;filter:url(#filter5205)"
          d="m 47.417079,1006.9028 c 0.295346,1.3154 -3.224791,1.9528 -8.482505,1.9528 -5.257715,0 -8.317176,-0.9249 -8.116355,-2.2579 0.250201,-1.6609 3.563671,-1.7644 8.05533,-1.7088 5.099314,0.063 8.087108,-0.019 8.54353,2.0139 z"
-         id="path5179"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="sssss" /><path
-         sodipodi:type="star"
+         id="path5179" /><path
          style="display:inline;opacity:0.9;fill:#fefdd7;fill-opacity:0.87538;stroke:none;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;filter:url(#filter4285-9-8-5)"
          id="path4252-6-0-8"
-         sodipodi:sides="4"
-         sodipodi:cx="4.7729707"
-         sodipodi:cy="1041.2474"
-         sodipodi:r1="3.3255017"
-         sodipodi:r2="0.49178758"
-         sodipodi:arg1="2.432965"
-         sodipodi:arg2="-3.0800218"
-         inkscape:flatsided="false"
-         inkscape:rounded="0"
-         inkscape:randomized="-0.017554997"
          d="m 2.2999628,1043.3702 1.9823895,-2.1047 -1.6734053,-2.5419 2.1987064,2.0209 2.4513363,-1.6427 -2.0383649,2.1623 1.7419712,2.4882 -2.2030799,-2.0431 z"
-         transform="matrix(0.22260765,1.6233698,-1.632842,-0.00450151,1730.7607,1010.0247)"
-         inkscape:transform-center-x="-0.08889601"
-         inkscape:transform-center-y="0.41892685" /><path
+         transform="matrix(0.22260765,1.6233698,-1.632842,-0.00450151,1730.7607,1010.0247)" /><path
          style="fill:none;fill-rule:evenodd;stroke:#f2f8fd;stroke-width:0.931161px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter5355)"
          d="m 28.708879,1009.9475 c -1.477481,1.9359 -2.98703,3.9919 -3.565257,6.3929 -1.141967,5.0531 -0.69538,10.337 -0.412422,15.2002 0.10232,1.4238 1.030543,2.6873 2.219855,3.4247"
          id="path5245"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccc"
          transform="matrix(1.1287543,0,0,1.0217639,-3.1136931,-22.519981)" /><path
          style="display:inline;opacity:0.799;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;filter:url(#filter5535)"
          d="m 44.264734,1011.5996 a 19.925179,19.996828 0 0 0 -16.566406,8.9061 13.02639,11.919721 0 0 0 -0.08789,1.3262 13.02639,11.919721 0 0 0 13.027344,11.9199 13.02639,11.919721 0 0 0 13.025391,-11.9199 13.02639,11.919721 0 0 0 -5.744141,-9.8788 19.925179,19.996828 0 0 0 -3.654298,-0.3535 z"
          id="path5381-3"
-         inkscape:connector-curvature="0"
          transform="matrix(0.79757984,0,0,0.78004748,6.1415043,216.15002)" /><path
          style="display:inline;fill:#a2bcd8;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter5127)"
          d="m 30.574128,1033.8149 c -8.543451,6.8929 -5.613924,-17.0469 -4.271766,-18.9788 l 0.366151,13.7917 c 0,0 0.06103,4.5769 3.905615,5.1871 z"
-         id="path5113"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccc" /><path
+         id="path5113" /><path
          style="fill:none;fill-rule:evenodd;stroke:#f0f7fc;stroke-width:0.808851px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter5311)"
          d="m 30.549867,1007.6066 c 0.328269,0.1642 0.191646,0.1528 0.381873,0.1528 0.05092,0 0.103353,-0.012 0.152749,0 0.51444,0.1286 0.0012,0 0.15275,0.1527 0.018,0.018 0.0536,-0.011 0.07637,0 0.23291,0.1165 -0.139685,0.061 0.229124,0.1528 0.0494,0.012 0.101833,0 0.15275,0 0.02546,0 0.05519,-0.014 0.07637,0 0.05991,0.04 0.08657,0.1244 0.15275,0.1527 0.119316,0.051 0.257056,0.041 0.381873,0.076 0.05474,0.016 0.09874,0.058 0.152749,0.076 0.0483,0.016 0.107209,-0.023 0.15275,0 0.0322,0.016 0.04176,0.067 0.07637,0.076 0.859473,0.2455 0.187983,0.023 0.610998,0.076 0.15366,0.019 0.306399,0.046 0.458248,0.076 0.102928,0.021 0.200962,0.067 0.305498,0.076 0.177476,0.016 0.356415,0 0.534623,0 0.381873,0 0.763747,0 1.14562,0 0.132788,0 0.522725,-0.018 0.610997,0 0.0353,0.01 0.04222,0.065 0.07637,0.076 0.07246,0.024 0.152749,0 0.229124,0 0.127291,0 0.254582,0 0.381873,0 0.04249,0 0.302548,-0.016 0.381874,0 0.102928,0.021 0.201586,0.062 0.305498,0.076 0.10081,0.014 0.203666,0 0.305499,0 0.28004,0 0.560081,0 0.840121,0 0.0995,0 0.296904,-0.017 0.381874,0 0.07894,0.016 0.151021,0.057 0.229124,0.076 0.0247,0.01 0.05092,0 0.07637,0 0.127291,0 0.254583,0 0.381874,0 0.432789,0 0.865579,0 1.298369,0 0.101833,0 0.203666,0 0.305499,0 0.05092,0 0.101833,0 0.152749,0 0.02546,0 0.05168,-0.01 0.07638,0 0.0781,0.019 0.150181,0.061 0.229124,0.076 0.09985,0.02 0.204452,-0.013 0.305498,0 0.153661,0.019 0.304948,0.054 0.458248,0.076 0.115408,0.017 0.33899,0 0.458248,0 0.280041,0 0.560081,0 0.840122,0 0.356415,0 0.71283,0 1.069245,0 0.02546,0 0.05092,0 0.07637,0 0.02546,0 0.05837,0.018 0.07637,0 0.018,-0.018 -0.018,-0.058 0,-0.076 0.01633,-0.016 0.263392,0.014 0.305499,0 0.05401,-0.018 0.09874,-0.058 0.152749,-0.076 0.0483,-0.016 0.107209,0.023 0.15275,0 0.0322,-0.016 0.04222,-0.065 0.07637,-0.076 0.0483,-0.016 0.101833,0 0.15275,0 0.07797,0 0.497517,0.012 0.534622,0 0.03416,-0.011 0.04417,-0.06 0.07637,-0.076 0.04554,-0.023 0.107208,0.023 0.152749,0 0.0322,-0.016 0.04417,-0.06 0.07637,-0.076 0.04554,-0.023 0.116746,0.036 0.152749,0 0.018,-0.018 -0.018,-0.058 0,-0.076 0.018,-0.018 0.0536,0.011 0.07638,0 0.0322,-0.016 0.04417,-0.06 0.07637,-0.076 0.02277,-0.011 0.0536,0.011 0.07637,0 0.317853,-0.1589 -0.08165,0.01 0.07637,-0.1527 0.036,-0.036 0.116746,0.036 0.152749,0 0.018,-0.018 -0.01139,-0.054 0,-0.076 0.0161,-0.032 0.06027,-0.044 0.07637,-0.076 0.01138,-0.023 -0.018,-0.058 0,-0.076 0.018,-0.018 0.05837,0.018 0.07637,0 0.036,-0.036 -0.036,-0.1168 0,-0.1528 0.018,-0.018 0.05837,0.018 0.07637,0 0.018,-0.018 0,-0.051 0,-0.076 0,-0.025 0,-0.051 0,-0.076"
          id="path5285"
-         inkscape:connector-curvature="0"
          transform="matrix(1,0,0,1.5284921,0,-532.51213)" /><path
          style="display:inline;fill:none;stroke:url(#linearGradient4093);stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
          d="m 32.18464,1002.9251 h 14.173328 c 1.424449,5.2237 8.684639,8.0056 8.684639,15.8058 v 11.6063 c 0,4.7278 -3.873347,8.534 -8.684639,8.534 H 32.18464 c -4.811293,0 -8.68464,-3.8062 -8.68464,-8.534 v -11.6063 c 0,-8.005 7.34086,-10.8778 8.68464,-15.8058 z"
-         id="rect4044-1"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccssssssc" /><rect
+         id="rect4044-1" /><rect
          style="display:inline;fill:url(#linearGradient4095);fill-opacity:1;stroke:url(#linearGradient4097);stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
          id="rect4815"
          width="25.845484"
@@ -951,15 +471,10 @@
          ry="2.3554082" /></g><g
        id="g4307"
        style="display:inline"
-       transform="rotate(135,25.40266,1028.1893)"
-       inkscape:label="green-arrow"><path
+       transform="rotate(135,25.40266,1028.1893)"><path
          style="fill:url(#linearGradient4533);fill-opacity:1;fill-rule:evenodd;stroke:#398a43;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
          d="m 1.356263,1009.9318 c 0.24182,-0.7378 4.276215,4.6418 4.276215,4.6418 11.44876,-7.9356 17.573348,1.4122 16.632852,8.3285 -0.287455,2.114 -2.873263,-9.5491 -13.24418,-4.9398 0,0 6.161054,4.0913 5.456972,5.1523 -0.390532,0.5886 -13.008987,0.7195 -13.731155,-0.03 -0.722169,-0.75 0.343071,-12.3401 0.609296,-13.1524 z"
-         id="path4522"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="scscszs" /><path
+         id="path4522" /><path
          style="display:inline;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4584);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
          d="m 1.57134,1022.8745 c -0.335464,-3.4409 0.540551,-10.8513 0.558812,-11.097 0.130143,0.1351 3.305251,4.1177 3.305251,4.1177 13.489832,-9.4517 15.979945,3.8837 15.944315,4.5632 0,0 -4.159907,-8.1407 -14.425918,-2.5964 3.722931,2.2 6.36447,4.7334 6.416153,4.8694"
-         id="path4522-3"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccscc" /></g></g></svg>
+         id="path4522-3" /></g></g></svg>
diff --git a/ui/org.eclipse.pde.ui/icons/wizban/migrate_30_wiz.svg b/ui/org.eclipse.pde.ui/icons/wizban/migrate_30_wiz.svg
index 7b50f4bc175..95347ec40a4 100644
--- a/ui/org.eclipse.pde.ui/icons/wizban/migrate_30_wiz.svg
+++ b/ui/org.eclipse.pde.ui/icons/wizban/migrate_30_wiz.svg
@@ -6,14 +6,7 @@
    height="66"
    id="svg2"
    version="1.1"
-   inkscape:version="1.3 (0e150ed, 2023-07-21)"
-   sodipodi:docname="migrate_30_wiz.svg"
-   inkscape:export-filename="/Users/d021678/git/eclipse.jdt.ui/org.eclipse.jdt.ui/icons/full/wizban/newclass_wiz2.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90"
    xml:space="preserve"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:svg="http://www.w3.org/2000/svg"
@@ -21,307 +14,13 @@
    xmlns:cc="http://creativecommons.org/ns#"
    xmlns:dc="http://purl.org/dc/elements/1.1/"><defs
      id="defs4"><linearGradient
-       id="linearGradient4"
-       inkscape:collect="always"><stop
+       id="linearGradient4"><stop
          style="stop-color:#2d639b;stop-opacity:1;"
          offset="0"
          id="stop4" /><stop
          style="stop-color:#a3bad2;stop-opacity:1;"
          offset="1"
          id="stop5" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       id="linearGradient4972"><stop
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0"
-         id="stop4974" /><stop
-         style="stop-color:#f5f8fd;stop-opacity:1"
-         offset="1"
-         id="stop4976" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       id="linearGradient4964"><stop
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0"
-         id="stop4966" /><stop
-         style="stop-color:#e8eefa;stop-opacity:1"
-         offset="1"
-         id="stop4968" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       id="linearGradient4956"><stop
-         style="stop-color:#fcfdfe;stop-opacity:1"
-         offset="0"
-         id="stop4958" /><stop
-         style="stop-color:#dee6f8;stop-opacity:1"
-         offset="1"
-         id="stop4960" /></linearGradient><filter
-       style="color-interpolation-filters:sRGB"
-       inkscape:label="Drop Shadow"
-       id="filter8854"><feFlood
-         flood-opacity="0.933333"
-         flood-color="rgb(244,248,254)"
-         result="flood"
-         id="feFlood8856" /><feComposite
-         in="flood"
-         in2="SourceGraphic"
-         operator="in"
-         result="composite1"
-         id="feComposite8858" /><feGaussianBlur
-         in="composite1"
-         stdDeviation="1.2"
-         result="blur"
-         id="feGaussianBlur8860" /><feOffset
-         dx="-1"
-         dy="3"
-         result="offset"
-         id="feOffset8862" /><feComposite
-         in="SourceGraphic"
-         in2="offset"
-         operator="over"
-         result="composite2"
-         id="feComposite8864" /></filter><linearGradient
-       id="linearGradient6122"><stop
-         style="stop-color:#c0c0c0;stop-opacity:1"
-         offset="0"
-         id="stop6124" /><stop
-         id="stop6132"
-         offset="0.5"
-         style="stop-color:#adadad;stop-opacity:1" /><stop
-         style="stop-color:#808080;stop-opacity:1"
-         offset="1"
-         id="stop6126" /></linearGradient><linearGradient
-       id="linearGradient7087"><stop
-         style="stop-color:#17325d;stop-opacity:1;"
-         offset="0"
-         id="stop7089" /><stop
-         id="stop7091"
-         offset="0.25"
-         style="stop-color:#b4d0e2;stop-opacity:1" /><stop
-         id="stop7093"
-         offset="0.5"
-         style="stop-color:#b7d2e4;stop-opacity:1" /><stop
-         style="stop-color:#acc9de;stop-opacity:1"
-         offset="0.75"
-         id="stop7095" /><stop
-         style="stop-color:#3e72a7;stop-opacity:1"
-         offset="1"
-         id="stop7097" /></linearGradient><mask
-       id="mask7366"
-       maskUnits="userSpaceOnUse"><path
-         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;display:inline"
-         d="m -16.593048,1040.862 9.990206,0 0,10.0018 -2.983353,3.0385 -5.966213,0 c -0.53033,-0.022 -1.04064,-0.5519 -1.04064,-1.0385 z"
-         id="path7368"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccccc" /></mask><linearGradient
-       id="linearGradient7584-5"><stop
-         id="stop7586-4"
-         offset="0"
-         style="stop-color:#f9cd5f;stop-opacity:1" /><stop
-         id="stop7588-5"
-         offset="1"
-         style="stop-color:#fbf0b4;stop-opacity:1" /></linearGradient><linearGradient
-       id="linearGradient7592-1"><stop
-         id="stop7594-6"
-         offset="0"
-         style="stop-color:#bd8416;stop-opacity:1" /><stop
-         id="stop7596-9"
-         offset="1"
-         style="stop-color:#a66b10;stop-opacity:1" /></linearGradient><linearGradient
-       id="linearGradient10798-1-9-3-7-6-6-6-2-6-7-98-9-4-1"><stop
-         style="stop-color:#5aad60;stop-opacity:1;"
-         offset="0"
-         id="stop10800-5-2-1-8-20-4-0-2-1-9-0-0-1-1" /><stop
-         id="stop10806-6-8-5-3-9-2-2-7-0-4-2-7-8-9"
-         offset="0.5"
-         style="stop-color:#5bb26a;stop-opacity:1;" /><stop
-         style="stop-color:#a4c589;stop-opacity:1"
-         offset="1"
-         id="stop10802-1-5-3-0-4-6-8-5-5-6-69-6-4-0" /></linearGradient><mask
-       maskUnits="userSpaceOnUse"
-       id="mask7366-4"><path
-         sodipodi:nodetypes="ccccccc"
-         inkscape:connector-curvature="0"
-         id="path7368-2"
-         d="m -16.593048,1040.862 9.990206,0 0,10.0018 -2.983353,3.0385 -5.966213,0 c -0.53033,-0.022 -1.04064,-0.5519 -1.04064,-1.0385 z"
-         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;display:inline" /></mask><linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient7087"
-       id="linearGradient9331"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-20,0)"
-       x1="4.7776356"
-       y1="1039.8118"
-       x2="4.7776356"
-       y2="1041.911" /><linearGradient
-       y2="1041.911"
-       x2="4.7776356"
-       y1="1039.8118"
-       x1="4.7776356"
-       gradientTransform="translate(-18,4.7e-5)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient9333"
-       xlink:href="#linearGradient7087"
-       inkscape:collect="always" /><linearGradient
-       y2="1041.911"
-       x2="4.7776356"
-       y1="1039.8118"
-       x1="4.7776356"
-       gradientTransform="translate(-16,4.7e-5)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient9335"
-       xlink:href="#linearGradient7087"
-       inkscape:collect="always" /><linearGradient
-       y2="1041.911"
-       x2="4.7776356"
-       y1="1039.8118"
-       x1="4.7776356"
-       gradientTransform="translate(-14,4.7e-5)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient9337"
-       xlink:href="#linearGradient7087"
-       inkscape:collect="always" /><linearGradient
-       y2="1041.911"
-       x2="4.7776356"
-       y1="1039.8118"
-       x1="4.7776356"
-       gradientTransform="translate(-12,4.7e-5)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient9339"
-       xlink:href="#linearGradient7087"
-       inkscape:collect="always" /><linearGradient
-       gradientTransform="translate(-80,0)"
-       gradientUnits="userSpaceOnUse"
-       y2="1042.7973"
-       x2="163.22012"
-       y1="1042.7973"
-       x1="88.220117"
-       id="linearGradient68073"
-       xlink:href="#linearGradient4956"
-       inkscape:collect="always" /><linearGradient
-       gradientTransform="translate(-80,0)"
-       gradientUnits="userSpaceOnUse"
-       y2="1032.2669"
-       x2="163.22012"
-       y1="1032.2668"
-       x1="94.469681"
-       id="linearGradient68075"
-       xlink:href="#linearGradient4964"
-       inkscape:collect="always" /><linearGradient
-       gradientTransform="translate(-80,0)"
-       gradientUnits="userSpaceOnUse"
-       y2="1032.2668"
-       x2="152.72206"
-       y1="1032.2668"
-       x1="88.220116"
-       id="linearGradient68077"
-       xlink:href="#linearGradient4972"
-       inkscape:collect="always" /><filter
-       id="filter8854-9"
-       inkscape:label="Drop Shadow"
-       style="color-interpolation-filters:sRGB"><feFlood
-         id="feFlood8856-0"
-         result="flood"
-         flood-color="rgb(244,248,254)"
-         flood-opacity="0.933333" /><feComposite
-         id="feComposite8858-2"
-         result="composite1"
-         operator="in"
-         in2="SourceGraphic"
-         in="flood" /><feGaussianBlur
-         id="feGaussianBlur8860-3"
-         result="blur"
-         stdDeviation="1.2"
-         in="composite1" /><feOffset
-         id="feOffset8862-2"
-         result="offset"
-         dy="3"
-         dx="-1" /><feComposite
-         id="feComposite8864-3"
-         result="composite2"
-         operator="over"
-         in2="offset"
-         in="SourceGraphic" /></filter><linearGradient
-       id="linearGradient10798-1-9-3-7-6-8-9-0-9-1"><stop
-         id="stop10800-5-2-1-8-20-6-4-9-8-2"
-         offset="0"
-         style="stop-color:#7564b1;stop-opacity:1" /><stop
-         style="stop-color:#5d4aa1;stop-opacity:1"
-         offset="0.5"
-         id="stop10806-6-8-5-3-9-24-8-4-3-2" /><stop
-         id="stop10802-1-5-3-0-4-8-4-2-9-2"
-         offset="1"
-         style="stop-color:#9283c3;stop-opacity:1" /></linearGradient><linearGradient
-       id="linearGradient7540-2-3-8-7"><stop
-         id="stop7542-8-7-5-3"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.502" /><stop
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0.47623286"
-         id="stop7544-8-2-0-5" /><stop
-         style="stop-color:#ffffff;stop-opacity:0"
-         offset="0.5"
-         id="stop7546-1-7-9-5" /><stop
-         id="stop7548-98-9-2-4"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       id="linearGradient7272-66-4-5-5-5-8"><stop
-         style="stop-color:#8f6c10;stop-opacity:1"
-         offset="0"
-         id="stop7274-6-0-1-7-4-7" /><stop
-         style="stop-color:#c9a645;stop-opacity:1"
-         offset="1"
-         id="stop7276-66-6-3-9-1-4" /></linearGradient><linearGradient
-       y2="1030.3411"
-       x2="-10.159802"
-       y1="1030.3411"
-       x1="-22.453552"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient10540"
-       xlink:href="#linearGradient7540-2-3-8-7"
-       inkscape:collect="always" /><linearGradient
-       y2="1030.3411"
-       x2="-10.159802"
-       y1="1030.3411"
-       x1="-22.453552"
-       gradientTransform="matrix(0,1,-1,0,1014.0344,1046.6478)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient10542"
-       xlink:href="#linearGradient7540-2-3-8-7"
-       inkscape:collect="always" /><linearGradient
-       y2="1023.2569"
-       x2="-15.945988"
-       y1="1037.4661"
-       x1="-15.945988"
-       gradientTransform="matrix(0.95585117,0,0,0.95585117,-0.71992063,45.488394)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient10544"
-       xlink:href="#linearGradient7272-66-4-5-5-5-8"
-       inkscape:collect="always" /><mask
-       id="mask10620"
-       maskUnits="userSpaceOnUse"><path
-         transform="matrix(0.55482947,0,0,0.55482947,-206.96039,787.08655)"
-         d="m 398.75,468.23718 a 10.625,10.625 0 1 1 -21.25,0 10.625,10.625 0 1 1 21.25,0 z"
-         sodipodi:ry="10.625"
-         sodipodi:rx="10.625"
-         sodipodi:cy="468.23718"
-         sodipodi:cx="388.125"
-         id="path10622"
-         style="font-size:13.58917427px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:2.16621375;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline;font-family:Sans"
-         sodipodi:type="arc" /></mask><linearGradient
-       id="linearGradient4528-9-5-7-9-7-3"><stop
-         id="stop4530-0-5-0-5-8-4"
-         offset="0"
-         style="stop-color:#e0c576;stop-opacity:1;" /><stop
-         id="stop4532-7-9-3-3-6-1"
-         offset="1"
-         style="stop-color:#9e7916;stop-opacity:1" /></linearGradient><linearGradient
-       id="linearGradient6281-8-0-1-6-6-4-2-8-0"><stop
-         style="stop-color:#f7f9fb;stop-opacity:1"
-         offset="0"
-         id="stop6283-0-2-2-1-2-0-1-6-0" /><stop
-         style="stop-color:#ffd680;stop-opacity:1"
-         offset="1"
-         id="stop6285-5-0-9-7-6-9-9-1-9" /></linearGradient><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4972-7"
        id="linearGradient4978"
        x1="88.220116"
@@ -330,7 +29,6 @@
        y2="1032.2668"
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-88.220116,-999.2669)" /><linearGradient
-       inkscape:collect="always"
        id="linearGradient4972-7"><stop
          style="stop-color:#b8ccf1;stop-opacity:0.10196079"
          offset="0"
@@ -338,7 +36,6 @@
          style="stop-color:#6e97e2;stop-opacity:0.10196079"
          offset="1"
          id="stop4976-1" /></linearGradient><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4964-3"
        id="linearGradient4970"
        x1="118.38584"
@@ -347,7 +44,6 @@
        y2="1032.2668"
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-88.220117,-999.2669)" /><linearGradient
-       inkscape:collect="always"
        id="linearGradient4964-3"><stop
          style="stop-color:#ffffff;stop-opacity:0.349"
          offset="0"
@@ -355,7 +51,6 @@
          style="stop-color:#91ade6;stop-opacity:1"
          offset="1"
          id="stop4968-1" /></linearGradient><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4956-2"
        id="linearGradient4962"
        x1="88.220116"
@@ -364,7 +59,6 @@
        y2="1042.7972"
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-88.220116,-999.2669)" /><linearGradient
-       inkscape:collect="always"
        id="linearGradient4956-2"><stop
          style="stop-color:#fcfdfe;stop-opacity:0.25641027"
          offset="0"
@@ -372,27 +66,6 @@
          style="stop-color:#98aae7;stop-opacity:0.40392157"
          offset="1"
          id="stop4960-6" /></linearGradient><linearGradient
-       id="linearGradient3827"><stop
-         id="stop3829"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0;" /><stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0.60149658"
-         id="stop3835" /><stop
-         id="stop3831"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" /></linearGradient><linearGradient
-       id="linearGradient10798-1-9-3-7-6-8-9-0-9-1-0"><stop
-         id="stop10800-5-2-1-8-20-6-4-9-8-2-9"
-         offset="0"
-         style="stop-color:#f3faed;stop-opacity:1" /><stop
-         style="stop-color:#e7f4da;stop-opacity:1"
-         offset="0.65917557"
-         id="stop10806-6-8-5-3-9-24-8-4-3-2-4" /><stop
-         id="stop10802-1-5-3-0-4-8-4-2-9-2-5"
-         offset="1"
-         style="stop-color:#67bf1f;stop-opacity:1" /></linearGradient><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4994"
        id="linearGradient6375-6"
        x1="50.702839"
@@ -401,15 +74,13 @@
        y2="1014.1386"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(0.66235895,0,0,0.70707433,29.627095,294.05583)" /><linearGradient
-       id="linearGradient4994"
-       inkscape:collect="always"><stop
+       id="linearGradient4994"><stop
          id="stop4996"
          offset="0"
          style="stop-color:#ffffff;stop-opacity:1" /><stop
          id="stop4998"
          offset="1"
          style="stop-color:#dbe2eb;stop-opacity:1" /></linearGradient><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4902"
        id="linearGradient4238"
        gradientUnits="userSpaceOnUse"
@@ -418,15 +89,13 @@
        y1="1038.5779"
        x2="10.544736"
        y2="1052.3228" /><linearGradient
-       id="linearGradient4902"
-       inkscape:collect="always"><stop
+       id="linearGradient4902"><stop
          id="stop4904"
          offset="0"
          style="stop-color:#c7b571;stop-opacity:1;" /><stop
          id="stop4906"
          offset="1"
          style="stop-color:#9a9a8f;stop-opacity:1" /></linearGradient><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient6411"
        id="linearGradient4240"
        gradientUnits="userSpaceOnUse"
@@ -435,7 +104,6 @@
        y1="1020.8994"
        x2="47.429596"
        y2="1023.1616" /><linearGradient
-       inkscape:collect="always"
        id="linearGradient6411"><stop
          style="stop-color:#4f605c;stop-opacity:1"
          offset="0"
@@ -443,7 +111,6 @@
          style="stop-color:#dbe2eb;stop-opacity:0"
          offset="1"
          id="stop6415" /></linearGradient><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4258"
        id="linearGradient4264"
        x1="59.220116"
@@ -452,7 +119,6 @@
        y2="1025.2668"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1.1922461,0,0,1.2728781,-10.09864,-290.57342)" /><linearGradient
-       inkscape:collect="always"
        id="linearGradient4258"><stop
          style="stop-color:#f4ae5f;stop-opacity:1;"
          offset="0"
@@ -468,12 +134,9 @@
        width="1.0967932"
        x="-0.048396592"
        id="filter4285-9"
-       style="color-interpolation-filters:sRGB"
-       inkscape:collect="always"><feGaussianBlur
+       style="color-interpolation-filters:sRGB"><feGaussianBlur
          id="feGaussianBlur4287-9"
-         stdDeviation="0.10000000000000001"
-         inkscape:collect="always" /></filter><linearGradient
-       inkscape:collect="always"
+         stdDeviation="0.10000000000000001" /></filter><linearGradient
        id="linearGradient4308"><stop
          style="stop-color:#d5d2d9;stop-opacity:1"
          offset="0"
@@ -481,7 +144,6 @@
          style="stop-color:#ffffff;stop-opacity:0.328"
          offset="1"
          id="stop4312" /></linearGradient><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4308"
        id="linearGradient6406"
        gradientUnits="userSpaceOnUse"
@@ -489,17 +151,14 @@
        y1="1041.0833"
        x2="75.020309"
        y2="1023.2908" /><filter
-       inkscape:collect="always"
        style="color-interpolation-filters:sRGB"
        id="filter4344"
        x="-0.027383926"
        width="1.0547679"
        y="-0.085576576"
        height="1.1711532"><feGaussianBlur
-         inkscape:collect="always"
          stdDeviation="0.57051052"
          id="feGaussianBlur4346" /></filter><linearGradient
-       inkscape:collect="always"
        id="linearGradient836"><stop
          style="stop-color:#79b14b;stop-opacity:1"
          offset="0"
@@ -507,7 +166,6 @@
          style="stop-color:#2a9449;stop-opacity:1"
          offset="1"
          id="stop834" /></linearGradient><linearGradient
-       inkscape:collect="always"
        id="linearGradient10468"><stop
          style="stop-color:#d6f3b6;stop-opacity:1"
          offset="0"
@@ -518,7 +176,6 @@
          style="stop-color:#c2e9a3;stop-opacity:1"
          offset="1"
          id="stop10466" /></linearGradient><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10468"
        id="linearGradient10470"
        x1="4"
@@ -527,17 +184,14 @@
        y2="4"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(2.7332009,0,0,2.7874538,2.1344017,2.7816281)" /><filter
-       inkscape:collect="always"
        style="color-interpolation-filters:sRGB"
        id="filter10710"
        x="-0.56371527"
        width="2.1274305"
        y="-0.6607788"
        height="2.3215576"><feGaussianBlur
-         inkscape:collect="always"
          stdDeviation="0.70464408"
          id="feGaussianBlur10712" /></filter><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient836"
        id="linearGradient838"
        x1="3.000002"
@@ -545,164 +199,78 @@
        x2="27"
        y2="24"
        gradientUnits="userSpaceOnUse" /><filter
-       inkscape:collect="always"
        style="color-interpolation-filters:sRGB"
        id="filter1941"
        x="-0.051404932"
        width="1.1028099"
        y="-0.075606635"
        height="1.1512133"><feGaussianBlur
-         inkscape:collect="always"
          stdDeviation="0.87812508"
          id="feGaussianBlur1943" /></filter><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4"
        id="linearGradient5"
        x1="49.818226"
        y1="1020.0432"
        x2="49.428432"
        y2="1013.5866"
-       gradientUnits="userSpaceOnUse" /></defs><sodipodi:namedview
-     id="base"
-     pagecolor="#bcbcbc"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="5.4521219"
-     inkscape:cx="77.034228"
-     inkscape:cy="57.592256"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer2"
-     showgrid="true"
-     inkscape:window-width="1728"
-     inkscape:window-height="1051"
-     inkscape:window-x="0"
-     inkscape:window-y="38"
-     inkscape:window-maximized="1"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="true"
-     inkscape:snap-bbox="true"
-     inkscape:bbox-nodes="true"
-     inkscape:showpageshadow="2"
-     inkscape:pagecheckerboard="0"
-     inkscape:deskcolor="#d1d1d1"><inkscape:grid
-       type="xygrid"
-       id="grid4112"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       originx="0"
-       originy="0"
-       spacingy="1"
-       spacingx="1"
-       units="px" /></sodipodi:namedview><metadata
+       gradientUnits="userSpaceOnUse" /></defs><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" /></cc:Work></rdf:RDF></metadata><g
-     inkscape:groupmode="layer"
      id="layer2"
-     inkscape:label="Background"
-     style="display:inline"
-     sodipodi:insensitive="true"><path
-       sodipodi:nodetypes="cccc"
-       inkscape:connector-curvature="0"
+     style="display:inline"><path
        id="rect4113-1"
        d="M 75,0 V 66 H 1e-6 C 1e-6,41.2048 50.00969,0 75,0 Z"
        style="display:inline;fill:url(#linearGradient4978);fill-opacity:1;stroke:none" /><path
-       sodipodi:nodetypes="cccc"
-       inkscape:connector-curvature="0"
        id="rect4113-1-0"
        d="M 75,21.0607 V 66 H 1e-6 C 10.625001,47.804 43.509694,25.4357 75,21.0607 Z"
        style="display:inline;opacity:0.404;fill:url(#linearGradient4962);fill-opacity:1;stroke:none" /><path
-       sodipodi:nodetypes="cccc"
-       inkscape:connector-curvature="0"
        id="rect4113-1-7"
        d="M 75,4.0000001e-7 V 66 H 30.000003 C 30.000003,46.1545 47.70944,9.2500004 75,4e-7 Z"
        style="display:inline;opacity:0.184;fill:url(#linearGradient4970);fill-opacity:1;stroke:none" /></g><g
-     inkscape:label="Foreground"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-986.3622)"><path
-       sodipodi:nodetypes="cccccc"
-       inkscape:connector-curvature="0"
        id="rect4001-3-4-5-3"
        d="m 61.725004,1022.8099 21.27431,-0.1009 1.654984,3.7793 -20.678174,12.1198 -29.322882,0.1009 z"
        style="display:inline;opacity:0.63;fill:url(#linearGradient6406);fill-opacity:1;stroke:none;filter:url(#filter4344)"
        transform="matrix(0.74942226,0,0,0.66945086,13.768515,330.84634)" /><g
        id="g6194"
-       transform="translate(-4.2813155,-15.35456)"
-       inkscape:label="paper"><path
+       transform="translate(-4.2813155,-15.35456)"><path
          style="display:inline;fill:url(#linearGradient6375-6);fill-opacity:1;stroke:none"
          d="m 42,1008.5848 16.29082,-0.1952 6.27458,7.3158 0.0609,23.4616 -22.504471,0.1952 z"
-         id="rect4001-3-4"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccc"
-         inkscape:label="page" /><path
+         id="rect4001-3-4" /><path
          style="display:inline;fill:none;stroke:url(#linearGradient4238);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1"
          d="m 42.040276,1008.6618 h 16.069976 c 0,0 4.831789,1.013 3.606431,3.347 -0.038,0.073 3.323597,3.9796 3.323597,3.9796 v 23.6381 H 42.040276 Z"
-         id="rect4001-1"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccscccc"
-         inkscape:label="border" /><path
+         id="rect4001-1" /><path
          style="display:inline;fill:url(#linearGradient4240);fill-opacity:1;stroke:none"
          d="m 58.29082,1008.6404 6.24946,7.1305 v 7.4102 l -9.171466,-6.482 c 1.202872,-2.5994 2.07431,-5.3145 2.921956,-8.0587 z"
-         id="rect4001-3-9-0"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccc"
-         inkscape:label="edge-shadow" /><path
-         inkscape:connector-curvature="0"
+         id="rect4001-3-9-0" /><path
          style="display:inline;fill:url(#linearGradient4264);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
          d="m 58.123726,1008.1339 c 1.348521,1.8713 2.974695,4.2652 1.769413,8.3553 2.773472,-1.598 5.647141,-0.7504 5.647141,-0.7504 0,-3.8185 -4.550947,-7.7849 -7.416554,-7.6049 z"
-         id="path5675-4"
-         sodipodi:nodetypes="cccc"
-         inkscape:label="edge" /><path
-         inkscape:transform-center-y="0.22008011"
-         inkscape:transform-center-x="-0.015534896"
+         id="path5675-4" /><path
          transform="matrix(0,0.69810267,-0.69299598,0,783.20728,1008.8838)"
          d="m 2.2999628,1043.3702 1.9823895,-2.1047 -1.6734053,-2.5419 2.1987064,2.0209 2.4513363,-1.6427 -2.0383649,2.1623 1.7419712,2.4882 -2.2030799,-2.0431 z"
-         inkscape:randomized="-0.017554997"
-         inkscape:rounded="0"
-         inkscape:flatsided="false"
-         sodipodi:arg2="-3.0800218"
-         sodipodi:arg1="2.432965"
-         sodipodi:r2="0.49178758"
-         sodipodi:r1="3.3255017"
-         sodipodi:cy="1041.2474"
-         sodipodi:cx="4.7729707"
-         sodipodi:sides="4"
          id="path4252-6"
-         style="display:inline;opacity:0.9;fill:#ffffff;fill-opacity:0.815842;stroke:none;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;filter:url(#filter4285-9)"
-         sodipodi:type="star"
-         inkscape:label="highlight" /><path
+         style="display:inline;opacity:0.9;fill:#ffffff;fill-opacity:0.815842;stroke:none;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;filter:url(#filter4285-9)" /><path
          style="font-weight:bold;font-size:13.7221px;font-family:Helvetica;-inkscape-font-specification:'Helvetica Bold';display:inline;fill:url(#linearGradient5);fill-rule:evenodd;stroke:none;stroke-width:1.5;stroke-linecap:square;stroke-miterlimit:2;stroke-opacity:0.894118"
          d="m 47.888554,1015.559 q -0.321612,0.4288 -0.308211,1.1458 h -1.782265 q 0.0268,-0.7237 0.247909,-1.3736 0.234508,-0.5695 0.737027,-1.0519 0.375213,-0.3417 0.891132,-0.5226 0.515919,-0.1809 1.266346,-0.1809 1.393651,0 2.244582,0.7236 0.857631,0.7169 0.857631,1.9297 0,0.8576 -0.509218,1.4472 -0.321612,0.3685 -0.670025,0.5025 0.26131,0 0.750428,0.4489 0.730326,0.6768 0.730326,1.8493 0,1.2329 -0.857631,2.1709 -0.850931,0.9313 -2.525992,0.9313 -2.063675,0 -2.867704,-1.3467 -0.422116,-0.717 -0.469018,-1.8761 h 1.876069 q 0,0.5829 0.187607,0.9648 0.348412,0.7036 1.266346,0.7036 0.56282,0 0.978236,-0.3819 0.422115,-0.3887 0.422115,-1.1123 0,-0.9581 -0.777228,-1.2797 -0.442217,-0.1809 -1.393651,-0.1809 v -1.3669 q 0.931334,-0.013 1.299847,-0.1809 0.636523,-0.2814 0.636523,-1.139 0,-0.5562 -0.328312,-0.9046 -0.321611,-0.3484 -0.911233,-0.3484 -0.676725,0 -0.991636,0.4288 z m 5.862714,5.7823 h 2.030174 v 1.9967 h -2.030174 z m 6.733745,2.2379 q -1.855967,0 -2.606395,-1.2998 -0.743727,-1.2999 -0.743727,-3.7053 0,-2.4053 0.743727,-3.7119 0.750428,-1.3065 2.606395,-1.3065 1.855968,0 2.606395,1.3065 0.743728,1.3066 0.743728,3.7119 0,2.4054 -0.750428,3.7053 -0.743727,1.2998 -2.599695,1.2998 z m 1.118941,-2.4456 q 0.26131,-0.8844 0.26131,-2.5595 0,-1.7554 -0.26801,-2.5997 -0.26131,-0.8442 -1.112241,-0.8442 -0.850931,0 -1.125641,0.8442 -0.27471,0.8443 -0.27471,2.5997 0,1.6751 0.27471,2.5662 0.27471,0.8845 1.125641,0.8845 0.850931,0 1.118941,-0.8912 z"
          id="text1"
          transform="matrix(1.0057659,0,0,0.99426716,-1.4475094,11.319434)"
-         aria-label="3.0"
-         inkscape:label="text-3.0" /></g><g
+         aria-label="3.0" /></g><g
        id="g2"
-       transform="translate(1.7681656,1006.3105)"
-       inkscape:label="arrow"><path
+       transform="translate(1.7681656,1006.3105)"><path
          style="display:inline;opacity:0.51;fill:#808080;fill-opacity:1;stroke:none;stroke-width:0.961952;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter1941)"
          d="m -37.166988,22.750262 v 8.362364 h -6.950445 a 10.930652,11.147621 0 0 0 -9.448761,-5.57491 10.930652,11.147621 0 0 0 -10.932804,11.149817 10.930652,11.147621 0 0 0 10.932804,11.149813 10.930652,11.147621 0 0 0 9.454099,-5.574907 h 6.945107 v 8.362363 l 13.666005,-13.937269 z"
          id="path10459-7"
-         inkscape:connector-curvature="0"
-         transform="matrix(1.033989,0,0,1.0493305,69.611421,-12.347266)"
-         inkscape:label="drop-shadow" /><path
+         transform="matrix(1.033989,0,0,1.0493305,69.611421,-12.347266)" /><path
          style="display:inline;opacity:1;fill:url(#linearGradient10470);fill-opacity:1;stroke:url(#linearGradient838);stroke-width:1.002;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
          d="M 30.833012,9.7502621 V 18.112626 H 23.882567 A 10.930652,11.147621 0 0 0 14.433806,12.537716 10.930652,11.147621 0 0 0 3.5010022,23.687533 10.930652,11.147621 0 0 0 14.433806,34.837346 10.930652,11.147621 0 0 0 23.887905,29.262439 h 6.945107 v 8.362363 L 44.499017,23.687533 Z"
-         id="path10459"
-         inkscape:connector-curvature="0"
-         inkscape:label="arrow" /><ellipse
+         id="path10459" /><ellipse
          style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.469644;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter10710)"
          id="path10474"
          cx="11"
          cy="20"
          rx="1.5"
          ry="1.2796611"
-         transform="matrix(2.0846209,0,0,2.1835921,-10.303899,-22.157244)"
-         inkscape:label="highlight" /></g></g></svg>
+         transform="matrix(2.0846209,0,0,2.1835921,-10.303899,-22.157244)" /></g></g></svg>
diff --git a/ui/org.eclipse.pde.ui/icons/wizban/newefix_wizban.svg b/ui/org.eclipse.pde.ui/icons/wizban/newefix_wizban.svg
index 05947c8b023..49d55eb0c39 100644
--- a/ui/org.eclipse.pde.ui/icons/wizban/newefix_wizban.svg
+++ b/ui/org.eclipse.pde.ui/icons/wizban/newefix_wizban.svg
@@ -6,14 +6,7 @@
    height="66"
    id="svg2"
    version="1.1"
-   inkscape:version="1.3 (0e150ed, 2023-07-21)"
-   sodipodi:docname="newefix_wizban.svg"
-   inkscape:export-filename="/Users/d021678/git/eclipse.jdt.ui/org.eclipse.jdt.ui/icons/full/wizban/newclass_wiz2.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90"
    xml:space="preserve"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:svg="http://www.w3.org/2000/svg"
@@ -21,307 +14,6 @@
    xmlns:cc="http://creativecommons.org/ns#"
    xmlns:dc="http://purl.org/dc/elements/1.1/"><defs
      id="defs4"><linearGradient
-       inkscape:collect="always"
-       id="linearGradient4541"><stop
-         style="stop-color:#a1adb2;stop-opacity:1"
-         offset="0"
-         id="stop4543" /><stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop4545" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       id="linearGradient4972"><stop
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0"
-         id="stop4974" /><stop
-         style="stop-color:#f5f8fd;stop-opacity:1"
-         offset="1"
-         id="stop4976" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       id="linearGradient4964"><stop
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0"
-         id="stop4966" /><stop
-         style="stop-color:#e8eefa;stop-opacity:1"
-         offset="1"
-         id="stop4968" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       id="linearGradient4956"><stop
-         style="stop-color:#fcfdfe;stop-opacity:1"
-         offset="0"
-         id="stop4958" /><stop
-         style="stop-color:#dee6f8;stop-opacity:1"
-         offset="1"
-         id="stop4960" /></linearGradient><filter
-       style="color-interpolation-filters:sRGB"
-       inkscape:label="Drop Shadow"
-       id="filter8854"><feFlood
-         flood-opacity="0.933333"
-         flood-color="rgb(244,248,254)"
-         result="flood"
-         id="feFlood8856" /><feComposite
-         in="flood"
-         in2="SourceGraphic"
-         operator="in"
-         result="composite1"
-         id="feComposite8858" /><feGaussianBlur
-         in="composite1"
-         stdDeviation="1.2"
-         result="blur"
-         id="feGaussianBlur8860" /><feOffset
-         dx="-1"
-         dy="3"
-         result="offset"
-         id="feOffset8862" /><feComposite
-         in="SourceGraphic"
-         in2="offset"
-         operator="over"
-         result="composite2"
-         id="feComposite8864" /></filter><linearGradient
-       id="linearGradient6122"><stop
-         style="stop-color:#c0c0c0;stop-opacity:1"
-         offset="0"
-         id="stop6124" /><stop
-         id="stop6132"
-         offset="0.5"
-         style="stop-color:#adadad;stop-opacity:1" /><stop
-         style="stop-color:#808080;stop-opacity:1"
-         offset="1"
-         id="stop6126" /></linearGradient><linearGradient
-       id="linearGradient7087"><stop
-         style="stop-color:#17325d;stop-opacity:1;"
-         offset="0"
-         id="stop7089" /><stop
-         id="stop7091"
-         offset="0.25"
-         style="stop-color:#b4d0e2;stop-opacity:1" /><stop
-         id="stop7093"
-         offset="0.5"
-         style="stop-color:#b7d2e4;stop-opacity:1" /><stop
-         style="stop-color:#acc9de;stop-opacity:1"
-         offset="0.75"
-         id="stop7095" /><stop
-         style="stop-color:#3e72a7;stop-opacity:1"
-         offset="1"
-         id="stop7097" /></linearGradient><mask
-       id="mask7366"
-       maskUnits="userSpaceOnUse"><path
-         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;display:inline"
-         d="m -16.593048,1040.862 9.990206,0 0,10.0018 -2.983353,3.0385 -5.966213,0 c -0.53033,-0.022 -1.04064,-0.5519 -1.04064,-1.0385 z"
-         id="path7368"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccccc" /></mask><linearGradient
-       id="linearGradient7584-5"><stop
-         id="stop7586-4"
-         offset="0"
-         style="stop-color:#f9cd5f;stop-opacity:1" /><stop
-         id="stop7588-5"
-         offset="1"
-         style="stop-color:#fbf0b4;stop-opacity:1" /></linearGradient><linearGradient
-       id="linearGradient7592-1"><stop
-         id="stop7594-6"
-         offset="0"
-         style="stop-color:#bd8416;stop-opacity:1" /><stop
-         id="stop7596-9"
-         offset="1"
-         style="stop-color:#a66b10;stop-opacity:1" /></linearGradient><linearGradient
-       id="linearGradient10798-1-9-3-7-6-6-6-2-6-7-98-9-4-1"><stop
-         style="stop-color:#5aad60;stop-opacity:1;"
-         offset="0"
-         id="stop10800-5-2-1-8-20-4-0-2-1-9-0-0-1-1" /><stop
-         id="stop10806-6-8-5-3-9-2-2-7-0-4-2-7-8-9"
-         offset="0.5"
-         style="stop-color:#5bb26a;stop-opacity:1;" /><stop
-         style="stop-color:#a4c589;stop-opacity:1"
-         offset="1"
-         id="stop10802-1-5-3-0-4-6-8-5-5-6-69-6-4-0" /></linearGradient><mask
-       maskUnits="userSpaceOnUse"
-       id="mask7366-4"><path
-         sodipodi:nodetypes="ccccccc"
-         inkscape:connector-curvature="0"
-         id="path7368-2"
-         d="m -16.593048,1040.862 9.990206,0 0,10.0018 -2.983353,3.0385 -5.966213,0 c -0.53033,-0.022 -1.04064,-0.5519 -1.04064,-1.0385 z"
-         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;display:inline" /></mask><linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient7087"
-       id="linearGradient9331"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-20,0)"
-       x1="4.7776356"
-       y1="1039.8118"
-       x2="4.7776356"
-       y2="1041.911" /><linearGradient
-       y2="1041.911"
-       x2="4.7776356"
-       y1="1039.8118"
-       x1="4.7776356"
-       gradientTransform="translate(-18,4.7e-5)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient9333"
-       xlink:href="#linearGradient7087"
-       inkscape:collect="always" /><linearGradient
-       y2="1041.911"
-       x2="4.7776356"
-       y1="1039.8118"
-       x1="4.7776356"
-       gradientTransform="translate(-16,4.7e-5)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient9335"
-       xlink:href="#linearGradient7087"
-       inkscape:collect="always" /><linearGradient
-       y2="1041.911"
-       x2="4.7776356"
-       y1="1039.8118"
-       x1="4.7776356"
-       gradientTransform="translate(-14,4.7e-5)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient9337"
-       xlink:href="#linearGradient7087"
-       inkscape:collect="always" /><linearGradient
-       y2="1041.911"
-       x2="4.7776356"
-       y1="1039.8118"
-       x1="4.7776356"
-       gradientTransform="translate(-12,4.7e-5)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient9339"
-       xlink:href="#linearGradient7087"
-       inkscape:collect="always" /><linearGradient
-       gradientTransform="translate(-80,0)"
-       gradientUnits="userSpaceOnUse"
-       y2="1042.7973"
-       x2="163.22012"
-       y1="1042.7973"
-       x1="88.220117"
-       id="linearGradient68073"
-       xlink:href="#linearGradient4956"
-       inkscape:collect="always" /><linearGradient
-       gradientTransform="translate(-80,0)"
-       gradientUnits="userSpaceOnUse"
-       y2="1032.2669"
-       x2="163.22012"
-       y1="1032.2668"
-       x1="94.469681"
-       id="linearGradient68075"
-       xlink:href="#linearGradient4964"
-       inkscape:collect="always" /><linearGradient
-       gradientTransform="translate(-80,0)"
-       gradientUnits="userSpaceOnUse"
-       y2="1032.2668"
-       x2="152.72206"
-       y1="1032.2668"
-       x1="88.220116"
-       id="linearGradient68077"
-       xlink:href="#linearGradient4972"
-       inkscape:collect="always" /><filter
-       id="filter8854-9"
-       inkscape:label="Drop Shadow"
-       style="color-interpolation-filters:sRGB"><feFlood
-         id="feFlood8856-0"
-         result="flood"
-         flood-color="rgb(244,248,254)"
-         flood-opacity="0.933333" /><feComposite
-         id="feComposite8858-2"
-         result="composite1"
-         operator="in"
-         in2="SourceGraphic"
-         in="flood" /><feGaussianBlur
-         id="feGaussianBlur8860-3"
-         result="blur"
-         stdDeviation="1.2"
-         in="composite1" /><feOffset
-         id="feOffset8862-2"
-         result="offset"
-         dy="3"
-         dx="-1" /><feComposite
-         id="feComposite8864-3"
-         result="composite2"
-         operator="over"
-         in2="offset"
-         in="SourceGraphic" /></filter><linearGradient
-       id="linearGradient10798-1-9-3-7-6-8-9-0-9-1"><stop
-         id="stop10800-5-2-1-8-20-6-4-9-8-2"
-         offset="0"
-         style="stop-color:#7564b1;stop-opacity:1" /><stop
-         style="stop-color:#5d4aa1;stop-opacity:1"
-         offset="0.5"
-         id="stop10806-6-8-5-3-9-24-8-4-3-2" /><stop
-         id="stop10802-1-5-3-0-4-8-4-2-9-2"
-         offset="1"
-         style="stop-color:#9283c3;stop-opacity:1" /></linearGradient><linearGradient
-       id="linearGradient7540-2-3-8-7"><stop
-         id="stop7542-8-7-5-3"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.502" /><stop
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0.47623286"
-         id="stop7544-8-2-0-5" /><stop
-         style="stop-color:#ffffff;stop-opacity:0"
-         offset="0.5"
-         id="stop7546-1-7-9-5" /><stop
-         id="stop7548-98-9-2-4"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       id="linearGradient7272-66-4-5-5-5-8"><stop
-         style="stop-color:#8f6c10;stop-opacity:1"
-         offset="0"
-         id="stop7274-6-0-1-7-4-7" /><stop
-         style="stop-color:#c9a645;stop-opacity:1"
-         offset="1"
-         id="stop7276-66-6-3-9-1-4" /></linearGradient><linearGradient
-       y2="1030.3411"
-       x2="-10.159802"
-       y1="1030.3411"
-       x1="-22.453552"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient10540"
-       xlink:href="#linearGradient7540-2-3-8-7"
-       inkscape:collect="always" /><linearGradient
-       y2="1030.3411"
-       x2="-10.159802"
-       y1="1030.3411"
-       x1="-22.453552"
-       gradientTransform="matrix(0,1,-1,0,1014.0344,1046.6478)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient10542"
-       xlink:href="#linearGradient7540-2-3-8-7"
-       inkscape:collect="always" /><linearGradient
-       y2="1023.2569"
-       x2="-15.945988"
-       y1="1037.4661"
-       x1="-15.945988"
-       gradientTransform="matrix(0.95585117,0,0,0.95585117,-0.71992063,45.488394)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient10544"
-       xlink:href="#linearGradient7272-66-4-5-5-5-8"
-       inkscape:collect="always" /><mask
-       id="mask10620"
-       maskUnits="userSpaceOnUse"><path
-         transform="matrix(0.55482947,0,0,0.55482947,-206.96039,787.08655)"
-         d="m 398.75,468.23718 a 10.625,10.625 0 1 1 -21.25,0 10.625,10.625 0 1 1 21.25,0 z"
-         sodipodi:ry="10.625"
-         sodipodi:rx="10.625"
-         sodipodi:cy="468.23718"
-         sodipodi:cx="388.125"
-         id="path10622"
-         style="font-size:13.58917427px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:2.16621375;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline;font-family:Sans"
-         sodipodi:type="arc" /></mask><linearGradient
-       id="linearGradient4528-9-5-7-9-7-3"><stop
-         id="stop4530-0-5-0-5-8-4"
-         offset="0"
-         style="stop-color:#e0c576;stop-opacity:1;" /><stop
-         id="stop4532-7-9-3-3-6-1"
-         offset="1"
-         style="stop-color:#9e7916;stop-opacity:1" /></linearGradient><linearGradient
-       id="linearGradient6281-8-0-1-6-6-4-2-8-0"><stop
-         style="stop-color:#f7f9fb;stop-opacity:1"
-         offset="0"
-         id="stop6283-0-2-2-1-2-0-1-6-0" /><stop
-         style="stop-color:#ffd680;stop-opacity:1"
-         offset="1"
-         id="stop6285-5-0-9-7-6-9-9-1-9" /></linearGradient><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4972-7"
        id="linearGradient4978"
        x1="88.220116"
@@ -330,7 +22,6 @@
        y2="1032.2668"
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-88.220116,-999.2669)" /><linearGradient
-       inkscape:collect="always"
        id="linearGradient4972-7"><stop
          style="stop-color:#b8ccf1;stop-opacity:0.10196079"
          offset="0"
@@ -338,7 +29,6 @@
          style="stop-color:#6e97e2;stop-opacity:0.10196079"
          offset="1"
          id="stop4976-1" /></linearGradient><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4964-3"
        id="linearGradient4970"
        x1="118.38584"
@@ -347,7 +37,6 @@
        y2="1032.2668"
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-88.220117,-999.2669)" /><linearGradient
-       inkscape:collect="always"
        id="linearGradient4964-3"><stop
          style="stop-color:#ffffff;stop-opacity:0.349"
          offset="0"
@@ -355,7 +44,6 @@
          style="stop-color:#91ade6;stop-opacity:1"
          offset="1"
          id="stop4968-1" /></linearGradient><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4956-2"
        id="linearGradient4962"
        x1="88.220116"
@@ -364,7 +52,6 @@
        y2="1042.7972"
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-88.220116,-999.2669)" /><linearGradient
-       inkscape:collect="always"
        id="linearGradient4956-2"><stop
          style="stop-color:#fcfdfe;stop-opacity:0.25641027"
          offset="0"
@@ -372,36 +59,6 @@
          style="stop-color:#98aae7;stop-opacity:0.40392157"
          offset="1"
          id="stop4960-6" /></linearGradient><linearGradient
-       id="linearGradient3827"><stop
-         id="stop3829"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0;" /><stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0.60149658"
-         id="stop3835" /><stop
-         id="stop3831"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" /></linearGradient><linearGradient
-       id="linearGradient10798-1-9-3-7-6-8-9-0-9-1-0"><stop
-         id="stop10800-5-2-1-8-20-6-4-9-8-2-9"
-         offset="0"
-         style="stop-color:#f3faed;stop-opacity:1" /><stop
-         style="stop-color:#e7f4da;stop-opacity:1"
-         offset="0.65917557"
-         id="stop10806-6-8-5-3-9-24-8-4-3-2-4" /><stop
-         id="stop10802-1-5-3-0-4-8-4-2-9-2-5"
-         offset="1"
-         style="stop-color:#67bf1f;stop-opacity:1" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4541"
-       id="linearGradient5885"
-       x1="41"
-       y1="1007.8622"
-       x2="60"
-       y2="1008.3622"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0,1,-1,0,1034.3618,967.36133)" /><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4894"
        id="linearGradient4884"
        x1="11.927121"
@@ -410,8 +67,7 @@
        y2="30.177986"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1.0044289,0,0,1.0089329,4.1109452,979.04)" /><linearGradient
-       id="linearGradient4894"
-       inkscape:collect="always"><stop
+       id="linearGradient4894"><stop
          id="stop4896"
          offset="0"
          style="stop-color:#000000;stop-opacity:1" /><stop
@@ -424,7 +80,6 @@
          id="stop4898"
          offset="1"
          style="stop-color:#ffffff;stop-opacity:1" /></linearGradient><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient5252"
        id="linearGradient5258"
        x1="5"
@@ -433,7 +88,6 @@
        y2="32"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1.0067606,0,0,1.0132311,4.0097642,978.90213)" /><linearGradient
-       inkscape:collect="always"
        id="linearGradient5252"><stop
          style="stop-color:#5f443c;stop-opacity:1"
          offset="0"
@@ -441,7 +95,6 @@
          style="stop-color:#765d54;stop-opacity:1"
          offset="1"
          id="stop5256" /></linearGradient><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4199"
        id="linearGradient4205"
        x1="12"
@@ -450,7 +103,6 @@
        y2="21"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1.4358218,0,0,1.270043,-10.369902,979.13683)" /><linearGradient
-       inkscape:collect="always"
        id="linearGradient4199"><stop
          style="stop-color:#765d54;stop-opacity:1;"
          offset="0"
@@ -461,7 +113,6 @@
          style="stop-color:#765d54;stop-opacity:1"
          offset="1"
          id="stop4203" /></linearGradient><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4944"
        id="linearGradient4936"
        gradientUnits="userSpaceOnUse"
@@ -470,7 +121,6 @@
        x2="49.569252"
        y2="40.099323"
        gradientTransform="matrix(1,0,0,1.0179005,538.66527,1114.6293)" /><linearGradient
-       inkscape:collect="always"
        id="linearGradient4944"><stop
          style="stop-color:#000000;stop-opacity:1"
          offset="0"
@@ -484,7 +134,6 @@
          style="stop-color:#ffffff;stop-opacity:1"
          offset="1"
          id="stop4910" /></linearGradient><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4950"
        id="linearGradient4956-9"
        x1="60.342896"
@@ -493,54 +142,21 @@
        y2="44.682102"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1,0,0,1.0179005,538.66527,1114.6293)" /><linearGradient
-       inkscape:collect="always"
        id="linearGradient4950"><stop
          style="stop-color:#6a5148;stop-opacity:1;"
          offset="0"
          id="stop4952" /><stop
          style="stop-color:#978379;stop-opacity:1"
          offset="1"
-         id="stop4954" /></linearGradient><linearGradient
-       id="linearGradient11146-4-4-4-6-2"><stop
-         id="stop11150-4-72-3-9-7"
-         offset="0"
-         style="stop-color:#faefba;stop-opacity:1" /><stop
-         style="stop-color:#9e6542;stop-opacity:1"
-         offset="1"
-         id="stop11152-9-0-7-3-8" /></linearGradient><linearGradient
-       id="linearGradient10507"><stop
-         style="stop-color:#5f392d;stop-opacity:1"
-         offset="0"
-         id="stop10509" /><stop
-         id="stop10511"
-         offset="0.18181793"
-         style="stop-color:#9e7058;stop-opacity:1" /><stop
-         id="stop10513"
-         offset="0.36363617"
-         style="stop-color:#794f40;stop-opacity:1" /><stop
-         id="stop10515"
-         offset="0.49999985"
-         style="stop-color:#794f40;stop-opacity:1" /><stop
-         id="stop10517"
-         offset="0.63636351"
-         style="stop-color:#794f40;stop-opacity:1" /><stop
-         style="stop-color:#9e7058;stop-opacity:1"
-         offset="0.81818175"
-         id="stop10519" /><stop
-         style="stop-color:#5f392d;stop-opacity:1"
-         offset="1"
-         id="stop10522" /></linearGradient><filter
-       inkscape:collect="always"
+         id="stop4954" /></linearGradient><filter
        style="color-interpolation-filters:sRGB"
        id="filter5309"
        x="-0.41279999"
        width="1.8256"
        y="-0.68799998"
        height="2.376"><feGaussianBlur
-         inkscape:collect="always"
          stdDeviation="2.58"
          id="feGaussianBlur5311" /></filter><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4456"
        id="linearGradient4462"
        x1="63.734764"
@@ -549,7 +165,6 @@
        y2="1006.3618"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1,0,-0.72750163,1,733.40264,2.0004)" /><linearGradient
-       inkscape:collect="always"
        id="linearGradient4456"><stop
          style="stop-color:#ffffff;stop-opacity:0.659"
          offset="0"
@@ -557,46 +172,14 @@
          style="stop-color:#ffffff;stop-opacity:0.369"
          offset="1"
          id="stop4460" /></linearGradient><filter
-       inkscape:collect="always"
        style="color-interpolation-filters:sRGB"
        id="filter4606"
        x="-0.062976157"
        width="1.1259523"
        y="-0.10879013"
        height="1.2175803"><feGaussianBlur
-         inkscape:collect="always"
          stdDeviation="1.5412116"
          id="feGaussianBlur4608" /></filter><linearGradient
-       id="linearGradient11146-4-4-4-6-2-8"><stop
-         id="stop11150-4-72-3-9-7-2"
-         offset="0"
-         style="stop-color:#faefba;stop-opacity:1" /><stop
-         style="stop-color:#ad6e48;stop-opacity:1"
-         offset="1"
-         id="stop11152-9-0-7-3-8-0" /></linearGradient><linearGradient
-       id="linearGradient4368"><stop
-         id="stop4370"
-         offset="0"
-         style="stop-color:#9c7561;stop-opacity:1" /><stop
-         style="stop-color:#966d59;stop-opacity:1"
-         offset="0.18181793"
-         id="stop4372" /><stop
-         style="stop-color:#8c6250;stop-opacity:1"
-         offset="0.36363617"
-         id="stop4374" /><stop
-         style="stop-color:#794f40;stop-opacity:1"
-         offset="0.49999985"
-         id="stop4376" /><stop
-         style="stop-color:#8c6250;stop-opacity:1"
-         offset="0.63636351"
-         id="stop4378" /><stop
-         id="stop4380"
-         offset="0.81818175"
-         style="stop-color:#966d59;stop-opacity:1" /><stop
-         id="stop4382"
-         offset="1"
-         style="stop-color:#99705c;stop-opacity:1" /></linearGradient><linearGradient
-       inkscape:collect="always"
        id="linearGradient2543"><stop
          style="stop-color:#4f76b0;stop-opacity:1"
          offset="0"
@@ -607,8 +190,7 @@
          style="stop-color:#587cb2;stop-opacity:1"
          offset="1"
          id="stop2541" /></linearGradient><linearGradient
-       id="linearGradient8785"
-       inkscape:collect="always"><stop
+       id="linearGradient8785"><stop
          id="stop8781"
          offset="0"
          style="stop-color:#bb8d2d;stop-opacity:1" /><stop
@@ -618,113 +200,34 @@
          id="stop8783"
          offset="1"
          style="stop-color:#b07905;stop-opacity:1" /></linearGradient><linearGradient
-       id="linearGradient8777"
-       inkscape:collect="always"><stop
+       id="linearGradient8777"><stop
          id="stop8773"
          offset="0"
          style="stop-color:#fbeaab;stop-opacity:1;" /><stop
          id="stop8775"
          offset="1"
          style="stop-color:#deb241;stop-opacity:1" /></linearGradient><linearGradient
-       id="linearGradient8767"
-       inkscape:collect="always"><stop
+       id="linearGradient8767"><stop
          id="stop8763"
          offset="0"
          style="stop-color:#6a8ec1;stop-opacity:1" /><stop
          id="stop8765"
          offset="1"
          style="stop-color:#80a1cf;stop-opacity:1" /></linearGradient><linearGradient
-       id="linearGradient8759"
-       inkscape:collect="always"><stop
+       id="linearGradient8759"><stop
          id="stop8755"
          offset="0"
          style="stop-color:#d3e0eb;stop-opacity:1" /><stop
          id="stop8757"
          offset="1"
          style="stop-color:#5179b5;stop-opacity:1" /></linearGradient><linearGradient
-       id="linearGradient8751"
-       inkscape:collect="always"><stop
+       id="linearGradient8751"><stop
          id="stop8747"
          offset="0"
          style="stop-color:#2e5d8f;stop-opacity:1" /><stop
          id="stop8749"
          offset="1"
-         style="stop-color:#6085bb;stop-opacity:1" /></linearGradient><filter
-       id="filter8854-7"
-       inkscape:label="Drop Shadow"
-       style="color-interpolation-filters:sRGB"><feFlood
-         id="feFlood8856-03"
-         result="flood"
-         flood-color="rgb(244,248,254)"
-         flood-opacity="0.933333" /><feComposite
-         id="feComposite8858-9"
-         result="composite1"
-         operator="in"
-         in2="SourceGraphic"
-         in="flood" /><feGaussianBlur
-         id="feGaussianBlur8860-9"
-         result="blur"
-         stdDeviation="1.2"
-         in="composite1" /><feOffset
-         id="feOffset8862-9"
-         result="offset"
-         dy="3"
-         dx="-1" /><feComposite
-         id="feComposite8864-1"
-         result="composite2"
-         operator="over"
-         in2="offset"
-         in="SourceGraphic" /></filter><mask
-       maskUnits="userSpaceOnUse"
-       id="mask7366-47"><path
-         sodipodi:nodetypes="ccccccc"
-         inkscape:connector-curvature="0"
-         id="path7368-1"
-         d="m -16.593048,1040.862 9.990206,0 0,10.0018 -2.983353,3.0385 -5.966213,0 c -0.53033,-0.022 -1.04064,-0.5519 -1.04064,-1.0385 z"
-         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;display:inline" /></mask><mask
-       id="mask7366-4-0"
-       maskUnits="userSpaceOnUse"><path
-         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;display:inline"
-         d="m -16.593048,1040.862 9.990206,0 0,10.0018 -2.983353,3.0385 -5.966213,0 c -0.53033,-0.022 -1.04064,-0.5519 -1.04064,-1.0385 z"
-         id="path7368-2-3"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccccc" /></mask><filter
-       style="color-interpolation-filters:sRGB"
-       inkscape:label="Drop Shadow"
-       id="filter8854-9-2"><feFlood
-         flood-opacity="0.933333"
-         flood-color="rgb(244,248,254)"
-         result="flood"
-         id="feFlood8856-0-6" /><feComposite
-         in="flood"
-         in2="SourceGraphic"
-         operator="in"
-         result="composite1"
-         id="feComposite8858-2-9" /><feGaussianBlur
-         in="composite1"
-         stdDeviation="1.2"
-         result="blur"
-         id="feGaussianBlur8860-3-4" /><feOffset
-         dx="-1"
-         dy="3"
-         result="offset"
-         id="feOffset8862-2-1" /><feComposite
-         in="SourceGraphic"
-         in2="offset"
-         operator="over"
-         result="composite2"
-         id="feComposite8864-3-3" /></filter><mask
-       maskUnits="userSpaceOnUse"
-       id="mask10620-4"><path
-         sodipodi:type="arc"
-         style="font-size:13.58917427px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:2.16621375;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline;font-family:Sans"
-         id="path10622-3"
-         sodipodi:cx="388.125"
-         sodipodi:cy="468.23718"
-         sodipodi:rx="10.625"
-         sodipodi:ry="10.625"
-         d="m 398.75,468.23718 a 10.625,10.625 0 1 1 -21.25,0 10.625,10.625 0 1 1 21.25,0 z"
-         transform="matrix(0.55482947,0,0,0.55482947,-206.96039,787.08655)" /></mask><linearGradient
+         style="stop-color:#6085bb;stop-opacity:1" /></linearGradient><linearGradient
        gradientUnits="userSpaceOnUse"
        y2="1024.3622"
        x2="50"
@@ -732,7 +235,6 @@
        x1="50"
        id="linearGradient8753"
        xlink:href="#linearGradient8751"
-       inkscape:collect="always"
        gradientTransform="matrix(2.7500001,0,0,0.99370101,-129.87501,-991.91286)" /><linearGradient
        gradientUnits="userSpaceOnUse"
        y2="1030.3622"
@@ -741,7 +243,6 @@
        x1="57"
        id="linearGradient8761"
        xlink:href="#linearGradient8759"
-       inkscape:collect="always"
        gradientTransform="matrix(1.0999999,0,0,1.1281495,-43.249997,-1129.0318)" /><linearGradient
        gradientUnits="userSpaceOnUse"
        y2="1023.234"
@@ -750,7 +251,6 @@
        x1="51.658199"
        id="linearGradient8769"
        xlink:href="#linearGradient8767"
-       inkscape:collect="always"
        gradientTransform="matrix(2.7500001,0,0,0.99370101,-129.87501,-991.91286)" /><linearGradient
        gradientUnits="userSpaceOnUse"
        y2="1026.0538"
@@ -759,7 +259,6 @@
        x1="63.98344"
        id="linearGradient8779"
        xlink:href="#linearGradient8777"
-       inkscape:collect="always"
        gradientTransform="matrix(1.3687895,0,0,1.494898,-60.408122,-1504.0798)" /><linearGradient
        gradientUnits="userSpaceOnUse"
        y2="1028.4165"
@@ -768,59 +267,47 @@
        x1="68.47998"
        id="linearGradient8787"
        xlink:href="#linearGradient8785"
-       inkscape:collect="always"
        gradientTransform="matrix(1.3687895,0,0,1.494898,-60.408122,-1504.0798)" /><filter
        height="1.4861495"
        y="-0.24307477"
        width="2.0754105"
        x="-0.53770523"
        id="filter8813"
-       style="color-interpolation-filters:sRGB"
-       inkscape:collect="always"><feGaussianBlur
+       style="color-interpolation-filters:sRGB"><feGaussianBlur
          id="feGaussianBlur8815"
-         stdDeviation="1.1269452"
-         inkscape:collect="always" /></filter><filter
+         stdDeviation="1.1269452" /></filter><filter
        height="1.6025846"
        y="-0.30129232"
        width="1.626688"
        x="-0.313344"
        id="filter8835"
-       style="color-interpolation-filters:sRGB"
-       inkscape:collect="always"><feGaussianBlur
+       style="color-interpolation-filters:sRGB"><feGaussianBlur
          id="feGaussianBlur8837"
-         stdDeviation="0.49751501"
-         inkscape:collect="always" /></filter><filter
+         stdDeviation="0.49751501" /></filter><filter
        height="1.2365698"
        y="-0.11828489"
        width="1.8310951"
        x="-0.41554753"
        id="filter8871"
-       style="color-interpolation-filters:sRGB"
-       inkscape:collect="always"><feGaussianBlur
+       style="color-interpolation-filters:sRGB"><feGaussianBlur
          id="feGaussianBlur8873"
-         stdDeviation="0.53588249"
-         inkscape:collect="always" /></filter><filter
+         stdDeviation="0.53588249" /></filter><filter
        height="1.2365698"
        y="-0.11828489"
        width="1.8310951"
        x="-0.41554753"
        id="filter8871-1"
-       style="color-interpolation-filters:sRGB"
-       inkscape:collect="always"><feGaussianBlur
+       style="color-interpolation-filters:sRGB"><feGaussianBlur
          id="feGaussianBlur8873-8"
-         stdDeviation="0.53588249"
-         inkscape:collect="always" /></filter><filter
-       inkscape:collect="always"
+         stdDeviation="0.53588249" /></filter><filter
        style="color-interpolation-filters:sRGB"
        id="filter2533"
        x="-0.59377657"
        width="2.1875531"
        y="-0.92639431"
        height="2.8527886"><feGaussianBlur
-         inkscape:collect="always"
          stdDeviation="0.73536407"
          id="feGaussianBlur2535" /></filter><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient2543"
        id="linearGradient2545"
        x1="18.423391"
@@ -833,62 +320,49 @@
        width="2.2508695"
        x="-0.62393297"
        id="filter8813-5"
-       style="color-interpolation-filters:sRGB"
-       inkscape:collect="always"><feGaussianBlur
+       style="color-interpolation-filters:sRGB"><feGaussianBlur
          id="feGaussianBlur8815-0"
-         stdDeviation="1.1269452"
-         inkscape:collect="always" /></filter><filter
+         stdDeviation="1.1269452" /></filter><filter
        height="1.3657107"
-       y="-0.14956415"
-       width="2.0529235"
+       y="-0.14956416"
+       width="2.0529236"
        x="-0.5290004"
        id="filter8871-4"
-       style="color-interpolation-filters:sRGB"
-       inkscape:collect="always"><feGaussianBlur
+       style="color-interpolation-filters:sRGB"><feGaussianBlur
          id="feGaussianBlur8873-9"
-         stdDeviation="0.53588249"
-         inkscape:collect="always" /></filter><filter
+         stdDeviation="0.53588249" /></filter><filter
        height="1.8202161"
        y="-0.41010804"
        width="1.8530247"
        x="-0.42651235"
        id="filter8835-5"
-       style="color-interpolation-filters:sRGB"
-       inkscape:collect="always"><feGaussianBlur
+       style="color-interpolation-filters:sRGB"><feGaussianBlur
          id="feGaussianBlur8837-4"
-         stdDeviation="0.49751501"
-         inkscape:collect="always" /></filter><filter
-       inkscape:collect="always"
+         stdDeviation="0.49751501" /></filter><filter
        style="color-interpolation-filters:sRGB"
        id="filter2533-6"
        x="-0.68029651"
        width="2.5817097"
        y="-1.073697"
        height="3.2469451"><feGaussianBlur
-         inkscape:collect="always"
          stdDeviation="0.73536407"
          id="feGaussianBlur2535-0" /></filter><filter
-       height="1.402261"
-       y="-0.15841809"
+       height="1.4022611"
+       y="-0.1584181"
        width="2.1157048"
        x="-0.56110931"
        id="filter8871-1-6"
-       style="color-interpolation-filters:sRGB"
-       inkscape:collect="always"><feGaussianBlur
+       style="color-interpolation-filters:sRGB"><feGaussianBlur
          id="feGaussianBlur8873-8-9"
-         stdDeviation="0.53588249"
-         inkscape:collect="always" /></filter><filter
-       inkscape:collect="always"
+         stdDeviation="0.53588249" /></filter><filter
        style="color-interpolation-filters:sRGB"
        id="filter2728"
        x="-0.06427016"
        width="1.1285403"
        y="-0.1171224"
        height="1.2342448"><feGaussianBlur
-         inkscape:collect="always"
          stdDeviation="0.90744768"
          id="feGaussianBlur2730" /></filter><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4456"
        id="linearGradient4462-6"
        x1="63.734764"
@@ -897,67 +371,22 @@
        y2="1006.3618"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1,0,-0.72750163,1,733.40264,2.0004)" /><filter
-       inkscape:collect="always"
        style="color-interpolation-filters:sRGB"
        id="filter4606-0"
        x="-0.062976157"
        width="1.1259523"
        y="-0.10879013"
        height="1.2175803"><feGaussianBlur
-         inkscape:collect="always"
          stdDeviation="1.5412116"
-         id="feGaussianBlur4608-6" /></filter></defs><sodipodi:namedview
-     id="base"
-     pagecolor="#bcbcbc"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="4.3895748"
-     inkscape:cx="11.276719"
-     inkscape:cy="62.876249"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1728"
-     inkscape:window-height="1051"
-     inkscape:window-x="0"
-     inkscape:window-y="38"
-     inkscape:window-maximized="1"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="true"
-     inkscape:snap-bbox="true"
-     inkscape:bbox-nodes="true"
-     inkscape:showpageshadow="2"
-     inkscape:pagecheckerboard="0"
-     inkscape:deskcolor="#d1d1d1"><inkscape:grid
-       type="xygrid"
-       id="grid4112"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       originx="0"
-       originy="0"
-       spacingy="1"
-       spacingx="1"
-       units="px" /></sodipodi:namedview><metadata
+         id="feGaussianBlur4608-6" /></filter></defs><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" /></cc:Work></rdf:RDF></metadata><g
-     inkscape:groupmode="layer"
      id="layer2"
-     inkscape:label="Background"
-     style="display:inline"
-     sodipodi:insensitive="true"><path
-       sodipodi:nodetypes="cccc"
-       inkscape:connector-curvature="0"
+     style="display:inline"><path
        id="rect4113-1"
        d="M 75,0 75,66 1e-6,66 C 1e-6,41.2048 50.00969,0 75,0 Z"
        style="display:inline;fill:url(#linearGradient4978);fill-opacity:1;stroke:none" /><path
-       sodipodi:nodetypes="cccc"
-       inkscape:connector-curvature="0"
        id="rect4113-1-0"
        d="M 75,21.0607 75,66 1e-6,66 C 10.625001,47.804 43.509694,25.4357 75,21.0607 Z"
        style="display:inline;opacity:0.40400002;fill:url(#linearGradient4962);fill-opacity:1;stroke:none" /><g
@@ -966,38 +395,26 @@
        transform="matrix(0.27903303,0,0,0.27903303,-14.618136,-107.52874)"><g
          style="fill:#737986;fill-opacity:1;stroke:#595e68;stroke-opacity:1"
          id="g13408-8-2" /></g><path
-       sodipodi:nodetypes="cccc"
-       inkscape:connector-curvature="0"
        id="rect4113-1-7"
        d="M 75,4.0000001e-7 75,66 30.000003,66 C 30.000003,46.1545 47.70944,9.2500004 75,4e-7 Z"
        style="display:inline;opacity:0.18399999;fill:url(#linearGradient4970);fill-opacity:1;stroke:none" /></g><g
-     inkscape:label="Foreground"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-986.3622)"><path
        style="font-style:normal;font-weight:normal;font-size:13.5892px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;display:inline;fill:url(#linearGradient4462);fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;filter:url(#filter4606)"
        d="m 47.000294,1007.3622 -12.319149,16.9335 -12.416197,17.0669 h 16.933329 17.066666 l 12.416197,-17.0669 0.09676,-0.133 L 81,1007.3626 H 63.933334 47.000005 Z"
        id="rect10961-8-3-6-1"
-       inkscape:connector-curvature="0"
-       transform="matrix(1.1726491,0,0.08958045,0.36603268,-114.80962,662.9609)"
-       inkscape:transform-center-x="4.3534013"
-       inkscape:transform-center-y="0.53407962"
-       inkscape:label="shadow" /><path
-       sodipodi:nodetypes="ccccc"
-       inkscape:connector-curvature="0"
+       transform="matrix(1.1726491,0,0.08958045,0.36603268,-114.80962,662.9609)" /><path
        id="path5250"
        d="m 7.5325811,1011.9694 3.7605929,-4.9642 H 27.83 l 3.904565,4.9642 z"
-       style="fill:#fffabf;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4205);stroke-width:1;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       inkscape:label="tab-shadow" /><ellipse
+       style="fill:#fffabf;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4205);stroke-width:1;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /><ellipse
        transform="matrix(1,0,0,0.38855855,-8.0264778,1007.1451)"
        ry="4.5"
        rx="7.5"
        cy="8.3080006"
        cx="23.691999"
        id="path5111"
-       style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;filter:url(#filter5309)"
-       inkscape:label="tab" /><rect
+       style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;filter:url(#filter5309)" /><rect
        ry="2.0792062"
        y="1011.9875"
        x="4.7691445"
@@ -1005,53 +422,36 @@
        width="41.860409"
        id="rect4876"
        style="fill:url(#linearGradient4884);fill-opacity:1;stroke:url(#linearGradient5258);stroke-width:1;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       inkscape:label="back"
        rx="2.0792062" /><path
        style="font-style:normal;font-weight:normal;font-size:13.5892px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;display:inline;fill:url(#linearGradient4462-6);fill-opacity:1;stroke:none;stroke-width:1.64517;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;filter:url(#filter4606-0)"
        d="m 47.000294,1007.3622 -12.319149,16.9335 -12.416197,17.0669 h 16.933329 17.066666 l 12.416197,-17.0669 0.09676,-0.133 L 81,1007.3626 H 63.933334 47.000005 Z"
        id="rect10961-8-3-6-1-0"
-       inkscape:connector-curvature="0"
-       transform="matrix(0.86295994,0,0.60219955,0.735072,-603.39688,258.38206)"
-       inkscape:transform-center-x="2.4211111"
-       inkscape:transform-center-y="1.0725452"
-       inkscape:label="shadow" /><g
+       transform="matrix(0.86295994,0,0.60219955,0.735072,-603.39688,258.38206)" /><g
        id="g2"
-       transform="translate(4.7530762,986.9882)"
-       inkscape:label="plug"><g
+       transform="translate(4.7530762,986.9882)"><g
          transform="matrix(1.0729615,0,0,1.0787087,-1.2096914,-0.17204372)"
          id="g2558-4"
          style="opacity:0.503;fill:#808080;stroke:#808080;stroke-width:0.929514;filter:url(#filter2728)"><path
            transform="matrix(1.029538,0,0,1.1281495,-40.181606,-1129.0381)"
            style="fill:#808080;fill-opacity:1;stroke:#808080;stroke-width:0.862484px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter8813-5)"
            d="m 53.577367,1026.9835 -0.152425,-8.8407 0.91455,-1.2194 3.124711,-0.076 0.07621,-0.9908 h 0.91455 l -0.07621,1.9054 -3.048499,1.2194 -0.152425,4.9538 z"
-           id="path8791-1"
-           inkscape:connector-curvature="0" /><path
+           id="path8791-1" /><path
            id="path8722-7-8"
            style="display:inline;opacity:1;fill:#808080;fill-opacity:1;stroke:#808080;stroke-width:0.929514;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="M 3.4999999,23.512598 V 25.5 H 14.5 V 21.525196 H 3.4999999 v 1.987402"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccccc" /><path
-           sodipodi:nodetypes="csssscsscccsssscsscc"
+           d="M 3.4999999,23.512598 V 25.5 H 14.5 V 21.525196 H 3.4999999 v 1.987402" /><path
            id="rect8645-3-9"
            style="display:inline;opacity:1;fill:#808080;fill-opacity:1;stroke:#808080;stroke-width:0.929514;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="M 25.499998,23.781495 25.5,15.413559 C 25.5,13.799403 24.568942,12.5 23.412427,12.5 h -2.424855 c -1.156515,0 -2.483072,1.299403 -2.483072,2.913559 v 1.599039 h -2.264856 c -0.963763,0 -1.739644,0.794104 -1.739644,1.780446 v 1.468512 3.519375 m 10.999998,5.64e-4 2e-6,8.367936 c 0,1.614156 -0.931058,2.913559 -2.087573,2.913559 h -2.424855 c -1.156515,0 -2.483072,-1.299403 -2.483072,-2.913559 V 30.550392 H 16.239644 C 15.275881,30.550392 14.5,29.756288 14.5,28.769946 v -1.468512 -3.519375"
-           inkscape:connector-curvature="0" /><path
-           sodipodi:nodetypes="cc"
-           inkscape:connector-curvature="0"
+           d="M 25.499998,23.781495 25.5,15.413559 C 25.5,13.799403 24.568942,12.5 23.412427,12.5 h -2.424855 c -1.156515,0 -2.483072,1.299403 -2.483072,2.913559 v 1.599039 h -2.264856 c -0.963763,0 -1.739644,0.794104 -1.739644,1.780446 v 1.468512 3.519375 m 10.999998,5.64e-4 2e-6,8.367936 c 0,1.614156 -0.931058,2.913559 -2.087573,2.913559 h -2.424855 c -1.156515,0 -2.483072,-1.299403 -2.483072,-2.913559 V 30.550392 H 16.239644 C 15.275881,30.550392 14.5,29.756288 14.5,28.769946 v -1.468512 -3.519375" /><path
            id="path2537-0"
            d="M 18.51661,16.539741 18.5464,30.705846"
            style="fill:#808080;stroke:#808080;stroke-width:0.929514px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /><path
            id="rect8645-2-5-2"
            style="display:inline;opacity:1;fill:#808080;fill-opacity:1;stroke:#808080;stroke-width:0.929514;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="m 36.091538,26.489769 -10e-7,1.058985 c 0,1.06945 -0.863288,1.955925 -2.164732,1.930363 -1.301445,-0.02541 -1.941636,0 -1.941636,0 v 0.201512 c 0,1.544678 -1.158564,2.787985 -2.597679,2.788284 l -1.648306,2.98e-4 c -1.360345,3e-4 -1.22903,0.546236 -1.22903,-2.989646 V 17.520381 c 0,-3.536032 -0.205068,-2.989797 1.22903,-2.989797 h 1.648306 c 1.439115,0 2.597679,1.243607 2.597679,2.788284 v 0.201513 h 1.941637 c 1.199261,0 2.164732,0.860911 2.164732,1.930361 v 2.554332 z m 0.06454,-6.010119 h 8.461471 l -0.05085,6.010119 h -8.188123"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cczccssssssccsccccccc" /><path
+           d="m 36.091538,26.489769 -10e-7,1.058985 c 0,1.06945 -0.863288,1.955925 -2.164732,1.930363 -1.301445,-0.02541 -1.941636,0 -1.941636,0 v 0.201512 c 0,1.544678 -1.158564,2.787985 -2.597679,2.788284 l -1.648306,2.98e-4 c -1.360345,3e-4 -1.22903,0.546236 -1.22903,-2.989646 V 17.520381 c 0,-3.536032 -0.205068,-2.989797 1.22903,-2.989797 h 1.648306 c 1.439115,0 2.597679,1.243607 2.597679,2.788284 v 0.201513 h 1.941637 c 1.199261,0 2.164732,0.860911 2.164732,1.930361 v 2.554332 z m 0.06454,-6.010119 h 8.461471 l -0.05085,6.010119 h -8.188123" /><path
            transform="matrix(1.445753,0,0,1.3224494,-65.097292,-1327.9481)"
            style="opacity:0.794;fill:#808080;fill-opacity:1;stroke:#808080;stroke-width:0.672232px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter8871-4)"
            d="m 64.018476,1016.5423 -0.152427,10.8222 c 2.375507,-3.3036 3.484206,-4.2052 2.972286,-9.2217 0.305009,-1.654 -1.117834,-1.7529 -2.819859,-1.6005 z"
-           id="path8861-9"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccc" /><ellipse
+           id="path8861-9" /><ellipse
            transform="matrix(1.029538,0,0,1.1281495,-39.470994,-1128.0797)"
            style="opacity:0.828;fill:#808080;fill-opacity:1;stroke:#808080;stroke-width:0.862484;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter8835-5)"
            id="path8817-1"
@@ -1062,14 +462,11 @@
            transform="matrix(1.7350569,0,0,1.8824502,-91.814902,-1903.1505)"
            style="opacity:0.862;fill:#808080;fill-opacity:1;stroke:#808080;stroke-width:0.514324px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter2533-6)"
            d="m 70.953811,1023.4014 v -1.8291 l 2.972286,-0.076 z"
-           id="path8875-0"
-           inkscape:connector-curvature="0" /><path
+           id="path8875-0" /><path
            transform="matrix(1.029538,0,0,1.1281495,-39.928294,-1128.6206)"
            style="display:inline;opacity:0.485;fill:#808080;fill-opacity:1;stroke:#808080;stroke-width:0.862484px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter8871-1-6)"
            d="m 53.924652,1016.631 -0.152427,10.8222 c 2.375507,-3.3036 3.484206,-4.2052 2.972286,-9.2217 0.305009,-1.654 -1.117834,-1.7529 -2.819859,-1.6005 z"
-           id="path8861-7-0"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccc" /></g><g
+           id="path8861-7-0" /></g><g
          id="g11331-3-1-1"
          style="display:inline"
          transform="matrix(0.92787456,0,0,0.92766861,-283.31685,-391.9053)"><g
@@ -1101,34 +498,23 @@
            transform="matrix(1.029538,0,0,1.1281495,-40.181606,-1129.0381)"
            style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.927888px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter8813)"
            d="m 53.577367,1026.9835 -0.152425,-8.8407 0.91455,-1.2194 3.124711,-0.076 0.07621,-0.9908 h 0.91455 l -0.07621,1.9054 -3.048499,1.2194 -0.152425,4.9538 z"
-           id="path8791"
-           inkscape:connector-curvature="0" /><path
+           id="path8791" /><path
            id="path8722-7"
            style="display:inline;opacity:1;fill:url(#linearGradient8769);fill-opacity:1;stroke:url(#linearGradient8753);stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="M 3.4999999,23.512598 V 25.5 H 14.5 V 21.525196 H 3.4999999 v 1.987402"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccccc" /><path
-           sodipodi:nodetypes="csssscsscccsssscsscc"
+           d="M 3.4999999,23.512598 V 25.5 H 14.5 V 21.525196 H 3.4999999 v 1.987402" /><path
            id="rect8645-3"
            style="display:inline;opacity:1;fill:url(#linearGradient8761);fill-opacity:1;stroke:#4d73ae;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="M 25.499998,23.781495 25.5,15.413559 C 25.5,13.799403 24.568942,12.5 23.412427,12.5 h -2.424855 c -1.156515,0 -2.483072,1.299403 -2.483072,2.913559 v 1.599039 h -2.264856 c -0.963763,0 -1.739644,0.794104 -1.739644,1.780446 v 1.468512 3.519375 m 10.999998,5.64e-4 2e-6,8.367936 c 0,1.614156 -0.931058,2.913559 -2.087573,2.913559 h -2.424855 c -1.156515,0 -2.483072,-1.299403 -2.483072,-2.913559 V 30.550392 H 16.239644 C 15.275881,30.550392 14.5,29.756288 14.5,28.769946 v -1.468512 -3.519375"
-           inkscape:connector-curvature="0" /><path
-           sodipodi:nodetypes="cc"
-           inkscape:connector-curvature="0"
+           d="M 25.499998,23.781495 25.5,15.413559 C 25.5,13.799403 24.568942,12.5 23.412427,12.5 h -2.424855 c -1.156515,0 -2.483072,1.299403 -2.483072,2.913559 v 1.599039 h -2.264856 c -0.963763,0 -1.739644,0.794104 -1.739644,1.780446 v 1.468512 3.519375 m 10.999998,5.64e-4 2e-6,8.367936 c 0,1.614156 -0.931058,2.913559 -2.087573,2.913559 h -2.424855 c -1.156515,0 -2.483072,-1.299403 -2.483072,-2.913559 V 30.550392 H 16.239644 C 15.275881,30.550392 14.5,29.756288 14.5,28.769946 v -1.468512 -3.519375" /><path
            id="path2537"
            d="M 18.51661,16.539741 18.5464,30.705846"
            style="fill:none;stroke:url(#linearGradient2545);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /><path
            id="rect8645-2-5"
            style="display:inline;opacity:1;fill:url(#linearGradient8779);fill-opacity:1;stroke:url(#linearGradient8787);stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="m 36.091538,26.489769 -10e-7,1.058985 c 0,1.06945 -0.863288,1.955925 -2.164732,1.930363 -1.301445,-0.02541 -1.941636,0 -1.941636,0 v 0.201512 c 0,1.544678 -1.158564,2.787985 -2.597679,2.788284 l -1.648306,2.98e-4 c -1.360345,3e-4 -1.22903,0.546236 -1.22903,-2.989646 V 17.520381 c 0,-3.536032 -0.205068,-2.989797 1.22903,-2.989797 h 1.648306 c 1.439115,0 2.597679,1.243607 2.597679,2.788284 v 0.201513 h 1.941637 c 1.199261,0 2.164732,0.860911 2.164732,1.930361 v 2.554332 z m 0.06454,-6.010119 h 8.461471 l -0.05085,6.010119 h -8.188123"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cczccssssssccsccccccc" /><path
+           d="m 36.091538,26.489769 -10e-7,1.058985 c 0,1.06945 -0.863288,1.955925 -2.164732,1.930363 -1.301445,-0.02541 -1.941636,0 -1.941636,0 v 0.201512 c 0,1.544678 -1.158564,2.787985 -2.597679,2.788284 l -1.648306,2.98e-4 c -1.360345,3e-4 -1.22903,0.546236 -1.22903,-2.989646 V 17.520381 c 0,-3.536032 -0.205068,-2.989797 1.22903,-2.989797 h 1.648306 c 1.439115,0 2.597679,1.243607 2.597679,2.788284 v 0.201513 h 1.941637 c 1.199261,0 2.164732,0.860911 2.164732,1.930361 v 2.554332 z m 0.06454,-6.010119 h 8.461471 l -0.05085,6.010119 h -8.188123" /><path
            transform="matrix(1.445753,0,0,1.3224494,-65.097292,-1327.9481)"
            style="opacity:0.794;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.723208px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter8871)"
            d="m 64.018476,1016.5423 -0.152427,10.8222 c 2.375507,-3.3036 3.484206,-4.2052 2.972286,-9.2217 0.305009,-1.654 -1.117834,-1.7529 -2.819859,-1.6005 z"
-           id="path8861"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccc" /><ellipse
+           id="path8861" /><ellipse
            transform="matrix(1.029538,0,0,1.1281495,-39.470994,-1128.0797)"
            style="opacity:0.828;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.927888;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter8835)"
            id="path8817"
@@ -1139,18 +525,14 @@
            transform="matrix(1.7350569,0,0,1.8824502,-91.814902,-1903.1505)"
            style="opacity:0.862;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.553326px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter2533)"
            d="m 70.953811,1023.4014 v -1.8291 l 2.972286,-0.076 z"
-           id="path8875"
-           inkscape:connector-curvature="0" /><path
+           id="path8875" /><path
            transform="matrix(1.029538,0,0,1.1281495,-39.928294,-1128.6206)"
            style="display:inline;opacity:0.485;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.927888px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter8871-1)"
            d="m 53.924652,1016.631 -0.152427,10.8222 c 2.375507,-3.3036 3.484206,-4.2052 2.972286,-9.2217 0.305009,-1.654 -1.117834,-1.7529 -2.819859,-1.6005 z"
-           id="path8861-7"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccc" /></g></g><g
+           id="path8861-7" /></g></g><g
        id="g4295"
        transform="matrix(0.87497103,0,0,0.88179573,-392.48444,665.51821)"
-       style="display:inline;stroke-width:0.317669"
-       inkscape:label="red-cross"><rect
+       style="display:inline;stroke-width:0.317669"><rect
          ry="0"
          rx="0"
          y="379.73184"
@@ -1173,5 +555,4 @@
        x="574.86713"
        y="1161.1145"
        ry="1.8222821"
-       inkscape:label="front"
        rx="1.8222821" /></g></svg>
diff --git a/ui/org.eclipse.pde.ui/icons/wizban/newex_wiz.svg b/ui/org.eclipse.pde.ui/icons/wizban/newex_wiz.svg
index b91bf1acb46..fe58542a01f 100644
--- a/ui/org.eclipse.pde.ui/icons/wizban/newex_wiz.svg
+++ b/ui/org.eclipse.pde.ui/icons/wizban/newex_wiz.svg
@@ -6,14 +6,7 @@
    height="66"
    id="svg2"
    version="1.1"
-   inkscape:version="1.3 (0e150ed, 2023-07-21)"
-   sodipodi:docname="newex_wiz.svg"
-   inkscape:export-filename="/Users/d021678/git/eclipse.jdt.ui/org.eclipse.jdt.ui/icons/full/wizban/newclass_wiz2.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90"
    xml:space="preserve"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:svg="http://www.w3.org/2000/svg"
@@ -21,307 +14,6 @@
    xmlns:cc="http://creativecommons.org/ns#"
    xmlns:dc="http://purl.org/dc/elements/1.1/"><defs
      id="defs4"><linearGradient
-       inkscape:collect="always"
-       id="linearGradient4541"><stop
-         style="stop-color:#a1adb2;stop-opacity:1"
-         offset="0"
-         id="stop4543" /><stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop4545" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       id="linearGradient4972"><stop
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0"
-         id="stop4974" /><stop
-         style="stop-color:#f5f8fd;stop-opacity:1"
-         offset="1"
-         id="stop4976" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       id="linearGradient4964"><stop
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0"
-         id="stop4966" /><stop
-         style="stop-color:#e8eefa;stop-opacity:1"
-         offset="1"
-         id="stop4968" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       id="linearGradient4956"><stop
-         style="stop-color:#fcfdfe;stop-opacity:1"
-         offset="0"
-         id="stop4958" /><stop
-         style="stop-color:#dee6f8;stop-opacity:1"
-         offset="1"
-         id="stop4960" /></linearGradient><filter
-       style="color-interpolation-filters:sRGB"
-       inkscape:label="Drop Shadow"
-       id="filter8854"><feFlood
-         flood-opacity="0.933333"
-         flood-color="rgb(244,248,254)"
-         result="flood"
-         id="feFlood8856" /><feComposite
-         in="flood"
-         in2="SourceGraphic"
-         operator="in"
-         result="composite1"
-         id="feComposite8858" /><feGaussianBlur
-         in="composite1"
-         stdDeviation="1.2"
-         result="blur"
-         id="feGaussianBlur8860" /><feOffset
-         dx="-1"
-         dy="3"
-         result="offset"
-         id="feOffset8862" /><feComposite
-         in="SourceGraphic"
-         in2="offset"
-         operator="over"
-         result="composite2"
-         id="feComposite8864" /></filter><linearGradient
-       id="linearGradient6122"><stop
-         style="stop-color:#c0c0c0;stop-opacity:1"
-         offset="0"
-         id="stop6124" /><stop
-         id="stop6132"
-         offset="0.5"
-         style="stop-color:#adadad;stop-opacity:1" /><stop
-         style="stop-color:#808080;stop-opacity:1"
-         offset="1"
-         id="stop6126" /></linearGradient><linearGradient
-       id="linearGradient7087"><stop
-         style="stop-color:#17325d;stop-opacity:1;"
-         offset="0"
-         id="stop7089" /><stop
-         id="stop7091"
-         offset="0.25"
-         style="stop-color:#b4d0e2;stop-opacity:1" /><stop
-         id="stop7093"
-         offset="0.5"
-         style="stop-color:#b7d2e4;stop-opacity:1" /><stop
-         style="stop-color:#acc9de;stop-opacity:1"
-         offset="0.75"
-         id="stop7095" /><stop
-         style="stop-color:#3e72a7;stop-opacity:1"
-         offset="1"
-         id="stop7097" /></linearGradient><mask
-       id="mask7366"
-       maskUnits="userSpaceOnUse"><path
-         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;display:inline"
-         d="m -16.593048,1040.862 9.990206,0 0,10.0018 -2.983353,3.0385 -5.966213,0 c -0.53033,-0.022 -1.04064,-0.5519 -1.04064,-1.0385 z"
-         id="path7368"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccccc" /></mask><linearGradient
-       id="linearGradient7584-5"><stop
-         id="stop7586-4"
-         offset="0"
-         style="stop-color:#f9cd5f;stop-opacity:1" /><stop
-         id="stop7588-5"
-         offset="1"
-         style="stop-color:#fbf0b4;stop-opacity:1" /></linearGradient><linearGradient
-       id="linearGradient7592-1"><stop
-         id="stop7594-6"
-         offset="0"
-         style="stop-color:#bd8416;stop-opacity:1" /><stop
-         id="stop7596-9"
-         offset="1"
-         style="stop-color:#a66b10;stop-opacity:1" /></linearGradient><linearGradient
-       id="linearGradient10798-1-9-3-7-6-6-6-2-6-7-98-9-4-1"><stop
-         style="stop-color:#5aad60;stop-opacity:1;"
-         offset="0"
-         id="stop10800-5-2-1-8-20-4-0-2-1-9-0-0-1-1" /><stop
-         id="stop10806-6-8-5-3-9-2-2-7-0-4-2-7-8-9"
-         offset="0.5"
-         style="stop-color:#5bb26a;stop-opacity:1;" /><stop
-         style="stop-color:#a4c589;stop-opacity:1"
-         offset="1"
-         id="stop10802-1-5-3-0-4-6-8-5-5-6-69-6-4-0" /></linearGradient><mask
-       maskUnits="userSpaceOnUse"
-       id="mask7366-4"><path
-         sodipodi:nodetypes="ccccccc"
-         inkscape:connector-curvature="0"
-         id="path7368-2"
-         d="m -16.593048,1040.862 9.990206,0 0,10.0018 -2.983353,3.0385 -5.966213,0 c -0.53033,-0.022 -1.04064,-0.5519 -1.04064,-1.0385 z"
-         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;display:inline" /></mask><linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient7087"
-       id="linearGradient9331"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-20,0)"
-       x1="4.7776356"
-       y1="1039.8118"
-       x2="4.7776356"
-       y2="1041.911" /><linearGradient
-       y2="1041.911"
-       x2="4.7776356"
-       y1="1039.8118"
-       x1="4.7776356"
-       gradientTransform="translate(-18,4.7e-5)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient9333"
-       xlink:href="#linearGradient7087"
-       inkscape:collect="always" /><linearGradient
-       y2="1041.911"
-       x2="4.7776356"
-       y1="1039.8118"
-       x1="4.7776356"
-       gradientTransform="translate(-16,4.7e-5)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient9335"
-       xlink:href="#linearGradient7087"
-       inkscape:collect="always" /><linearGradient
-       y2="1041.911"
-       x2="4.7776356"
-       y1="1039.8118"
-       x1="4.7776356"
-       gradientTransform="translate(-14,4.7e-5)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient9337"
-       xlink:href="#linearGradient7087"
-       inkscape:collect="always" /><linearGradient
-       y2="1041.911"
-       x2="4.7776356"
-       y1="1039.8118"
-       x1="4.7776356"
-       gradientTransform="translate(-12,4.7e-5)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient9339"
-       xlink:href="#linearGradient7087"
-       inkscape:collect="always" /><linearGradient
-       gradientTransform="translate(-80,0)"
-       gradientUnits="userSpaceOnUse"
-       y2="1042.7973"
-       x2="163.22012"
-       y1="1042.7973"
-       x1="88.220117"
-       id="linearGradient68073"
-       xlink:href="#linearGradient4956"
-       inkscape:collect="always" /><linearGradient
-       gradientTransform="translate(-80,0)"
-       gradientUnits="userSpaceOnUse"
-       y2="1032.2669"
-       x2="163.22012"
-       y1="1032.2668"
-       x1="94.469681"
-       id="linearGradient68075"
-       xlink:href="#linearGradient4964"
-       inkscape:collect="always" /><linearGradient
-       gradientTransform="translate(-80,0)"
-       gradientUnits="userSpaceOnUse"
-       y2="1032.2668"
-       x2="152.72206"
-       y1="1032.2668"
-       x1="88.220116"
-       id="linearGradient68077"
-       xlink:href="#linearGradient4972"
-       inkscape:collect="always" /><filter
-       id="filter8854-9"
-       inkscape:label="Drop Shadow"
-       style="color-interpolation-filters:sRGB"><feFlood
-         id="feFlood8856-0"
-         result="flood"
-         flood-color="rgb(244,248,254)"
-         flood-opacity="0.933333" /><feComposite
-         id="feComposite8858-2"
-         result="composite1"
-         operator="in"
-         in2="SourceGraphic"
-         in="flood" /><feGaussianBlur
-         id="feGaussianBlur8860-3"
-         result="blur"
-         stdDeviation="1.2"
-         in="composite1" /><feOffset
-         id="feOffset8862-2"
-         result="offset"
-         dy="3"
-         dx="-1" /><feComposite
-         id="feComposite8864-3"
-         result="composite2"
-         operator="over"
-         in2="offset"
-         in="SourceGraphic" /></filter><linearGradient
-       id="linearGradient10798-1-9-3-7-6-8-9-0-9-1"><stop
-         id="stop10800-5-2-1-8-20-6-4-9-8-2"
-         offset="0"
-         style="stop-color:#7564b1;stop-opacity:1" /><stop
-         style="stop-color:#5d4aa1;stop-opacity:1"
-         offset="0.5"
-         id="stop10806-6-8-5-3-9-24-8-4-3-2" /><stop
-         id="stop10802-1-5-3-0-4-8-4-2-9-2"
-         offset="1"
-         style="stop-color:#9283c3;stop-opacity:1" /></linearGradient><linearGradient
-       id="linearGradient7540-2-3-8-7"><stop
-         id="stop7542-8-7-5-3"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.502" /><stop
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0.47623286"
-         id="stop7544-8-2-0-5" /><stop
-         style="stop-color:#ffffff;stop-opacity:0"
-         offset="0.5"
-         id="stop7546-1-7-9-5" /><stop
-         id="stop7548-98-9-2-4"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       id="linearGradient7272-66-4-5-5-5-8"><stop
-         style="stop-color:#8f6c10;stop-opacity:1"
-         offset="0"
-         id="stop7274-6-0-1-7-4-7" /><stop
-         style="stop-color:#c9a645;stop-opacity:1"
-         offset="1"
-         id="stop7276-66-6-3-9-1-4" /></linearGradient><linearGradient
-       y2="1030.3411"
-       x2="-10.159802"
-       y1="1030.3411"
-       x1="-22.453552"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient10540"
-       xlink:href="#linearGradient7540-2-3-8-7"
-       inkscape:collect="always" /><linearGradient
-       y2="1030.3411"
-       x2="-10.159802"
-       y1="1030.3411"
-       x1="-22.453552"
-       gradientTransform="matrix(0,1,-1,0,1014.0344,1046.6478)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient10542"
-       xlink:href="#linearGradient7540-2-3-8-7"
-       inkscape:collect="always" /><linearGradient
-       y2="1023.2569"
-       x2="-15.945988"
-       y1="1037.4661"
-       x1="-15.945988"
-       gradientTransform="matrix(0.95585117,0,0,0.95585117,-0.71992063,45.488394)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient10544"
-       xlink:href="#linearGradient7272-66-4-5-5-5-8"
-       inkscape:collect="always" /><mask
-       id="mask10620"
-       maskUnits="userSpaceOnUse"><path
-         transform="matrix(0.55482947,0,0,0.55482947,-206.96039,787.08655)"
-         d="m 398.75,468.23718 a 10.625,10.625 0 1 1 -21.25,0 10.625,10.625 0 1 1 21.25,0 z"
-         sodipodi:ry="10.625"
-         sodipodi:rx="10.625"
-         sodipodi:cy="468.23718"
-         sodipodi:cx="388.125"
-         id="path10622"
-         style="font-size:13.58917427px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:2.16621375;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline;font-family:Sans"
-         sodipodi:type="arc" /></mask><linearGradient
-       id="linearGradient4528-9-5-7-9-7-3"><stop
-         id="stop4530-0-5-0-5-8-4"
-         offset="0"
-         style="stop-color:#e0c576;stop-opacity:1;" /><stop
-         id="stop4532-7-9-3-3-6-1"
-         offset="1"
-         style="stop-color:#9e7916;stop-opacity:1" /></linearGradient><linearGradient
-       id="linearGradient6281-8-0-1-6-6-4-2-8-0"><stop
-         style="stop-color:#f7f9fb;stop-opacity:1"
-         offset="0"
-         id="stop6283-0-2-2-1-2-0-1-6-0" /><stop
-         style="stop-color:#ffd680;stop-opacity:1"
-         offset="1"
-         id="stop6285-5-0-9-7-6-9-9-1-9" /></linearGradient><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4972-7"
        id="linearGradient4978"
        x1="88.220116"
@@ -330,7 +22,6 @@
        y2="1032.2668"
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-88.220116,-999.2669)" /><linearGradient
-       inkscape:collect="always"
        id="linearGradient4972-7"><stop
          style="stop-color:#b8ccf1;stop-opacity:0.10196079"
          offset="0"
@@ -338,7 +29,6 @@
          style="stop-color:#6e97e2;stop-opacity:0.10196079"
          offset="1"
          id="stop4976-1" /></linearGradient><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4964-3"
        id="linearGradient4970"
        x1="118.38584"
@@ -347,7 +37,6 @@
        y2="1032.2668"
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-88.220117,-999.2669)" /><linearGradient
-       inkscape:collect="always"
        id="linearGradient4964-3"><stop
          style="stop-color:#ffffff;stop-opacity:0.349"
          offset="0"
@@ -355,7 +44,6 @@
          style="stop-color:#91ade6;stop-opacity:1"
          offset="1"
          id="stop4968-1" /></linearGradient><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4956-2"
        id="linearGradient4962"
        x1="88.220116"
@@ -364,7 +52,6 @@
        y2="1042.7972"
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-88.220116,-999.2669)" /><linearGradient
-       inkscape:collect="always"
        id="linearGradient4956-2"><stop
          style="stop-color:#fcfdfe;stop-opacity:0.25641027"
          offset="0"
@@ -372,95 +59,7 @@
          style="stop-color:#98aae7;stop-opacity:0.40392157"
          offset="1"
          id="stop4960-6" /></linearGradient><linearGradient
-       id="linearGradient3827"><stop
-         id="stop3829"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0;" /><stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0.60149658"
-         id="stop3835" /><stop
-         id="stop3831"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" /></linearGradient><linearGradient
-       id="linearGradient10798-1-9-3-7-6-8-9-0-9-1-0"><stop
-         id="stop10800-5-2-1-8-20-6-4-9-8-2-9"
-         offset="0"
-         style="stop-color:#f3faed;stop-opacity:1" /><stop
-         style="stop-color:#e7f4da;stop-opacity:1"
-         offset="0.65917557"
-         id="stop10806-6-8-5-3-9-24-8-4-3-2-4" /><stop
-         id="stop10802-1-5-3-0-4-8-4-2-9-2-5"
-         offset="1"
-         style="stop-color:#67bf1f;stop-opacity:1" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4541"
-       id="linearGradient5885"
-       x1="41"
-       y1="1007.8622"
-       x2="60"
-       y2="1008.3622"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0,1,-1,0,1034.3618,967.36133)" /><linearGradient
-       id="linearGradient11146-4-4-4-6-2"><stop
-         id="stop11150-4-72-3-9-7"
-         offset="0"
-         style="stop-color:#faefba;stop-opacity:1" /><stop
-         style="stop-color:#9e6542;stop-opacity:1"
-         offset="1"
-         id="stop11152-9-0-7-3-8" /></linearGradient><linearGradient
-       id="linearGradient10507"><stop
-         style="stop-color:#5f392d;stop-opacity:1"
-         offset="0"
-         id="stop10509" /><stop
-         id="stop10511"
-         offset="0.18181793"
-         style="stop-color:#9e7058;stop-opacity:1" /><stop
-         id="stop10513"
-         offset="0.36363617"
-         style="stop-color:#794f40;stop-opacity:1" /><stop
-         id="stop10515"
-         offset="0.49999985"
-         style="stop-color:#794f40;stop-opacity:1" /><stop
-         id="stop10517"
-         offset="0.63636351"
-         style="stop-color:#794f40;stop-opacity:1" /><stop
-         style="stop-color:#9e7058;stop-opacity:1"
-         offset="0.81818175"
-         id="stop10519" /><stop
-         style="stop-color:#5f392d;stop-opacity:1"
-         offset="1"
-         id="stop10522" /></linearGradient><linearGradient
-       id="linearGradient11146-4-4-4-6-2-8"><stop
-         id="stop11150-4-72-3-9-7-2"
-         offset="0"
-         style="stop-color:#faefba;stop-opacity:1" /><stop
-         style="stop-color:#ad6e48;stop-opacity:1"
-         offset="1"
-         id="stop11152-9-0-7-3-8-0" /></linearGradient><linearGradient
-       id="linearGradient4368"><stop
-         id="stop4370"
-         offset="0"
-         style="stop-color:#9c7561;stop-opacity:1" /><stop
-         style="stop-color:#966d59;stop-opacity:1"
-         offset="0.18181793"
-         id="stop4372" /><stop
-         style="stop-color:#8c6250;stop-opacity:1"
-         offset="0.36363617"
-         id="stop4374" /><stop
-         style="stop-color:#794f40;stop-opacity:1"
-         offset="0.49999985"
-         id="stop4376" /><stop
-         style="stop-color:#8c6250;stop-opacity:1"
-         offset="0.63636351"
-         id="stop4378" /><stop
-         id="stop4380"
-         offset="0.81818175"
-         style="stop-color:#966d59;stop-opacity:1" /><stop
-         id="stop4382"
-         offset="1"
-         style="stop-color:#99705c;stop-opacity:1" /></linearGradient><linearGradient
-       id="linearGradient8785"
-       inkscape:collect="always"><stop
+       id="linearGradient8785"><stop
          id="stop8781"
          offset="0"
          style="stop-color:#bb8d2d;stop-opacity:1" /><stop
@@ -470,89 +69,13 @@
          id="stop8783"
          offset="1"
          style="stop-color:#b07905;stop-opacity:1" /></linearGradient><linearGradient
-       id="linearGradient8777"
-       inkscape:collect="always"><stop
+       id="linearGradient8777"><stop
          id="stop8773"
          offset="0"
          style="stop-color:#fbeaab;stop-opacity:1;" /><stop
          id="stop8775"
          offset="1"
-         style="stop-color:#e3bd5b;stop-opacity:1;" /></linearGradient><filter
-       id="filter8854-7"
-       inkscape:label="Drop Shadow"
-       style="color-interpolation-filters:sRGB"><feFlood
-         id="feFlood8856-03"
-         result="flood"
-         flood-color="rgb(244,248,254)"
-         flood-opacity="0.933333" /><feComposite
-         id="feComposite8858-9"
-         result="composite1"
-         operator="in"
-         in2="SourceGraphic"
-         in="flood" /><feGaussianBlur
-         id="feGaussianBlur8860-9"
-         result="blur"
-         stdDeviation="1.2"
-         in="composite1" /><feOffset
-         id="feOffset8862-9"
-         result="offset"
-         dy="3"
-         dx="-1" /><feComposite
-         id="feComposite8864-1"
-         result="composite2"
-         operator="over"
-         in2="offset"
-         in="SourceGraphic" /></filter><mask
-       maskUnits="userSpaceOnUse"
-       id="mask7366-47"><path
-         sodipodi:nodetypes="ccccccc"
-         inkscape:connector-curvature="0"
-         id="path7368-1"
-         d="m -16.593048,1040.862 9.990206,0 0,10.0018 -2.983353,3.0385 -5.966213,0 c -0.53033,-0.022 -1.04064,-0.5519 -1.04064,-1.0385 z"
-         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;display:inline" /></mask><mask
-       id="mask7366-4-0"
-       maskUnits="userSpaceOnUse"><path
-         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;display:inline"
-         d="m -16.593048,1040.862 9.990206,0 0,10.0018 -2.983353,3.0385 -5.966213,0 c -0.53033,-0.022 -1.04064,-0.5519 -1.04064,-1.0385 z"
-         id="path7368-2-3"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccccc" /></mask><filter
-       style="color-interpolation-filters:sRGB"
-       inkscape:label="Drop Shadow"
-       id="filter8854-9-2"><feFlood
-         flood-opacity="0.933333"
-         flood-color="rgb(244,248,254)"
-         result="flood"
-         id="feFlood8856-0-6" /><feComposite
-         in="flood"
-         in2="SourceGraphic"
-         operator="in"
-         result="composite1"
-         id="feComposite8858-2-9" /><feGaussianBlur
-         in="composite1"
-         stdDeviation="1.2"
-         result="blur"
-         id="feGaussianBlur8860-3-4" /><feOffset
-         dx="-1"
-         dy="3"
-         result="offset"
-         id="feOffset8862-2-1" /><feComposite
-         in="SourceGraphic"
-         in2="offset"
-         operator="over"
-         result="composite2"
-         id="feComposite8864-3-3" /></filter><mask
-       maskUnits="userSpaceOnUse"
-       id="mask10620-4"><path
-         sodipodi:type="arc"
-         style="font-size:13.58917427px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:2.16621375;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline;font-family:Sans"
-         id="path10622-3"
-         sodipodi:cx="388.125"
-         sodipodi:cy="468.23718"
-         sodipodi:rx="10.625"
-         sodipodi:ry="10.625"
-         d="m 398.75,468.23718 a 10.625,10.625 0 1 1 -21.25,0 10.625,10.625 0 1 1 21.25,0 z"
-         transform="matrix(0.55482947,0,0,0.55482947,-206.96039,787.08655)" /></mask><linearGradient
+         style="stop-color:#e3bd5b;stop-opacity:1;" /></linearGradient><linearGradient
        gradientUnits="userSpaceOnUse"
        y2="1026.0538"
        x2="68.598152"
@@ -560,7 +83,6 @@
        x1="63.98344"
        id="linearGradient8779"
        xlink:href="#linearGradient8777"
-       inkscape:collect="always"
        gradientTransform="matrix(1.3687895,0,0,1.494898,-60.408122,-1504.0798)" /><linearGradient
        gradientUnits="userSpaceOnUse"
        y2="1028.4165"
@@ -569,89 +91,39 @@
        x1="68.47998"
        id="linearGradient8787"
        xlink:href="#linearGradient8785"
-       inkscape:collect="always"
        gradientTransform="matrix(1.3687895,0,0,1.494898,-60.408122,-1504.0798)" /><filter
        height="1.2365698"
        y="-0.11828489"
        width="1.8310951"
        x="-0.41554753"
        id="filter8871"
-       style="color-interpolation-filters:sRGB"
-       inkscape:collect="always"><feGaussianBlur
+       style="color-interpolation-filters:sRGB"><feGaussianBlur
          id="feGaussianBlur8873"
-         stdDeviation="0.53588249"
-         inkscape:collect="always" /></filter><filter
-       inkscape:collect="always"
+         stdDeviation="0.53588249" /></filter><filter
        style="color-interpolation-filters:sRGB"
        id="filter2533"
        x="-0.59377657"
        width="2.1875531"
        y="-0.92639431"
        height="2.8527886"><feGaussianBlur
-         inkscape:collect="always"
          stdDeviation="0.73536407"
          id="feGaussianBlur2535" /></filter><filter
-       inkscape:collect="always"
        style="color-interpolation-filters:sRGB"
        id="filter3"
        x="-0.12316962"
        y="-0.72709807"
        width="1.2463392"
        height="2.4541961"><feGaussianBlur
-         inkscape:collect="always"
          stdDeviation="2.6139133"
-         id="feGaussianBlur3" /></filter></defs><sodipodi:namedview
-     id="base"
-     pagecolor="#bcbcbc"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="9.2263547"
-     inkscape:cx="58.52799"
-     inkscape:cy="34.683254"
-     inkscape:document-units="px"
-     inkscape:current-layer="g2558"
-     showgrid="true"
-     inkscape:window-width="1728"
-     inkscape:window-height="1051"
-     inkscape:window-x="0"
-     inkscape:window-y="38"
-     inkscape:window-maximized="1"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="true"
-     inkscape:snap-bbox="true"
-     inkscape:bbox-nodes="true"
-     inkscape:showpageshadow="2"
-     inkscape:pagecheckerboard="0"
-     inkscape:deskcolor="#d1d1d1"><inkscape:grid
-       type="xygrid"
-       id="grid4112"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       originx="0"
-       originy="0"
-       spacingy="1"
-       spacingx="1"
-       units="px" /></sodipodi:namedview><metadata
+         id="feGaussianBlur3" /></filter></defs><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" /></cc:Work></rdf:RDF></metadata><g
-     inkscape:groupmode="layer"
      id="layer2"
-     inkscape:label="Background"
-     style="display:inline"
-     sodipodi:insensitive="true"><path
-       sodipodi:nodetypes="cccc"
-       inkscape:connector-curvature="0"
+     style="display:inline"><path
        id="rect4113-1"
        d="M 75,0 75,66 1e-6,66 C 1e-6,41.2048 50.00969,0 75,0 Z"
        style="display:inline;fill:url(#linearGradient4978);fill-opacity:1;stroke:none" /><path
-       sodipodi:nodetypes="cccc"
-       inkscape:connector-curvature="0"
        id="rect4113-1-0"
        d="M 75,21.0607 75,66 1e-6,66 C 10.625001,47.804 43.509694,25.4357 75,21.0607 Z"
        style="display:inline;opacity:0.40400002;fill:url(#linearGradient4962);fill-opacity:1;stroke:none" /><g
@@ -660,19 +132,14 @@
        transform="matrix(0.27903303,0,0,0.27903303,-14.618136,-107.52874)"><g
          style="fill:#737986;fill-opacity:1;stroke:#595e68;stroke-opacity:1"
          id="g13408-8-2" /></g><path
-       sodipodi:nodetypes="cccc"
-       inkscape:connector-curvature="0"
        id="rect4113-1-7"
        d="M 75,4.0000001e-7 75,66 30.000003,66 C 30.000003,46.1545 47.70944,9.2500004 75,4e-7 Z"
        style="display:inline;opacity:0.18399999;fill:url(#linearGradient4970);fill-opacity:1;stroke:none" /></g><g
-     inkscape:label="Foreground"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-986.3622)"><g
        id="g2"
-       transform="translate(-8.4378146,995.86224)"
-       inkscape:label="plug"><rect
+       transform="translate(-8.4378146,995.86224)"><rect
          style="display:inline;fill:#f6e9b6;fill-opacity:1;fill-rule:evenodd;stroke:#ba8c2b;stroke-width:0.999998;stroke-linecap:square;stroke-miterlimit:2;stroke-dasharray:none;stroke-opacity:1"
          id="rect2"
          width="9.0001593"
@@ -681,7 +148,6 @@
          y="1013.7326"
          rx="0.37885904"
          ry="0.37885904"
-         inkscape:label="contact2"
          transform="translate(8.4378146,-995.86224)" /><rect
          style="display:inline;fill:#f6e9b6;fill-opacity:1;fill-rule:evenodd;stroke:#ba8c2b;stroke-width:0.999998;stroke-linecap:square;stroke-miterlimit:2;stroke-dasharray:none;stroke-opacity:1"
          id="rect2-5"
@@ -691,30 +157,20 @@
          y="1021.935"
          rx="0.37885904"
          ry="0.37885904"
-         inkscape:label="contact1"
          transform="translate(8.4378146,-995.86224)" /><g
          id="g2558"
-         style="display:inline"
-         inkscape:label="plug"><path
+         style="display:inline"><path
            id="rect8645-2-5"
            style="display:inline;opacity:1;fill:url(#linearGradient8779);fill-opacity:1;stroke:url(#linearGradient8787);stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="m 36.091538,26.489769 -10e-7,1.058985 c 0,1.06945 -0.863288,1.955925 -2.164732,1.930363 -1.301445,-0.02541 -1.941636,0 -1.941636,0 v 0.201512 c 0,1.544678 -1.158564,2.787985 -2.597679,2.788284 l -1.648306,2.98e-4 c -1.360345,3e-4 -1.22903,0.546236 -1.22903,-2.989646 V 17.520381 c 0,-3.536032 -0.205068,-2.989797 1.22903,-2.989797 h 1.648306 c 1.439115,0 2.597679,1.243607 2.597679,2.788284 v 0.201513 h 1.941637 c 1.199261,0 2.164732,0.860911 2.164732,1.930361 v 2.554332 z m 0.06454,-4.989809 h 27.281737 v 4 H 36.378576"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cczccssssssccsccccccc"
-           inkscape:label="plug" /><path
+           d="m 36.091538,26.489769 -10e-7,1.058985 c 0,1.06945 -0.863288,1.955925 -2.164732,1.930363 -1.301445,-0.02541 -1.941636,0 -1.941636,0 v 0.201512 c 0,1.544678 -1.158564,2.787985 -2.597679,2.788284 l -1.648306,2.98e-4 c -1.360345,3e-4 -1.22903,0.546236 -1.22903,-2.989646 V 17.520381 c 0,-3.536032 -0.205068,-2.989797 1.22903,-2.989797 h 1.648306 c 1.439115,0 2.597679,1.243607 2.597679,2.788284 v 0.201513 h 1.941637 c 1.199261,0 2.164732,0.860911 2.164732,1.930361 v 2.554332 z m 0.06454,-4.989809 h 27.281737 v 4 H 36.378576" /><path
            transform="matrix(1.445753,0,0,1.3224494,-65.097292,-1327.9481)"
            style="display:inline;opacity:0.794;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.723208px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter8871)"
            d="m 64.018476,1016.5423 -0.152427,10.8222 c 2.375507,-3.3036 3.484206,-4.2052 2.972286,-9.2217 0.305009,-1.654 -1.117834,-1.7529 -2.819859,-1.6005 z"
-           id="path8861"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccc"
-           inkscape:label="highlight" /><path
+           id="path8861" /><path
            transform="matrix(1.7350569,0,0,1.8824502,-91.814902,-1903.1505)"
            style="display:inline;opacity:0.862;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.553326px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter2533)"
            d="m 70.953811,1023.4014 v -1.8291 l 2.972286,-0.076 z"
-           id="path8875"
-           inkscape:connector-curvature="0"
-           inkscape:label="highlight" /></g><ellipse
+           id="path8875" /></g><ellipse
          style="fill:#cdc7d2;fill-opacity:0.95686275;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-miterlimit:2;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter3)"
          id="path3"
          cx="40.877205"
diff --git a/ui/org.eclipse.pde.ui/icons/wizban/newexp_wiz.svg b/ui/org.eclipse.pde.ui/icons/wizban/newexp_wiz.svg
index 148c4b0f79e..a9393658125 100644
--- a/ui/org.eclipse.pde.ui/icons/wizban/newexp_wiz.svg
+++ b/ui/org.eclipse.pde.ui/icons/wizban/newexp_wiz.svg
@@ -6,14 +6,7 @@
    height="66"
    id="svg2"
    version="1.1"
-   inkscape:version="1.3 (0e150ed, 2023-07-21)"
-   sodipodi:docname="newexp_wiz.svg"
-   inkscape:export-filename="/Users/d021678/git/eclipse.jdt.ui/org.eclipse.jdt.ui/icons/full/wizban/newclass_wiz2.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90"
    xml:space="preserve"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:svg="http://www.w3.org/2000/svg"
@@ -21,307 +14,6 @@
    xmlns:cc="http://creativecommons.org/ns#"
    xmlns:dc="http://purl.org/dc/elements/1.1/"><defs
      id="defs4"><linearGradient
-       inkscape:collect="always"
-       id="linearGradient4541"><stop
-         style="stop-color:#a1adb2;stop-opacity:1"
-         offset="0"
-         id="stop4543" /><stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop4545" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       id="linearGradient4972"><stop
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0"
-         id="stop4974" /><stop
-         style="stop-color:#f5f8fd;stop-opacity:1"
-         offset="1"
-         id="stop4976" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       id="linearGradient4964"><stop
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0"
-         id="stop4966" /><stop
-         style="stop-color:#e8eefa;stop-opacity:1"
-         offset="1"
-         id="stop4968" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       id="linearGradient4956"><stop
-         style="stop-color:#fcfdfe;stop-opacity:1"
-         offset="0"
-         id="stop4958" /><stop
-         style="stop-color:#dee6f8;stop-opacity:1"
-         offset="1"
-         id="stop4960" /></linearGradient><filter
-       style="color-interpolation-filters:sRGB"
-       inkscape:label="Drop Shadow"
-       id="filter8854"><feFlood
-         flood-opacity="0.933333"
-         flood-color="rgb(244,248,254)"
-         result="flood"
-         id="feFlood8856" /><feComposite
-         in="flood"
-         in2="SourceGraphic"
-         operator="in"
-         result="composite1"
-         id="feComposite8858" /><feGaussianBlur
-         in="composite1"
-         stdDeviation="1.2"
-         result="blur"
-         id="feGaussianBlur8860" /><feOffset
-         dx="-1"
-         dy="3"
-         result="offset"
-         id="feOffset8862" /><feComposite
-         in="SourceGraphic"
-         in2="offset"
-         operator="over"
-         result="composite2"
-         id="feComposite8864" /></filter><linearGradient
-       id="linearGradient6122"><stop
-         style="stop-color:#c0c0c0;stop-opacity:1"
-         offset="0"
-         id="stop6124" /><stop
-         id="stop6132"
-         offset="0.5"
-         style="stop-color:#adadad;stop-opacity:1" /><stop
-         style="stop-color:#808080;stop-opacity:1"
-         offset="1"
-         id="stop6126" /></linearGradient><linearGradient
-       id="linearGradient7087"><stop
-         style="stop-color:#17325d;stop-opacity:1;"
-         offset="0"
-         id="stop7089" /><stop
-         id="stop7091"
-         offset="0.25"
-         style="stop-color:#b4d0e2;stop-opacity:1" /><stop
-         id="stop7093"
-         offset="0.5"
-         style="stop-color:#b7d2e4;stop-opacity:1" /><stop
-         style="stop-color:#acc9de;stop-opacity:1"
-         offset="0.75"
-         id="stop7095" /><stop
-         style="stop-color:#3e72a7;stop-opacity:1"
-         offset="1"
-         id="stop7097" /></linearGradient><mask
-       id="mask7366"
-       maskUnits="userSpaceOnUse"><path
-         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;display:inline"
-         d="m -16.593048,1040.862 9.990206,0 0,10.0018 -2.983353,3.0385 -5.966213,0 c -0.53033,-0.022 -1.04064,-0.5519 -1.04064,-1.0385 z"
-         id="path7368"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccccc" /></mask><linearGradient
-       id="linearGradient7584-5"><stop
-         id="stop7586-4"
-         offset="0"
-         style="stop-color:#f9cd5f;stop-opacity:1" /><stop
-         id="stop7588-5"
-         offset="1"
-         style="stop-color:#fbf0b4;stop-opacity:1" /></linearGradient><linearGradient
-       id="linearGradient7592-1"><stop
-         id="stop7594-6"
-         offset="0"
-         style="stop-color:#bd8416;stop-opacity:1" /><stop
-         id="stop7596-9"
-         offset="1"
-         style="stop-color:#a66b10;stop-opacity:1" /></linearGradient><linearGradient
-       id="linearGradient10798-1-9-3-7-6-6-6-2-6-7-98-9-4-1"><stop
-         style="stop-color:#5aad60;stop-opacity:1;"
-         offset="0"
-         id="stop10800-5-2-1-8-20-4-0-2-1-9-0-0-1-1" /><stop
-         id="stop10806-6-8-5-3-9-2-2-7-0-4-2-7-8-9"
-         offset="0.5"
-         style="stop-color:#5bb26a;stop-opacity:1;" /><stop
-         style="stop-color:#a4c589;stop-opacity:1"
-         offset="1"
-         id="stop10802-1-5-3-0-4-6-8-5-5-6-69-6-4-0" /></linearGradient><mask
-       maskUnits="userSpaceOnUse"
-       id="mask7366-4"><path
-         sodipodi:nodetypes="ccccccc"
-         inkscape:connector-curvature="0"
-         id="path7368-2"
-         d="m -16.593048,1040.862 9.990206,0 0,10.0018 -2.983353,3.0385 -5.966213,0 c -0.53033,-0.022 -1.04064,-0.5519 -1.04064,-1.0385 z"
-         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;display:inline" /></mask><linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient7087"
-       id="linearGradient9331"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-20,0)"
-       x1="4.7776356"
-       y1="1039.8118"
-       x2="4.7776356"
-       y2="1041.911" /><linearGradient
-       y2="1041.911"
-       x2="4.7776356"
-       y1="1039.8118"
-       x1="4.7776356"
-       gradientTransform="translate(-18,4.7e-5)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient9333"
-       xlink:href="#linearGradient7087"
-       inkscape:collect="always" /><linearGradient
-       y2="1041.911"
-       x2="4.7776356"
-       y1="1039.8118"
-       x1="4.7776356"
-       gradientTransform="translate(-16,4.7e-5)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient9335"
-       xlink:href="#linearGradient7087"
-       inkscape:collect="always" /><linearGradient
-       y2="1041.911"
-       x2="4.7776356"
-       y1="1039.8118"
-       x1="4.7776356"
-       gradientTransform="translate(-14,4.7e-5)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient9337"
-       xlink:href="#linearGradient7087"
-       inkscape:collect="always" /><linearGradient
-       y2="1041.911"
-       x2="4.7776356"
-       y1="1039.8118"
-       x1="4.7776356"
-       gradientTransform="translate(-12,4.7e-5)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient9339"
-       xlink:href="#linearGradient7087"
-       inkscape:collect="always" /><linearGradient
-       gradientTransform="translate(-80,0)"
-       gradientUnits="userSpaceOnUse"
-       y2="1042.7973"
-       x2="163.22012"
-       y1="1042.7973"
-       x1="88.220117"
-       id="linearGradient68073"
-       xlink:href="#linearGradient4956"
-       inkscape:collect="always" /><linearGradient
-       gradientTransform="translate(-80,0)"
-       gradientUnits="userSpaceOnUse"
-       y2="1032.2669"
-       x2="163.22012"
-       y1="1032.2668"
-       x1="94.469681"
-       id="linearGradient68075"
-       xlink:href="#linearGradient4964"
-       inkscape:collect="always" /><linearGradient
-       gradientTransform="translate(-80,0)"
-       gradientUnits="userSpaceOnUse"
-       y2="1032.2668"
-       x2="152.72206"
-       y1="1032.2668"
-       x1="88.220116"
-       id="linearGradient68077"
-       xlink:href="#linearGradient4972"
-       inkscape:collect="always" /><filter
-       id="filter8854-9"
-       inkscape:label="Drop Shadow"
-       style="color-interpolation-filters:sRGB"><feFlood
-         id="feFlood8856-0"
-         result="flood"
-         flood-color="rgb(244,248,254)"
-         flood-opacity="0.933333" /><feComposite
-         id="feComposite8858-2"
-         result="composite1"
-         operator="in"
-         in2="SourceGraphic"
-         in="flood" /><feGaussianBlur
-         id="feGaussianBlur8860-3"
-         result="blur"
-         stdDeviation="1.2"
-         in="composite1" /><feOffset
-         id="feOffset8862-2"
-         result="offset"
-         dy="3"
-         dx="-1" /><feComposite
-         id="feComposite8864-3"
-         result="composite2"
-         operator="over"
-         in2="offset"
-         in="SourceGraphic" /></filter><linearGradient
-       id="linearGradient10798-1-9-3-7-6-8-9-0-9-1"><stop
-         id="stop10800-5-2-1-8-20-6-4-9-8-2"
-         offset="0"
-         style="stop-color:#7564b1;stop-opacity:1" /><stop
-         style="stop-color:#5d4aa1;stop-opacity:1"
-         offset="0.5"
-         id="stop10806-6-8-5-3-9-24-8-4-3-2" /><stop
-         id="stop10802-1-5-3-0-4-8-4-2-9-2"
-         offset="1"
-         style="stop-color:#9283c3;stop-opacity:1" /></linearGradient><linearGradient
-       id="linearGradient7540-2-3-8-7"><stop
-         id="stop7542-8-7-5-3"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.502" /><stop
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0.47623286"
-         id="stop7544-8-2-0-5" /><stop
-         style="stop-color:#ffffff;stop-opacity:0"
-         offset="0.5"
-         id="stop7546-1-7-9-5" /><stop
-         id="stop7548-98-9-2-4"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       id="linearGradient7272-66-4-5-5-5-8"><stop
-         style="stop-color:#8f6c10;stop-opacity:1"
-         offset="0"
-         id="stop7274-6-0-1-7-4-7" /><stop
-         style="stop-color:#c9a645;stop-opacity:1"
-         offset="1"
-         id="stop7276-66-6-3-9-1-4" /></linearGradient><linearGradient
-       y2="1030.3411"
-       x2="-10.159802"
-       y1="1030.3411"
-       x1="-22.453552"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient10540"
-       xlink:href="#linearGradient7540-2-3-8-7"
-       inkscape:collect="always" /><linearGradient
-       y2="1030.3411"
-       x2="-10.159802"
-       y1="1030.3411"
-       x1="-22.453552"
-       gradientTransform="matrix(0,1,-1,0,1014.0344,1046.6478)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient10542"
-       xlink:href="#linearGradient7540-2-3-8-7"
-       inkscape:collect="always" /><linearGradient
-       y2="1023.2569"
-       x2="-15.945988"
-       y1="1037.4661"
-       x1="-15.945988"
-       gradientTransform="matrix(0.95585117,0,0,0.95585117,-0.71992063,45.488394)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient10544"
-       xlink:href="#linearGradient7272-66-4-5-5-5-8"
-       inkscape:collect="always" /><mask
-       id="mask10620"
-       maskUnits="userSpaceOnUse"><path
-         transform="matrix(0.55482947,0,0,0.55482947,-206.96039,787.08655)"
-         d="m 398.75,468.23718 a 10.625,10.625 0 1 1 -21.25,0 10.625,10.625 0 1 1 21.25,0 z"
-         sodipodi:ry="10.625"
-         sodipodi:rx="10.625"
-         sodipodi:cy="468.23718"
-         sodipodi:cx="388.125"
-         id="path10622"
-         style="font-size:13.58917427px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:2.16621375;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline;font-family:Sans"
-         sodipodi:type="arc" /></mask><linearGradient
-       id="linearGradient4528-9-5-7-9-7-3"><stop
-         id="stop4530-0-5-0-5-8-4"
-         offset="0"
-         style="stop-color:#e0c576;stop-opacity:1;" /><stop
-         id="stop4532-7-9-3-3-6-1"
-         offset="1"
-         style="stop-color:#9e7916;stop-opacity:1" /></linearGradient><linearGradient
-       id="linearGradient6281-8-0-1-6-6-4-2-8-0"><stop
-         style="stop-color:#f7f9fb;stop-opacity:1"
-         offset="0"
-         id="stop6283-0-2-2-1-2-0-1-6-0" /><stop
-         style="stop-color:#ffd680;stop-opacity:1"
-         offset="1"
-         id="stop6285-5-0-9-7-6-9-9-1-9" /></linearGradient><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4972-7"
        id="linearGradient4978"
        x1="88.220116"
@@ -330,7 +22,6 @@
        y2="1032.2668"
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-88.220116,-999.2669)" /><linearGradient
-       inkscape:collect="always"
        id="linearGradient4972-7"><stop
          style="stop-color:#b8ccf1;stop-opacity:0.10196079"
          offset="0"
@@ -338,7 +29,6 @@
          style="stop-color:#6e97e2;stop-opacity:0.10196079"
          offset="1"
          id="stop4976-1" /></linearGradient><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4964-3"
        id="linearGradient4970"
        x1="118.38584"
@@ -347,7 +37,6 @@
        y2="1032.2668"
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-88.220117,-999.2669)" /><linearGradient
-       inkscape:collect="always"
        id="linearGradient4964-3"><stop
          style="stop-color:#ffffff;stop-opacity:0.349"
          offset="0"
@@ -355,7 +44,6 @@
          style="stop-color:#91ade6;stop-opacity:1"
          offset="1"
          id="stop4968-1" /></linearGradient><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4956-2"
        id="linearGradient4962"
        x1="88.220116"
@@ -364,184 +52,19 @@
        y2="1042.7972"
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-88.220116,-999.2669)" /><linearGradient
-       inkscape:collect="always"
        id="linearGradient4956-2"><stop
          style="stop-color:#fcfdfe;stop-opacity:0.25641027"
          offset="0"
          id="stop4958-5" /><stop
          style="stop-color:#98aae7;stop-opacity:0.40392157"
          offset="1"
-         id="stop4960-6" /></linearGradient><linearGradient
-       id="linearGradient3827"><stop
-         id="stop3829"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0;" /><stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0.60149658"
-         id="stop3835" /><stop
-         id="stop3831"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" /></linearGradient><linearGradient
-       id="linearGradient10798-1-9-3-7-6-8-9-0-9-1-0"><stop
-         id="stop10800-5-2-1-8-20-6-4-9-8-2-9"
-         offset="0"
-         style="stop-color:#f3faed;stop-opacity:1" /><stop
-         style="stop-color:#e7f4da;stop-opacity:1"
-         offset="0.65917557"
-         id="stop10806-6-8-5-3-9-24-8-4-3-2-4" /><stop
-         id="stop10802-1-5-3-0-4-8-4-2-9-2-5"
-         offset="1"
-         style="stop-color:#67bf1f;stop-opacity:1" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4541"
-       id="linearGradient5885"
-       x1="41"
-       y1="1007.8622"
-       x2="60"
-       y2="1008.3622"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0,1,-1,0,1034.3618,967.36133)" /><linearGradient
-       id="linearGradient11146-4-4-4-6-2"><stop
-         id="stop11150-4-72-3-9-7"
-         offset="0"
-         style="stop-color:#faefba;stop-opacity:1" /><stop
-         style="stop-color:#9e6542;stop-opacity:1"
-         offset="1"
-         id="stop11152-9-0-7-3-8" /></linearGradient><linearGradient
-       id="linearGradient10507"><stop
-         style="stop-color:#5f392d;stop-opacity:1"
-         offset="0"
-         id="stop10509" /><stop
-         id="stop10511"
-         offset="0.18181793"
-         style="stop-color:#9e7058;stop-opacity:1" /><stop
-         id="stop10513"
-         offset="0.36363617"
-         style="stop-color:#794f40;stop-opacity:1" /><stop
-         id="stop10515"
-         offset="0.49999985"
-         style="stop-color:#794f40;stop-opacity:1" /><stop
-         id="stop10517"
-         offset="0.63636351"
-         style="stop-color:#794f40;stop-opacity:1" /><stop
-         style="stop-color:#9e7058;stop-opacity:1"
-         offset="0.81818175"
-         id="stop10519" /><stop
-         style="stop-color:#5f392d;stop-opacity:1"
-         offset="1"
-         id="stop10522" /></linearGradient><linearGradient
-       id="linearGradient11146-4-4-4-6-2-8"><stop
-         id="stop11150-4-72-3-9-7-2"
-         offset="0"
-         style="stop-color:#faefba;stop-opacity:1" /><stop
-         style="stop-color:#ad6e48;stop-opacity:1"
-         offset="1"
-         id="stop11152-9-0-7-3-8-0" /></linearGradient><linearGradient
-       id="linearGradient4368"><stop
-         id="stop4370"
-         offset="0"
-         style="stop-color:#9c7561;stop-opacity:1" /><stop
-         style="stop-color:#966d59;stop-opacity:1"
-         offset="0.18181793"
-         id="stop4372" /><stop
-         style="stop-color:#8c6250;stop-opacity:1"
-         offset="0.36363617"
-         id="stop4374" /><stop
-         style="stop-color:#794f40;stop-opacity:1"
-         offset="0.49999985"
-         id="stop4376" /><stop
-         style="stop-color:#8c6250;stop-opacity:1"
-         offset="0.63636351"
-         id="stop4378" /><stop
-         id="stop4380"
-         offset="0.81818175"
-         style="stop-color:#966d59;stop-opacity:1" /><stop
-         id="stop4382"
-         offset="1"
-         style="stop-color:#99705c;stop-opacity:1" /></linearGradient><filter
-       id="filter8854-7"
-       inkscape:label="Drop Shadow"
-       style="color-interpolation-filters:sRGB"><feFlood
-         id="feFlood8856-03"
-         result="flood"
-         flood-color="rgb(244,248,254)"
-         flood-opacity="0.933333" /><feComposite
-         id="feComposite8858-9"
-         result="composite1"
-         operator="in"
-         in2="SourceGraphic"
-         in="flood" /><feGaussianBlur
-         id="feGaussianBlur8860-9"
-         result="blur"
-         stdDeviation="1.2"
-         in="composite1" /><feOffset
-         id="feOffset8862-9"
-         result="offset"
-         dy="3"
-         dx="-1" /><feComposite
-         id="feComposite8864-1"
-         result="composite2"
-         operator="over"
-         in2="offset"
-         in="SourceGraphic" /></filter><mask
-       maskUnits="userSpaceOnUse"
-       id="mask7366-47"><path
-         sodipodi:nodetypes="ccccccc"
-         inkscape:connector-curvature="0"
-         id="path7368-1"
-         d="m -16.593048,1040.862 9.990206,0 0,10.0018 -2.983353,3.0385 -5.966213,0 c -0.53033,-0.022 -1.04064,-0.5519 -1.04064,-1.0385 z"
-         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;display:inline" /></mask><mask
-       id="mask7366-4-0"
-       maskUnits="userSpaceOnUse"><path
-         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;display:inline"
-         d="m -16.593048,1040.862 9.990206,0 0,10.0018 -2.983353,3.0385 -5.966213,0 c -0.53033,-0.022 -1.04064,-0.5519 -1.04064,-1.0385 z"
-         id="path7368-2-3"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccccc" /></mask><filter
-       style="color-interpolation-filters:sRGB"
-       inkscape:label="Drop Shadow"
-       id="filter8854-9-2"><feFlood
-         flood-opacity="0.933333"
-         flood-color="rgb(244,248,254)"
-         result="flood"
-         id="feFlood8856-0-6" /><feComposite
-         in="flood"
-         in2="SourceGraphic"
-         operator="in"
-         result="composite1"
-         id="feComposite8858-2-9" /><feGaussianBlur
-         in="composite1"
-         stdDeviation="1.2"
-         result="blur"
-         id="feGaussianBlur8860-3-4" /><feOffset
-         dx="-1"
-         dy="3"
-         result="offset"
-         id="feOffset8862-2-1" /><feComposite
-         in="SourceGraphic"
-         in2="offset"
-         operator="over"
-         result="composite2"
-         id="feComposite8864-3-3" /></filter><mask
-       maskUnits="userSpaceOnUse"
-       id="mask10620-4"><path
-         sodipodi:type="arc"
-         style="font-size:13.58917427px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:2.16621375;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline;font-family:Sans"
-         id="path10622-3"
-         sodipodi:cx="388.125"
-         sodipodi:cy="468.23718"
-         sodipodi:rx="10.625"
-         sodipodi:ry="10.625"
-         d="m 398.75,468.23718 a 10.625,10.625 0 1 1 -21.25,0 10.625,10.625 0 1 1 21.25,0 z"
-         transform="matrix(0.55482947,0,0,0.55482947,-206.96039,787.08655)" /></mask><filter
-       inkscape:collect="always"
+         id="stop4960-6" /></linearGradient><filter
        style="color-interpolation-filters:sRGB"
        id="filter3"
        x="-0.12316962"
        y="-0.72709807"
        width="1.2463392"
        height="2.4541961"><feGaussianBlur
-         inkscape:collect="always"
          stdDeviation="2.6139133"
          id="feGaussianBlur3" /></filter><linearGradient
        gradientUnits="userSpaceOnUse"
@@ -551,10 +74,8 @@
        x1="51.658199"
        id="linearGradient8769"
        xlink:href="#linearGradient8767"
-       inkscape:collect="always"
        gradientTransform="matrix(2.7500001,0,0,0.99370101,-129.87501,-991.91286)" /><linearGradient
-       id="linearGradient8767"
-       inkscape:collect="always"><stop
+       id="linearGradient8767"><stop
          id="stop8763"
          offset="0"
          style="stop-color:#6a8ec1;stop-opacity:1" /><stop
@@ -568,10 +89,8 @@
        x1="50"
        id="linearGradient8753"
        xlink:href="#linearGradient8751"
-       inkscape:collect="always"
        gradientTransform="matrix(2.7500001,0,0,0.99370101,-129.87501,-991.91286)" /><linearGradient
-       id="linearGradient8751"
-       inkscape:collect="always"><stop
+       id="linearGradient8751"><stop
          id="stop8747"
          offset="0"
          style="stop-color:#2e5d8f;stop-opacity:1" /><stop
@@ -585,17 +104,14 @@
        x1="57"
        id="linearGradient8761"
        xlink:href="#linearGradient8759"
-       inkscape:collect="always"
        gradientTransform="matrix(1.0999999,0,0,1.1281495,-43.249997,-1129.0318)" /><linearGradient
-       id="linearGradient8759"
-       inkscape:collect="always"><stop
+       id="linearGradient8759"><stop
          id="stop8755"
          offset="0"
          style="stop-color:#d3e0eb;stop-opacity:1" /><stop
          id="stop8757"
          offset="1"
          style="stop-color:#5179b5;stop-opacity:1" /></linearGradient><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient2543"
        id="linearGradient2545"
        x1="18.423391"
@@ -603,7 +119,6 @@
        x2="18.436228"
        y2="30.334658"
        gradientUnits="userSpaceOnUse" /><linearGradient
-       inkscape:collect="always"
        id="linearGradient2543"><stop
          style="stop-color:#4f76b0;stop-opacity:1"
          offset="0"
@@ -619,72 +134,25 @@
        width="1.626688"
        x="-0.313344"
        id="filter8835"
-       style="color-interpolation-filters:sRGB"
-       inkscape:collect="always"><feGaussianBlur
+       style="color-interpolation-filters:sRGB"><feGaussianBlur
          id="feGaussianBlur8837"
-         stdDeviation="0.49751501"
-         inkscape:collect="always" /></filter><filter
+         stdDeviation="0.49751501" /></filter><filter
        height="1.2365698"
        y="-0.11828489"
        width="1.8310951"
        x="-0.41554753"
        id="filter8871-1"
-       style="color-interpolation-filters:sRGB"
-       inkscape:collect="always"><feGaussianBlur
+       style="color-interpolation-filters:sRGB"><feGaussianBlur
          id="feGaussianBlur8873-8"
-         stdDeviation="0.53588249"
-         inkscape:collect="always" /></filter></defs><sodipodi:namedview
-     id="base"
-     pagecolor="#bcbcbc"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="3.6750543"
-     inkscape:cx="37.414413"
-     inkscape:cy="38.910989"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1728"
-     inkscape:window-height="1051"
-     inkscape:window-x="0"
-     inkscape:window-y="38"
-     inkscape:window-maximized="1"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="true"
-     inkscape:snap-bbox="true"
-     inkscape:bbox-nodes="true"
-     inkscape:showpageshadow="2"
-     inkscape:pagecheckerboard="0"
-     inkscape:deskcolor="#d1d1d1"><inkscape:grid
-       type="xygrid"
-       id="grid4112"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       originx="0"
-       originy="0"
-       spacingy="1"
-       spacingx="1"
-       units="px" /></sodipodi:namedview><metadata
+         stdDeviation="0.53588249" /></filter></defs><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" /></cc:Work></rdf:RDF></metadata><g
-     inkscape:groupmode="layer"
      id="layer2"
-     inkscape:label="Background"
-     style="display:inline"
-     sodipodi:insensitive="true"><path
-       sodipodi:nodetypes="cccc"
-       inkscape:connector-curvature="0"
+     style="display:inline"><path
        id="rect4113-1"
        d="M 75,0 75,66 1e-6,66 C 1e-6,41.2048 50.00969,0 75,0 Z"
        style="display:inline;fill:url(#linearGradient4978);fill-opacity:1;stroke:none" /><path
-       sodipodi:nodetypes="cccc"
-       inkscape:connector-curvature="0"
        id="rect4113-1-0"
        d="M 75,21.0607 75,66 1e-6,66 C 10.625001,47.804 43.509694,25.4357 75,21.0607 Z"
        style="display:inline;opacity:0.40400002;fill:url(#linearGradient4962);fill-opacity:1;stroke:none" /><g
@@ -693,58 +161,39 @@
        transform="matrix(0.27903303,0,0,0.27903303,-14.618136,-107.52874)"><g
          style="fill:#737986;fill-opacity:1;stroke:#595e68;stroke-opacity:1"
          id="g13408-8-2" /></g><path
-       sodipodi:nodetypes="cccc"
-       inkscape:connector-curvature="0"
        id="rect4113-1-7"
        d="M 75,4.0000001e-7 75,66 30.000003,66 C 30.000003,46.1545 47.70944,9.2500004 75,4e-7 Z"
        style="display:inline;opacity:0.18399999;fill:url(#linearGradient4970);fill-opacity:1;stroke:none" /></g><g
-     inkscape:label="Foreground"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-986.3622)"><g
        id="g2558-3"
        style="display:inline;stroke-width:1.09987"
-       inkscape:label="plug"
        transform="matrix(1.0284909,0,0,0.8037302,19.727164,1000.2483)"><path
          id="path8722-7"
          style="display:inline;opacity:1;fill:url(#linearGradient8769);fill-opacity:1;stroke:url(#linearGradient8753);stroke-width:1.09987;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="M -10.430004,26.269889 H 14.5 v -4.976795 h -24.930004 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc"
-         inkscape:label="cord" /><path
-         sodipodi:nodetypes="csssscsscccsssscsscc"
+         d="M -10.430004,26.269889 H 14.5 v -4.976795 h -24.930004 z" /><path
          id="rect8645-3"
          style="display:inline;opacity:1;fill:url(#linearGradient8761);fill-opacity:1;stroke:#4d73ae;stroke-width:1.09987;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="M 25.499998,23.781495 25.5,15.413559 C 25.5,13.799403 24.568942,12.5 23.412427,12.5 h -2.424855 c -1.156515,0 -2.483072,1.299403 -2.483072,2.913559 v 1.599039 h -2.264856 c -0.963763,0 -1.739644,0.794104 -1.739644,1.780446 v 1.468512 3.519375 m 10.999998,5.64e-4 2e-6,8.367936 c 0,1.614156 -0.931058,2.913559 -2.087573,2.913559 h -2.424855 c -1.156515,0 -2.483072,-1.299403 -2.483072,-2.913559 V 30.550392 H 16.239644 C 15.275881,30.550392 14.5,29.756288 14.5,28.769946 v -1.468512 -3.519375"
-         inkscape:connector-curvature="0"
-         inkscape:label="plug" /><path
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
+         d="M 25.499998,23.781495 25.5,15.413559 C 25.5,13.799403 24.568942,12.5 23.412427,12.5 h -2.424855 c -1.156515,0 -2.483072,1.299403 -2.483072,2.913559 v 1.599039 h -2.264856 c -0.963763,0 -1.739644,0.794104 -1.739644,1.780446 v 1.468512 3.519375 m 10.999998,5.64e-4 2e-6,8.367936 c 0,1.614156 -0.931058,2.913559 -2.087573,2.913559 h -2.424855 c -1.156515,0 -2.483072,-1.299403 -2.483072,-2.913559 V 30.550392 H 16.239644 C 15.275881,30.550392 14.5,29.756288 14.5,28.769946 v -1.468512 -3.519375" /><path
          id="path2537"
          d="M 18.51661,16.539741 18.5464,30.705846"
-         style="display:inline;fill:none;stroke:url(#linearGradient2545);stroke-width:1.09987px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         inkscape:label="line" /><ellipse
+         style="display:inline;fill:none;stroke:url(#linearGradient2545);stroke-width:1.09987px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /><ellipse
          transform="matrix(1.029538,0,0,1.1281495,-39.470994,-1128.0797)"
          style="opacity:0.828;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.02056;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter8835)"
          id="path8817"
          cx="59.521938"
          cy="1014.637"
          rx="1.9053118"
-         ry="1.9815242"
-         inkscape:label="highlight" /><path
+         ry="1.9815242" /><path
          transform="matrix(1.029538,0,0,1.1281495,-39.928294,-1128.6206)"
          style="display:inline;opacity:0.485;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.02056px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter8871-1)"
          d="m 53.924652,1016.631 -0.152427,10.8222 c 2.375507,-3.3036 3.484206,-4.2052 2.972286,-9.2217 0.305009,-1.654 -1.117834,-1.7529 -2.819859,-1.6005 z"
-         id="path8861-7"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccc"
-         inkscape:label="highlight" /></g><ellipse
+         id="path8861-7" /></g><ellipse
        style="display:inline;fill:#cdc7d2;fill-opacity:0.956863;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-miterlimit:2;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter3)"
        id="path3"
        cx="41.697948"
        cy="39.912575"
        rx="25.466475"
        ry="4.313993"
-       transform="translate(-8.4378146,995.86224)"
-       inkscape:label="shadow" /></g></svg>
+       transform="translate(-8.4378146,995.86224)" /></g></svg>
diff --git a/ui/org.eclipse.pde.ui/icons/wizban/newexprj_wiz.svg b/ui/org.eclipse.pde.ui/icons/wizban/newexprj_wiz.svg
index 3804fbd9e4b..c3f33ba8a99 100644
--- a/ui/org.eclipse.pde.ui/icons/wizban/newexprj_wiz.svg
+++ b/ui/org.eclipse.pde.ui/icons/wizban/newexprj_wiz.svg
@@ -6,14 +6,7 @@
    height="66"
    id="svg2"
    version="1.1"
-   inkscape:version="1.3 (0e150ed, 2023-07-21)"
-   sodipodi:docname="newexprj_wiz.svg"
-   inkscape:export-filename="/Users/d021678/git/eclipse.jdt.ui/org.eclipse.jdt.ui/icons/full/wizban/newclass_wiz2.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90"
    xml:space="preserve"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:svg="http://www.w3.org/2000/svg"
@@ -21,307 +14,6 @@
    xmlns:cc="http://creativecommons.org/ns#"
    xmlns:dc="http://purl.org/dc/elements/1.1/"><defs
      id="defs4"><linearGradient
-       inkscape:collect="always"
-       id="linearGradient4541"><stop
-         style="stop-color:#a1adb2;stop-opacity:1"
-         offset="0"
-         id="stop4543" /><stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop4545" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       id="linearGradient4972"><stop
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0"
-         id="stop4974" /><stop
-         style="stop-color:#f5f8fd;stop-opacity:1"
-         offset="1"
-         id="stop4976" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       id="linearGradient4964"><stop
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0"
-         id="stop4966" /><stop
-         style="stop-color:#e8eefa;stop-opacity:1"
-         offset="1"
-         id="stop4968" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       id="linearGradient4956"><stop
-         style="stop-color:#fcfdfe;stop-opacity:1"
-         offset="0"
-         id="stop4958" /><stop
-         style="stop-color:#dee6f8;stop-opacity:1"
-         offset="1"
-         id="stop4960" /></linearGradient><filter
-       style="color-interpolation-filters:sRGB"
-       inkscape:label="Drop Shadow"
-       id="filter8854"><feFlood
-         flood-opacity="0.933333"
-         flood-color="rgb(244,248,254)"
-         result="flood"
-         id="feFlood8856" /><feComposite
-         in="flood"
-         in2="SourceGraphic"
-         operator="in"
-         result="composite1"
-         id="feComposite8858" /><feGaussianBlur
-         in="composite1"
-         stdDeviation="1.2"
-         result="blur"
-         id="feGaussianBlur8860" /><feOffset
-         dx="-1"
-         dy="3"
-         result="offset"
-         id="feOffset8862" /><feComposite
-         in="SourceGraphic"
-         in2="offset"
-         operator="over"
-         result="composite2"
-         id="feComposite8864" /></filter><linearGradient
-       id="linearGradient6122"><stop
-         style="stop-color:#c0c0c0;stop-opacity:1"
-         offset="0"
-         id="stop6124" /><stop
-         id="stop6132"
-         offset="0.5"
-         style="stop-color:#adadad;stop-opacity:1" /><stop
-         style="stop-color:#808080;stop-opacity:1"
-         offset="1"
-         id="stop6126" /></linearGradient><linearGradient
-       id="linearGradient7087"><stop
-         style="stop-color:#17325d;stop-opacity:1;"
-         offset="0"
-         id="stop7089" /><stop
-         id="stop7091"
-         offset="0.25"
-         style="stop-color:#b4d0e2;stop-opacity:1" /><stop
-         id="stop7093"
-         offset="0.5"
-         style="stop-color:#b7d2e4;stop-opacity:1" /><stop
-         style="stop-color:#acc9de;stop-opacity:1"
-         offset="0.75"
-         id="stop7095" /><stop
-         style="stop-color:#3e72a7;stop-opacity:1"
-         offset="1"
-         id="stop7097" /></linearGradient><mask
-       id="mask7366"
-       maskUnits="userSpaceOnUse"><path
-         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;display:inline"
-         d="m -16.593048,1040.862 9.990206,0 0,10.0018 -2.983353,3.0385 -5.966213,0 c -0.53033,-0.022 -1.04064,-0.5519 -1.04064,-1.0385 z"
-         id="path7368"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccccc" /></mask><linearGradient
-       id="linearGradient7584-5"><stop
-         id="stop7586-4"
-         offset="0"
-         style="stop-color:#f9cd5f;stop-opacity:1" /><stop
-         id="stop7588-5"
-         offset="1"
-         style="stop-color:#fbf0b4;stop-opacity:1" /></linearGradient><linearGradient
-       id="linearGradient7592-1"><stop
-         id="stop7594-6"
-         offset="0"
-         style="stop-color:#bd8416;stop-opacity:1" /><stop
-         id="stop7596-9"
-         offset="1"
-         style="stop-color:#a66b10;stop-opacity:1" /></linearGradient><linearGradient
-       id="linearGradient10798-1-9-3-7-6-6-6-2-6-7-98-9-4-1"><stop
-         style="stop-color:#5aad60;stop-opacity:1;"
-         offset="0"
-         id="stop10800-5-2-1-8-20-4-0-2-1-9-0-0-1-1" /><stop
-         id="stop10806-6-8-5-3-9-2-2-7-0-4-2-7-8-9"
-         offset="0.5"
-         style="stop-color:#5bb26a;stop-opacity:1;" /><stop
-         style="stop-color:#a4c589;stop-opacity:1"
-         offset="1"
-         id="stop10802-1-5-3-0-4-6-8-5-5-6-69-6-4-0" /></linearGradient><mask
-       maskUnits="userSpaceOnUse"
-       id="mask7366-4"><path
-         sodipodi:nodetypes="ccccccc"
-         inkscape:connector-curvature="0"
-         id="path7368-2"
-         d="m -16.593048,1040.862 9.990206,0 0,10.0018 -2.983353,3.0385 -5.966213,0 c -0.53033,-0.022 -1.04064,-0.5519 -1.04064,-1.0385 z"
-         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;display:inline" /></mask><linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient7087"
-       id="linearGradient9331"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-20,0)"
-       x1="4.7776356"
-       y1="1039.8118"
-       x2="4.7776356"
-       y2="1041.911" /><linearGradient
-       y2="1041.911"
-       x2="4.7776356"
-       y1="1039.8118"
-       x1="4.7776356"
-       gradientTransform="translate(-18,4.7e-5)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient9333"
-       xlink:href="#linearGradient7087"
-       inkscape:collect="always" /><linearGradient
-       y2="1041.911"
-       x2="4.7776356"
-       y1="1039.8118"
-       x1="4.7776356"
-       gradientTransform="translate(-16,4.7e-5)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient9335"
-       xlink:href="#linearGradient7087"
-       inkscape:collect="always" /><linearGradient
-       y2="1041.911"
-       x2="4.7776356"
-       y1="1039.8118"
-       x1="4.7776356"
-       gradientTransform="translate(-14,4.7e-5)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient9337"
-       xlink:href="#linearGradient7087"
-       inkscape:collect="always" /><linearGradient
-       y2="1041.911"
-       x2="4.7776356"
-       y1="1039.8118"
-       x1="4.7776356"
-       gradientTransform="translate(-12,4.7e-5)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient9339"
-       xlink:href="#linearGradient7087"
-       inkscape:collect="always" /><linearGradient
-       gradientTransform="translate(-80,0)"
-       gradientUnits="userSpaceOnUse"
-       y2="1042.7973"
-       x2="163.22012"
-       y1="1042.7973"
-       x1="88.220117"
-       id="linearGradient68073"
-       xlink:href="#linearGradient4956"
-       inkscape:collect="always" /><linearGradient
-       gradientTransform="translate(-80,0)"
-       gradientUnits="userSpaceOnUse"
-       y2="1032.2669"
-       x2="163.22012"
-       y1="1032.2668"
-       x1="94.469681"
-       id="linearGradient68075"
-       xlink:href="#linearGradient4964"
-       inkscape:collect="always" /><linearGradient
-       gradientTransform="translate(-80,0)"
-       gradientUnits="userSpaceOnUse"
-       y2="1032.2668"
-       x2="152.72206"
-       y1="1032.2668"
-       x1="88.220116"
-       id="linearGradient68077"
-       xlink:href="#linearGradient4972"
-       inkscape:collect="always" /><filter
-       id="filter8854-9"
-       inkscape:label="Drop Shadow"
-       style="color-interpolation-filters:sRGB"><feFlood
-         id="feFlood8856-0"
-         result="flood"
-         flood-color="rgb(244,248,254)"
-         flood-opacity="0.933333" /><feComposite
-         id="feComposite8858-2"
-         result="composite1"
-         operator="in"
-         in2="SourceGraphic"
-         in="flood" /><feGaussianBlur
-         id="feGaussianBlur8860-3"
-         result="blur"
-         stdDeviation="1.2"
-         in="composite1" /><feOffset
-         id="feOffset8862-2"
-         result="offset"
-         dy="3"
-         dx="-1" /><feComposite
-         id="feComposite8864-3"
-         result="composite2"
-         operator="over"
-         in2="offset"
-         in="SourceGraphic" /></filter><linearGradient
-       id="linearGradient10798-1-9-3-7-6-8-9-0-9-1"><stop
-         id="stop10800-5-2-1-8-20-6-4-9-8-2"
-         offset="0"
-         style="stop-color:#7564b1;stop-opacity:1" /><stop
-         style="stop-color:#5d4aa1;stop-opacity:1"
-         offset="0.5"
-         id="stop10806-6-8-5-3-9-24-8-4-3-2" /><stop
-         id="stop10802-1-5-3-0-4-8-4-2-9-2"
-         offset="1"
-         style="stop-color:#9283c3;stop-opacity:1" /></linearGradient><linearGradient
-       id="linearGradient7540-2-3-8-7"><stop
-         id="stop7542-8-7-5-3"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.502" /><stop
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0.47623286"
-         id="stop7544-8-2-0-5" /><stop
-         style="stop-color:#ffffff;stop-opacity:0"
-         offset="0.5"
-         id="stop7546-1-7-9-5" /><stop
-         id="stop7548-98-9-2-4"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       id="linearGradient7272-66-4-5-5-5-8"><stop
-         style="stop-color:#8f6c10;stop-opacity:1"
-         offset="0"
-         id="stop7274-6-0-1-7-4-7" /><stop
-         style="stop-color:#c9a645;stop-opacity:1"
-         offset="1"
-         id="stop7276-66-6-3-9-1-4" /></linearGradient><linearGradient
-       y2="1030.3411"
-       x2="-10.159802"
-       y1="1030.3411"
-       x1="-22.453552"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient10540"
-       xlink:href="#linearGradient7540-2-3-8-7"
-       inkscape:collect="always" /><linearGradient
-       y2="1030.3411"
-       x2="-10.159802"
-       y1="1030.3411"
-       x1="-22.453552"
-       gradientTransform="matrix(0,1,-1,0,1014.0344,1046.6478)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient10542"
-       xlink:href="#linearGradient7540-2-3-8-7"
-       inkscape:collect="always" /><linearGradient
-       y2="1023.2569"
-       x2="-15.945988"
-       y1="1037.4661"
-       x1="-15.945988"
-       gradientTransform="matrix(0.95585117,0,0,0.95585117,-0.71992063,45.488394)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient10544"
-       xlink:href="#linearGradient7272-66-4-5-5-5-8"
-       inkscape:collect="always" /><mask
-       id="mask10620"
-       maskUnits="userSpaceOnUse"><path
-         transform="matrix(0.55482947,0,0,0.55482947,-206.96039,787.08655)"
-         d="m 398.75,468.23718 a 10.625,10.625 0 1 1 -21.25,0 10.625,10.625 0 1 1 21.25,0 z"
-         sodipodi:ry="10.625"
-         sodipodi:rx="10.625"
-         sodipodi:cy="468.23718"
-         sodipodi:cx="388.125"
-         id="path10622"
-         style="font-size:13.58917427px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:2.16621375;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline;font-family:Sans"
-         sodipodi:type="arc" /></mask><linearGradient
-       id="linearGradient4528-9-5-7-9-7-3"><stop
-         id="stop4530-0-5-0-5-8-4"
-         offset="0"
-         style="stop-color:#e0c576;stop-opacity:1;" /><stop
-         id="stop4532-7-9-3-3-6-1"
-         offset="1"
-         style="stop-color:#9e7916;stop-opacity:1" /></linearGradient><linearGradient
-       id="linearGradient6281-8-0-1-6-6-4-2-8-0"><stop
-         style="stop-color:#f7f9fb;stop-opacity:1"
-         offset="0"
-         id="stop6283-0-2-2-1-2-0-1-6-0" /><stop
-         style="stop-color:#ffd680;stop-opacity:1"
-         offset="1"
-         id="stop6285-5-0-9-7-6-9-9-1-9" /></linearGradient><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4972-7"
        id="linearGradient4978"
        x1="88.220116"
@@ -330,7 +22,6 @@
        y2="1032.2668"
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-88.220116,-999.2669)" /><linearGradient
-       inkscape:collect="always"
        id="linearGradient4972-7"><stop
          style="stop-color:#b8ccf1;stop-opacity:0.10196079"
          offset="0"
@@ -338,7 +29,6 @@
          style="stop-color:#6e97e2;stop-opacity:0.10196079"
          offset="1"
          id="stop4976-1" /></linearGradient><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4964-3"
        id="linearGradient4970"
        x1="118.38584"
@@ -347,7 +37,6 @@
        y2="1032.2668"
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-88.220117,-999.2669)" /><linearGradient
-       inkscape:collect="always"
        id="linearGradient4964-3"><stop
          style="stop-color:#ffffff;stop-opacity:0.349"
          offset="0"
@@ -355,7 +44,6 @@
          style="stop-color:#91ade6;stop-opacity:1"
          offset="1"
          id="stop4968-1" /></linearGradient><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4956-2"
        id="linearGradient4962"
        x1="88.220116"
@@ -364,7 +52,6 @@
        y2="1042.7972"
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-88.220116,-999.2669)" /><linearGradient
-       inkscape:collect="always"
        id="linearGradient4956-2"><stop
          style="stop-color:#fcfdfe;stop-opacity:0.25641027"
          offset="0"
@@ -372,65 +59,6 @@
          style="stop-color:#98aae7;stop-opacity:0.40392157"
          offset="1"
          id="stop4960-6" /></linearGradient><linearGradient
-       id="linearGradient3827"><stop
-         id="stop3829"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0;" /><stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0.60149658"
-         id="stop3835" /><stop
-         id="stop3831"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" /></linearGradient><linearGradient
-       id="linearGradient10798-1-9-3-7-6-8-9-0-9-1-0"><stop
-         id="stop10800-5-2-1-8-20-6-4-9-8-2-9"
-         offset="0"
-         style="stop-color:#f3faed;stop-opacity:1" /><stop
-         style="stop-color:#e7f4da;stop-opacity:1"
-         offset="0.65917557"
-         id="stop10806-6-8-5-3-9-24-8-4-3-2-4" /><stop
-         id="stop10802-1-5-3-0-4-8-4-2-9-2-5"
-         offset="1"
-         style="stop-color:#67bf1f;stop-opacity:1" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4541"
-       id="linearGradient5885"
-       x1="41"
-       y1="1007.8622"
-       x2="60"
-       y2="1008.3622"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0,1,-1,0,1034.3618,967.36133)" /><linearGradient
-       id="linearGradient11146-4-4-4-6-2"><stop
-         id="stop11150-4-72-3-9-7"
-         offset="0"
-         style="stop-color:#faefba;stop-opacity:1" /><stop
-         style="stop-color:#9e6542;stop-opacity:1"
-         offset="1"
-         id="stop11152-9-0-7-3-8" /></linearGradient><linearGradient
-       id="linearGradient10507"><stop
-         style="stop-color:#5f392d;stop-opacity:1"
-         offset="0"
-         id="stop10509" /><stop
-         id="stop10511"
-         offset="0.18181793"
-         style="stop-color:#9e7058;stop-opacity:1" /><stop
-         id="stop10513"
-         offset="0.36363617"
-         style="stop-color:#794f40;stop-opacity:1" /><stop
-         id="stop10515"
-         offset="0.49999985"
-         style="stop-color:#794f40;stop-opacity:1" /><stop
-         id="stop10517"
-         offset="0.63636351"
-         style="stop-color:#794f40;stop-opacity:1" /><stop
-         style="stop-color:#9e7058;stop-opacity:1"
-         offset="0.81818175"
-         id="stop10519" /><stop
-         style="stop-color:#5f392d;stop-opacity:1"
-         offset="1"
-         id="stop10522" /></linearGradient><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4456"
        id="linearGradient4462"
        x1="63.734764"
@@ -439,7 +67,6 @@
        y2="1006.3618"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1,0,-0.72750163,1,733.40264,2.0004)" /><linearGradient
-       inkscape:collect="always"
        id="linearGradient4456"><stop
          style="stop-color:#ffffff;stop-opacity:0.659"
          offset="0"
@@ -447,46 +74,14 @@
          style="stop-color:#ffffff;stop-opacity:0.369"
          offset="1"
          id="stop4460" /></linearGradient><filter
-       inkscape:collect="always"
        style="color-interpolation-filters:sRGB"
        id="filter4606"
        x="-0.062976157"
        width="1.1259523"
        y="-0.10879013"
        height="1.2175803"><feGaussianBlur
-         inkscape:collect="always"
          stdDeviation="1.5412116"
          id="feGaussianBlur4608" /></filter><linearGradient
-       id="linearGradient11146-4-4-4-6-2-8"><stop
-         id="stop11150-4-72-3-9-7-2"
-         offset="0"
-         style="stop-color:#faefba;stop-opacity:1" /><stop
-         style="stop-color:#ad6e48;stop-opacity:1"
-         offset="1"
-         id="stop11152-9-0-7-3-8-0" /></linearGradient><linearGradient
-       id="linearGradient4368"><stop
-         id="stop4370"
-         offset="0"
-         style="stop-color:#9c7561;stop-opacity:1" /><stop
-         style="stop-color:#966d59;stop-opacity:1"
-         offset="0.18181793"
-         id="stop4372" /><stop
-         style="stop-color:#8c6250;stop-opacity:1"
-         offset="0.36363617"
-         id="stop4374" /><stop
-         style="stop-color:#794f40;stop-opacity:1"
-         offset="0.49999985"
-         id="stop4376" /><stop
-         style="stop-color:#8c6250;stop-opacity:1"
-         offset="0.63636351"
-         id="stop4378" /><stop
-         id="stop4380"
-         offset="0.81818175"
-         style="stop-color:#966d59;stop-opacity:1" /><stop
-         id="stop4382"
-         offset="1"
-         style="stop-color:#99705c;stop-opacity:1" /></linearGradient><linearGradient
-       inkscape:collect="always"
        id="linearGradient2543"><stop
          style="stop-color:#4f76b0;stop-opacity:1"
          offset="0"
@@ -497,8 +92,7 @@
          style="stop-color:#587cb2;stop-opacity:1"
          offset="1"
          id="stop2541" /></linearGradient><linearGradient
-       id="linearGradient8785"
-       inkscape:collect="always"><stop
+       id="linearGradient8785"><stop
          id="stop8781"
          offset="0"
          style="stop-color:#bb8d2d;stop-opacity:1" /><stop
@@ -508,113 +102,34 @@
          id="stop8783"
          offset="1"
          style="stop-color:#b07905;stop-opacity:1" /></linearGradient><linearGradient
-       id="linearGradient8777"
-       inkscape:collect="always"><stop
+       id="linearGradient8777"><stop
          id="stop8773"
          offset="0"
          style="stop-color:#fbeaab;stop-opacity:1;" /><stop
          id="stop8775"
          offset="1"
          style="stop-color:#deb241;stop-opacity:1" /></linearGradient><linearGradient
-       id="linearGradient8767"
-       inkscape:collect="always"><stop
+       id="linearGradient8767"><stop
          id="stop8763"
          offset="0"
          style="stop-color:#6a8ec1;stop-opacity:1" /><stop
          id="stop8765"
          offset="1"
          style="stop-color:#80a1cf;stop-opacity:1" /></linearGradient><linearGradient
-       id="linearGradient8759"
-       inkscape:collect="always"><stop
+       id="linearGradient8759"><stop
          id="stop8755"
          offset="0"
          style="stop-color:#d3e0eb;stop-opacity:1" /><stop
          id="stop8757"
          offset="1"
          style="stop-color:#5179b5;stop-opacity:1" /></linearGradient><linearGradient
-       id="linearGradient8751"
-       inkscape:collect="always"><stop
+       id="linearGradient8751"><stop
          id="stop8747"
          offset="0"
          style="stop-color:#2e5d8f;stop-opacity:1" /><stop
          id="stop8749"
          offset="1"
-         style="stop-color:#6085bb;stop-opacity:1" /></linearGradient><filter
-       id="filter8854-7"
-       inkscape:label="Drop Shadow"
-       style="color-interpolation-filters:sRGB"><feFlood
-         id="feFlood8856-03"
-         result="flood"
-         flood-color="rgb(244,248,254)"
-         flood-opacity="0.933333" /><feComposite
-         id="feComposite8858-9"
-         result="composite1"
-         operator="in"
-         in2="SourceGraphic"
-         in="flood" /><feGaussianBlur
-         id="feGaussianBlur8860-9"
-         result="blur"
-         stdDeviation="1.2"
-         in="composite1" /><feOffset
-         id="feOffset8862-9"
-         result="offset"
-         dy="3"
-         dx="-1" /><feComposite
-         id="feComposite8864-1"
-         result="composite2"
-         operator="over"
-         in2="offset"
-         in="SourceGraphic" /></filter><mask
-       maskUnits="userSpaceOnUse"
-       id="mask7366-47"><path
-         sodipodi:nodetypes="ccccccc"
-         inkscape:connector-curvature="0"
-         id="path7368-1"
-         d="m -16.593048,1040.862 9.990206,0 0,10.0018 -2.983353,3.0385 -5.966213,0 c -0.53033,-0.022 -1.04064,-0.5519 -1.04064,-1.0385 z"
-         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;display:inline" /></mask><mask
-       id="mask7366-4-0"
-       maskUnits="userSpaceOnUse"><path
-         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;display:inline"
-         d="m -16.593048,1040.862 9.990206,0 0,10.0018 -2.983353,3.0385 -5.966213,0 c -0.53033,-0.022 -1.04064,-0.5519 -1.04064,-1.0385 z"
-         id="path7368-2-3"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccccc" /></mask><filter
-       style="color-interpolation-filters:sRGB"
-       inkscape:label="Drop Shadow"
-       id="filter8854-9-2"><feFlood
-         flood-opacity="0.933333"
-         flood-color="rgb(244,248,254)"
-         result="flood"
-         id="feFlood8856-0-6" /><feComposite
-         in="flood"
-         in2="SourceGraphic"
-         operator="in"
-         result="composite1"
-         id="feComposite8858-2-9" /><feGaussianBlur
-         in="composite1"
-         stdDeviation="1.2"
-         result="blur"
-         id="feGaussianBlur8860-3-4" /><feOffset
-         dx="-1"
-         dy="3"
-         result="offset"
-         id="feOffset8862-2-1" /><feComposite
-         in="SourceGraphic"
-         in2="offset"
-         operator="over"
-         result="composite2"
-         id="feComposite8864-3-3" /></filter><mask
-       maskUnits="userSpaceOnUse"
-       id="mask10620-4"><path
-         sodipodi:type="arc"
-         style="font-size:13.58917427px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:2.16621375;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline;font-family:Sans"
-         id="path10622-3"
-         sodipodi:cx="388.125"
-         sodipodi:cy="468.23718"
-         sodipodi:rx="10.625"
-         sodipodi:ry="10.625"
-         d="m 398.75,468.23718 a 10.625,10.625 0 1 1 -21.25,0 10.625,10.625 0 1 1 21.25,0 z"
-         transform="matrix(0.55482947,0,0,0.55482947,-206.96039,787.08655)" /></mask><linearGradient
+         style="stop-color:#6085bb;stop-opacity:1" /></linearGradient><linearGradient
        gradientUnits="userSpaceOnUse"
        y2="1024.3622"
        x2="50"
@@ -622,7 +137,6 @@
        x1="50"
        id="linearGradient8753"
        xlink:href="#linearGradient8751"
-       inkscape:collect="always"
        gradientTransform="matrix(2.7500001,0,0,0.99370101,-129.87501,-991.91286)" /><linearGradient
        gradientUnits="userSpaceOnUse"
        y2="1030.3622"
@@ -631,7 +145,6 @@
        x1="57"
        id="linearGradient8761"
        xlink:href="#linearGradient8759"
-       inkscape:collect="always"
        gradientTransform="matrix(1.0999999,0,0,1.1281495,-43.249997,-1129.0318)" /><linearGradient
        gradientUnits="userSpaceOnUse"
        y2="1023.234"
@@ -640,7 +153,6 @@
        x1="51.658199"
        id="linearGradient8769"
        xlink:href="#linearGradient8767"
-       inkscape:collect="always"
        gradientTransform="matrix(2.7500001,0,0,0.99370101,-129.87501,-991.91286)" /><linearGradient
        gradientUnits="userSpaceOnUse"
        y2="1026.0538"
@@ -649,7 +161,6 @@
        x1="63.98344"
        id="linearGradient8779"
        xlink:href="#linearGradient8777"
-       inkscape:collect="always"
        gradientTransform="matrix(1.3687895,0,0,1.494898,-60.408122,-1504.0798)" /><linearGradient
        gradientUnits="userSpaceOnUse"
        y2="1028.4165"
@@ -658,59 +169,47 @@
        x1="68.47998"
        id="linearGradient8787"
        xlink:href="#linearGradient8785"
-       inkscape:collect="always"
        gradientTransform="matrix(1.3687895,0,0,1.494898,-60.408122,-1504.0798)" /><filter
        height="1.4861495"
        y="-0.24307477"
        width="2.0754105"
        x="-0.53770523"
        id="filter8813"
-       style="color-interpolation-filters:sRGB"
-       inkscape:collect="always"><feGaussianBlur
+       style="color-interpolation-filters:sRGB"><feGaussianBlur
          id="feGaussianBlur8815"
-         stdDeviation="1.1269452"
-         inkscape:collect="always" /></filter><filter
+         stdDeviation="1.1269452" /></filter><filter
        height="1.6025846"
        y="-0.30129232"
        width="1.626688"
        x="-0.313344"
        id="filter8835"
-       style="color-interpolation-filters:sRGB"
-       inkscape:collect="always"><feGaussianBlur
+       style="color-interpolation-filters:sRGB"><feGaussianBlur
          id="feGaussianBlur8837"
-         stdDeviation="0.49751501"
-         inkscape:collect="always" /></filter><filter
+         stdDeviation="0.49751501" /></filter><filter
        height="1.2365698"
        y="-0.11828489"
        width="1.8310951"
        x="-0.41554753"
        id="filter8871"
-       style="color-interpolation-filters:sRGB"
-       inkscape:collect="always"><feGaussianBlur
+       style="color-interpolation-filters:sRGB"><feGaussianBlur
          id="feGaussianBlur8873"
-         stdDeviation="0.53588249"
-         inkscape:collect="always" /></filter><filter
+         stdDeviation="0.53588249" /></filter><filter
        height="1.2365698"
        y="-0.11828489"
        width="1.8310951"
        x="-0.41554753"
        id="filter8871-1"
-       style="color-interpolation-filters:sRGB"
-       inkscape:collect="always"><feGaussianBlur
+       style="color-interpolation-filters:sRGB"><feGaussianBlur
          id="feGaussianBlur8873-8"
-         stdDeviation="0.53588249"
-         inkscape:collect="always" /></filter><filter
-       inkscape:collect="always"
+         stdDeviation="0.53588249" /></filter><filter
        style="color-interpolation-filters:sRGB"
        id="filter2533"
        x="-0.59377657"
        width="2.1875531"
        y="-0.92639431"
        height="2.8527886"><feGaussianBlur
-         inkscape:collect="always"
          stdDeviation="0.73536407"
          id="feGaussianBlur2535" /></filter><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient2543"
        id="linearGradient2545"
        x1="18.423391"
@@ -723,62 +222,49 @@
        width="2.2422064"
        x="-0.61967559"
        id="filter8813-5"
-       style="color-interpolation-filters:sRGB"
-       inkscape:collect="always"><feGaussianBlur
+       style="color-interpolation-filters:sRGB"><feGaussianBlur
          id="feGaussianBlur8815-0"
-         stdDeviation="1.1269452"
-         inkscape:collect="always" /></filter><filter
+         stdDeviation="1.1269452" /></filter><filter
        height="1.3593343"
-       y="-0.14801957"
-       width="2.0419708"
+       y="-0.14801958"
+       width="2.0419709"
        x="-0.52339875"
        id="filter8871-4"
-       style="color-interpolation-filters:sRGB"
-       inkscape:collect="always"><feGaussianBlur
+       style="color-interpolation-filters:sRGB"><feGaussianBlur
          id="feGaussianBlur8873-9"
-         stdDeviation="0.53588249"
-         inkscape:collect="always" /></filter><filter
+         stdDeviation="0.53588249" /></filter><filter
        height="1.8094708"
        y="-0.40473541"
        width="1.8418496"
        x="-0.42092481"
        id="filter8835-5"
-       style="color-interpolation-filters:sRGB"
-       inkscape:collect="always"><feGaussianBlur
+       style="color-interpolation-filters:sRGB"><feGaussianBlur
          id="feGaussianBlur8837-4"
-         stdDeviation="0.49751501"
-         inkscape:collect="always" /></filter><filter
-       inkscape:collect="always"
+         stdDeviation="0.49751501" /></filter><filter
        style="color-interpolation-filters:sRGB"
        id="filter2533-6"
        x="-0.67602471"
        width="2.5622487"
        y="-1.0664242"
        height="3.2274842"><feGaussianBlur
-         inkscape:collect="always"
          stdDeviation="0.73536407"
          id="feGaussianBlur2535-0" /></filter><filter
        height="1.39408"
-       y="-0.15643627"
+       y="-0.15643628"
        width="2.1016525"
        x="-0.55392239"
        id="filter8871-1-6"
-       style="color-interpolation-filters:sRGB"
-       inkscape:collect="always"><feGaussianBlur
+       style="color-interpolation-filters:sRGB"><feGaussianBlur
          id="feGaussianBlur8873-8-9"
-         stdDeviation="0.53588249"
-         inkscape:collect="always" /></filter><filter
-       inkscape:collect="always"
+         stdDeviation="0.53588249" /></filter><filter
        style="color-interpolation-filters:sRGB"
        id="filter2728"
        x="-0.063712089"
        width="1.1274242"
        y="-0.1161054"
        height="1.2322108"><feGaussianBlur
-         inkscape:collect="always"
          stdDeviation="0.90744768"
          id="feGaussianBlur2730" /></filter><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4994"
        id="linearGradient6375-6"
        x1="50.702839"
@@ -787,15 +273,13 @@
        y2="1014.1386"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(0.96603716,0,0,1.0044749,17.954368,-72.314)" /><linearGradient
-       id="linearGradient4994"
-       inkscape:collect="always"><stop
+       id="linearGradient4994"><stop
          id="stop4996"
          offset="0"
          style="stop-color:#fef3a7;stop-opacity:1;" /><stop
          id="stop4998"
          offset="1"
          style="stop-color:#ffe13b;stop-opacity:1;" /></linearGradient><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4902"
        id="linearGradient4238"
        gradientUnits="userSpaceOnUse"
@@ -804,15 +288,13 @@
        y1="1038.5779"
        x2="10.544736"
        y2="1052.3228" /><linearGradient
-       id="linearGradient4902"
-       inkscape:collect="always"><stop
+       id="linearGradient4902"><stop
          id="stop4904"
          offset="0"
          style="stop-color:#d6be69;stop-opacity:0.99607843;" /><stop
          id="stop4906"
          offset="1"
          style="stop-color:#c2b67d;stop-opacity:0.49411765;" /></linearGradient><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient6411"
        id="linearGradient4240"
        gradientUnits="userSpaceOnUse"
@@ -821,7 +303,6 @@
        y1="1020.8994"
        x2="47.429596"
        y2="1023.1616" /><linearGradient
-       inkscape:collect="always"
        id="linearGradient6411"><stop
          style="stop-color:#4f605c;stop-opacity:1"
          offset="0"
@@ -829,7 +310,6 @@
          style="stop-color:#dbe2eb;stop-opacity:0"
          offset="1"
          id="stop6415" /></linearGradient><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4258"
        id="linearGradient4264"
        x1="59.220116"
@@ -838,7 +318,6 @@
        y2="1025.2668"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1.7498306,0,0,1.8651544,-40.901292,-961.63121)" /><linearGradient
-       inkscape:collect="always"
        id="linearGradient4258"><stop
          style="stop-color:#e0bf47;stop-opacity:1;"
          offset="0"
@@ -848,58 +327,15 @@
          style="stop-color:#ecd685;stop-opacity:1;" /><stop
          style="stop-color:#c3a340;stop-opacity:1;"
          offset="1"
-         id="stop4262" /></linearGradient></defs><sodipodi:namedview
-     id="base"
-     pagecolor="#bcbcbc"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7.185918"
-     inkscape:cx="54.064074"
-     inkscape:cy="10.297919"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1728"
-     inkscape:window-height="1051"
-     inkscape:window-x="0"
-     inkscape:window-y="38"
-     inkscape:window-maximized="1"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="true"
-     inkscape:snap-bbox="true"
-     inkscape:bbox-nodes="true"
-     inkscape:showpageshadow="2"
-     inkscape:pagecheckerboard="0"
-     inkscape:deskcolor="#d1d1d1"><inkscape:grid
-       type="xygrid"
-       id="grid4112"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       originx="0"
-       originy="0"
-       spacingy="1"
-       spacingx="1"
-       units="px" /></sodipodi:namedview><metadata
+         id="stop4262" /></linearGradient></defs><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" /></cc:Work></rdf:RDF></metadata><g
-     inkscape:groupmode="layer"
      id="layer2"
-     inkscape:label="Background"
-     style="display:inline"
-     sodipodi:insensitive="true"><path
-       sodipodi:nodetypes="cccc"
-       inkscape:connector-curvature="0"
+     style="display:inline"><path
        id="rect4113-1"
        d="M 75,0 75,66 1e-6,66 C 1e-6,41.2048 50.00969,0 75,0 Z"
        style="display:inline;fill:url(#linearGradient4978);fill-opacity:1;stroke:none" /><path
-       sodipodi:nodetypes="cccc"
-       inkscape:connector-curvature="0"
        id="rect4113-1-0"
        d="M 75,21.0607 75,66 1e-6,66 C 10.625001,47.804 43.509694,25.4357 75,21.0607 Z"
        style="display:inline;opacity:0.40400002;fill:url(#linearGradient4962);fill-opacity:1;stroke:none" /><g
@@ -908,54 +344,32 @@
        transform="matrix(0.27903303,0,0,0.27903303,-14.618136,-107.52874)"><g
          style="fill:#737986;fill-opacity:1;stroke:#595e68;stroke-opacity:1"
          id="g13408-8-2" /></g><path
-       sodipodi:nodetypes="cccc"
-       inkscape:connector-curvature="0"
        id="rect4113-1-7"
        d="M 75,4.0000001e-7 75,66 30.000003,66 C 30.000003,46.1545 47.70944,9.2500004 75,4e-7 Z"
        style="display:inline;opacity:0.18399999;fill:url(#linearGradient4970);fill-opacity:1;stroke:none" /></g><g
-     inkscape:label="Foreground"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-986.3622)"><path
        style="font-style:normal;font-weight:normal;font-size:13.5892px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;display:inline;fill:url(#linearGradient4462);fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;filter:url(#filter4606)"
        d="m 47.000294,1007.3622 -12.319149,16.9335 -12.416197,17.0669 h 16.933329 17.066666 l 12.416197,-17.0669 0.09676,-0.133 L 81,1007.3626 H 63.933334 47.000005 Z"
        id="rect10961-8-3-6-1"
-       inkscape:connector-curvature="0"
-       transform="matrix(1.1726471,0,0.08958029,0.36603268,-111.08155,660.8224)"
-       inkscape:transform-center-x="4.353394"
-       inkscape:transform-center-y="0.53407509"
-       inkscape:label="shadow" /><g
+       transform="matrix(1.1726471,0,0.08958029,0.36603268,-111.08155,660.8224)" /><g
        id="g1"
-       transform="rotate(90,11.15276,983.68891)"
-       inkscape:label="paper"><path
-         sodipodi:nodetypes="cccccc"
-         inkscape:connector-curvature="0"
+       transform="rotate(90,11.15276,983.68891)"><path
          id="rect4001-3-4"
          d="M 36,942.47377 H 59.759832 L 68.91118,952.86667 69,986.47377 H 36 Z"
-         style="display:inline;fill:url(#linearGradient6375-6);fill-opacity:1;stroke:none"
-         inkscape:label="fill" /><path
-         sodipodi:nodetypes="ccscccc"
-         inkscape:connector-curvature="0"
+         style="display:inline;fill:url(#linearGradient6375-6);fill-opacity:1;stroke:none" /><path
          id="rect4001-1"
          d="m 35.5,941.97375 h 23.755611 c 0,0 7.142644,1.47217 5.331245,4.86412 -0.05617,0.1062 4.913143,5.7835 4.913143,5.7835 v 34.3524 H 35.5 Z"
-         style="display:inline;fill:none;stroke:url(#linearGradient4238);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1"
-         inkscape:label="border" /><path
-         sodipodi:nodetypes="cccccc"
-         inkscape:connector-curvature="0"
+         style="display:inline;fill:none;stroke:url(#linearGradient4238);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1" /><path
          id="rect4001-3-9-0"
          d="M 59.82782,942.16722 69,952.61557 v 10.8582 l -13.460738,-9.4981 c 1.765426,-3.8089 3.044415,-7.7874 4.288484,-11.80845 z"
-         style="display:none;fill:url(#linearGradient4240);fill-opacity:1;stroke:none"
-         inkscape:label="shadow" /><path
-         sodipodi:nodetypes="cccc"
+         style="display:none;fill:url(#linearGradient4240);fill-opacity:1;stroke:none" /><path
          id="path5675-4"
          d="m 59.227017,941.37085 c 1.979191,2.74202 4.365887,6.24982 2.596924,12.24302 4.070558,-2.3415 8.288172,-1.0995 8.288172,-1.0995 0,-5.5953 -6.679314,-11.40728 -10.885096,-11.14352 z"
-         style="display:inline;fill:url(#linearGradient4264);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         inkscape:connector-curvature="0"
-         inkscape:label="edge" /></g><g
+         style="display:inline;fill:url(#linearGradient4264);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /></g><g
        id="g2"
        transform="matrix(1.0711236,0,0,1.0330936,3.6455974,982.75691)"
-       inkscape:label="plug"
        style="stroke-width:0.950626"><g
          transform="matrix(1.0729615,0,0,1.0787087,-1.2096914,-0.17204372)"
          id="g2558-4"
@@ -963,34 +377,23 @@
            transform="matrix(1.029538,0,0,1.1281495,-40.181606,-1129.0381)"
            style="fill:#808080;fill-opacity:1;stroke:#808080;stroke-width:0.8199px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter8813-5)"
            d="m 53.577367,1026.9835 -0.152425,-8.8407 0.91455,-1.2194 3.124711,-0.076 0.07621,-0.9908 h 0.91455 l -0.07621,1.9054 -3.048499,1.2194 -0.152425,4.9538 z"
-           id="path8791-1"
-           inkscape:connector-curvature="0" /><path
+           id="path8791-1" /><path
            id="path8722-7-8"
            style="display:inline;opacity:1;fill:#808080;fill-opacity:1;stroke:#808080;stroke-width:0.883621;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="M 3.4999999,23.512598 V 25.5 H 14.5 V 21.525196 H 3.4999999 v 1.987402"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccccc" /><path
-           sodipodi:nodetypes="csssscsscccsssscsscc"
+           d="M 3.4999999,23.512598 V 25.5 H 14.5 V 21.525196 H 3.4999999 v 1.987402" /><path
            id="rect8645-3-9"
            style="display:inline;opacity:1;fill:#808080;fill-opacity:1;stroke:#808080;stroke-width:0.883621;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="M 25.499998,23.781495 25.5,15.413559 C 25.5,13.799403 24.568942,12.5 23.412427,12.5 h -2.424855 c -1.156515,0 -2.483072,1.299403 -2.483072,2.913559 v 1.599039 h -2.264856 c -0.963763,0 -1.739644,0.794104 -1.739644,1.780446 v 1.468512 3.519375 m 10.999998,5.64e-4 2e-6,8.367936 c 0,1.614156 -0.931058,2.913559 -2.087573,2.913559 h -2.424855 c -1.156515,0 -2.483072,-1.299403 -2.483072,-2.913559 V 30.550392 H 16.239644 C 15.275881,30.550392 14.5,29.756288 14.5,28.769946 v -1.468512 -3.519375"
-           inkscape:connector-curvature="0" /><path
-           sodipodi:nodetypes="cc"
-           inkscape:connector-curvature="0"
+           d="M 25.499998,23.781495 25.5,15.413559 C 25.5,13.799403 24.568942,12.5 23.412427,12.5 h -2.424855 c -1.156515,0 -2.483072,1.299403 -2.483072,2.913559 v 1.599039 h -2.264856 c -0.963763,0 -1.739644,0.794104 -1.739644,1.780446 v 1.468512 3.519375 m 10.999998,5.64e-4 2e-6,8.367936 c 0,1.614156 -0.931058,2.913559 -2.087573,2.913559 h -2.424855 c -1.156515,0 -2.483072,-1.299403 -2.483072,-2.913559 V 30.550392 H 16.239644 C 15.275881,30.550392 14.5,29.756288 14.5,28.769946 v -1.468512 -3.519375" /><path
            id="path2537-0"
            d="M 18.51661,16.539741 18.5464,30.705846"
            style="fill:#808080;stroke:#808080;stroke-width:0.883621px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /><path
            id="rect8645-2-5-2"
            style="display:inline;opacity:1;fill:#808080;fill-opacity:1;stroke:#808080;stroke-width:0.883621;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="m 36.091538,26.489769 -10e-7,1.058985 c 0,1.06945 -0.863288,1.955925 -2.164732,1.930363 -1.301445,-0.02541 -1.941636,0 -1.941636,0 v 0.201512 c 0,1.544678 -1.158564,2.787985 -2.597679,2.788284 l -1.648306,2.98e-4 c -1.360345,3e-4 -1.22903,0.546236 -1.22903,-2.989646 V 17.520381 c 0,-3.536032 -0.205068,-2.989797 1.22903,-2.989797 h 1.648306 c 1.439115,0 2.597679,1.243607 2.597679,2.788284 v 0.201513 h 1.941637 c 1.199261,0 2.164732,0.860911 2.164732,1.930361 v 2.554332 z m 0.06454,-6.010119 h 8.461471 l -0.05085,6.010119 h -8.188123"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cczccssssssccsccccccc" /><path
+           d="m 36.091538,26.489769 -10e-7,1.058985 c 0,1.06945 -0.863288,1.955925 -2.164732,1.930363 -1.301445,-0.02541 -1.941636,0 -1.941636,0 v 0.201512 c 0,1.544678 -1.158564,2.787985 -2.597679,2.788284 l -1.648306,2.98e-4 c -1.360345,3e-4 -1.22903,0.546236 -1.22903,-2.989646 V 17.520381 c 0,-3.536032 -0.205068,-2.989797 1.22903,-2.989797 h 1.648306 c 1.439115,0 2.597679,1.243607 2.597679,2.788284 v 0.201513 h 1.941637 c 1.199261,0 2.164732,0.860911 2.164732,1.930361 v 2.554332 z m 0.06454,-6.010119 h 8.461471 l -0.05085,6.010119 h -8.188123" /><path
            transform="matrix(1.445753,0,0,1.3224494,-65.097292,-1327.9481)"
            style="opacity:0.794;fill:#808080;fill-opacity:1;stroke:#808080;stroke-width:0.639041px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter8871-4)"
            d="m 64.018476,1016.5423 -0.152427,10.8222 c 2.375507,-3.3036 3.484206,-4.2052 2.972286,-9.2217 0.305009,-1.654 -1.117834,-1.7529 -2.819859,-1.6005 z"
-           id="path8861-9"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccc" /><ellipse
+           id="path8861-9" /><ellipse
            transform="matrix(1.029538,0,0,1.1281495,-39.470994,-1128.0797)"
            style="opacity:0.828;fill:#808080;fill-opacity:1;stroke:#808080;stroke-width:0.8199;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter8835-5)"
            id="path8817-1"
@@ -1001,14 +404,11 @@
            transform="matrix(1.7350569,0,0,1.8824502,-91.814902,-1903.1505)"
            style="opacity:0.862;fill:#808080;fill-opacity:1;stroke:#808080;stroke-width:0.48893px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter2533-6)"
            d="m 70.953811,1023.4014 v -1.8291 l 2.972286,-0.076 z"
-           id="path8875-0"
-           inkscape:connector-curvature="0" /><path
+           id="path8875-0" /><path
            transform="matrix(1.029538,0,0,1.1281495,-39.928294,-1128.6206)"
            style="display:inline;opacity:0.485;fill:#808080;fill-opacity:1;stroke:#808080;stroke-width:0.8199px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter8871-1-6)"
            d="m 53.924652,1016.631 -0.152427,10.8222 c 2.375507,-3.3036 3.484206,-4.2052 2.972286,-9.2217 0.305009,-1.654 -1.117834,-1.7529 -2.819859,-1.6005 z"
-           id="path8861-7-0"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccc" /></g><g
+           id="path8861-7-0" /></g><g
          id="g11331-3-1-1"
          style="display:inline;stroke-width:0.950626"
          transform="matrix(0.92787456,0,0,0.92766861,-283.31685,-391.9053)"><g
@@ -1041,34 +441,23 @@
            transform="matrix(1.029538,0,0,1.1281495,-40.181606,-1129.0381)"
            style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.882075px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter8813)"
            d="m 53.577367,1026.9835 -0.152425,-8.8407 0.91455,-1.2194 3.124711,-0.076 0.07621,-0.9908 h 0.91455 l -0.07621,1.9054 -3.048499,1.2194 -0.152425,4.9538 z"
-           id="path8791"
-           inkscape:connector-curvature="0" /><path
+           id="path8791" /><path
            id="path8722-7"
            style="display:inline;opacity:1;fill:url(#linearGradient8769);fill-opacity:1;stroke:url(#linearGradient8753);stroke-width:0.950626;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="M 3.4999999,23.512598 V 25.5 H 14.5 V 21.525196 H 3.4999999 v 1.987402"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccccc" /><path
-           sodipodi:nodetypes="csssscsscccsssscsscc"
+           d="M 3.4999999,23.512598 V 25.5 H 14.5 V 21.525196 H 3.4999999 v 1.987402" /><path
            id="rect8645-3"
            style="display:inline;opacity:1;fill:url(#linearGradient8761);fill-opacity:1;stroke:#4d73ae;stroke-width:0.950626;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="M 25.499998,23.781495 25.5,15.413559 C 25.5,13.799403 24.568942,12.5 23.412427,12.5 h -2.424855 c -1.156515,0 -2.483072,1.299403 -2.483072,2.913559 v 1.599039 h -2.264856 c -0.963763,0 -1.739644,0.794104 -1.739644,1.780446 v 1.468512 3.519375 m 10.999998,5.64e-4 2e-6,8.367936 c 0,1.614156 -0.931058,2.913559 -2.087573,2.913559 h -2.424855 c -1.156515,0 -2.483072,-1.299403 -2.483072,-2.913559 V 30.550392 H 16.239644 C 15.275881,30.550392 14.5,29.756288 14.5,28.769946 v -1.468512 -3.519375"
-           inkscape:connector-curvature="0" /><path
-           sodipodi:nodetypes="cc"
-           inkscape:connector-curvature="0"
+           d="M 25.499998,23.781495 25.5,15.413559 C 25.5,13.799403 24.568942,12.5 23.412427,12.5 h -2.424855 c -1.156515,0 -2.483072,1.299403 -2.483072,2.913559 v 1.599039 h -2.264856 c -0.963763,0 -1.739644,0.794104 -1.739644,1.780446 v 1.468512 3.519375 m 10.999998,5.64e-4 2e-6,8.367936 c 0,1.614156 -0.931058,2.913559 -2.087573,2.913559 h -2.424855 c -1.156515,0 -2.483072,-1.299403 -2.483072,-2.913559 V 30.550392 H 16.239644 C 15.275881,30.550392 14.5,29.756288 14.5,28.769946 v -1.468512 -3.519375" /><path
            id="path2537"
            d="M 18.51661,16.539741 18.5464,30.705846"
            style="fill:none;stroke:url(#linearGradient2545);stroke-width:0.950626px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /><path
            id="rect8645-2-5"
            style="display:inline;opacity:1;fill:url(#linearGradient8779);fill-opacity:1;stroke:url(#linearGradient8787);stroke-width:0.950626;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="m 36.091538,26.489769 -10e-7,1.058985 c 0,1.06945 -0.863288,1.955925 -2.164732,1.930363 -1.301445,-0.02541 -1.941636,0 -1.941636,0 v 0.201512 c 0,1.544678 -1.158564,2.787985 -2.597679,2.788284 l -1.648306,2.98e-4 c -1.360345,3e-4 -1.22903,0.546236 -1.22903,-2.989646 V 17.520381 c 0,-3.536032 -0.205068,-2.989797 1.22903,-2.989797 h 1.648306 c 1.439115,0 2.597679,1.243607 2.597679,2.788284 v 0.201513 h 1.941637 c 1.199261,0 2.164732,0.860911 2.164732,1.930361 v 2.554332 z m 0.06454,-6.010119 h 8.461471 l -0.05085,6.010119 h -8.188123"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cczccssssssccsccccccc" /><path
+           d="m 36.091538,26.489769 -10e-7,1.058985 c 0,1.06945 -0.863288,1.955925 -2.164732,1.930363 -1.301445,-0.02541 -1.941636,0 -1.941636,0 v 0.201512 c 0,1.544678 -1.158564,2.787985 -2.597679,2.788284 l -1.648306,2.98e-4 c -1.360345,3e-4 -1.22903,0.546236 -1.22903,-2.989646 V 17.520381 c 0,-3.536032 -0.205068,-2.989797 1.22903,-2.989797 h 1.648306 c 1.439115,0 2.597679,1.243607 2.597679,2.788284 v 0.201513 h 1.941637 c 1.199261,0 2.164732,0.860911 2.164732,1.930361 v 2.554332 z m 0.06454,-6.010119 h 8.461471 l -0.05085,6.010119 h -8.188123" /><path
            transform="matrix(1.445753,0,0,1.3224494,-65.097292,-1327.9481)"
            style="opacity:0.794;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.6875px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter8871)"
            d="m 64.018476,1016.5423 -0.152427,10.8222 c 2.375507,-3.3036 3.484206,-4.2052 2.972286,-9.2217 0.305009,-1.654 -1.117834,-1.7529 -2.819859,-1.6005 z"
-           id="path8861"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccc" /><ellipse
+           id="path8861" /><ellipse
            transform="matrix(1.029538,0,0,1.1281495,-39.470994,-1128.0797)"
            style="opacity:0.828;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.882075;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter8835)"
            id="path8817"
@@ -1079,11 +468,8 @@
            transform="matrix(1.7350569,0,0,1.8824502,-91.814902,-1903.1505)"
            style="opacity:0.862;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.526007px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter2533)"
            d="m 70.953811,1023.4014 v -1.8291 l 2.972286,-0.076 z"
-           id="path8875"
-           inkscape:connector-curvature="0" /><path
+           id="path8875" /><path
            transform="matrix(1.029538,0,0,1.1281495,-39.928294,-1128.6206)"
            style="display:inline;opacity:0.485;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.882075px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter8871-1)"
            d="m 53.924652,1016.631 -0.152427,10.8222 c 2.375507,-3.3036 3.484206,-4.2052 2.972286,-9.2217 0.305009,-1.654 -1.117834,-1.7529 -2.819859,-1.6005 z"
-           id="path8861-7"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccc" /></g></g></g></svg>
+           id="path8861-7" /></g></g></g></svg>
diff --git a/ui/org.eclipse.pde.ui/icons/wizban/newfolder_wiz.svg b/ui/org.eclipse.pde.ui/icons/wizban/newfolder_wiz.svg
index d3ba472873b..7839d515d0a 100644
--- a/ui/org.eclipse.pde.ui/icons/wizban/newfolder_wiz.svg
+++ b/ui/org.eclipse.pde.ui/icons/wizban/newfolder_wiz.svg
@@ -1,16 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg
-   inkscape:export-ydpi="90"
-   inkscape:export-xdpi="90"
-   inkscape:export-filename="/Users/d021678/git/eclipse.jdt.ui/org.eclipse.jdt.ui/icons/full/wizban/newclass_wiz2.png"
-   sodipodi:docname="newfolder_wiz.svg"
-   inkscape:version="1.3 (0e150ed, 2023-07-21)"
    version="1.1"
    id="svg2"
    height="66"
    width="75"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:svg="http://www.w3.org/2000/svg"
@@ -19,404 +12,6 @@
    xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
-    <linearGradient
-       id="linearGradient4541"
-       inkscape:collect="always">
-      <stop
-         id="stop4543"
-         offset="0"
-         style="stop-color:#a1adb2;stop-opacity:1" />
-      <stop
-         id="stop4545"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4972"
-       inkscape:collect="always">
-      <stop
-         id="stop4974"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1" />
-      <stop
-         id="stop4976"
-         offset="1"
-         style="stop-color:#f5f8fd;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4964"
-       inkscape:collect="always">
-      <stop
-         id="stop4966"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1" />
-      <stop
-         id="stop4968"
-         offset="1"
-         style="stop-color:#e8eefa;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4956"
-       inkscape:collect="always">
-      <stop
-         id="stop4958"
-         offset="0"
-         style="stop-color:#fcfdfe;stop-opacity:1" />
-      <stop
-         id="stop4960"
-         offset="1"
-         style="stop-color:#dee6f8;stop-opacity:1" />
-    </linearGradient>
-    <filter
-       id="filter8854"
-       inkscape:label="Drop Shadow"
-       style="color-interpolation-filters:sRGB">
-      <feFlood
-         id="feFlood8856"
-         result="flood"
-         flood-color="rgb(244,248,254)"
-         flood-opacity="0.933333" />
-      <feComposite
-         id="feComposite8858"
-         result="composite1"
-         operator="in"
-         in2="SourceGraphic"
-         in="flood" />
-      <feGaussianBlur
-         id="feGaussianBlur8860"
-         result="blur"
-         stdDeviation="1.2"
-         in="composite1" />
-      <feOffset
-         id="feOffset8862"
-         result="offset"
-         dy="3"
-         dx="-1" />
-      <feComposite
-         id="feComposite8864"
-         result="composite2"
-         operator="over"
-         in2="offset"
-         in="SourceGraphic" />
-    </filter>
-    <linearGradient
-       id="linearGradient6122">
-      <stop
-         id="stop6124"
-         offset="0"
-         style="stop-color:#c0c0c0;stop-opacity:1" />
-      <stop
-         style="stop-color:#adadad;stop-opacity:1"
-         offset="0.5"
-         id="stop6132" />
-      <stop
-         id="stop6126"
-         offset="1"
-         style="stop-color:#808080;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient7087">
-      <stop
-         id="stop7089"
-         offset="0"
-         style="stop-color:#17325d;stop-opacity:1;" />
-      <stop
-         style="stop-color:#b4d0e2;stop-opacity:1"
-         offset="0.25"
-         id="stop7091" />
-      <stop
-         style="stop-color:#b7d2e4;stop-opacity:1"
-         offset="0.5"
-         id="stop7093" />
-      <stop
-         id="stop7095"
-         offset="0.75"
-         style="stop-color:#acc9de;stop-opacity:1" />
-      <stop
-         id="stop7097"
-         offset="1"
-         style="stop-color:#3e72a7;stop-opacity:1" />
-    </linearGradient>
-    <mask
-       maskUnits="userSpaceOnUse"
-       id="mask7366">
-      <path
-         sodipodi:nodetypes="ccccccc"
-         inkscape:connector-curvature="0"
-         id="path7368"
-         d="m -16.593048,1040.862 9.990206,0 0,10.0018 -2.983353,3.0385 -5.966213,0 c -0.53033,-0.022 -1.04064,-0.5519 -1.04064,-1.0385 z"
-         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;display:inline" />
-    </mask>
-    <linearGradient
-       id="linearGradient7584-5">
-      <stop
-         style="stop-color:#f9cd5f;stop-opacity:1"
-         offset="0"
-         id="stop7586-4" />
-      <stop
-         style="stop-color:#fbf0b4;stop-opacity:1"
-         offset="1"
-         id="stop7588-5" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient7592-1">
-      <stop
-         style="stop-color:#bd8416;stop-opacity:1"
-         offset="0"
-         id="stop7594-6" />
-      <stop
-         style="stop-color:#a66b10;stop-opacity:1"
-         offset="1"
-         id="stop7596-9" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10798-1-9-3-7-6-6-6-2-6-7-98-9-4-1">
-      <stop
-         id="stop10800-5-2-1-8-20-4-0-2-1-9-0-0-1-1"
-         offset="0"
-         style="stop-color:#5aad60;stop-opacity:1;" />
-      <stop
-         style="stop-color:#5bb26a;stop-opacity:1;"
-         offset="0.5"
-         id="stop10806-6-8-5-3-9-2-2-7-0-4-2-7-8-9" />
-      <stop
-         id="stop10802-1-5-3-0-4-6-8-5-5-6-69-6-4-0"
-         offset="1"
-         style="stop-color:#a4c589;stop-opacity:1" />
-    </linearGradient>
-    <mask
-       id="mask7366-4"
-       maskUnits="userSpaceOnUse">
-      <path
-         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;display:inline"
-         d="m -16.593048,1040.862 9.990206,0 0,10.0018 -2.983353,3.0385 -5.966213,0 c -0.53033,-0.022 -1.04064,-0.5519 -1.04064,-1.0385 z"
-         id="path7368-2"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccccc" />
-    </mask>
-    <linearGradient
-       y2="1041.911"
-       x2="4.7776356"
-       y1="1039.8118"
-       x1="4.7776356"
-       gradientTransform="translate(-20,0)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient9331"
-       xlink:href="#linearGradient7087"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient7087"
-       id="linearGradient9333"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-18,4.7e-5)"
-       x1="4.7776356"
-       y1="1039.8118"
-       x2="4.7776356"
-       y2="1041.911" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient7087"
-       id="linearGradient9335"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-16,4.7e-5)"
-       x1="4.7776356"
-       y1="1039.8118"
-       x2="4.7776356"
-       y2="1041.911" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient7087"
-       id="linearGradient9337"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-14,4.7e-5)"
-       x1="4.7776356"
-       y1="1039.8118"
-       x2="4.7776356"
-       y2="1041.911" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient7087"
-       id="linearGradient9339"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-12,4.7e-5)"
-       x1="4.7776356"
-       y1="1039.8118"
-       x2="4.7776356"
-       y2="1041.911" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4956"
-       id="linearGradient68073"
-       x1="88.220117"
-       y1="1042.7973"
-       x2="163.22012"
-       y2="1042.7973"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-80,0)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4964"
-       id="linearGradient68075"
-       x1="94.469681"
-       y1="1032.2668"
-       x2="163.22012"
-       y2="1032.2669"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-80,0)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4972"
-       id="linearGradient68077"
-       x1="88.220116"
-       y1="1032.2668"
-       x2="152.72206"
-       y2="1032.2668"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-80,0)" />
-    <filter
-       style="color-interpolation-filters:sRGB"
-       inkscape:label="Drop Shadow"
-       id="filter8854-9">
-      <feFlood
-         flood-opacity="0.933333"
-         flood-color="rgb(244,248,254)"
-         result="flood"
-         id="feFlood8856-0" />
-      <feComposite
-         in="flood"
-         in2="SourceGraphic"
-         operator="in"
-         result="composite1"
-         id="feComposite8858-2" />
-      <feGaussianBlur
-         in="composite1"
-         stdDeviation="1.2"
-         result="blur"
-         id="feGaussianBlur8860-3" />
-      <feOffset
-         dx="-1"
-         dy="3"
-         result="offset"
-         id="feOffset8862-2" />
-      <feComposite
-         in="SourceGraphic"
-         in2="offset"
-         operator="over"
-         result="composite2"
-         id="feComposite8864-3" />
-    </filter>
-    <linearGradient
-       id="linearGradient10798-1-9-3-7-6-8-9-0-9-1">
-      <stop
-         style="stop-color:#7564b1;stop-opacity:1"
-         offset="0"
-         id="stop10800-5-2-1-8-20-6-4-9-8-2" />
-      <stop
-         id="stop10806-6-8-5-3-9-24-8-4-3-2"
-         offset="0.5"
-         style="stop-color:#5d4aa1;stop-opacity:1" />
-      <stop
-         style="stop-color:#9283c3;stop-opacity:1"
-         offset="1"
-         id="stop10802-1-5-3-0-4-8-4-2-9-2" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient7540-2-3-8-7">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.502"
-         offset="0"
-         id="stop7542-8-7-5-3" />
-      <stop
-         id="stop7544-8-2-0-5"
-         offset="0.47623286"
-         style="stop-color:#ffffff;stop-opacity:1" />
-      <stop
-         id="stop7546-1-7-9-5"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop7548-98-9-2-4" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient7272-66-4-5-5-5-8"
-       inkscape:collect="always">
-      <stop
-         id="stop7274-6-0-1-7-4-7"
-         offset="0"
-         style="stop-color:#8f6c10;stop-opacity:1" />
-      <stop
-         id="stop7276-66-6-3-9-1-4"
-         offset="1"
-         style="stop-color:#c9a645;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient7540-2-3-8-7"
-       id="linearGradient10540"
-       gradientUnits="userSpaceOnUse"
-       x1="-22.453552"
-       y1="1030.3411"
-       x2="-10.159802"
-       y2="1030.3411" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient7540-2-3-8-7"
-       id="linearGradient10542"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0,1,-1,0,1014.0344,1046.6478)"
-       x1="-22.453552"
-       y1="1030.3411"
-       x2="-10.159802"
-       y2="1030.3411" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient7272-66-4-5-5-5-8"
-       id="linearGradient10544"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.95585117,0,0,0.95585117,-0.71992063,45.488394)"
-       x1="-15.945988"
-       y1="1037.4661"
-       x2="-15.945988"
-       y2="1023.2569" />
-    <mask
-       maskUnits="userSpaceOnUse"
-       id="mask10620">
-      <path
-         sodipodi:type="arc"
-         style="font-size:13.58917427px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:2.16621375;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline;font-family:Sans"
-         id="path10622"
-         sodipodi:cx="388.125"
-         sodipodi:cy="468.23718"
-         sodipodi:rx="10.625"
-         sodipodi:ry="10.625"
-         d="m 398.75,468.23718 a 10.625,10.625 0 1 1 -21.25,0 10.625,10.625 0 1 1 21.25,0 z"
-         transform="matrix(0.55482947,0,0,0.55482947,-206.96039,787.08655)" />
-    </mask>
-    <linearGradient
-       id="linearGradient4528-9-5-7-9-7-3">
-      <stop
-         style="stop-color:#e0c576;stop-opacity:1;"
-         offset="0"
-         id="stop4530-0-5-0-5-8-4" />
-      <stop
-         style="stop-color:#9e7916;stop-opacity:1"
-         offset="1"
-         id="stop4532-7-9-3-3-6-1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient6281-8-0-1-6-6-4-2-8-0">
-      <stop
-         id="stop6283-0-2-2-1-2-0-1-6-0"
-         offset="0"
-         style="stop-color:#f7f9fb;stop-opacity:1" />
-      <stop
-         id="stop6285-5-0-9-7-6-9-9-1-9"
-         offset="1"
-         style="stop-color:#ffd680;stop-opacity:1" />
-    </linearGradient>
     <linearGradient
        gradientTransform="translate(-88.220116,-999.2669)"
        gradientUnits="userSpaceOnUse"
@@ -425,11 +20,9 @@
        y1="1032.2668"
        x1="88.220116"
        id="linearGradient4978"
-       xlink:href="#linearGradient4972-7"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4972-7" />
     <linearGradient
-       id="linearGradient4972-7"
-       inkscape:collect="always">
+       id="linearGradient4972-7">
       <stop
          id="stop4974-8"
          offset="0"
@@ -447,11 +40,9 @@
        y1="1032.1835"
        x1="118.38584"
        id="linearGradient4970"
-       xlink:href="#linearGradient4964-3"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4964-3" />
     <linearGradient
-       id="linearGradient4964-3"
-       inkscape:collect="always">
+       id="linearGradient4964-3">
       <stop
          id="stop4966-1"
          offset="0"
@@ -469,11 +60,9 @@
        y1="1042.7972"
        x1="88.220116"
        id="linearGradient4962"
-       xlink:href="#linearGradient4956-2"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4956-2" />
     <linearGradient
-       id="linearGradient4956-2"
-       inkscape:collect="always">
+       id="linearGradient4956-2">
       <stop
          id="stop4958-5"
          offset="0"
@@ -484,47 +73,6 @@
          style="stop-color:#98aae7;stop-opacity:0.40392157" />
     </linearGradient>
     <linearGradient
-       id="linearGradient3827">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="0"
-         id="stop3829" />
-      <stop
-         id="stop3835"
-         offset="0.60149658"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop3831" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10798-1-9-3-7-6-8-9-0-9-1-0">
-      <stop
-         style="stop-color:#f3faed;stop-opacity:1"
-         offset="0"
-         id="stop10800-5-2-1-8-20-6-4-9-8-2-9" />
-      <stop
-         id="stop10806-6-8-5-3-9-24-8-4-3-2-4"
-         offset="0.65917557"
-         style="stop-color:#e7f4da;stop-opacity:1" />
-      <stop
-         style="stop-color:#67bf1f;stop-opacity:1"
-         offset="1"
-         id="stop10802-1-5-3-0-4-8-4-2-9-2-5" />
-    </linearGradient>
-    <linearGradient
-       gradientTransform="matrix(0,1,-1,0,1034.3618,967.36133)"
-       gradientUnits="userSpaceOnUse"
-       y2="1008.3622"
-       x2="60"
-       y1="1007.8622"
-       x1="41"
-       id="linearGradient5885"
-       xlink:href="#linearGradient4541"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
        id="linearGradient4894">
       <stop
          style="stop-color:#000000;stop-opacity:1"
@@ -544,8 +92,7 @@
          id="stop4898" />
     </linearGradient>
     <linearGradient
-       id="linearGradient5252"
-       inkscape:collect="always">
+       id="linearGradient5252">
       <stop
          id="stop5254"
          offset="0"
@@ -556,8 +103,7 @@
          style="stop-color:#765d54;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       id="linearGradient4199"
-       inkscape:collect="always">
+       id="linearGradient4199">
       <stop
          id="stop4201"
          offset="0"
@@ -571,48 +117,6 @@
          offset="1"
          style="stop-color:#765d54;stop-opacity:1" />
     </linearGradient>
-    <linearGradient
-       id="linearGradient11146-4-4-4-6-2">
-      <stop
-         style="stop-color:#faefba;stop-opacity:1"
-         offset="0"
-         id="stop11150-4-72-3-9-7" />
-      <stop
-         id="stop11152-9-0-7-3-8"
-         offset="1"
-         style="stop-color:#9e6542;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10507">
-      <stop
-         id="stop10509"
-         offset="0"
-         style="stop-color:#5f392d;stop-opacity:1" />
-      <stop
-         style="stop-color:#9e7058;stop-opacity:1"
-         offset="0.18181793"
-         id="stop10511" />
-      <stop
-         style="stop-color:#794f40;stop-opacity:1"
-         offset="0.36363617"
-         id="stop10513" />
-      <stop
-         style="stop-color:#794f40;stop-opacity:1"
-         offset="0.49999985"
-         id="stop10515" />
-      <stop
-         style="stop-color:#794f40;stop-opacity:1"
-         offset="0.63636351"
-         id="stop10517" />
-      <stop
-         id="stop10519"
-         offset="0.81818175"
-         style="stop-color:#9e7058;stop-opacity:1" />
-      <stop
-         id="stop10522"
-         offset="1"
-         style="stop-color:#5f392d;stop-opacity:1" />
-    </linearGradient>
     <linearGradient
        gradientTransform="matrix(1,0,-0.72750163,1,733.40264,2.0004)"
        gradientUnits="userSpaceOnUse"
@@ -621,11 +125,9 @@
        y1="1039.3618"
        x1="63.734764"
        id="linearGradient4462"
-       xlink:href="#linearGradient4456"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4456" />
     <linearGradient
-       id="linearGradient4456"
-       inkscape:collect="always">
+       id="linearGradient4456">
       <stop
          id="stop4458"
          offset="0"
@@ -641,12 +143,10 @@
        width="1.1259523"
        x="-0.062976157"
        id="filter4606"
-       style="color-interpolation-filters:sRGB"
-       inkscape:collect="always">
+       style="color-interpolation-filters:sRGB">
       <feGaussianBlur
          id="feGaussianBlur4608"
-         stdDeviation="1.5412116"
-         inkscape:collect="always" />
+         stdDeviation="1.5412116" />
     </filter>
     <linearGradient
        gradientTransform="matrix(1.4358218,0,0,1.270043,-3.499458,-7.3507277)"
@@ -656,8 +156,7 @@
        y1="26"
        x1="12"
        id="linearGradient4205-2"
-       xlink:href="#linearGradient4199"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4199" />
     <linearGradient
        gradientTransform="matrix(1.0044289,0,0,1.0089329,10.981389,-7.447563)"
        gradientUnits="userSpaceOnUse"
@@ -666,8 +165,7 @@
        y1="67.148781"
        x1="11.927121"
        id="linearGradient4884-4"
-       xlink:href="#linearGradient4894"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4894" />
     <linearGradient
        gradientTransform="matrix(1.0067606,0,0,1.0132311,10.880208,-7.5854333)"
        gradientUnits="userSpaceOnUse"
@@ -676,20 +174,17 @@
        y1="64"
        x1="5"
        id="linearGradient5258-8"
-       xlink:href="#linearGradient5252"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient5252" />
     <filter
        height="2.376"
        y="-0.68799998"
        width="1.8256"
        x="-0.41279999"
        id="filter5309-3"
-       style="color-interpolation-filters:sRGB"
-       inkscape:collect="always">
+       style="color-interpolation-filters:sRGB">
       <feGaussianBlur
          id="feGaussianBlur5311-6"
-         stdDeviation="2.58"
-         inkscape:collect="always" />
+         stdDeviation="2.58" />
     </filter>
     <linearGradient
        gradientTransform="matrix(1,0,0,1.0179005,6.5979291,-9.4754449)"
@@ -699,11 +194,9 @@
        x1="72.098145"
        gradientUnits="userSpaceOnUse"
        id="linearGradient4936-4"
-       xlink:href="#linearGradient4944-0"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4944-0" />
     <linearGradient
-       id="linearGradient4944-0"
-       inkscape:collect="always">
+       id="linearGradient4944-0">
       <stop
          id="stop4908-5"
          offset="0"
@@ -729,11 +222,9 @@
        y1="74.470169"
        x1="60.342896"
        id="linearGradient4956-9-2"
-       xlink:href="#linearGradient4950-5"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4950-5" />
     <linearGradient
-       id="linearGradient4950-5"
-       inkscape:collect="always">
+       id="linearGradient4950-5">
       <stop
          id="stop4952-1"
          offset="0"
@@ -744,46 +235,6 @@
          style="stop-color:#978379;stop-opacity:1" />
     </linearGradient>
   </defs>
-  <sodipodi:namedview
-     inkscape:document-rotation="0"
-     inkscape:bbox-nodes="true"
-     inkscape:snap-bbox="true"
-     inkscape:snap-global="true"
-     inkscape:guide-bbox="true"
-     showguides="true"
-     inkscape:window-maximized="1"
-     inkscape:window-y="38"
-     inkscape:window-x="0"
-     inkscape:window-height="1051"
-     inkscape:window-width="1728"
-     showgrid="true"
-     inkscape:current-layer="layer1"
-     inkscape:document-units="px"
-     inkscape:cy="35.184184"
-     inkscape:cx="40.609783"
-     inkscape:zoom="9.1234174"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0"
-     borderopacity="1.0"
-     bordercolor="#666666"
-     pagecolor="#3e3e3e"
-     id="base"
-     inkscape:showpageshadow="2"
-     inkscape:pagecheckerboard="0"
-     inkscape:deskcolor="#d1d1d1">
-    <inkscape:grid
-       snapvisiblegridlinesonly="true"
-       enabled="true"
-       visible="true"
-       empspacing="5"
-       id="grid4112"
-       type="xygrid"
-       originx="0"
-       originy="0"
-       spacingy="1"
-       spacingx="1"
-       units="px" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -796,23 +247,16 @@
     </rdf:RDF>
   </metadata>
   <g
-     sodipodi:insensitive="true"
      style="display:inline"
-     inkscape:label="Background"
-     id="layer2"
-     inkscape:groupmode="layer">
+     id="layer2">
     <path
        style="display:inline;fill:url(#linearGradient4978);fill-opacity:1;stroke:none"
        d="M 75,0 75,66 1e-6,66 C 1e-6,41.2048 50.00969,0 75,0 Z"
-       id="rect4113-1"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccc" />
+       id="rect4113-1" />
     <path
        style="display:inline;opacity:0.40400002;fill:url(#linearGradient4962);fill-opacity:1;stroke:none"
        d="M 75,21.0607 75,66 1e-6,66 C 10.625001,47.804 43.509694,25.4357 75,21.0607 Z"
-       id="rect4113-1-0"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccc" />
+       id="rect4113-1-0" />
     <g
        transform="matrix(0.27903303,0,0,0.27903303,-14.618136,-107.52874)"
        style="display:inline"
@@ -824,21 +268,14 @@
     <path
        style="display:inline;opacity:0.18399999;fill:url(#linearGradient4970);fill-opacity:1;stroke:none"
        d="M 75,4.0000001e-7 75,66 30.000003,66 C 30.000003,46.1545 47.70944,9.2500004 75,4e-7 Z"
-       id="rect4113-1-7"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccc" />
+       id="rect4113-1-7" />
   </g>
   <g
      transform="translate(0,-986.3622)"
      style="display:inline"
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Foreground">
+     id="layer1">
     <path
-       inkscape:transform-center-y="0.53407962"
-       inkscape:transform-center-x="4.3534013"
        transform="matrix(1.1726491,0,0.08958045,0.36603268,-112.93917,660.83554)"
-       inkscape:connector-curvature="0"
        id="rect10961-8-3-6-1"
        d="m 47.000294,1007.3622 -12.319149,16.9335 -12.416197,17.0669 16.933329,0 17.066666,0 12.416197,-17.0669 0.09676,-0.133 12.2221,-16.8001 -17.066666,0 -16.933329,0 z"
        style="font-style:normal;font-weight:normal;font-size:13.58917427px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;display:inline;fill:url(#linearGradient4462);fill-opacity:1;stroke:none;stroke-width:1.99999988;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;filter:url(#filter4606)" />
@@ -850,8 +287,6 @@
          id="g5348"
          transform="translate(0,986.3622)">
         <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
            id="path5250-6"
            d="m 14.403025,25.481913 3.760593,-4.964217 16.536826,0 3.904565,4.964217 z"
            style="fill:#fffabf;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4205-2);stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
diff --git a/ui/org.eclipse.pde.ui/icons/wizban/newfprj_wiz.svg b/ui/org.eclipse.pde.ui/icons/wizban/newfprj_wiz.svg
index 3f56e183f08..08da169edab 100644
--- a/ui/org.eclipse.pde.ui/icons/wizban/newfprj_wiz.svg
+++ b/ui/org.eclipse.pde.ui/icons/wizban/newfprj_wiz.svg
@@ -6,14 +6,7 @@
    height="66"
    id="svg2"
    version="1.1"
-   inkscape:version="1.3 (0e150ed, 2023-07-21)"
-   sodipodi:docname="newfprj_wiz.svg"
-   inkscape:export-filename="/Users/d021678/git/eclipse.jdt.ui/org.eclipse.jdt.ui/icons/full/wizban/newclass_wiz2.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90"
    xml:space="preserve"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:svg="http://www.w3.org/2000/svg"
@@ -21,307 +14,6 @@
    xmlns:cc="http://creativecommons.org/ns#"
    xmlns:dc="http://purl.org/dc/elements/1.1/"><defs
      id="defs4"><linearGradient
-       inkscape:collect="always"
-       id="linearGradient4541"><stop
-         style="stop-color:#a1adb2;stop-opacity:1"
-         offset="0"
-         id="stop4543" /><stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop4545" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       id="linearGradient4972"><stop
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0"
-         id="stop4974" /><stop
-         style="stop-color:#f5f8fd;stop-opacity:1"
-         offset="1"
-         id="stop4976" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       id="linearGradient4964"><stop
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0"
-         id="stop4966" /><stop
-         style="stop-color:#e8eefa;stop-opacity:1"
-         offset="1"
-         id="stop4968" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       id="linearGradient4956"><stop
-         style="stop-color:#fcfdfe;stop-opacity:1"
-         offset="0"
-         id="stop4958" /><stop
-         style="stop-color:#dee6f8;stop-opacity:1"
-         offset="1"
-         id="stop4960" /></linearGradient><filter
-       style="color-interpolation-filters:sRGB"
-       inkscape:label="Drop Shadow"
-       id="filter8854"><feFlood
-         flood-opacity="0.933333"
-         flood-color="rgb(244,248,254)"
-         result="flood"
-         id="feFlood8856" /><feComposite
-         in="flood"
-         in2="SourceGraphic"
-         operator="in"
-         result="composite1"
-         id="feComposite8858" /><feGaussianBlur
-         in="composite1"
-         stdDeviation="1.2"
-         result="blur"
-         id="feGaussianBlur8860" /><feOffset
-         dx="-1"
-         dy="3"
-         result="offset"
-         id="feOffset8862" /><feComposite
-         in="SourceGraphic"
-         in2="offset"
-         operator="over"
-         result="composite2"
-         id="feComposite8864" /></filter><linearGradient
-       id="linearGradient6122"><stop
-         style="stop-color:#c0c0c0;stop-opacity:1"
-         offset="0"
-         id="stop6124" /><stop
-         id="stop6132"
-         offset="0.5"
-         style="stop-color:#adadad;stop-opacity:1" /><stop
-         style="stop-color:#808080;stop-opacity:1"
-         offset="1"
-         id="stop6126" /></linearGradient><linearGradient
-       id="linearGradient7087"><stop
-         style="stop-color:#17325d;stop-opacity:1;"
-         offset="0"
-         id="stop7089" /><stop
-         id="stop7091"
-         offset="0.25"
-         style="stop-color:#b4d0e2;stop-opacity:1" /><stop
-         id="stop7093"
-         offset="0.5"
-         style="stop-color:#b7d2e4;stop-opacity:1" /><stop
-         style="stop-color:#acc9de;stop-opacity:1"
-         offset="0.75"
-         id="stop7095" /><stop
-         style="stop-color:#3e72a7;stop-opacity:1"
-         offset="1"
-         id="stop7097" /></linearGradient><mask
-       id="mask7366"
-       maskUnits="userSpaceOnUse"><path
-         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;display:inline"
-         d="m -16.593048,1040.862 9.990206,0 0,10.0018 -2.983353,3.0385 -5.966213,0 c -0.53033,-0.022 -1.04064,-0.5519 -1.04064,-1.0385 z"
-         id="path7368"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccccc" /></mask><linearGradient
-       id="linearGradient7584-5"><stop
-         id="stop7586-4"
-         offset="0"
-         style="stop-color:#f9cd5f;stop-opacity:1" /><stop
-         id="stop7588-5"
-         offset="1"
-         style="stop-color:#fbf0b4;stop-opacity:1" /></linearGradient><linearGradient
-       id="linearGradient7592-1"><stop
-         id="stop7594-6"
-         offset="0"
-         style="stop-color:#bd8416;stop-opacity:1" /><stop
-         id="stop7596-9"
-         offset="1"
-         style="stop-color:#a66b10;stop-opacity:1" /></linearGradient><linearGradient
-       id="linearGradient10798-1-9-3-7-6-6-6-2-6-7-98-9-4-1"><stop
-         style="stop-color:#5aad60;stop-opacity:1;"
-         offset="0"
-         id="stop10800-5-2-1-8-20-4-0-2-1-9-0-0-1-1" /><stop
-         id="stop10806-6-8-5-3-9-2-2-7-0-4-2-7-8-9"
-         offset="0.5"
-         style="stop-color:#5bb26a;stop-opacity:1;" /><stop
-         style="stop-color:#a4c589;stop-opacity:1"
-         offset="1"
-         id="stop10802-1-5-3-0-4-6-8-5-5-6-69-6-4-0" /></linearGradient><mask
-       maskUnits="userSpaceOnUse"
-       id="mask7366-4"><path
-         sodipodi:nodetypes="ccccccc"
-         inkscape:connector-curvature="0"
-         id="path7368-2"
-         d="m -16.593048,1040.862 9.990206,0 0,10.0018 -2.983353,3.0385 -5.966213,0 c -0.53033,-0.022 -1.04064,-0.5519 -1.04064,-1.0385 z"
-         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;display:inline" /></mask><linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient7087"
-       id="linearGradient9331"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-20,0)"
-       x1="4.7776356"
-       y1="1039.8118"
-       x2="4.7776356"
-       y2="1041.911" /><linearGradient
-       y2="1041.911"
-       x2="4.7776356"
-       y1="1039.8118"
-       x1="4.7776356"
-       gradientTransform="translate(-18,4.7e-5)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient9333"
-       xlink:href="#linearGradient7087"
-       inkscape:collect="always" /><linearGradient
-       y2="1041.911"
-       x2="4.7776356"
-       y1="1039.8118"
-       x1="4.7776356"
-       gradientTransform="translate(-16,4.7e-5)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient9335"
-       xlink:href="#linearGradient7087"
-       inkscape:collect="always" /><linearGradient
-       y2="1041.911"
-       x2="4.7776356"
-       y1="1039.8118"
-       x1="4.7776356"
-       gradientTransform="translate(-14,4.7e-5)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient9337"
-       xlink:href="#linearGradient7087"
-       inkscape:collect="always" /><linearGradient
-       y2="1041.911"
-       x2="4.7776356"
-       y1="1039.8118"
-       x1="4.7776356"
-       gradientTransform="translate(-12,4.7e-5)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient9339"
-       xlink:href="#linearGradient7087"
-       inkscape:collect="always" /><linearGradient
-       gradientTransform="translate(-80,0)"
-       gradientUnits="userSpaceOnUse"
-       y2="1042.7973"
-       x2="163.22012"
-       y1="1042.7973"
-       x1="88.220117"
-       id="linearGradient68073"
-       xlink:href="#linearGradient4956"
-       inkscape:collect="always" /><linearGradient
-       gradientTransform="translate(-80,0)"
-       gradientUnits="userSpaceOnUse"
-       y2="1032.2669"
-       x2="163.22012"
-       y1="1032.2668"
-       x1="94.469681"
-       id="linearGradient68075"
-       xlink:href="#linearGradient4964"
-       inkscape:collect="always" /><linearGradient
-       gradientTransform="translate(-80,0)"
-       gradientUnits="userSpaceOnUse"
-       y2="1032.2668"
-       x2="152.72206"
-       y1="1032.2668"
-       x1="88.220116"
-       id="linearGradient68077"
-       xlink:href="#linearGradient4972"
-       inkscape:collect="always" /><filter
-       id="filter8854-9"
-       inkscape:label="Drop Shadow"
-       style="color-interpolation-filters:sRGB"><feFlood
-         id="feFlood8856-0"
-         result="flood"
-         flood-color="rgb(244,248,254)"
-         flood-opacity="0.933333" /><feComposite
-         id="feComposite8858-2"
-         result="composite1"
-         operator="in"
-         in2="SourceGraphic"
-         in="flood" /><feGaussianBlur
-         id="feGaussianBlur8860-3"
-         result="blur"
-         stdDeviation="1.2"
-         in="composite1" /><feOffset
-         id="feOffset8862-2"
-         result="offset"
-         dy="3"
-         dx="-1" /><feComposite
-         id="feComposite8864-3"
-         result="composite2"
-         operator="over"
-         in2="offset"
-         in="SourceGraphic" /></filter><linearGradient
-       id="linearGradient10798-1-9-3-7-6-8-9-0-9-1"><stop
-         id="stop10800-5-2-1-8-20-6-4-9-8-2"
-         offset="0"
-         style="stop-color:#7564b1;stop-opacity:1" /><stop
-         style="stop-color:#5d4aa1;stop-opacity:1"
-         offset="0.5"
-         id="stop10806-6-8-5-3-9-24-8-4-3-2" /><stop
-         id="stop10802-1-5-3-0-4-8-4-2-9-2"
-         offset="1"
-         style="stop-color:#9283c3;stop-opacity:1" /></linearGradient><linearGradient
-       id="linearGradient7540-2-3-8-7"><stop
-         id="stop7542-8-7-5-3"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.502" /><stop
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0.47623286"
-         id="stop7544-8-2-0-5" /><stop
-         style="stop-color:#ffffff;stop-opacity:0"
-         offset="0.5"
-         id="stop7546-1-7-9-5" /><stop
-         id="stop7548-98-9-2-4"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       id="linearGradient7272-66-4-5-5-5-8"><stop
-         style="stop-color:#8f6c10;stop-opacity:1"
-         offset="0"
-         id="stop7274-6-0-1-7-4-7" /><stop
-         style="stop-color:#c9a645;stop-opacity:1"
-         offset="1"
-         id="stop7276-66-6-3-9-1-4" /></linearGradient><linearGradient
-       y2="1030.3411"
-       x2="-10.159802"
-       y1="1030.3411"
-       x1="-22.453552"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient10540"
-       xlink:href="#linearGradient7540-2-3-8-7"
-       inkscape:collect="always" /><linearGradient
-       y2="1030.3411"
-       x2="-10.159802"
-       y1="1030.3411"
-       x1="-22.453552"
-       gradientTransform="matrix(0,1,-1,0,1014.0344,1046.6478)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient10542"
-       xlink:href="#linearGradient7540-2-3-8-7"
-       inkscape:collect="always" /><linearGradient
-       y2="1023.2569"
-       x2="-15.945988"
-       y1="1037.4661"
-       x1="-15.945988"
-       gradientTransform="matrix(0.95585117,0,0,0.95585117,-0.71992063,45.488394)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient10544"
-       xlink:href="#linearGradient7272-66-4-5-5-5-8"
-       inkscape:collect="always" /><mask
-       id="mask10620"
-       maskUnits="userSpaceOnUse"><path
-         transform="matrix(0.55482947,0,0,0.55482947,-206.96039,787.08655)"
-         d="m 398.75,468.23718 a 10.625,10.625 0 1 1 -21.25,0 10.625,10.625 0 1 1 21.25,0 z"
-         sodipodi:ry="10.625"
-         sodipodi:rx="10.625"
-         sodipodi:cy="468.23718"
-         sodipodi:cx="388.125"
-         id="path10622"
-         style="font-size:13.58917427px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:2.16621375;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline;font-family:Sans"
-         sodipodi:type="arc" /></mask><linearGradient
-       id="linearGradient4528-9-5-7-9-7-3"><stop
-         id="stop4530-0-5-0-5-8-4"
-         offset="0"
-         style="stop-color:#e0c576;stop-opacity:1;" /><stop
-         id="stop4532-7-9-3-3-6-1"
-         offset="1"
-         style="stop-color:#9e7916;stop-opacity:1" /></linearGradient><linearGradient
-       id="linearGradient6281-8-0-1-6-6-4-2-8-0"><stop
-         style="stop-color:#f7f9fb;stop-opacity:1"
-         offset="0"
-         id="stop6283-0-2-2-1-2-0-1-6-0" /><stop
-         style="stop-color:#ffd680;stop-opacity:1"
-         offset="1"
-         id="stop6285-5-0-9-7-6-9-9-1-9" /></linearGradient><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4972-7"
        id="linearGradient4978"
        x1="88.220116"
@@ -330,7 +22,6 @@
        y2="1032.2668"
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-88.220116,-999.2669)" /><linearGradient
-       inkscape:collect="always"
        id="linearGradient4972-7"><stop
          style="stop-color:#b8ccf1;stop-opacity:0.10196079"
          offset="0"
@@ -338,7 +29,6 @@
          style="stop-color:#6e97e2;stop-opacity:0.10196079"
          offset="1"
          id="stop4976-1" /></linearGradient><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4964-3"
        id="linearGradient4970"
        x1="118.38584"
@@ -347,7 +37,6 @@
        y2="1032.2668"
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-88.220117,-999.2669)" /><linearGradient
-       inkscape:collect="always"
        id="linearGradient4964-3"><stop
          style="stop-color:#ffffff;stop-opacity:0.349"
          offset="0"
@@ -355,7 +44,6 @@
          style="stop-color:#91ade6;stop-opacity:1"
          offset="1"
          id="stop4968-1" /></linearGradient><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4956-2"
        id="linearGradient4962"
        x1="88.220116"
@@ -364,7 +52,6 @@
        y2="1042.7972"
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-88.220116,-999.2669)" /><linearGradient
-       inkscape:collect="always"
        id="linearGradient4956-2"><stop
          style="stop-color:#fcfdfe;stop-opacity:0.25641027"
          offset="0"
@@ -372,36 +59,6 @@
          style="stop-color:#98aae7;stop-opacity:0.40392157"
          offset="1"
          id="stop4960-6" /></linearGradient><linearGradient
-       id="linearGradient3827"><stop
-         id="stop3829"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0;" /><stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0.60149658"
-         id="stop3835" /><stop
-         id="stop3831"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" /></linearGradient><linearGradient
-       id="linearGradient10798-1-9-3-7-6-8-9-0-9-1-0"><stop
-         id="stop10800-5-2-1-8-20-6-4-9-8-2-9"
-         offset="0"
-         style="stop-color:#f3faed;stop-opacity:1" /><stop
-         style="stop-color:#e7f4da;stop-opacity:1"
-         offset="0.65917557"
-         id="stop10806-6-8-5-3-9-24-8-4-3-2-4" /><stop
-         id="stop10802-1-5-3-0-4-8-4-2-9-2-5"
-         offset="1"
-         style="stop-color:#67bf1f;stop-opacity:1" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4541"
-       id="linearGradient5885"
-       x1="41"
-       y1="1007.8622"
-       x2="60"
-       y2="1008.3622"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0,1,-1,0,1034.3618,967.36133)" /><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4894"
        id="linearGradient4884"
        x1="11.927121"
@@ -410,8 +67,7 @@
        y2="30.177986"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1.0044276,0,0,1.0089329,4.2405011,977.30396)" /><linearGradient
-       id="linearGradient4894"
-       inkscape:collect="always"><stop
+       id="linearGradient4894"><stop
          id="stop4896"
          offset="0"
          style="stop-color:#000000;stop-opacity:1" /><stop
@@ -424,7 +80,6 @@
          id="stop4898"
          offset="1"
          style="stop-color:#ffffff;stop-opacity:1" /></linearGradient><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient5252"
        id="linearGradient5258"
        x1="5"
@@ -433,7 +88,6 @@
        y2="32"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1.0067593,0,0,1.0132311,4.1393203,977.16609)" /><linearGradient
-       inkscape:collect="always"
        id="linearGradient5252"><stop
          style="stop-color:#5f443c;stop-opacity:1"
          offset="0"
@@ -441,7 +95,6 @@
          style="stop-color:#765d54;stop-opacity:1"
          offset="1"
          id="stop5256" /></linearGradient><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4199"
        id="linearGradient4205"
        x1="12"
@@ -450,7 +103,6 @@
        y2="21"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1.4358198,0,0,1.270043,-10.240326,977.40079)" /><linearGradient
-       inkscape:collect="always"
        id="linearGradient4199"><stop
          style="stop-color:#765d54;stop-opacity:1;"
          offset="0"
@@ -461,7 +113,6 @@
          style="stop-color:#765d54;stop-opacity:1"
          offset="1"
          id="stop4203" /></linearGradient><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4944"
        id="linearGradient4936"
        gradientUnits="userSpaceOnUse"
@@ -470,54 +121,21 @@
        x2="71.580559"
        y2="70.944893"
        gradientTransform="matrix(0.99999865,0,0,1.0179002,537.84569,1112.6509)" /><linearGradient
-       inkscape:collect="always"
        id="linearGradient4944"><stop
          id="stop4948"
          offset="0.0001"
          style="stop-color:#cfedfe;stop-opacity:1;" /><stop
          id="stop4946"
          offset="0.99989998"
-         style="stop-color:#95b9ec;stop-opacity:1;" /></linearGradient><linearGradient
-       id="linearGradient11146-4-4-4-6-2"><stop
-         id="stop11150-4-72-3-9-7"
-         offset="0"
-         style="stop-color:#faefba;stop-opacity:1" /><stop
-         style="stop-color:#9e6542;stop-opacity:1"
-         offset="1"
-         id="stop11152-9-0-7-3-8" /></linearGradient><linearGradient
-       id="linearGradient10507"><stop
-         style="stop-color:#5f392d;stop-opacity:1"
-         offset="0"
-         id="stop10509" /><stop
-         id="stop10511"
-         offset="0.18181793"
-         style="stop-color:#9e7058;stop-opacity:1" /><stop
-         id="stop10513"
-         offset="0.36363617"
-         style="stop-color:#794f40;stop-opacity:1" /><stop
-         id="stop10515"
-         offset="0.49999985"
-         style="stop-color:#794f40;stop-opacity:1" /><stop
-         id="stop10517"
-         offset="0.63636351"
-         style="stop-color:#794f40;stop-opacity:1" /><stop
-         style="stop-color:#9e7058;stop-opacity:1"
-         offset="0.81818175"
-         id="stop10519" /><stop
-         style="stop-color:#5f392d;stop-opacity:1"
-         offset="1"
-         id="stop10522" /></linearGradient><filter
-       inkscape:collect="always"
+         style="stop-color:#95b9ec;stop-opacity:1;" /></linearGradient><filter
        style="color-interpolation-filters:sRGB"
        id="filter5309"
        x="-0.41279999"
        width="1.8256"
        y="-0.68799998"
        height="2.376"><feGaussianBlur
-         inkscape:collect="always"
          stdDeviation="2.58"
          id="feGaussianBlur5311" /></filter><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4456"
        id="linearGradient4462"
        x1="63.734764"
@@ -526,7 +144,6 @@
        y2="1006.3618"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1,0,-0.72750163,1,733.40264,2.0004)" /><linearGradient
-       inkscape:collect="always"
        id="linearGradient4456"><stop
          style="stop-color:#ffffff;stop-opacity:0.659"
          offset="0"
@@ -534,47 +151,15 @@
          style="stop-color:#ffffff;stop-opacity:0.369"
          offset="1"
          id="stop4460" /></linearGradient><filter
-       inkscape:collect="always"
        style="color-interpolation-filters:sRGB"
        id="filter4606"
        x="-0.062976157"
        width="1.1259523"
        y="-0.10879013"
        height="1.2175803"><feGaussianBlur
-         inkscape:collect="always"
          stdDeviation="1.5412116"
          id="feGaussianBlur4608" /></filter><linearGradient
-       id="linearGradient11146-4-4-4-6-2-8"><stop
-         id="stop11150-4-72-3-9-7-2"
-         offset="0"
-         style="stop-color:#faefba;stop-opacity:1" /><stop
-         style="stop-color:#ad6e48;stop-opacity:1"
-         offset="1"
-         id="stop11152-9-0-7-3-8-0" /></linearGradient><linearGradient
-       id="linearGradient4368"><stop
-         id="stop4370"
-         offset="0"
-         style="stop-color:#9c7561;stop-opacity:1" /><stop
-         style="stop-color:#966d59;stop-opacity:1"
-         offset="0.18181793"
-         id="stop4372" /><stop
-         style="stop-color:#8c6250;stop-opacity:1"
-         offset="0.36363617"
-         id="stop4374" /><stop
-         style="stop-color:#794f40;stop-opacity:1"
-         offset="0.49999985"
-         id="stop4376" /><stop
-         style="stop-color:#8c6250;stop-opacity:1"
-         offset="0.63636351"
-         id="stop4378" /><stop
-         id="stop4380"
-         offset="0.81818175"
-         style="stop-color:#966d59;stop-opacity:1" /><stop
-         id="stop4382"
-         offset="1"
-         style="stop-color:#99705c;stop-opacity:1" /></linearGradient><linearGradient
-       id="linearGradient8785"
-       inkscape:collect="always"><stop
+       id="linearGradient8785"><stop
          id="stop8781"
          offset="0"
          style="stop-color:#bb8d2d;stop-opacity:1" /><stop
@@ -584,97 +169,19 @@
          id="stop8783"
          offset="1"
          style="stop-color:#b07905;stop-opacity:1" /></linearGradient><linearGradient
-       id="linearGradient8777"
-       inkscape:collect="always"><stop
+       id="linearGradient8777"><stop
          id="stop8773"
          offset="0"
          style="stop-color:#fbeaab;stop-opacity:1;" /><stop
          id="stop8775"
          offset="1"
          style="stop-color:#deb241;stop-opacity:1" /></linearGradient><filter
-       id="filter8854-7"
-       inkscape:label="Drop Shadow"
-       style="color-interpolation-filters:sRGB"><feFlood
-         id="feFlood8856-03"
-         result="flood"
-         flood-color="rgb(244,248,254)"
-         flood-opacity="0.933333" /><feComposite
-         id="feComposite8858-9"
-         result="composite1"
-         operator="in"
-         in2="SourceGraphic"
-         in="flood" /><feGaussianBlur
-         id="feGaussianBlur8860-9"
-         result="blur"
-         stdDeviation="1.2"
-         in="composite1" /><feOffset
-         id="feOffset8862-9"
-         result="offset"
-         dy="3"
-         dx="-1" /><feComposite
-         id="feComposite8864-1"
-         result="composite2"
-         operator="over"
-         in2="offset"
-         in="SourceGraphic" /></filter><mask
-       maskUnits="userSpaceOnUse"
-       id="mask7366-47"><path
-         sodipodi:nodetypes="ccccccc"
-         inkscape:connector-curvature="0"
-         id="path7368-1"
-         d="m -16.593048,1040.862 9.990206,0 0,10.0018 -2.983353,3.0385 -5.966213,0 c -0.53033,-0.022 -1.04064,-0.5519 -1.04064,-1.0385 z"
-         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;display:inline" /></mask><mask
-       id="mask7366-4-0"
-       maskUnits="userSpaceOnUse"><path
-         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;display:inline"
-         d="m -16.593048,1040.862 9.990206,0 0,10.0018 -2.983353,3.0385 -5.966213,0 c -0.53033,-0.022 -1.04064,-0.5519 -1.04064,-1.0385 z"
-         id="path7368-2-3"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccccc" /></mask><filter
-       style="color-interpolation-filters:sRGB"
-       inkscape:label="Drop Shadow"
-       id="filter8854-9-2"><feFlood
-         flood-opacity="0.933333"
-         flood-color="rgb(244,248,254)"
-         result="flood"
-         id="feFlood8856-0-6" /><feComposite
-         in="flood"
-         in2="SourceGraphic"
-         operator="in"
-         result="composite1"
-         id="feComposite8858-2-9" /><feGaussianBlur
-         in="composite1"
-         stdDeviation="1.2"
-         result="blur"
-         id="feGaussianBlur8860-3-4" /><feOffset
-         dx="-1"
-         dy="3"
-         result="offset"
-         id="feOffset8862-2-1" /><feComposite
-         in="SourceGraphic"
-         in2="offset"
-         operator="over"
-         result="composite2"
-         id="feComposite8864-3-3" /></filter><mask
-       maskUnits="userSpaceOnUse"
-       id="mask10620-4"><path
-         sodipodi:type="arc"
-         style="font-size:13.58917427px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:2.16621375;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline;font-family:Sans"
-         id="path10622-3"
-         sodipodi:cx="388.125"
-         sodipodi:cy="468.23718"
-         sodipodi:rx="10.625"
-         sodipodi:ry="10.625"
-         d="m 398.75,468.23718 a 10.625,10.625 0 1 1 -21.25,0 10.625,10.625 0 1 1 21.25,0 z"
-         transform="matrix(0.55482947,0,0,0.55482947,-206.96039,787.08655)" /></mask><filter
-       inkscape:collect="always"
        style="color-interpolation-filters:sRGB"
        id="filter2728-6"
        x="-0.063527558"
        width="1.1270551"
        y="-0.1326247"
        height="1.2655597"><feGaussianBlur
-         inkscape:collect="always"
          stdDeviation="0.90744768"
          id="feGaussianBlur2730-2" /></filter><linearGradient
        gradientUnits="userSpaceOnUse"
@@ -684,10 +191,8 @@
        x1="51.658199"
        id="linearGradient8769-0"
        xlink:href="#linearGradient5"
-       inkscape:collect="always"
        gradientTransform="matrix(2.7500001,0,0,0.99370101,-129.87501,-991.91286)" /><linearGradient
-       id="linearGradient5"
-       inkscape:collect="always"><stop
+       id="linearGradient5"><stop
          id="stop4"
          offset="0"
          style="stop-color:#ad7bc1;stop-opacity:1;" /><stop
@@ -701,17 +206,14 @@
        x1="50"
        id="linearGradient8753-0"
        xlink:href="#linearGradient7"
-       inkscape:collect="always"
        gradientTransform="matrix(2.7500001,0,0,0.99370101,-129.87501,-991.91286)" /><linearGradient
-       id="linearGradient7"
-       inkscape:collect="always"><stop
+       id="linearGradient7"><stop
          id="stop6"
          offset="0"
          style="stop-color:#762894;stop-opacity:1;" /><stop
          id="stop7"
          offset="1"
          style="stop-color:#9a5fb1;stop-opacity:1;" /></linearGradient><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient3"
        id="linearGradient11"
        gradientUnits="userSpaceOnUse"
@@ -720,15 +222,13 @@
        y1="1019.3622"
        x2="62"
        y2="1030.3622" /><linearGradient
-       id="linearGradient3"
-       inkscape:collect="always"><stop
+       id="linearGradient3"><stop
          id="stop2"
          offset="0"
          style="stop-color:#dbc3e6;stop-opacity:1;" /><stop
          id="stop3"
          offset="1"
          style="stop-color:#84489e;stop-opacity:1;" /></linearGradient><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient10"
        id="linearGradient2545-3"
        x1="18.423391"
@@ -737,7 +237,6 @@
        y2="30.334658"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1.0023036,0,0,0.65047885,-0.04265565,10.451345)" /><linearGradient
-       inkscape:collect="always"
        id="linearGradient10"><stop
          style="stop-color:#9454ac;stop-opacity:1;"
          offset="0"
@@ -755,7 +254,6 @@
        x1="63.98344"
        id="linearGradient8779-0"
        xlink:href="#linearGradient8777"
-       inkscape:collect="always"
        gradientTransform="matrix(1.3687895,0,0,1.494898,-60.915436,-1504.7782)" /><linearGradient
        gradientUnits="userSpaceOnUse"
        y2="1028.4165"
@@ -764,26 +262,21 @@
        x1="68.47998"
        id="linearGradient8787-7"
        xlink:href="#linearGradient8785"
-       inkscape:collect="always"
        gradientTransform="matrix(1.3687895,0,0,1.494898,-60.915436,-1504.7782)" /><filter
        height="1.2365698"
        y="-0.11828489"
        width="1.8310951"
        x="-0.41554753"
        id="filter8871-9"
-       style="color-interpolation-filters:sRGB"
-       inkscape:collect="always"><feGaussianBlur
+       style="color-interpolation-filters:sRGB"><feGaussianBlur
          id="feGaussianBlur8873-7"
-         stdDeviation="0.53588249"
-         inkscape:collect="always" /></filter><filter
-       inkscape:collect="always"
+         stdDeviation="0.53588249" /></filter><filter
        style="color-interpolation-filters:sRGB"
        id="filter2533-3"
        x="-0.59377657"
        width="2.1875531"
        y="-0.92639431"
        height="2.8527886"><feGaussianBlur
-         inkscape:collect="always"
          stdDeviation="0.73536407"
          id="feGaussianBlur2535-04" /></filter><filter
        height="1.2365698"
@@ -791,62 +284,17 @@
        width="1.8310951"
        x="-0.41554753"
        id="filter8871-1-8"
-       style="color-interpolation-filters:sRGB"
-       inkscape:collect="always"><feGaussianBlur
+       style="color-interpolation-filters:sRGB"><feGaussianBlur
          id="feGaussianBlur8873-8-5"
-         stdDeviation="0.53588249"
-         inkscape:collect="always" /></filter></defs><sodipodi:namedview
-     id="base"
-     pagecolor="#bcbcbc"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="8.929"
-     inkscape:cx="40.094076"
-     inkscape:cy="31.918468"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1728"
-     inkscape:window-height="1051"
-     inkscape:window-x="0"
-     inkscape:window-y="38"
-     inkscape:window-maximized="1"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="true"
-     inkscape:snap-bbox="true"
-     inkscape:bbox-nodes="true"
-     inkscape:showpageshadow="2"
-     inkscape:pagecheckerboard="0"
-     inkscape:deskcolor="#d1d1d1"><inkscape:grid
-       type="xygrid"
-       id="grid4112"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       originx="0"
-       originy="0"
-       spacingy="1"
-       spacingx="1"
-       units="px" /></sodipodi:namedview><metadata
+         stdDeviation="0.53588249" /></filter></defs><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" /></cc:Work></rdf:RDF></metadata><g
-     inkscape:groupmode="layer"
      id="layer2"
-     inkscape:label="Background"
-     style="display:inline"
-     sodipodi:insensitive="true"><path
-       sodipodi:nodetypes="cccc"
-       inkscape:connector-curvature="0"
+     style="display:inline"><path
        id="rect4113-1"
        d="M 75,0 75,66 1e-6,66 C 1e-6,41.2048 50.00969,0 75,0 Z"
        style="display:inline;fill:url(#linearGradient4978);fill-opacity:1;stroke:none" /><path
-       sodipodi:nodetypes="cccc"
-       inkscape:connector-curvature="0"
        id="rect4113-1-0"
        d="M 75,21.0607 75,66 1e-6,66 C 10.625001,47.804 43.509694,25.4357 75,21.0607 Z"
        style="display:inline;opacity:0.40400002;fill:url(#linearGradient4962);fill-opacity:1;stroke:none" /><g
@@ -855,38 +303,26 @@
        transform="matrix(0.27903303,0,0,0.27903303,-14.618136,-107.52874)"><g
          style="fill:#737986;fill-opacity:1;stroke:#595e68;stroke-opacity:1"
          id="g13408-8-2" /></g><path
-       sodipodi:nodetypes="cccc"
-       inkscape:connector-curvature="0"
        id="rect4113-1-7"
        d="M 75,4.0000001e-7 75,66 30.000003,66 C 30.000003,46.1545 47.70944,9.2500004 75,4e-7 Z"
        style="display:inline;opacity:0.18399999;fill:url(#linearGradient4970);fill-opacity:1;stroke:none" /></g><g
-     inkscape:label="Foreground"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-986.3622)"><path
        style="font-style:normal;font-weight:normal;font-size:13.5892px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;display:inline;fill:url(#linearGradient4462);fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;filter:url(#filter4606)"
        d="m 47.000294,1007.3622 -12.319149,16.9335 -12.416197,17.0669 h 16.933329 17.066666 l 12.416197,-17.0669 0.09676,-0.133 L 81,1007.3626 H 63.933334 47.000005 Z"
        id="rect10961-8-3-6-1"
-       inkscape:connector-curvature="0"
-       transform="matrix(1.1726475,0,0.08958032,0.36603268,-114.8094,661.36402)"
-       inkscape:transform-center-x="4.353394"
-       inkscape:transform-center-y="0.53407509"
-       inkscape:label="shadow" /><path
-       sodipodi:nodetypes="ccccc"
-       inkscape:connector-curvature="0"
+       transform="matrix(1.1726475,0,0.08958032,0.36603268,-114.8094,661.36402)" /><path
        id="path5250"
        d="m 7.662133,1010.2334 3.760589,-4.9642 h 16.536804 l 3.904559,4.9642 z"
-       style="fill:#fffabf;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4205);stroke-width:1;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       inkscape:label="tab-shadow" /><ellipse
+       style="fill:#fffabf;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4205);stroke-width:1;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /><ellipse
        transform="matrix(0.99999865,0,0,0.38855855,-7.8969055,1005.4091)"
        ry="4.5"
        rx="7.5"
        cy="8.3080006"
        cx="23.691999"
        id="path5111"
-       style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;filter:url(#filter5309)"
-       inkscape:label="tab" /><rect
+       style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;filter:url(#filter5309)" /><rect
        ry="2.0792062"
        y="1010.2515"
        x="4.8986993"
@@ -894,78 +330,48 @@
        width="41.860352"
        id="rect4876"
        style="fill:url(#linearGradient4884);fill-opacity:1;stroke:url(#linearGradient5258);stroke-width:1;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       inkscape:label="back"
        rx="2.0792062" /><g
        id="g2-5"
        transform="matrix(1.0558482,0,0,1.0849851,16.956316,984.38203)"
-       inkscape:label="plug-purple"
        style="display:inline;stroke-width:0.934301"><g
          transform="matrix(1.0729615,0,0,1.0787087,-1.2096914,-0.17204372)"
          id="g2558-4-4"
-         style="display:inline;opacity:0.503;fill:#808080;stroke:#808080;stroke-width:0.868446;filter:url(#filter2728-6)"
-         inkscape:label="shadow"><path
+         style="display:inline;opacity:0.503;fill:#808080;stroke:#808080;stroke-width:0.868446;filter:url(#filter2728-6)"><path
            id="path8722-7-8-1"
            style="display:inline;opacity:1;fill:#808080;fill-opacity:1;stroke:#808080;stroke-width:0.868446;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="M 3.4999999,23.512598 V 25.5 H 14.5 V 21.525196 H 3.4999999 v 1.987402"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccccc" /><path
-           sodipodi:nodetypes="cscccsssscsscc"
+           d="M 3.4999999,23.512598 V 25.5 H 14.5 V 21.525196 H 3.4999999 v 1.987402" /><path
            id="rect8645-3-9-9"
            style="display:inline;opacity:1;fill:#808080;fill-opacity:1;stroke:#808080;stroke-width:0.868446;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="m 25.499998,23.781495 2e-6,-8.367936 c -1e-6,2.603078 -9.194589,4.450864 -11,4.847997 v 3.519375 m 10.999998,5.64e-4 2e-6,8.367936 c 0,1.614156 -0.931058,2.913559 -2.087573,2.913559 h -2.424855 c -1.156515,0 -2.483072,-1.299403 -2.483072,-2.913559 V 30.550392 H 16.239644 C 15.275881,30.550392 14.5,29.756288 14.5,28.769946 v -1.468512 -3.519375"
-           inkscape:connector-curvature="0" /><path
+           d="m 25.499998,23.781495 2e-6,-8.367936 c -1e-6,2.603078 -9.194589,4.450864 -11,4.847997 v 3.519375 m 10.999998,5.64e-4 2e-6,8.367936 c 0,1.614156 -0.931058,2.913559 -2.087573,2.913559 h -2.424855 c -1.156515,0 -2.483072,-1.299403 -2.483072,-2.913559 V 30.550392 H 16.239644 C 15.275881,30.550392 14.5,29.756288 14.5,28.769946 v -1.468512 -3.519375" /><path
            id="rect8645-2-5-2-4"
            style="display:inline;opacity:1;fill:#808080;fill-opacity:1;stroke:#808080;stroke-width:0.868446;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="m 36.091538,26.489769 -10e-7,1.058985 c 0,1.06945 -0.863288,1.955925 -2.164732,1.930363 -1.301445,-0.02541 -1.941636,0 -1.941636,0 v 0.201512 c 0,1.544678 -1.158564,2.787985 -2.597679,2.788284 l -1.648306,2.98e-4 c -1.360345,3e-4 -1.894397,0.487086 -1.22903,-2.989646 l 1.605386,-8.388592 c 4.307956,0 7.975998,-2.709681 7.975998,-1.640231 v 2.554332 z m 0.06454,-6.010119 h 8.461471 l -0.05085,6.010119 h -8.188123"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cczccssscccccccc" /></g><g
+           d="m 36.091538,26.489769 -10e-7,1.058985 c 0,1.06945 -0.863288,1.955925 -2.164732,1.930363 -1.301445,-0.02541 -1.941636,0 -1.941636,0 v 0.201512 c 0,1.544678 -1.158564,2.787985 -2.597679,2.788284 l -1.648306,2.98e-4 c -1.360345,3e-4 -1.894397,0.487086 -1.22903,-2.989646 l 1.605386,-8.388592 c 4.307956,0 7.975998,-2.709681 7.975998,-1.640231 v 2.554332 z m 0.06454,-6.010119 h 8.461471 l -0.05085,6.010119 h -8.188123" /></g><g
          id="g2558-8"
-         style="display:inline;stroke-width:0.934301"
-         inkscape:label="plug"><path
+         style="display:inline;stroke-width:0.934301"><path
            id="path8722-7-1"
            style="display:inline;opacity:1;fill:url(#linearGradient8769-0);fill-opacity:1;stroke:url(#linearGradient8753-0);stroke-width:0.934301;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="M 3.4999999,23.512598 V 25.5 H 14.5 V 21.525196 H 3.4999999 v 1.987402"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccccc"
-           inkscape:label="cord" /><path
-           sodipodi:nodetypes="csscssccccccsssscsscc"
+           d="M 3.4999999,23.512598 V 25.5 H 14.5 V 21.525196 H 3.4999999 v 1.987402" /><path
            id="rect8645-3-5-6"
            style="display:inline;fill:url(#linearGradient11);fill-opacity:1;stroke:#9454ac;stroke-width:0.934301;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="M 25.5,23.781491 25.4936,18.23846 c -0.0019,-1.614155 -0.650924,-2.542218 -1.638414,-1.956396 l -0.595274,2.47471 -1.583604,-1.182104 c -0.917642,-0.684987 0.603801,2.235437 -0.908819,1.573079 l -1.377472,-0.603178 -0.592212,2.34584 c -0.963763,0 -1.592058,0.171739 -1.592058,1.158081 -2.036015,-1.123034 -1.623448,0.308424 -2.705747,0.02333 v 1.709109 m 10.999998,5.64e-4 2e-6,8.367936 c 0,1.614156 -0.931058,2.913559 -2.087573,2.913559 h -2.424855 c -1.156515,0 -2.483072,-1.299403 -2.483072,-2.913559 V 30.550392 H 16.239644 C 15.275881,30.550392 14.5,29.756288 14.5,28.769946 v -1.468512 -3.519375"
-           inkscape:connector-curvature="0"
-           inkscape:label="plug" /><path
-           sodipodi:nodetypes="cc"
-           inkscape:connector-curvature="0"
+           d="M 25.5,23.781491 25.4936,18.23846 c -0.0019,-1.614155 -0.650924,-2.542218 -1.638414,-1.956396 l -0.595274,2.47471 -1.583604,-1.182104 c -0.917642,-0.684987 0.603801,2.235437 -0.908819,1.573079 l -1.377472,-0.603178 -0.592212,2.34584 c -0.963763,0 -1.592058,0.171739 -1.592058,1.158081 -2.036015,-1.123034 -1.623448,0.308424 -2.705747,0.02333 v 1.709109 m 10.999998,5.64e-4 2e-6,8.367936 c 0,1.614156 -0.931058,2.913559 -2.087573,2.913559 h -2.424855 c -1.156515,0 -2.483072,-1.299403 -2.483072,-2.913559 V 30.550392 H 16.239644 C 15.275881,30.550392 14.5,29.756288 14.5,28.769946 v -1.468512 -3.519375" /><path
            id="path2537-5"
            d="m 18.516609,21.210096 0.02986,9.214752"
-           style="fill:none;stroke:url(#linearGradient2545-3);stroke-width:0.9343px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-           inkscape:label="line" /><path
+           style="fill:none;stroke:url(#linearGradient2545-3);stroke-width:0.9343px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /><path
            id="rect8645-2-5-8"
            style="display:inline;opacity:1;fill:url(#linearGradient8779-0);fill-opacity:1;stroke:url(#linearGradient8787-7);stroke-width:0.934301;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="m 35.584224,25.791351 v 1.058985 c 0,1.06945 -0.86329,1.955925 -2.16474,1.930363 -1.30144,-0.02541 -1.94163,0 -1.94163,0 v 0.201512 c 0,1.544678 -1.15857,2.787985 -2.59768,2.788284 l -1.64831,2.98e-4 c -1.36034,3e-4 -1.22903,0.546236 -1.22903,-2.989646 v -8.697694 l 1.0001,-0.451316 c 0.73866,-0.333337 0.24318,-1.03959 0.77485,-1.523121 0.14263,-0.129715 1.05499,0.929393 1.52937,0.6759 0.45561,-0.243458 0.32468,-1.571886 1.05063,-1.470834 l 1.3916,0.729993 1.6701,-1.222114 c 0.95852,-0.701405 2.16474,0.860911 2.16474,1.930361 v 2.554332 z m 0.0645,-6.010119 h 8.46147 l -0.0509,6.010119 h -8.18813"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cczccssscsssccsccccccc"
-           inkscape:label="socket" /><path
+           d="m 35.584224,25.791351 v 1.058985 c 0,1.06945 -0.86329,1.955925 -2.16474,1.930363 -1.30144,-0.02541 -1.94163,0 -1.94163,0 v 0.201512 c 0,1.544678 -1.15857,2.787985 -2.59768,2.788284 l -1.64831,2.98e-4 c -1.36034,3e-4 -1.22903,0.546236 -1.22903,-2.989646 v -8.697694 l 1.0001,-0.451316 c 0.73866,-0.333337 0.24318,-1.03959 0.77485,-1.523121 0.14263,-0.129715 1.05499,0.929393 1.52937,0.6759 0.45561,-0.243458 0.32468,-1.571886 1.05063,-1.470834 l 1.3916,0.729993 1.6701,-1.222114 c 0.95852,-0.701405 2.16474,0.860911 2.16474,1.930361 v 2.554332 z m 0.0645,-6.010119 h 8.46147 l -0.0509,6.010119 h -8.18813" /><path
            transform="matrix(1.445753,0,0,1.0582384,-65.097292,-1055.8857)"
            style="opacity:0.794;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.755349px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter8871-9)"
            d="m 64.018476,1016.5423 -0.152427,10.8222 c 2.375507,-3.3036 3.484206,-4.2052 2.972286,-9.2217 0.305009,-1.654 -1.117834,-1.7529 -2.819859,-1.6005 z"
-           id="path8861-5"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccc"
-           inkscape:label="highlight" /><path
+           id="path8861-5" /><path
            transform="matrix(1.7350569,0,0,1.2551252,-91.814902,-1260.0381)"
            style="opacity:0.862;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.63312px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter2533-3)"
            d="m 70.953811,1023.4014 v -1.8291 l 2.972286,-0.076 z"
-           id="path8875-7"
-           inkscape:connector-curvature="0"
-           inkscape:label="highlight" /><path
+           id="path8875-7" /><path
            transform="matrix(1.029538,0,0,0.78990616,-39.928294,-780.65638)"
            style="display:inline;opacity:0.485;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.03604px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter8871-1-8)"
            d="m 53.924652,1016.631 -0.152427,10.8222 c 2.375507,-3.3036 3.484206,-4.2052 2.972286,-9.2217 0.305009,-1.654 -1.117834,-1.7529 -2.819859,-1.6005 z"
-           id="path8861-7-9"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccc"
-           inkscape:label="highlight" /></g></g><rect
+           id="path8861-7-9" /></g></g><rect
        transform="matrix(1,0,-0.47943681,0.8775764,0,0)"
        style="display:inline;fill:url(#linearGradient4936);fill-opacity:1;stroke:#4c65c0;stroke-width:1.06747;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect4932"
@@ -974,5 +380,4 @@
        x="574.04755"
        y="1159.136"
        ry="1.8222821"
-       inkscape:label="front"
        rx="1.8222821" /></g></svg>
diff --git a/ui/org.eclipse.pde.ui/icons/wizban/newftrprj_wiz.svg b/ui/org.eclipse.pde.ui/icons/wizban/newftrprj_wiz.svg
index 3e8d1dac0f0..8e079c33cb6 100644
--- a/ui/org.eclipse.pde.ui/icons/wizban/newftrprj_wiz.svg
+++ b/ui/org.eclipse.pde.ui/icons/wizban/newftrprj_wiz.svg
@@ -6,14 +6,7 @@
    height="66"
    id="svg2"
    version="1.1"
-   inkscape:version="1.3 (0e150ed, 2023-07-21)"
-   sodipodi:docname="newftrprj_wiz.svg"
-   inkscape:export-filename="/Users/d021678/git/eclipse.jdt.ui/org.eclipse.jdt.ui/icons/full/wizban/newclass_wiz2.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90"
    xml:space="preserve"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:svg="http://www.w3.org/2000/svg"
@@ -21,307 +14,6 @@
    xmlns:cc="http://creativecommons.org/ns#"
    xmlns:dc="http://purl.org/dc/elements/1.1/"><defs
      id="defs4"><linearGradient
-       inkscape:collect="always"
-       id="linearGradient4541"><stop
-         style="stop-color:#a1adb2;stop-opacity:1"
-         offset="0"
-         id="stop4543" /><stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop4545" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       id="linearGradient4972"><stop
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0"
-         id="stop4974" /><stop
-         style="stop-color:#f5f8fd;stop-opacity:1"
-         offset="1"
-         id="stop4976" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       id="linearGradient4964"><stop
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0"
-         id="stop4966" /><stop
-         style="stop-color:#e8eefa;stop-opacity:1"
-         offset="1"
-         id="stop4968" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       id="linearGradient4956"><stop
-         style="stop-color:#fcfdfe;stop-opacity:1"
-         offset="0"
-         id="stop4958" /><stop
-         style="stop-color:#dee6f8;stop-opacity:1"
-         offset="1"
-         id="stop4960" /></linearGradient><filter
-       style="color-interpolation-filters:sRGB"
-       inkscape:label="Drop Shadow"
-       id="filter8854"><feFlood
-         flood-opacity="0.933333"
-         flood-color="rgb(244,248,254)"
-         result="flood"
-         id="feFlood8856" /><feComposite
-         in="flood"
-         in2="SourceGraphic"
-         operator="in"
-         result="composite1"
-         id="feComposite8858" /><feGaussianBlur
-         in="composite1"
-         stdDeviation="1.2"
-         result="blur"
-         id="feGaussianBlur8860" /><feOffset
-         dx="-1"
-         dy="3"
-         result="offset"
-         id="feOffset8862" /><feComposite
-         in="SourceGraphic"
-         in2="offset"
-         operator="over"
-         result="composite2"
-         id="feComposite8864" /></filter><linearGradient
-       id="linearGradient6122"><stop
-         style="stop-color:#c0c0c0;stop-opacity:1"
-         offset="0"
-         id="stop6124" /><stop
-         id="stop6132"
-         offset="0.5"
-         style="stop-color:#adadad;stop-opacity:1" /><stop
-         style="stop-color:#808080;stop-opacity:1"
-         offset="1"
-         id="stop6126" /></linearGradient><linearGradient
-       id="linearGradient7087"><stop
-         style="stop-color:#17325d;stop-opacity:1;"
-         offset="0"
-         id="stop7089" /><stop
-         id="stop7091"
-         offset="0.25"
-         style="stop-color:#b4d0e2;stop-opacity:1" /><stop
-         id="stop7093"
-         offset="0.5"
-         style="stop-color:#b7d2e4;stop-opacity:1" /><stop
-         style="stop-color:#acc9de;stop-opacity:1"
-         offset="0.75"
-         id="stop7095" /><stop
-         style="stop-color:#3e72a7;stop-opacity:1"
-         offset="1"
-         id="stop7097" /></linearGradient><mask
-       id="mask7366"
-       maskUnits="userSpaceOnUse"><path
-         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;display:inline"
-         d="m -16.593048,1040.862 9.990206,0 0,10.0018 -2.983353,3.0385 -5.966213,0 c -0.53033,-0.022 -1.04064,-0.5519 -1.04064,-1.0385 z"
-         id="path7368"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccccc" /></mask><linearGradient
-       id="linearGradient7584-5"><stop
-         id="stop7586-4"
-         offset="0"
-         style="stop-color:#f9cd5f;stop-opacity:1" /><stop
-         id="stop7588-5"
-         offset="1"
-         style="stop-color:#fbf0b4;stop-opacity:1" /></linearGradient><linearGradient
-       id="linearGradient7592-1"><stop
-         id="stop7594-6"
-         offset="0"
-         style="stop-color:#bd8416;stop-opacity:1" /><stop
-         id="stop7596-9"
-         offset="1"
-         style="stop-color:#a66b10;stop-opacity:1" /></linearGradient><linearGradient
-       id="linearGradient10798-1-9-3-7-6-6-6-2-6-7-98-9-4-1"><stop
-         style="stop-color:#5aad60;stop-opacity:1;"
-         offset="0"
-         id="stop10800-5-2-1-8-20-4-0-2-1-9-0-0-1-1" /><stop
-         id="stop10806-6-8-5-3-9-2-2-7-0-4-2-7-8-9"
-         offset="0.5"
-         style="stop-color:#5bb26a;stop-opacity:1;" /><stop
-         style="stop-color:#a4c589;stop-opacity:1"
-         offset="1"
-         id="stop10802-1-5-3-0-4-6-8-5-5-6-69-6-4-0" /></linearGradient><mask
-       maskUnits="userSpaceOnUse"
-       id="mask7366-4"><path
-         sodipodi:nodetypes="ccccccc"
-         inkscape:connector-curvature="0"
-         id="path7368-2"
-         d="m -16.593048,1040.862 9.990206,0 0,10.0018 -2.983353,3.0385 -5.966213,0 c -0.53033,-0.022 -1.04064,-0.5519 -1.04064,-1.0385 z"
-         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;display:inline" /></mask><linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient7087"
-       id="linearGradient9331"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-20,0)"
-       x1="4.7776356"
-       y1="1039.8118"
-       x2="4.7776356"
-       y2="1041.911" /><linearGradient
-       y2="1041.911"
-       x2="4.7776356"
-       y1="1039.8118"
-       x1="4.7776356"
-       gradientTransform="translate(-18,4.7e-5)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient9333"
-       xlink:href="#linearGradient7087"
-       inkscape:collect="always" /><linearGradient
-       y2="1041.911"
-       x2="4.7776356"
-       y1="1039.8118"
-       x1="4.7776356"
-       gradientTransform="translate(-16,4.7e-5)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient9335"
-       xlink:href="#linearGradient7087"
-       inkscape:collect="always" /><linearGradient
-       y2="1041.911"
-       x2="4.7776356"
-       y1="1039.8118"
-       x1="4.7776356"
-       gradientTransform="translate(-14,4.7e-5)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient9337"
-       xlink:href="#linearGradient7087"
-       inkscape:collect="always" /><linearGradient
-       y2="1041.911"
-       x2="4.7776356"
-       y1="1039.8118"
-       x1="4.7776356"
-       gradientTransform="translate(-12,4.7e-5)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient9339"
-       xlink:href="#linearGradient7087"
-       inkscape:collect="always" /><linearGradient
-       gradientTransform="translate(-80,0)"
-       gradientUnits="userSpaceOnUse"
-       y2="1042.7973"
-       x2="163.22012"
-       y1="1042.7973"
-       x1="88.220117"
-       id="linearGradient68073"
-       xlink:href="#linearGradient4956"
-       inkscape:collect="always" /><linearGradient
-       gradientTransform="translate(-80,0)"
-       gradientUnits="userSpaceOnUse"
-       y2="1032.2669"
-       x2="163.22012"
-       y1="1032.2668"
-       x1="94.469681"
-       id="linearGradient68075"
-       xlink:href="#linearGradient4964"
-       inkscape:collect="always" /><linearGradient
-       gradientTransform="translate(-80,0)"
-       gradientUnits="userSpaceOnUse"
-       y2="1032.2668"
-       x2="152.72206"
-       y1="1032.2668"
-       x1="88.220116"
-       id="linearGradient68077"
-       xlink:href="#linearGradient4972"
-       inkscape:collect="always" /><filter
-       id="filter8854-9"
-       inkscape:label="Drop Shadow"
-       style="color-interpolation-filters:sRGB"><feFlood
-         id="feFlood8856-0"
-         result="flood"
-         flood-color="rgb(244,248,254)"
-         flood-opacity="0.933333" /><feComposite
-         id="feComposite8858-2"
-         result="composite1"
-         operator="in"
-         in2="SourceGraphic"
-         in="flood" /><feGaussianBlur
-         id="feGaussianBlur8860-3"
-         result="blur"
-         stdDeviation="1.2"
-         in="composite1" /><feOffset
-         id="feOffset8862-2"
-         result="offset"
-         dy="3"
-         dx="-1" /><feComposite
-         id="feComposite8864-3"
-         result="composite2"
-         operator="over"
-         in2="offset"
-         in="SourceGraphic" /></filter><linearGradient
-       id="linearGradient10798-1-9-3-7-6-8-9-0-9-1"><stop
-         id="stop10800-5-2-1-8-20-6-4-9-8-2"
-         offset="0"
-         style="stop-color:#7564b1;stop-opacity:1" /><stop
-         style="stop-color:#5d4aa1;stop-opacity:1"
-         offset="0.5"
-         id="stop10806-6-8-5-3-9-24-8-4-3-2" /><stop
-         id="stop10802-1-5-3-0-4-8-4-2-9-2"
-         offset="1"
-         style="stop-color:#9283c3;stop-opacity:1" /></linearGradient><linearGradient
-       id="linearGradient7540-2-3-8-7"><stop
-         id="stop7542-8-7-5-3"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.502" /><stop
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0.47623286"
-         id="stop7544-8-2-0-5" /><stop
-         style="stop-color:#ffffff;stop-opacity:0"
-         offset="0.5"
-         id="stop7546-1-7-9-5" /><stop
-         id="stop7548-98-9-2-4"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       id="linearGradient7272-66-4-5-5-5-8"><stop
-         style="stop-color:#8f6c10;stop-opacity:1"
-         offset="0"
-         id="stop7274-6-0-1-7-4-7" /><stop
-         style="stop-color:#c9a645;stop-opacity:1"
-         offset="1"
-         id="stop7276-66-6-3-9-1-4" /></linearGradient><linearGradient
-       y2="1030.3411"
-       x2="-10.159802"
-       y1="1030.3411"
-       x1="-22.453552"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient10540"
-       xlink:href="#linearGradient7540-2-3-8-7"
-       inkscape:collect="always" /><linearGradient
-       y2="1030.3411"
-       x2="-10.159802"
-       y1="1030.3411"
-       x1="-22.453552"
-       gradientTransform="matrix(0,1,-1,0,1014.0344,1046.6478)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient10542"
-       xlink:href="#linearGradient7540-2-3-8-7"
-       inkscape:collect="always" /><linearGradient
-       y2="1023.2569"
-       x2="-15.945988"
-       y1="1037.4661"
-       x1="-15.945988"
-       gradientTransform="matrix(0.95585117,0,0,0.95585117,-0.71992063,45.488394)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient10544"
-       xlink:href="#linearGradient7272-66-4-5-5-5-8"
-       inkscape:collect="always" /><mask
-       id="mask10620"
-       maskUnits="userSpaceOnUse"><path
-         transform="matrix(0.55482947,0,0,0.55482947,-206.96039,787.08655)"
-         d="m 398.75,468.23718 a 10.625,10.625 0 1 1 -21.25,0 10.625,10.625 0 1 1 21.25,0 z"
-         sodipodi:ry="10.625"
-         sodipodi:rx="10.625"
-         sodipodi:cy="468.23718"
-         sodipodi:cx="388.125"
-         id="path10622"
-         style="font-size:13.58917427px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:2.16621375;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline;font-family:Sans"
-         sodipodi:type="arc" /></mask><linearGradient
-       id="linearGradient4528-9-5-7-9-7-3"><stop
-         id="stop4530-0-5-0-5-8-4"
-         offset="0"
-         style="stop-color:#e0c576;stop-opacity:1;" /><stop
-         id="stop4532-7-9-3-3-6-1"
-         offset="1"
-         style="stop-color:#9e7916;stop-opacity:1" /></linearGradient><linearGradient
-       id="linearGradient6281-8-0-1-6-6-4-2-8-0"><stop
-         style="stop-color:#f7f9fb;stop-opacity:1"
-         offset="0"
-         id="stop6283-0-2-2-1-2-0-1-6-0" /><stop
-         style="stop-color:#ffd680;stop-opacity:1"
-         offset="1"
-         id="stop6285-5-0-9-7-6-9-9-1-9" /></linearGradient><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4972-7"
        id="linearGradient4978"
        x1="88.220116"
@@ -330,7 +22,6 @@
        y2="1032.2668"
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-88.220116,-999.2669)" /><linearGradient
-       inkscape:collect="always"
        id="linearGradient4972-7"><stop
          style="stop-color:#b8ccf1;stop-opacity:0.10196079"
          offset="0"
@@ -338,7 +29,6 @@
          style="stop-color:#6e97e2;stop-opacity:0.10196079"
          offset="1"
          id="stop4976-1" /></linearGradient><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4964-3"
        id="linearGradient4970"
        x1="118.38584"
@@ -347,7 +37,6 @@
        y2="1032.2668"
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-88.220117,-999.2669)" /><linearGradient
-       inkscape:collect="always"
        id="linearGradient4964-3"><stop
          style="stop-color:#ffffff;stop-opacity:0.349"
          offset="0"
@@ -355,7 +44,6 @@
          style="stop-color:#91ade6;stop-opacity:1"
          offset="1"
          id="stop4968-1" /></linearGradient><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4956-2"
        id="linearGradient4962"
        x1="88.220116"
@@ -364,7 +52,6 @@
        y2="1042.7972"
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-88.220116,-999.2669)" /><linearGradient
-       inkscape:collect="always"
        id="linearGradient4956-2"><stop
          style="stop-color:#fcfdfe;stop-opacity:0.25641027"
          offset="0"
@@ -372,36 +59,6 @@
          style="stop-color:#98aae7;stop-opacity:0.40392157"
          offset="1"
          id="stop4960-6" /></linearGradient><linearGradient
-       id="linearGradient3827"><stop
-         id="stop3829"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0;" /><stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0.60149658"
-         id="stop3835" /><stop
-         id="stop3831"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" /></linearGradient><linearGradient
-       id="linearGradient10798-1-9-3-7-6-8-9-0-9-1-0"><stop
-         id="stop10800-5-2-1-8-20-6-4-9-8-2-9"
-         offset="0"
-         style="stop-color:#f3faed;stop-opacity:1" /><stop
-         style="stop-color:#e7f4da;stop-opacity:1"
-         offset="0.65917557"
-         id="stop10806-6-8-5-3-9-24-8-4-3-2-4" /><stop
-         id="stop10802-1-5-3-0-4-8-4-2-9-2-5"
-         offset="1"
-         style="stop-color:#67bf1f;stop-opacity:1" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4541"
-       id="linearGradient5885"
-       x1="41"
-       y1="1007.8622"
-       x2="60"
-       y2="1008.3622"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0,1,-1,0,1034.3618,967.36133)" /><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4894"
        id="linearGradient4884"
        x1="11.927121"
@@ -410,8 +67,7 @@
        y2="30.177986"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1.0044276,0,0,1.0089329,4.2405011,977.30396)" /><linearGradient
-       id="linearGradient4894"
-       inkscape:collect="always"><stop
+       id="linearGradient4894"><stop
          id="stop4896"
          offset="0"
          style="stop-color:#000000;stop-opacity:1" /><stop
@@ -424,7 +80,6 @@
          id="stop4898"
          offset="1"
          style="stop-color:#ffffff;stop-opacity:1" /></linearGradient><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient5252"
        id="linearGradient5258"
        x1="5"
@@ -433,7 +88,6 @@
        y2="32"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1.0067593,0,0,1.0132311,4.1393203,977.16609)" /><linearGradient
-       inkscape:collect="always"
        id="linearGradient5252"><stop
          style="stop-color:#5f443c;stop-opacity:1"
          offset="0"
@@ -441,7 +95,6 @@
          style="stop-color:#765d54;stop-opacity:1"
          offset="1"
          id="stop5256" /></linearGradient><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4199"
        id="linearGradient4205"
        x1="12"
@@ -450,7 +103,6 @@
        y2="21"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1.4358198,0,0,1.270043,-10.240326,977.40079)" /><linearGradient
-       inkscape:collect="always"
        id="linearGradient4199"><stop
          style="stop-color:#765d54;stop-opacity:1;"
          offset="0"
@@ -461,7 +113,6 @@
          style="stop-color:#765d54;stop-opacity:1"
          offset="1"
          id="stop4203" /></linearGradient><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4944"
        id="linearGradient4936"
        gradientUnits="userSpaceOnUse"
@@ -470,7 +121,6 @@
        x2="49.569252"
        y2="40.099323"
        gradientTransform="matrix(0.99999865,0,0,1.0179002,537.84569,1112.6509)" /><linearGradient
-       inkscape:collect="always"
        id="linearGradient4944"><stop
          style="stop-color:#000000;stop-opacity:1"
          offset="0"
@@ -484,7 +134,6 @@
          style="stop-color:#ffffff;stop-opacity:1"
          offset="1"
          id="stop4910" /></linearGradient><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4950"
        id="linearGradient4956-9"
        x1="60.342896"
@@ -493,54 +142,21 @@
        y2="44.682102"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(0.99999865,0,0,1.0179002,537.84569,1112.6509)" /><linearGradient
-       inkscape:collect="always"
        id="linearGradient4950"><stop
          style="stop-color:#6a5148;stop-opacity:1;"
          offset="0"
          id="stop4952" /><stop
          style="stop-color:#978379;stop-opacity:1"
          offset="1"
-         id="stop4954" /></linearGradient><linearGradient
-       id="linearGradient11146-4-4-4-6-2"><stop
-         id="stop11150-4-72-3-9-7"
-         offset="0"
-         style="stop-color:#faefba;stop-opacity:1" /><stop
-         style="stop-color:#9e6542;stop-opacity:1"
-         offset="1"
-         id="stop11152-9-0-7-3-8" /></linearGradient><linearGradient
-       id="linearGradient10507"><stop
-         style="stop-color:#5f392d;stop-opacity:1"
-         offset="0"
-         id="stop10509" /><stop
-         id="stop10511"
-         offset="0.18181793"
-         style="stop-color:#9e7058;stop-opacity:1" /><stop
-         id="stop10513"
-         offset="0.36363617"
-         style="stop-color:#794f40;stop-opacity:1" /><stop
-         id="stop10515"
-         offset="0.49999985"
-         style="stop-color:#794f40;stop-opacity:1" /><stop
-         id="stop10517"
-         offset="0.63636351"
-         style="stop-color:#794f40;stop-opacity:1" /><stop
-         style="stop-color:#9e7058;stop-opacity:1"
-         offset="0.81818175"
-         id="stop10519" /><stop
-         style="stop-color:#5f392d;stop-opacity:1"
-         offset="1"
-         id="stop10522" /></linearGradient><filter
-       inkscape:collect="always"
+         id="stop4954" /></linearGradient><filter
        style="color-interpolation-filters:sRGB"
        id="filter5309"
        x="-0.41279999"
        width="1.8256"
        y="-0.68799998"
        height="2.376"><feGaussianBlur
-         inkscape:collect="always"
          stdDeviation="2.58"
          id="feGaussianBlur5311" /></filter><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4456"
        id="linearGradient4462"
        x1="63.734764"
@@ -549,7 +165,6 @@
        y2="1006.3618"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1,0,-0.72750163,1,733.40264,2.0004)" /><linearGradient
-       inkscape:collect="always"
        id="linearGradient4456"><stop
          style="stop-color:#ffffff;stop-opacity:0.659"
          offset="0"
@@ -557,46 +172,14 @@
          style="stop-color:#ffffff;stop-opacity:0.369"
          offset="1"
          id="stop4460" /></linearGradient><filter
-       inkscape:collect="always"
        style="color-interpolation-filters:sRGB"
        id="filter4606"
        x="-0.062976157"
        width="1.1259523"
        y="-0.10879013"
        height="1.2175803"><feGaussianBlur
-         inkscape:collect="always"
          stdDeviation="1.5412116"
          id="feGaussianBlur4608" /></filter><linearGradient
-       id="linearGradient11146-4-4-4-6-2-8"><stop
-         id="stop11150-4-72-3-9-7-2"
-         offset="0"
-         style="stop-color:#faefba;stop-opacity:1" /><stop
-         style="stop-color:#ad6e48;stop-opacity:1"
-         offset="1"
-         id="stop11152-9-0-7-3-8-0" /></linearGradient><linearGradient
-       id="linearGradient4368"><stop
-         id="stop4370"
-         offset="0"
-         style="stop-color:#9c7561;stop-opacity:1" /><stop
-         style="stop-color:#966d59;stop-opacity:1"
-         offset="0.18181793"
-         id="stop4372" /><stop
-         style="stop-color:#8c6250;stop-opacity:1"
-         offset="0.36363617"
-         id="stop4374" /><stop
-         style="stop-color:#794f40;stop-opacity:1"
-         offset="0.49999985"
-         id="stop4376" /><stop
-         style="stop-color:#8c6250;stop-opacity:1"
-         offset="0.63636351"
-         id="stop4378" /><stop
-         id="stop4380"
-         offset="0.81818175"
-         style="stop-color:#966d59;stop-opacity:1" /><stop
-         id="stop4382"
-         offset="1"
-         style="stop-color:#99705c;stop-opacity:1" /></linearGradient><linearGradient
-       inkscape:collect="always"
        id="linearGradient2543"><stop
          style="stop-color:#4f76b0;stop-opacity:1"
          offset="0"
@@ -607,8 +190,7 @@
          style="stop-color:#587cb2;stop-opacity:1"
          offset="1"
          id="stop2541" /></linearGradient><linearGradient
-       id="linearGradient8785"
-       inkscape:collect="always"><stop
+       id="linearGradient8785"><stop
          id="stop8781"
          offset="0"
          style="stop-color:#bb8d2d;stop-opacity:1" /><stop
@@ -618,113 +200,34 @@
          id="stop8783"
          offset="1"
          style="stop-color:#b07905;stop-opacity:1" /></linearGradient><linearGradient
-       id="linearGradient8777"
-       inkscape:collect="always"><stop
+       id="linearGradient8777"><stop
          id="stop8773"
          offset="0"
          style="stop-color:#fbeaab;stop-opacity:1;" /><stop
          id="stop8775"
          offset="1"
          style="stop-color:#deb241;stop-opacity:1" /></linearGradient><linearGradient
-       id="linearGradient8767"
-       inkscape:collect="always"><stop
+       id="linearGradient8767"><stop
          id="stop8763"
          offset="0"
          style="stop-color:#6a8ec1;stop-opacity:1" /><stop
          id="stop8765"
          offset="1"
          style="stop-color:#80a1cf;stop-opacity:1" /></linearGradient><linearGradient
-       id="linearGradient8759"
-       inkscape:collect="always"><stop
+       id="linearGradient8759"><stop
          id="stop8755"
          offset="0"
          style="stop-color:#d3e0eb;stop-opacity:1" /><stop
          id="stop8757"
          offset="1"
          style="stop-color:#5179b5;stop-opacity:1" /></linearGradient><linearGradient
-       id="linearGradient8751"
-       inkscape:collect="always"><stop
+       id="linearGradient8751"><stop
          id="stop8747"
          offset="0"
          style="stop-color:#2e5d8f;stop-opacity:1" /><stop
          id="stop8749"
          offset="1"
-         style="stop-color:#6085bb;stop-opacity:1" /></linearGradient><filter
-       id="filter8854-7"
-       inkscape:label="Drop Shadow"
-       style="color-interpolation-filters:sRGB"><feFlood
-         id="feFlood8856-03"
-         result="flood"
-         flood-color="rgb(244,248,254)"
-         flood-opacity="0.933333" /><feComposite
-         id="feComposite8858-9"
-         result="composite1"
-         operator="in"
-         in2="SourceGraphic"
-         in="flood" /><feGaussianBlur
-         id="feGaussianBlur8860-9"
-         result="blur"
-         stdDeviation="1.2"
-         in="composite1" /><feOffset
-         id="feOffset8862-9"
-         result="offset"
-         dy="3"
-         dx="-1" /><feComposite
-         id="feComposite8864-1"
-         result="composite2"
-         operator="over"
-         in2="offset"
-         in="SourceGraphic" /></filter><mask
-       maskUnits="userSpaceOnUse"
-       id="mask7366-47"><path
-         sodipodi:nodetypes="ccccccc"
-         inkscape:connector-curvature="0"
-         id="path7368-1"
-         d="m -16.593048,1040.862 9.990206,0 0,10.0018 -2.983353,3.0385 -5.966213,0 c -0.53033,-0.022 -1.04064,-0.5519 -1.04064,-1.0385 z"
-         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;display:inline" /></mask><mask
-       id="mask7366-4-0"
-       maskUnits="userSpaceOnUse"><path
-         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;display:inline"
-         d="m -16.593048,1040.862 9.990206,0 0,10.0018 -2.983353,3.0385 -5.966213,0 c -0.53033,-0.022 -1.04064,-0.5519 -1.04064,-1.0385 z"
-         id="path7368-2-3"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccccc" /></mask><filter
-       style="color-interpolation-filters:sRGB"
-       inkscape:label="Drop Shadow"
-       id="filter8854-9-2"><feFlood
-         flood-opacity="0.933333"
-         flood-color="rgb(244,248,254)"
-         result="flood"
-         id="feFlood8856-0-6" /><feComposite
-         in="flood"
-         in2="SourceGraphic"
-         operator="in"
-         result="composite1"
-         id="feComposite8858-2-9" /><feGaussianBlur
-         in="composite1"
-         stdDeviation="1.2"
-         result="blur"
-         id="feGaussianBlur8860-3-4" /><feOffset
-         dx="-1"
-         dy="3"
-         result="offset"
-         id="feOffset8862-2-1" /><feComposite
-         in="SourceGraphic"
-         in2="offset"
-         operator="over"
-         result="composite2"
-         id="feComposite8864-3-3" /></filter><mask
-       maskUnits="userSpaceOnUse"
-       id="mask10620-4"><path
-         sodipodi:type="arc"
-         style="font-size:13.58917427px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:2.16621375;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline;font-family:Sans"
-         id="path10622-3"
-         sodipodi:cx="388.125"
-         sodipodi:cy="468.23718"
-         sodipodi:rx="10.625"
-         sodipodi:ry="10.625"
-         d="m 398.75,468.23718 a 10.625,10.625 0 1 1 -21.25,0 10.625,10.625 0 1 1 21.25,0 z"
-         transform="matrix(0.55482947,0,0,0.55482947,-206.96039,787.08655)" /></mask><linearGradient
+         style="stop-color:#6085bb;stop-opacity:1" /></linearGradient><linearGradient
        gradientUnits="userSpaceOnUse"
        y2="1024.3622"
        x2="50"
@@ -732,7 +235,6 @@
        x1="50"
        id="linearGradient8753"
        xlink:href="#linearGradient8751"
-       inkscape:collect="always"
        gradientTransform="matrix(2.7500001,0,0,0.99370101,-129.87501,-991.91286)" /><linearGradient
        gradientUnits="userSpaceOnUse"
        y2="1030.3622"
@@ -741,7 +243,6 @@
        x1="57"
        id="linearGradient8761"
        xlink:href="#linearGradient8759"
-       inkscape:collect="always"
        gradientTransform="matrix(1.0999999,0,0,1.1281495,-43.249997,-1129.0318)" /><linearGradient
        gradientUnits="userSpaceOnUse"
        y2="1023.234"
@@ -750,7 +251,6 @@
        x1="51.658199"
        id="linearGradient8769"
        xlink:href="#linearGradient8767"
-       inkscape:collect="always"
        gradientTransform="matrix(2.7500001,0,0,0.99370101,-129.87501,-991.91286)" /><linearGradient
        gradientUnits="userSpaceOnUse"
        y2="1026.0538"
@@ -759,7 +259,6 @@
        x1="63.98344"
        id="linearGradient8779"
        xlink:href="#linearGradient8777"
-       inkscape:collect="always"
        gradientTransform="matrix(1.3687895,0,0,1.494898,-60.408122,-1504.0798)" /><linearGradient
        gradientUnits="userSpaceOnUse"
        y2="1028.4165"
@@ -768,59 +267,47 @@
        x1="68.47998"
        id="linearGradient8787"
        xlink:href="#linearGradient8785"
-       inkscape:collect="always"
        gradientTransform="matrix(1.3687895,0,0,1.494898,-60.408122,-1504.0798)" /><filter
        height="1.4861495"
        y="-0.24307477"
        width="2.0754105"
        x="-0.53770523"
        id="filter8813"
-       style="color-interpolation-filters:sRGB"
-       inkscape:collect="always"><feGaussianBlur
+       style="color-interpolation-filters:sRGB"><feGaussianBlur
          id="feGaussianBlur8815"
-         stdDeviation="1.1269452"
-         inkscape:collect="always" /></filter><filter
+         stdDeviation="1.1269452" /></filter><filter
        height="1.6025846"
        y="-0.30129232"
        width="1.626688"
        x="-0.313344"
        id="filter8835"
-       style="color-interpolation-filters:sRGB"
-       inkscape:collect="always"><feGaussianBlur
+       style="color-interpolation-filters:sRGB"><feGaussianBlur
          id="feGaussianBlur8837"
-         stdDeviation="0.49751501"
-         inkscape:collect="always" /></filter><filter
+         stdDeviation="0.49751501" /></filter><filter
        height="1.2365698"
        y="-0.11828489"
        width="1.8310951"
        x="-0.41554753"
        id="filter8871"
-       style="color-interpolation-filters:sRGB"
-       inkscape:collect="always"><feGaussianBlur
+       style="color-interpolation-filters:sRGB"><feGaussianBlur
          id="feGaussianBlur8873"
-         stdDeviation="0.53588249"
-         inkscape:collect="always" /></filter><filter
+         stdDeviation="0.53588249" /></filter><filter
        height="1.2365698"
        y="-0.11828489"
        width="1.8310951"
        x="-0.41554753"
        id="filter8871-1"
-       style="color-interpolation-filters:sRGB"
-       inkscape:collect="always"><feGaussianBlur
+       style="color-interpolation-filters:sRGB"><feGaussianBlur
          id="feGaussianBlur8873-8"
-         stdDeviation="0.53588249"
-         inkscape:collect="always" /></filter><filter
-       inkscape:collect="always"
+         stdDeviation="0.53588249" /></filter><filter
        style="color-interpolation-filters:sRGB"
        id="filter2533"
        x="-0.59377657"
        width="2.1875531"
        y="-0.92639431"
        height="2.8527886"><feGaussianBlur
-         inkscape:collect="always"
          stdDeviation="0.73536407"
          id="feGaussianBlur2535" /></filter><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient2543"
        id="linearGradient2545"
        x1="18.423391"
@@ -833,112 +320,57 @@
        width="2.2508695"
        x="-0.62393297"
        id="filter8813-5"
-       style="color-interpolation-filters:sRGB"
-       inkscape:collect="always"><feGaussianBlur
+       style="color-interpolation-filters:sRGB"><feGaussianBlur
          id="feGaussianBlur8815-0"
-         stdDeviation="1.1269452"
-         inkscape:collect="always" /></filter><filter
+         stdDeviation="1.1269452" /></filter><filter
        height="1.3657107"
-       y="-0.14956415"
-       width="2.0529235"
+       y="-0.14956416"
+       width="2.0529236"
        x="-0.5290004"
        id="filter8871-4"
-       style="color-interpolation-filters:sRGB"
-       inkscape:collect="always"><feGaussianBlur
+       style="color-interpolation-filters:sRGB"><feGaussianBlur
          id="feGaussianBlur8873-9"
-         stdDeviation="0.53588249"
-         inkscape:collect="always" /></filter><filter
+         stdDeviation="0.53588249" /></filter><filter
        height="1.8202161"
        y="-0.41010804"
        width="1.8530247"
        x="-0.42651235"
        id="filter8835-5"
-       style="color-interpolation-filters:sRGB"
-       inkscape:collect="always"><feGaussianBlur
+       style="color-interpolation-filters:sRGB"><feGaussianBlur
          id="feGaussianBlur8837-4"
-         stdDeviation="0.49751501"
-         inkscape:collect="always" /></filter><filter
-       inkscape:collect="always"
+         stdDeviation="0.49751501" /></filter><filter
        style="color-interpolation-filters:sRGB"
        id="filter2533-6"
        x="-0.68029651"
        width="2.5817097"
        y="-1.073697"
        height="3.2469451"><feGaussianBlur
-         inkscape:collect="always"
          stdDeviation="0.73536407"
          id="feGaussianBlur2535-0" /></filter><filter
-       height="1.402261"
-       y="-0.15841809"
+       height="1.4022611"
+       y="-0.1584181"
        width="2.1157048"
        x="-0.56110931"
        id="filter8871-1-6"
-       style="color-interpolation-filters:sRGB"
-       inkscape:collect="always"><feGaussianBlur
+       style="color-interpolation-filters:sRGB"><feGaussianBlur
          id="feGaussianBlur8873-8-9"
-         stdDeviation="0.53588249"
-         inkscape:collect="always" /></filter><filter
-       inkscape:collect="always"
+         stdDeviation="0.53588249" /></filter><filter
        style="color-interpolation-filters:sRGB"
        id="filter2728"
        x="-0.06427016"
        width="1.1285403"
        y="-0.1171224"
        height="1.2342448"><feGaussianBlur
-         inkscape:collect="always"
          stdDeviation="0.90744768"
-         id="feGaussianBlur2730" /></filter></defs><sodipodi:namedview
-     id="base"
-     pagecolor="#bcbcbc"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7.185918"
-     inkscape:cx="52.811624"
-     inkscape:cy="24.77067"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1728"
-     inkscape:window-height="1051"
-     inkscape:window-x="0"
-     inkscape:window-y="38"
-     inkscape:window-maximized="1"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="true"
-     inkscape:snap-bbox="true"
-     inkscape:bbox-nodes="true"
-     inkscape:showpageshadow="2"
-     inkscape:pagecheckerboard="0"
-     inkscape:deskcolor="#d1d1d1"><inkscape:grid
-       type="xygrid"
-       id="grid4112"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       originx="0"
-       originy="0"
-       spacingy="1"
-       spacingx="1"
-       units="px" /></sodipodi:namedview><metadata
+         id="feGaussianBlur2730" /></filter></defs><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" /></cc:Work></rdf:RDF></metadata><g
-     inkscape:groupmode="layer"
      id="layer2"
-     inkscape:label="Background"
-     style="display:inline"
-     sodipodi:insensitive="true"><path
-       sodipodi:nodetypes="cccc"
-       inkscape:connector-curvature="0"
+     style="display:inline"><path
        id="rect4113-1"
        d="M 75,0 75,66 1e-6,66 C 1e-6,41.2048 50.00969,0 75,0 Z"
        style="display:inline;fill:url(#linearGradient4978);fill-opacity:1;stroke:none" /><path
-       sodipodi:nodetypes="cccc"
-       inkscape:connector-curvature="0"
        id="rect4113-1-0"
        d="M 75,21.0607 75,66 1e-6,66 C 10.625001,47.804 43.509694,25.4357 75,21.0607 Z"
        style="display:inline;opacity:0.40400002;fill:url(#linearGradient4962);fill-opacity:1;stroke:none" /><g
@@ -947,38 +379,26 @@
        transform="matrix(0.27903303,0,0,0.27903303,-14.618136,-107.52874)"><g
          style="fill:#737986;fill-opacity:1;stroke:#595e68;stroke-opacity:1"
          id="g13408-8-2" /></g><path
-       sodipodi:nodetypes="cccc"
-       inkscape:connector-curvature="0"
        id="rect4113-1-7"
        d="M 75,4.0000001e-7 75,66 30.000003,66 C 30.000003,46.1545 47.70944,9.2500004 75,4e-7 Z"
        style="display:inline;opacity:0.18399999;fill:url(#linearGradient4970);fill-opacity:1;stroke:none" /></g><g
-     inkscape:label="Foreground"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-986.3622)"><path
        style="font-style:normal;font-weight:normal;font-size:13.5892px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;display:inline;fill:url(#linearGradient4462);fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;filter:url(#filter4606)"
        d="m 47.000294,1007.3622 -12.319149,16.9335 -12.416197,17.0669 h 16.933329 17.066666 l 12.416197,-17.0669 0.09676,-0.133 L 81,1007.3626 H 63.933334 47.000005 Z"
        id="rect10961-8-3-6-1"
-       inkscape:connector-curvature="0"
-       transform="matrix(1.1726475,0,0.08958032,0.36603268,-114.6799,661.22486)"
-       inkscape:transform-center-x="4.353394"
-       inkscape:transform-center-y="0.53407509"
-       inkscape:label="shadow" /><path
-       sodipodi:nodetypes="ccccc"
-       inkscape:connector-curvature="0"
+       transform="matrix(1.1726475,0,0.08958032,0.36603268,-114.6799,661.22486)" /><path
        id="path5250"
        d="m 7.662133,1010.2334 3.760589,-4.9642 h 16.536804 l 3.904559,4.9642 z"
-       style="fill:#fffabf;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4205);stroke-width:1;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       inkscape:label="tab-shadow" /><ellipse
+       style="fill:#fffabf;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4205);stroke-width:1;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /><ellipse
        transform="matrix(0.99999865,0,0,0.38855855,-7.8969055,1005.4091)"
        ry="4.5"
        rx="7.5"
        cy="8.3080006"
        cx="23.691999"
        id="path5111"
-       style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;filter:url(#filter5309)"
-       inkscape:label="tab" /><rect
+       style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;filter:url(#filter5309)" /><rect
        ry="2.0792062"
        y="1010.2515"
        x="4.8986993"
@@ -986,45 +406,32 @@
        width="41.860352"
        id="rect4876"
        style="fill:url(#linearGradient4884);fill-opacity:1;stroke:url(#linearGradient5258);stroke-width:1;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       inkscape:label="back"
        rx="2.0792062" /><g
        id="g2"
-       transform="matrix(0.99999865,0,0,1,18.716424,985.90101)"
-       inkscape:label="plug"><g
+       transform="matrix(0.99999865,0,0,1,18.716424,985.90101)"><g
          transform="matrix(1.0729615,0,0,1.0787087,-1.2096914,-0.17204372)"
          id="g2558-4"
          style="opacity:0.503;fill:#808080;stroke:#808080;stroke-width:0.929514;filter:url(#filter2728)"><path
            transform="matrix(1.029538,0,0,1.1281495,-40.181606,-1129.0381)"
            style="fill:#808080;fill-opacity:1;stroke:#808080;stroke-width:0.862484px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter8813-5)"
            d="m 53.577367,1026.9835 -0.152425,-8.8407 0.91455,-1.2194 3.124711,-0.076 0.07621,-0.9908 h 0.91455 l -0.07621,1.9054 -3.048499,1.2194 -0.152425,4.9538 z"
-           id="path8791-1"
-           inkscape:connector-curvature="0" /><path
+           id="path8791-1" /><path
            id="path8722-7-8"
            style="display:inline;opacity:1;fill:#808080;fill-opacity:1;stroke:#808080;stroke-width:0.929514;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="M 3.4999999,23.512598 V 25.5 H 14.5 V 21.525196 H 3.4999999 v 1.987402"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccccc" /><path
-           sodipodi:nodetypes="csssscsscccsssscsscc"
+           d="M 3.4999999,23.512598 V 25.5 H 14.5 V 21.525196 H 3.4999999 v 1.987402" /><path
            id="rect8645-3-9"
            style="display:inline;opacity:1;fill:#808080;fill-opacity:1;stroke:#808080;stroke-width:0.929514;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="M 25.499998,23.781495 25.5,15.413559 C 25.5,13.799403 24.568942,12.5 23.412427,12.5 h -2.424855 c -1.156515,0 -2.483072,1.299403 -2.483072,2.913559 v 1.599039 h -2.264856 c -0.963763,0 -1.739644,0.794104 -1.739644,1.780446 v 1.468512 3.519375 m 10.999998,5.64e-4 2e-6,8.367936 c 0,1.614156 -0.931058,2.913559 -2.087573,2.913559 h -2.424855 c -1.156515,0 -2.483072,-1.299403 -2.483072,-2.913559 V 30.550392 H 16.239644 C 15.275881,30.550392 14.5,29.756288 14.5,28.769946 v -1.468512 -3.519375"
-           inkscape:connector-curvature="0" /><path
-           sodipodi:nodetypes="cc"
-           inkscape:connector-curvature="0"
+           d="M 25.499998,23.781495 25.5,15.413559 C 25.5,13.799403 24.568942,12.5 23.412427,12.5 h -2.424855 c -1.156515,0 -2.483072,1.299403 -2.483072,2.913559 v 1.599039 h -2.264856 c -0.963763,0 -1.739644,0.794104 -1.739644,1.780446 v 1.468512 3.519375 m 10.999998,5.64e-4 2e-6,8.367936 c 0,1.614156 -0.931058,2.913559 -2.087573,2.913559 h -2.424855 c -1.156515,0 -2.483072,-1.299403 -2.483072,-2.913559 V 30.550392 H 16.239644 C 15.275881,30.550392 14.5,29.756288 14.5,28.769946 v -1.468512 -3.519375" /><path
            id="path2537-0"
            d="M 18.51661,16.539741 18.5464,30.705846"
            style="fill:#808080;stroke:#808080;stroke-width:0.929514px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /><path
            id="rect8645-2-5-2"
            style="display:inline;opacity:1;fill:#808080;fill-opacity:1;stroke:#808080;stroke-width:0.929514;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="m 36.091538,26.489769 -10e-7,1.058985 c 0,1.06945 -0.863288,1.955925 -2.164732,1.930363 -1.301445,-0.02541 -1.941636,0 -1.941636,0 v 0.201512 c 0,1.544678 -1.158564,2.787985 -2.597679,2.788284 l -1.648306,2.98e-4 c -1.360345,3e-4 -1.22903,0.546236 -1.22903,-2.989646 V 17.520381 c 0,-3.536032 -0.205068,-2.989797 1.22903,-2.989797 h 1.648306 c 1.439115,0 2.597679,1.243607 2.597679,2.788284 v 0.201513 h 1.941637 c 1.199261,0 2.164732,0.860911 2.164732,1.930361 v 2.554332 z m 0.06454,-6.010119 h 8.461471 l -0.05085,6.010119 h -8.188123"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cczccssssssccsccccccc" /><path
+           d="m 36.091538,26.489769 -10e-7,1.058985 c 0,1.06945 -0.863288,1.955925 -2.164732,1.930363 -1.301445,-0.02541 -1.941636,0 -1.941636,0 v 0.201512 c 0,1.544678 -1.158564,2.787985 -2.597679,2.788284 l -1.648306,2.98e-4 c -1.360345,3e-4 -1.22903,0.546236 -1.22903,-2.989646 V 17.520381 c 0,-3.536032 -0.205068,-2.989797 1.22903,-2.989797 h 1.648306 c 1.439115,0 2.597679,1.243607 2.597679,2.788284 v 0.201513 h 1.941637 c 1.199261,0 2.164732,0.860911 2.164732,1.930361 v 2.554332 z m 0.06454,-6.010119 h 8.461471 l -0.05085,6.010119 h -8.188123" /><path
            transform="matrix(1.445753,0,0,1.3224494,-65.097292,-1327.9481)"
            style="opacity:0.794;fill:#808080;fill-opacity:1;stroke:#808080;stroke-width:0.672232px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter8871-4)"
            d="m 64.018476,1016.5423 -0.152427,10.8222 c 2.375507,-3.3036 3.484206,-4.2052 2.972286,-9.2217 0.305009,-1.654 -1.117834,-1.7529 -2.819859,-1.6005 z"
-           id="path8861-9"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccc" /><ellipse
+           id="path8861-9" /><ellipse
            transform="matrix(1.029538,0,0,1.1281495,-39.470994,-1128.0797)"
            style="opacity:0.828;fill:#808080;fill-opacity:1;stroke:#808080;stroke-width:0.862484;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter8835-5)"
            id="path8817-1"
@@ -1035,14 +442,11 @@
            transform="matrix(1.7350569,0,0,1.8824502,-91.814902,-1903.1505)"
            style="opacity:0.862;fill:#808080;fill-opacity:1;stroke:#808080;stroke-width:0.514324px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter2533-6)"
            d="m 70.953811,1023.4014 v -1.8291 l 2.972286,-0.076 z"
-           id="path8875-0"
-           inkscape:connector-curvature="0" /><path
+           id="path8875-0" /><path
            transform="matrix(1.029538,0,0,1.1281495,-39.928294,-1128.6206)"
            style="display:inline;opacity:0.485;fill:#808080;fill-opacity:1;stroke:#808080;stroke-width:0.862484px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter8871-1-6)"
            d="m 53.924652,1016.631 -0.152427,10.8222 c 2.375507,-3.3036 3.484206,-4.2052 2.972286,-9.2217 0.305009,-1.654 -1.117834,-1.7529 -2.819859,-1.6005 z"
-           id="path8861-7-0"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccc" /></g><g
+           id="path8861-7-0" /></g><g
          id="g11331-3-1-1"
          style="display:inline"
          transform="matrix(0.92787456,0,0,0.92766861,-283.31685,-391.9053)"><g
@@ -1074,34 +478,23 @@
            transform="matrix(1.029538,0,0,1.1281495,-40.181606,-1129.0381)"
            style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.927888px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter8813)"
            d="m 53.577367,1026.9835 -0.152425,-8.8407 0.91455,-1.2194 3.124711,-0.076 0.07621,-0.9908 h 0.91455 l -0.07621,1.9054 -3.048499,1.2194 -0.152425,4.9538 z"
-           id="path8791"
-           inkscape:connector-curvature="0" /><path
+           id="path8791" /><path
            id="path8722-7"
            style="display:inline;opacity:1;fill:url(#linearGradient8769);fill-opacity:1;stroke:url(#linearGradient8753);stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="M 3.4999999,23.512598 V 25.5 H 14.5 V 21.525196 H 3.4999999 v 1.987402"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccccc" /><path
-           sodipodi:nodetypes="csssscsscccsssscsscc"
+           d="M 3.4999999,23.512598 V 25.5 H 14.5 V 21.525196 H 3.4999999 v 1.987402" /><path
            id="rect8645-3"
            style="display:inline;opacity:1;fill:url(#linearGradient8761);fill-opacity:1;stroke:#4d73ae;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="M 25.499998,23.781495 25.5,15.413559 C 25.5,13.799403 24.568942,12.5 23.412427,12.5 h -2.424855 c -1.156515,0 -2.483072,1.299403 -2.483072,2.913559 v 1.599039 h -2.264856 c -0.963763,0 -1.739644,0.794104 -1.739644,1.780446 v 1.468512 3.519375 m 10.999998,5.64e-4 2e-6,8.367936 c 0,1.614156 -0.931058,2.913559 -2.087573,2.913559 h -2.424855 c -1.156515,0 -2.483072,-1.299403 -2.483072,-2.913559 V 30.550392 H 16.239644 C 15.275881,30.550392 14.5,29.756288 14.5,28.769946 v -1.468512 -3.519375"
-           inkscape:connector-curvature="0" /><path
-           sodipodi:nodetypes="cc"
-           inkscape:connector-curvature="0"
+           d="M 25.499998,23.781495 25.5,15.413559 C 25.5,13.799403 24.568942,12.5 23.412427,12.5 h -2.424855 c -1.156515,0 -2.483072,1.299403 -2.483072,2.913559 v 1.599039 h -2.264856 c -0.963763,0 -1.739644,0.794104 -1.739644,1.780446 v 1.468512 3.519375 m 10.999998,5.64e-4 2e-6,8.367936 c 0,1.614156 -0.931058,2.913559 -2.087573,2.913559 h -2.424855 c -1.156515,0 -2.483072,-1.299403 -2.483072,-2.913559 V 30.550392 H 16.239644 C 15.275881,30.550392 14.5,29.756288 14.5,28.769946 v -1.468512 -3.519375" /><path
            id="path2537"
            d="M 18.51661,16.539741 18.5464,30.705846"
            style="fill:none;stroke:url(#linearGradient2545);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /><path
            id="rect8645-2-5"
            style="display:inline;opacity:1;fill:url(#linearGradient8779);fill-opacity:1;stroke:url(#linearGradient8787);stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="m 36.091538,26.489769 -10e-7,1.058985 c 0,1.06945 -0.863288,1.955925 -2.164732,1.930363 -1.301445,-0.02541 -1.941636,0 -1.941636,0 v 0.201512 c 0,1.544678 -1.158564,2.787985 -2.597679,2.788284 l -1.648306,2.98e-4 c -1.360345,3e-4 -1.22903,0.546236 -1.22903,-2.989646 V 17.520381 c 0,-3.536032 -0.205068,-2.989797 1.22903,-2.989797 h 1.648306 c 1.439115,0 2.597679,1.243607 2.597679,2.788284 v 0.201513 h 1.941637 c 1.199261,0 2.164732,0.860911 2.164732,1.930361 v 2.554332 z m 0.06454,-6.010119 h 8.461471 l -0.05085,6.010119 h -8.188123"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cczccssssssccsccccccc" /><path
+           d="m 36.091538,26.489769 -10e-7,1.058985 c 0,1.06945 -0.863288,1.955925 -2.164732,1.930363 -1.301445,-0.02541 -1.941636,0 -1.941636,0 v 0.201512 c 0,1.544678 -1.158564,2.787985 -2.597679,2.788284 l -1.648306,2.98e-4 c -1.360345,3e-4 -1.22903,0.546236 -1.22903,-2.989646 V 17.520381 c 0,-3.536032 -0.205068,-2.989797 1.22903,-2.989797 h 1.648306 c 1.439115,0 2.597679,1.243607 2.597679,2.788284 v 0.201513 h 1.941637 c 1.199261,0 2.164732,0.860911 2.164732,1.930361 v 2.554332 z m 0.06454,-6.010119 h 8.461471 l -0.05085,6.010119 h -8.188123" /><path
            transform="matrix(1.445753,0,0,1.3224494,-65.097292,-1327.9481)"
            style="opacity:0.794;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.723208px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter8871)"
            d="m 64.018476,1016.5423 -0.152427,10.8222 c 2.375507,-3.3036 3.484206,-4.2052 2.972286,-9.2217 0.305009,-1.654 -1.117834,-1.7529 -2.819859,-1.6005 z"
-           id="path8861"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccc" /><ellipse
+           id="path8861" /><ellipse
            transform="matrix(1.029538,0,0,1.1281495,-39.470994,-1128.0797)"
            style="opacity:0.828;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.927888;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter8835)"
            id="path8817"
@@ -1112,14 +505,11 @@
            transform="matrix(1.7350569,0,0,1.8824502,-91.814902,-1903.1505)"
            style="opacity:0.862;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.553326px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter2533)"
            d="m 70.953811,1023.4014 v -1.8291 l 2.972286,-0.076 z"
-           id="path8875"
-           inkscape:connector-curvature="0" /><path
+           id="path8875" /><path
            transform="matrix(1.029538,0,0,1.1281495,-39.928294,-1128.6206)"
            style="display:inline;opacity:0.485;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.927888px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter8871-1)"
            d="m 53.924652,1016.631 -0.152427,10.8222 c 2.375507,-3.3036 3.484206,-4.2052 2.972286,-9.2217 0.305009,-1.654 -1.117834,-1.7529 -2.819859,-1.6005 z"
-           id="path8861-7"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccc" /></g></g><rect
+           id="path8861-7" /></g></g><rect
        transform="matrix(1,0,-0.47943681,0.8775764,0,0)"
        style="display:inline;fill:url(#linearGradient4936);fill-opacity:1;stroke:url(#linearGradient4956-9);stroke-width:1.06747;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect4932"
@@ -1128,5 +518,4 @@
        x="574.04755"
        y="1159.136"
        ry="1.8222821"
-       inkscape:label="front"
        rx="1.8222821" /></g></svg>
diff --git a/ui/org.eclipse.pde.ui/icons/wizban/newpprj_wiz.svg b/ui/org.eclipse.pde.ui/icons/wizban/newpprj_wiz.svg
index 60c71e97f47..4ae3bf563ef 100644
--- a/ui/org.eclipse.pde.ui/icons/wizban/newpprj_wiz.svg
+++ b/ui/org.eclipse.pde.ui/icons/wizban/newpprj_wiz.svg
@@ -6,14 +6,7 @@
    height="66"
    id="svg2"
    version="1.1"
-   inkscape:version="1.3 (0e150ed, 2023-07-21)"
-   sodipodi:docname="newpprj_wiz.svg"
-   inkscape:export-filename="/Users/d021678/git/eclipse.jdt.ui/org.eclipse.jdt.ui/icons/full/wizban/newclass_wiz2.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90"
    xml:space="preserve"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:svg="http://www.w3.org/2000/svg"
@@ -21,307 +14,6 @@
    xmlns:cc="http://creativecommons.org/ns#"
    xmlns:dc="http://purl.org/dc/elements/1.1/"><defs
      id="defs4"><linearGradient
-       inkscape:collect="always"
-       id="linearGradient4541"><stop
-         style="stop-color:#a1adb2;stop-opacity:1"
-         offset="0"
-         id="stop4543" /><stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop4545" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       id="linearGradient4972"><stop
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0"
-         id="stop4974" /><stop
-         style="stop-color:#f5f8fd;stop-opacity:1"
-         offset="1"
-         id="stop4976" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       id="linearGradient4964"><stop
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0"
-         id="stop4966" /><stop
-         style="stop-color:#e8eefa;stop-opacity:1"
-         offset="1"
-         id="stop4968" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       id="linearGradient4956"><stop
-         style="stop-color:#fcfdfe;stop-opacity:1"
-         offset="0"
-         id="stop4958" /><stop
-         style="stop-color:#dee6f8;stop-opacity:1"
-         offset="1"
-         id="stop4960" /></linearGradient><filter
-       style="color-interpolation-filters:sRGB"
-       inkscape:label="Drop Shadow"
-       id="filter8854"><feFlood
-         flood-opacity="0.933333"
-         flood-color="rgb(244,248,254)"
-         result="flood"
-         id="feFlood8856" /><feComposite
-         in="flood"
-         in2="SourceGraphic"
-         operator="in"
-         result="composite1"
-         id="feComposite8858" /><feGaussianBlur
-         in="composite1"
-         stdDeviation="1.2"
-         result="blur"
-         id="feGaussianBlur8860" /><feOffset
-         dx="-1"
-         dy="3"
-         result="offset"
-         id="feOffset8862" /><feComposite
-         in="SourceGraphic"
-         in2="offset"
-         operator="over"
-         result="composite2"
-         id="feComposite8864" /></filter><linearGradient
-       id="linearGradient6122"><stop
-         style="stop-color:#c0c0c0;stop-opacity:1"
-         offset="0"
-         id="stop6124" /><stop
-         id="stop6132"
-         offset="0.5"
-         style="stop-color:#adadad;stop-opacity:1" /><stop
-         style="stop-color:#808080;stop-opacity:1"
-         offset="1"
-         id="stop6126" /></linearGradient><linearGradient
-       id="linearGradient7087"><stop
-         style="stop-color:#17325d;stop-opacity:1;"
-         offset="0"
-         id="stop7089" /><stop
-         id="stop7091"
-         offset="0.25"
-         style="stop-color:#b4d0e2;stop-opacity:1" /><stop
-         id="stop7093"
-         offset="0.5"
-         style="stop-color:#b7d2e4;stop-opacity:1" /><stop
-         style="stop-color:#acc9de;stop-opacity:1"
-         offset="0.75"
-         id="stop7095" /><stop
-         style="stop-color:#3e72a7;stop-opacity:1"
-         offset="1"
-         id="stop7097" /></linearGradient><mask
-       id="mask7366"
-       maskUnits="userSpaceOnUse"><path
-         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;display:inline"
-         d="m -16.593048,1040.862 9.990206,0 0,10.0018 -2.983353,3.0385 -5.966213,0 c -0.53033,-0.022 -1.04064,-0.5519 -1.04064,-1.0385 z"
-         id="path7368"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccccc" /></mask><linearGradient
-       id="linearGradient7584-5"><stop
-         id="stop7586-4"
-         offset="0"
-         style="stop-color:#f9cd5f;stop-opacity:1" /><stop
-         id="stop7588-5"
-         offset="1"
-         style="stop-color:#fbf0b4;stop-opacity:1" /></linearGradient><linearGradient
-       id="linearGradient7592-1"><stop
-         id="stop7594-6"
-         offset="0"
-         style="stop-color:#bd8416;stop-opacity:1" /><stop
-         id="stop7596-9"
-         offset="1"
-         style="stop-color:#a66b10;stop-opacity:1" /></linearGradient><linearGradient
-       id="linearGradient10798-1-9-3-7-6-6-6-2-6-7-98-9-4-1"><stop
-         style="stop-color:#5aad60;stop-opacity:1;"
-         offset="0"
-         id="stop10800-5-2-1-8-20-4-0-2-1-9-0-0-1-1" /><stop
-         id="stop10806-6-8-5-3-9-2-2-7-0-4-2-7-8-9"
-         offset="0.5"
-         style="stop-color:#5bb26a;stop-opacity:1;" /><stop
-         style="stop-color:#a4c589;stop-opacity:1"
-         offset="1"
-         id="stop10802-1-5-3-0-4-6-8-5-5-6-69-6-4-0" /></linearGradient><mask
-       maskUnits="userSpaceOnUse"
-       id="mask7366-4"><path
-         sodipodi:nodetypes="ccccccc"
-         inkscape:connector-curvature="0"
-         id="path7368-2"
-         d="m -16.593048,1040.862 9.990206,0 0,10.0018 -2.983353,3.0385 -5.966213,0 c -0.53033,-0.022 -1.04064,-0.5519 -1.04064,-1.0385 z"
-         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;display:inline" /></mask><linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient7087"
-       id="linearGradient9331"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-20,0)"
-       x1="4.7776356"
-       y1="1039.8118"
-       x2="4.7776356"
-       y2="1041.911" /><linearGradient
-       y2="1041.911"
-       x2="4.7776356"
-       y1="1039.8118"
-       x1="4.7776356"
-       gradientTransform="translate(-18,4.7e-5)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient9333"
-       xlink:href="#linearGradient7087"
-       inkscape:collect="always" /><linearGradient
-       y2="1041.911"
-       x2="4.7776356"
-       y1="1039.8118"
-       x1="4.7776356"
-       gradientTransform="translate(-16,4.7e-5)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient9335"
-       xlink:href="#linearGradient7087"
-       inkscape:collect="always" /><linearGradient
-       y2="1041.911"
-       x2="4.7776356"
-       y1="1039.8118"
-       x1="4.7776356"
-       gradientTransform="translate(-14,4.7e-5)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient9337"
-       xlink:href="#linearGradient7087"
-       inkscape:collect="always" /><linearGradient
-       y2="1041.911"
-       x2="4.7776356"
-       y1="1039.8118"
-       x1="4.7776356"
-       gradientTransform="translate(-12,4.7e-5)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient9339"
-       xlink:href="#linearGradient7087"
-       inkscape:collect="always" /><linearGradient
-       gradientTransform="translate(-80,0)"
-       gradientUnits="userSpaceOnUse"
-       y2="1042.7973"
-       x2="163.22012"
-       y1="1042.7973"
-       x1="88.220117"
-       id="linearGradient68073"
-       xlink:href="#linearGradient4956"
-       inkscape:collect="always" /><linearGradient
-       gradientTransform="translate(-80,0)"
-       gradientUnits="userSpaceOnUse"
-       y2="1032.2669"
-       x2="163.22012"
-       y1="1032.2668"
-       x1="94.469681"
-       id="linearGradient68075"
-       xlink:href="#linearGradient4964"
-       inkscape:collect="always" /><linearGradient
-       gradientTransform="translate(-80,0)"
-       gradientUnits="userSpaceOnUse"
-       y2="1032.2668"
-       x2="152.72206"
-       y1="1032.2668"
-       x1="88.220116"
-       id="linearGradient68077"
-       xlink:href="#linearGradient4972"
-       inkscape:collect="always" /><filter
-       id="filter8854-9"
-       inkscape:label="Drop Shadow"
-       style="color-interpolation-filters:sRGB"><feFlood
-         id="feFlood8856-0"
-         result="flood"
-         flood-color="rgb(244,248,254)"
-         flood-opacity="0.933333" /><feComposite
-         id="feComposite8858-2"
-         result="composite1"
-         operator="in"
-         in2="SourceGraphic"
-         in="flood" /><feGaussianBlur
-         id="feGaussianBlur8860-3"
-         result="blur"
-         stdDeviation="1.2"
-         in="composite1" /><feOffset
-         id="feOffset8862-2"
-         result="offset"
-         dy="3"
-         dx="-1" /><feComposite
-         id="feComposite8864-3"
-         result="composite2"
-         operator="over"
-         in2="offset"
-         in="SourceGraphic" /></filter><linearGradient
-       id="linearGradient10798-1-9-3-7-6-8-9-0-9-1"><stop
-         id="stop10800-5-2-1-8-20-6-4-9-8-2"
-         offset="0"
-         style="stop-color:#7564b1;stop-opacity:1" /><stop
-         style="stop-color:#5d4aa1;stop-opacity:1"
-         offset="0.5"
-         id="stop10806-6-8-5-3-9-24-8-4-3-2" /><stop
-         id="stop10802-1-5-3-0-4-8-4-2-9-2"
-         offset="1"
-         style="stop-color:#9283c3;stop-opacity:1" /></linearGradient><linearGradient
-       id="linearGradient7540-2-3-8-7"><stop
-         id="stop7542-8-7-5-3"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.502" /><stop
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0.47623286"
-         id="stop7544-8-2-0-5" /><stop
-         style="stop-color:#ffffff;stop-opacity:0"
-         offset="0.5"
-         id="stop7546-1-7-9-5" /><stop
-         id="stop7548-98-9-2-4"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       id="linearGradient7272-66-4-5-5-5-8"><stop
-         style="stop-color:#8f6c10;stop-opacity:1"
-         offset="0"
-         id="stop7274-6-0-1-7-4-7" /><stop
-         style="stop-color:#c9a645;stop-opacity:1"
-         offset="1"
-         id="stop7276-66-6-3-9-1-4" /></linearGradient><linearGradient
-       y2="1030.3411"
-       x2="-10.159802"
-       y1="1030.3411"
-       x1="-22.453552"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient10540"
-       xlink:href="#linearGradient7540-2-3-8-7"
-       inkscape:collect="always" /><linearGradient
-       y2="1030.3411"
-       x2="-10.159802"
-       y1="1030.3411"
-       x1="-22.453552"
-       gradientTransform="matrix(0,1,-1,0,1014.0344,1046.6478)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient10542"
-       xlink:href="#linearGradient7540-2-3-8-7"
-       inkscape:collect="always" /><linearGradient
-       y2="1023.2569"
-       x2="-15.945988"
-       y1="1037.4661"
-       x1="-15.945988"
-       gradientTransform="matrix(0.95585117,0,0,0.95585117,-0.71992063,45.488394)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient10544"
-       xlink:href="#linearGradient7272-66-4-5-5-5-8"
-       inkscape:collect="always" /><mask
-       id="mask10620"
-       maskUnits="userSpaceOnUse"><path
-         transform="matrix(0.55482947,0,0,0.55482947,-206.96039,787.08655)"
-         d="m 398.75,468.23718 a 10.625,10.625 0 1 1 -21.25,0 10.625,10.625 0 1 1 21.25,0 z"
-         sodipodi:ry="10.625"
-         sodipodi:rx="10.625"
-         sodipodi:cy="468.23718"
-         sodipodi:cx="388.125"
-         id="path10622"
-         style="font-size:13.58917427px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:2.16621375;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline;font-family:Sans"
-         sodipodi:type="arc" /></mask><linearGradient
-       id="linearGradient4528-9-5-7-9-7-3"><stop
-         id="stop4530-0-5-0-5-8-4"
-         offset="0"
-         style="stop-color:#e0c576;stop-opacity:1;" /><stop
-         id="stop4532-7-9-3-3-6-1"
-         offset="1"
-         style="stop-color:#9e7916;stop-opacity:1" /></linearGradient><linearGradient
-       id="linearGradient6281-8-0-1-6-6-4-2-8-0"><stop
-         style="stop-color:#f7f9fb;stop-opacity:1"
-         offset="0"
-         id="stop6283-0-2-2-1-2-0-1-6-0" /><stop
-         style="stop-color:#ffd680;stop-opacity:1"
-         offset="1"
-         id="stop6285-5-0-9-7-6-9-9-1-9" /></linearGradient><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4972-7"
        id="linearGradient4978"
        x1="88.220116"
@@ -330,7 +22,6 @@
        y2="1032.2668"
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-88.220116,-999.2669)" /><linearGradient
-       inkscape:collect="always"
        id="linearGradient4972-7"><stop
          style="stop-color:#b8ccf1;stop-opacity:0.10196079"
          offset="0"
@@ -338,7 +29,6 @@
          style="stop-color:#6e97e2;stop-opacity:0.10196079"
          offset="1"
          id="stop4976-1" /></linearGradient><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4964-3"
        id="linearGradient4970"
        x1="118.38584"
@@ -347,7 +37,6 @@
        y2="1032.2668"
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-88.220117,-999.2669)" /><linearGradient
-       inkscape:collect="always"
        id="linearGradient4964-3"><stop
          style="stop-color:#ffffff;stop-opacity:0.349"
          offset="0"
@@ -355,7 +44,6 @@
          style="stop-color:#91ade6;stop-opacity:1"
          offset="1"
          id="stop4968-1" /></linearGradient><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4956-2"
        id="linearGradient4962"
        x1="88.220116"
@@ -364,7 +52,6 @@
        y2="1042.7972"
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-88.220116,-999.2669)" /><linearGradient
-       inkscape:collect="always"
        id="linearGradient4956-2"><stop
          style="stop-color:#fcfdfe;stop-opacity:0.25641027"
          offset="0"
@@ -372,36 +59,6 @@
          style="stop-color:#98aae7;stop-opacity:0.40392157"
          offset="1"
          id="stop4960-6" /></linearGradient><linearGradient
-       id="linearGradient3827"><stop
-         id="stop3829"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0;" /><stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0.60149658"
-         id="stop3835" /><stop
-         id="stop3831"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" /></linearGradient><linearGradient
-       id="linearGradient10798-1-9-3-7-6-8-9-0-9-1-0"><stop
-         id="stop10800-5-2-1-8-20-6-4-9-8-2-9"
-         offset="0"
-         style="stop-color:#f3faed;stop-opacity:1" /><stop
-         style="stop-color:#e7f4da;stop-opacity:1"
-         offset="0.65917557"
-         id="stop10806-6-8-5-3-9-24-8-4-3-2-4" /><stop
-         id="stop10802-1-5-3-0-4-8-4-2-9-2-5"
-         offset="1"
-         style="stop-color:#67bf1f;stop-opacity:1" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4541"
-       id="linearGradient5885"
-       x1="41"
-       y1="1007.8622"
-       x2="60"
-       y2="1008.3622"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0,1,-1,0,1034.3618,967.36133)" /><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4894"
        id="linearGradient4884"
        x1="11.927121"
@@ -410,8 +67,7 @@
        y2="30.177986"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1.0044276,0,0,1.0089329,4.2405011,977.30396)" /><linearGradient
-       id="linearGradient4894"
-       inkscape:collect="always"><stop
+       id="linearGradient4894"><stop
          id="stop4896"
          offset="0"
          style="stop-color:#000000;stop-opacity:1" /><stop
@@ -424,7 +80,6 @@
          id="stop4898"
          offset="1"
          style="stop-color:#ffffff;stop-opacity:1" /></linearGradient><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient5252"
        id="linearGradient5258"
        x1="5"
@@ -433,7 +88,6 @@
        y2="32"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1.0067593,0,0,1.0132311,4.1393203,977.16609)" /><linearGradient
-       inkscape:collect="always"
        id="linearGradient5252"><stop
          style="stop-color:#5f443c;stop-opacity:1"
          offset="0"
@@ -441,7 +95,6 @@
          style="stop-color:#765d54;stop-opacity:1"
          offset="1"
          id="stop5256" /></linearGradient><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4199"
        id="linearGradient4205"
        x1="12"
@@ -450,7 +103,6 @@
        y2="21"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1.4358198,0,0,1.270043,-10.240326,977.40079)" /><linearGradient
-       inkscape:collect="always"
        id="linearGradient4199"><stop
          style="stop-color:#765d54;stop-opacity:1;"
          offset="0"
@@ -461,7 +113,6 @@
          style="stop-color:#765d54;stop-opacity:1"
          offset="1"
          id="stop4203" /></linearGradient><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4944"
        id="linearGradient4936"
        gradientUnits="userSpaceOnUse"
@@ -470,54 +121,21 @@
        x2="71.580559"
        y2="70.944893"
        gradientTransform="matrix(0.99999865,0,0,1.0179002,537.84569,1112.6509)" /><linearGradient
-       inkscape:collect="always"
        id="linearGradient4944"><stop
          id="stop4948"
          offset="0.0001"
          style="stop-color:#cfedfe;stop-opacity:1;" /><stop
          id="stop4946"
          offset="0.99989998"
-         style="stop-color:#95b9ec;stop-opacity:1;" /></linearGradient><linearGradient
-       id="linearGradient11146-4-4-4-6-2"><stop
-         id="stop11150-4-72-3-9-7"
-         offset="0"
-         style="stop-color:#faefba;stop-opacity:1" /><stop
-         style="stop-color:#9e6542;stop-opacity:1"
-         offset="1"
-         id="stop11152-9-0-7-3-8" /></linearGradient><linearGradient
-       id="linearGradient10507"><stop
-         style="stop-color:#5f392d;stop-opacity:1"
-         offset="0"
-         id="stop10509" /><stop
-         id="stop10511"
-         offset="0.18181793"
-         style="stop-color:#9e7058;stop-opacity:1" /><stop
-         id="stop10513"
-         offset="0.36363617"
-         style="stop-color:#794f40;stop-opacity:1" /><stop
-         id="stop10515"
-         offset="0.49999985"
-         style="stop-color:#794f40;stop-opacity:1" /><stop
-         id="stop10517"
-         offset="0.63636351"
-         style="stop-color:#794f40;stop-opacity:1" /><stop
-         style="stop-color:#9e7058;stop-opacity:1"
-         offset="0.81818175"
-         id="stop10519" /><stop
-         style="stop-color:#5f392d;stop-opacity:1"
-         offset="1"
-         id="stop10522" /></linearGradient><filter
-       inkscape:collect="always"
+         style="stop-color:#95b9ec;stop-opacity:1;" /></linearGradient><filter
        style="color-interpolation-filters:sRGB"
        id="filter5309"
        x="-0.41279999"
        width="1.8256"
        y="-0.68799998"
        height="2.376"><feGaussianBlur
-         inkscape:collect="always"
          stdDeviation="2.58"
          id="feGaussianBlur5311" /></filter><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4456"
        id="linearGradient4462"
        x1="63.734764"
@@ -526,7 +144,6 @@
        y2="1006.3618"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1,0,-0.72750163,1,733.40264,2.0004)" /><linearGradient
-       inkscape:collect="always"
        id="linearGradient4456"><stop
          style="stop-color:#ffffff;stop-opacity:0.659"
          offset="0"
@@ -534,46 +151,14 @@
          style="stop-color:#ffffff;stop-opacity:0.369"
          offset="1"
          id="stop4460" /></linearGradient><filter
-       inkscape:collect="always"
        style="color-interpolation-filters:sRGB"
        id="filter4606"
        x="-0.062976157"
        width="1.1259523"
        y="-0.10879013"
        height="1.2175803"><feGaussianBlur
-         inkscape:collect="always"
          stdDeviation="1.5412116"
          id="feGaussianBlur4608" /></filter><linearGradient
-       id="linearGradient11146-4-4-4-6-2-8"><stop
-         id="stop11150-4-72-3-9-7-2"
-         offset="0"
-         style="stop-color:#faefba;stop-opacity:1" /><stop
-         style="stop-color:#ad6e48;stop-opacity:1"
-         offset="1"
-         id="stop11152-9-0-7-3-8-0" /></linearGradient><linearGradient
-       id="linearGradient4368"><stop
-         id="stop4370"
-         offset="0"
-         style="stop-color:#9c7561;stop-opacity:1" /><stop
-         style="stop-color:#966d59;stop-opacity:1"
-         offset="0.18181793"
-         id="stop4372" /><stop
-         style="stop-color:#8c6250;stop-opacity:1"
-         offset="0.36363617"
-         id="stop4374" /><stop
-         style="stop-color:#794f40;stop-opacity:1"
-         offset="0.49999985"
-         id="stop4376" /><stop
-         style="stop-color:#8c6250;stop-opacity:1"
-         offset="0.63636351"
-         id="stop4378" /><stop
-         id="stop4380"
-         offset="0.81818175"
-         style="stop-color:#966d59;stop-opacity:1" /><stop
-         id="stop4382"
-         offset="1"
-         style="stop-color:#99705c;stop-opacity:1" /></linearGradient><linearGradient
-       inkscape:collect="always"
        id="linearGradient2543"><stop
          style="stop-color:#4f76b0;stop-opacity:1"
          offset="0"
@@ -584,8 +169,7 @@
          style="stop-color:#587cb2;stop-opacity:1"
          offset="1"
          id="stop2541" /></linearGradient><linearGradient
-       id="linearGradient8785"
-       inkscape:collect="always"><stop
+       id="linearGradient8785"><stop
          id="stop8781"
          offset="0"
          style="stop-color:#bb8d2d;stop-opacity:1" /><stop
@@ -595,113 +179,34 @@
          id="stop8783"
          offset="1"
          style="stop-color:#b07905;stop-opacity:1" /></linearGradient><linearGradient
-       id="linearGradient8777"
-       inkscape:collect="always"><stop
+       id="linearGradient8777"><stop
          id="stop8773"
          offset="0"
          style="stop-color:#fbeaab;stop-opacity:1;" /><stop
          id="stop8775"
          offset="1"
          style="stop-color:#deb241;stop-opacity:1" /></linearGradient><linearGradient
-       id="linearGradient8767"
-       inkscape:collect="always"><stop
+       id="linearGradient8767"><stop
          id="stop8763"
          offset="0"
          style="stop-color:#6a8ec1;stop-opacity:1" /><stop
          id="stop8765"
          offset="1"
          style="stop-color:#80a1cf;stop-opacity:1" /></linearGradient><linearGradient
-       id="linearGradient8759"
-       inkscape:collect="always"><stop
+       id="linearGradient8759"><stop
          id="stop8755"
          offset="0"
          style="stop-color:#d3e0eb;stop-opacity:1" /><stop
          id="stop8757"
          offset="1"
          style="stop-color:#5179b5;stop-opacity:1" /></linearGradient><linearGradient
-       id="linearGradient8751"
-       inkscape:collect="always"><stop
+       id="linearGradient8751"><stop
          id="stop8747"
          offset="0"
          style="stop-color:#2e5d8f;stop-opacity:1" /><stop
          id="stop8749"
          offset="1"
-         style="stop-color:#6085bb;stop-opacity:1" /></linearGradient><filter
-       id="filter8854-7"
-       inkscape:label="Drop Shadow"
-       style="color-interpolation-filters:sRGB"><feFlood
-         id="feFlood8856-03"
-         result="flood"
-         flood-color="rgb(244,248,254)"
-         flood-opacity="0.933333" /><feComposite
-         id="feComposite8858-9"
-         result="composite1"
-         operator="in"
-         in2="SourceGraphic"
-         in="flood" /><feGaussianBlur
-         id="feGaussianBlur8860-9"
-         result="blur"
-         stdDeviation="1.2"
-         in="composite1" /><feOffset
-         id="feOffset8862-9"
-         result="offset"
-         dy="3"
-         dx="-1" /><feComposite
-         id="feComposite8864-1"
-         result="composite2"
-         operator="over"
-         in2="offset"
-         in="SourceGraphic" /></filter><mask
-       maskUnits="userSpaceOnUse"
-       id="mask7366-47"><path
-         sodipodi:nodetypes="ccccccc"
-         inkscape:connector-curvature="0"
-         id="path7368-1"
-         d="m -16.593048,1040.862 9.990206,0 0,10.0018 -2.983353,3.0385 -5.966213,0 c -0.53033,-0.022 -1.04064,-0.5519 -1.04064,-1.0385 z"
-         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;display:inline" /></mask><mask
-       id="mask7366-4-0"
-       maskUnits="userSpaceOnUse"><path
-         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;display:inline"
-         d="m -16.593048,1040.862 9.990206,0 0,10.0018 -2.983353,3.0385 -5.966213,0 c -0.53033,-0.022 -1.04064,-0.5519 -1.04064,-1.0385 z"
-         id="path7368-2-3"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccccc" /></mask><filter
-       style="color-interpolation-filters:sRGB"
-       inkscape:label="Drop Shadow"
-       id="filter8854-9-2"><feFlood
-         flood-opacity="0.933333"
-         flood-color="rgb(244,248,254)"
-         result="flood"
-         id="feFlood8856-0-6" /><feComposite
-         in="flood"
-         in2="SourceGraphic"
-         operator="in"
-         result="composite1"
-         id="feComposite8858-2-9" /><feGaussianBlur
-         in="composite1"
-         stdDeviation="1.2"
-         result="blur"
-         id="feGaussianBlur8860-3-4" /><feOffset
-         dx="-1"
-         dy="3"
-         result="offset"
-         id="feOffset8862-2-1" /><feComposite
-         in="SourceGraphic"
-         in2="offset"
-         operator="over"
-         result="composite2"
-         id="feComposite8864-3-3" /></filter><mask
-       maskUnits="userSpaceOnUse"
-       id="mask10620-4"><path
-         sodipodi:type="arc"
-         style="font-size:13.58917427px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:2.16621375;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline;font-family:Sans"
-         id="path10622-3"
-         sodipodi:cx="388.125"
-         sodipodi:cy="468.23718"
-         sodipodi:rx="10.625"
-         sodipodi:ry="10.625"
-         d="m 398.75,468.23718 a 10.625,10.625 0 1 1 -21.25,0 10.625,10.625 0 1 1 21.25,0 z"
-         transform="matrix(0.55482947,0,0,0.55482947,-206.96039,787.08655)" /></mask><linearGradient
+         style="stop-color:#6085bb;stop-opacity:1" /></linearGradient><linearGradient
        gradientUnits="userSpaceOnUse"
        y2="1024.3622"
        x2="50"
@@ -709,7 +214,6 @@
        x1="50"
        id="linearGradient8753"
        xlink:href="#linearGradient8751"
-       inkscape:collect="always"
        gradientTransform="matrix(2.7500001,0,0,0.99370101,-129.87501,-991.91286)" /><linearGradient
        gradientUnits="userSpaceOnUse"
        y2="1030.3622"
@@ -718,7 +222,6 @@
        x1="57"
        id="linearGradient8761"
        xlink:href="#linearGradient8759"
-       inkscape:collect="always"
        gradientTransform="matrix(1.0999999,0,0,1.1281495,-43.249997,-1129.0318)" /><linearGradient
        gradientUnits="userSpaceOnUse"
        y2="1023.234"
@@ -727,7 +230,6 @@
        x1="51.658199"
        id="linearGradient8769"
        xlink:href="#linearGradient8767"
-       inkscape:collect="always"
        gradientTransform="matrix(2.7500001,0,0,0.99370101,-129.87501,-991.91286)" /><linearGradient
        gradientUnits="userSpaceOnUse"
        y2="1026.0538"
@@ -736,7 +238,6 @@
        x1="63.98344"
        id="linearGradient8779"
        xlink:href="#linearGradient8777"
-       inkscape:collect="always"
        gradientTransform="matrix(1.3687895,0,0,1.494898,-60.408122,-1504.0798)" /><linearGradient
        gradientUnits="userSpaceOnUse"
        y2="1028.4165"
@@ -745,59 +246,47 @@
        x1="68.47998"
        id="linearGradient8787"
        xlink:href="#linearGradient8785"
-       inkscape:collect="always"
        gradientTransform="matrix(1.3687895,0,0,1.494898,-60.408122,-1504.0798)" /><filter
        height="1.4861495"
        y="-0.24307477"
        width="2.0754105"
        x="-0.53770523"
        id="filter8813"
-       style="color-interpolation-filters:sRGB"
-       inkscape:collect="always"><feGaussianBlur
+       style="color-interpolation-filters:sRGB"><feGaussianBlur
          id="feGaussianBlur8815"
-         stdDeviation="1.1269452"
-         inkscape:collect="always" /></filter><filter
+         stdDeviation="1.1269452" /></filter><filter
        height="1.6025846"
        y="-0.30129232"
        width="1.626688"
        x="-0.313344"
        id="filter8835"
-       style="color-interpolation-filters:sRGB"
-       inkscape:collect="always"><feGaussianBlur
+       style="color-interpolation-filters:sRGB"><feGaussianBlur
          id="feGaussianBlur8837"
-         stdDeviation="0.49751501"
-         inkscape:collect="always" /></filter><filter
+         stdDeviation="0.49751501" /></filter><filter
        height="1.2365698"
        y="-0.11828489"
        width="1.8310951"
        x="-0.41554753"
        id="filter8871"
-       style="color-interpolation-filters:sRGB"
-       inkscape:collect="always"><feGaussianBlur
+       style="color-interpolation-filters:sRGB"><feGaussianBlur
          id="feGaussianBlur8873"
-         stdDeviation="0.53588249"
-         inkscape:collect="always" /></filter><filter
+         stdDeviation="0.53588249" /></filter><filter
        height="1.2365698"
        y="-0.11828489"
        width="1.8310951"
        x="-0.41554753"
        id="filter8871-1"
-       style="color-interpolation-filters:sRGB"
-       inkscape:collect="always"><feGaussianBlur
+       style="color-interpolation-filters:sRGB"><feGaussianBlur
          id="feGaussianBlur8873-8"
-         stdDeviation="0.53588249"
-         inkscape:collect="always" /></filter><filter
-       inkscape:collect="always"
+         stdDeviation="0.53588249" /></filter><filter
        style="color-interpolation-filters:sRGB"
        id="filter2533"
        x="-0.59377657"
        width="2.1875531"
        y="-0.92639431"
        height="2.8527886"><feGaussianBlur
-         inkscape:collect="always"
          stdDeviation="0.73536407"
          id="feGaussianBlur2535" /></filter><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient2543"
        id="linearGradient2545"
        x1="18.423391"
@@ -810,112 +299,57 @@
        width="2.2508695"
        x="-0.62393297"
        id="filter8813-5"
-       style="color-interpolation-filters:sRGB"
-       inkscape:collect="always"><feGaussianBlur
+       style="color-interpolation-filters:sRGB"><feGaussianBlur
          id="feGaussianBlur8815-0"
-         stdDeviation="1.1269452"
-         inkscape:collect="always" /></filter><filter
+         stdDeviation="1.1269452" /></filter><filter
        height="1.3657107"
-       y="-0.14956415"
-       width="2.0529235"
+       y="-0.14956416"
+       width="2.0529236"
        x="-0.5290004"
        id="filter8871-4"
-       style="color-interpolation-filters:sRGB"
-       inkscape:collect="always"><feGaussianBlur
+       style="color-interpolation-filters:sRGB"><feGaussianBlur
          id="feGaussianBlur8873-9"
-         stdDeviation="0.53588249"
-         inkscape:collect="always" /></filter><filter
+         stdDeviation="0.53588249" /></filter><filter
        height="1.8202161"
        y="-0.41010804"
        width="1.8530247"
        x="-0.42651235"
        id="filter8835-5"
-       style="color-interpolation-filters:sRGB"
-       inkscape:collect="always"><feGaussianBlur
+       style="color-interpolation-filters:sRGB"><feGaussianBlur
          id="feGaussianBlur8837-4"
-         stdDeviation="0.49751501"
-         inkscape:collect="always" /></filter><filter
-       inkscape:collect="always"
+         stdDeviation="0.49751501" /></filter><filter
        style="color-interpolation-filters:sRGB"
        id="filter2533-6"
        x="-0.68029651"
        width="2.5817097"
        y="-1.073697"
        height="3.2469451"><feGaussianBlur
-         inkscape:collect="always"
          stdDeviation="0.73536407"
          id="feGaussianBlur2535-0" /></filter><filter
-       height="1.402261"
-       y="-0.15841809"
+       height="1.4022611"
+       y="-0.1584181"
        width="2.1157048"
        x="-0.56110931"
        id="filter8871-1-6"
-       style="color-interpolation-filters:sRGB"
-       inkscape:collect="always"><feGaussianBlur
+       style="color-interpolation-filters:sRGB"><feGaussianBlur
          id="feGaussianBlur8873-8-9"
-         stdDeviation="0.53588249"
-         inkscape:collect="always" /></filter><filter
-       inkscape:collect="always"
+         stdDeviation="0.53588249" /></filter><filter
        style="color-interpolation-filters:sRGB"
        id="filter2728"
        x="-0.06427016"
        width="1.1285403"
        y="-0.1171224"
        height="1.2342448"><feGaussianBlur
-         inkscape:collect="always"
          stdDeviation="0.90744768"
-         id="feGaussianBlur2730" /></filter></defs><sodipodi:namedview
-     id="base"
-     pagecolor="#bcbcbc"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7.185918"
-     inkscape:cx="65.823184"
-     inkscape:cy="24.77067"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1728"
-     inkscape:window-height="1051"
-     inkscape:window-x="0"
-     inkscape:window-y="38"
-     inkscape:window-maximized="1"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="true"
-     inkscape:snap-bbox="true"
-     inkscape:bbox-nodes="true"
-     inkscape:showpageshadow="2"
-     inkscape:pagecheckerboard="0"
-     inkscape:deskcolor="#d1d1d1"><inkscape:grid
-       type="xygrid"
-       id="grid4112"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       originx="0"
-       originy="0"
-       spacingy="1"
-       spacingx="1"
-       units="px" /></sodipodi:namedview><metadata
+         id="feGaussianBlur2730" /></filter></defs><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" /></cc:Work></rdf:RDF></metadata><g
-     inkscape:groupmode="layer"
      id="layer2"
-     inkscape:label="Background"
-     style="display:inline"
-     sodipodi:insensitive="true"><path
-       sodipodi:nodetypes="cccc"
-       inkscape:connector-curvature="0"
+     style="display:inline"><path
        id="rect4113-1"
        d="M 75,0 75,66 1e-6,66 C 1e-6,41.2048 50.00969,0 75,0 Z"
        style="display:inline;fill:url(#linearGradient4978);fill-opacity:1;stroke:none" /><path
-       sodipodi:nodetypes="cccc"
-       inkscape:connector-curvature="0"
        id="rect4113-1-0"
        d="M 75,21.0607 75,66 1e-6,66 C 10.625001,47.804 43.509694,25.4357 75,21.0607 Z"
        style="display:inline;opacity:0.40400002;fill:url(#linearGradient4962);fill-opacity:1;stroke:none" /><g
@@ -924,38 +358,26 @@
        transform="matrix(0.27903303,0,0,0.27903303,-14.618136,-107.52874)"><g
          style="fill:#737986;fill-opacity:1;stroke:#595e68;stroke-opacity:1"
          id="g13408-8-2" /></g><path
-       sodipodi:nodetypes="cccc"
-       inkscape:connector-curvature="0"
        id="rect4113-1-7"
        d="M 75,4.0000001e-7 75,66 30.000003,66 C 30.000003,46.1545 47.70944,9.2500004 75,4e-7 Z"
        style="display:inline;opacity:0.18399999;fill:url(#linearGradient4970);fill-opacity:1;stroke:none" /></g><g
-     inkscape:label="Foreground"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-986.3622)"><path
        style="font-style:normal;font-weight:normal;font-size:13.5892px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;display:inline;fill:url(#linearGradient4462);fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;filter:url(#filter4606)"
        d="m 47.000294,1007.3622 -12.319149,16.9335 -12.416197,17.0669 h 16.933329 17.066666 l 12.416197,-17.0669 0.09676,-0.133 L 81,1007.3626 H 63.933334 47.000005 Z"
        id="rect10961-8-3-6-1"
-       inkscape:connector-curvature="0"
-       transform="matrix(1.1726475,0,0.08958032,0.36603268,-114.8094,661.36402)"
-       inkscape:transform-center-x="4.353394"
-       inkscape:transform-center-y="0.53407509"
-       inkscape:label="shadow" /><path
-       sodipodi:nodetypes="ccccc"
-       inkscape:connector-curvature="0"
+       transform="matrix(1.1726475,0,0.08958032,0.36603268,-114.8094,661.36402)" /><path
        id="path5250"
        d="m 7.662133,1010.2334 3.760589,-4.9642 h 16.536804 l 3.904559,4.9642 z"
-       style="fill:#fffabf;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4205);stroke-width:1;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       inkscape:label="tab-shadow" /><ellipse
+       style="fill:#fffabf;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4205);stroke-width:1;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /><ellipse
        transform="matrix(0.99999865,0,0,0.38855855,-7.8969055,1005.4091)"
        ry="4.5"
        rx="7.5"
        cy="8.3080006"
        cx="23.691999"
        id="path5111"
-       style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;filter:url(#filter5309)"
-       inkscape:label="tab" /><rect
+       style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;filter:url(#filter5309)" /><rect
        ry="2.0792062"
        y="1010.2515"
        x="4.8986993"
@@ -963,45 +385,32 @@
        width="41.860352"
        id="rect4876"
        style="fill:url(#linearGradient4884);fill-opacity:1;stroke:url(#linearGradient5258);stroke-width:1;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       inkscape:label="back"
        rx="2.0792062" /><g
        id="g2"
-       transform="matrix(0.99999865,0,0,1,18.716424,985.90101)"
-       inkscape:label="plug"><g
+       transform="matrix(0.99999865,0,0,1,18.716424,985.90101)"><g
          transform="matrix(1.0729615,0,0,1.0787087,-1.2096914,-0.17204372)"
          id="g2558-4"
          style="opacity:0.503;fill:#808080;stroke:#808080;stroke-width:0.929514;filter:url(#filter2728)"><path
            transform="matrix(1.029538,0,0,1.1281495,-40.181606,-1129.0381)"
            style="fill:#808080;fill-opacity:1;stroke:#808080;stroke-width:0.862484px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter8813-5)"
            d="m 53.577367,1026.9835 -0.152425,-8.8407 0.91455,-1.2194 3.124711,-0.076 0.07621,-0.9908 h 0.91455 l -0.07621,1.9054 -3.048499,1.2194 -0.152425,4.9538 z"
-           id="path8791-1"
-           inkscape:connector-curvature="0" /><path
+           id="path8791-1" /><path
            id="path8722-7-8"
            style="display:inline;opacity:1;fill:#808080;fill-opacity:1;stroke:#808080;stroke-width:0.929514;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="M 3.4999999,23.512598 V 25.5 H 14.5 V 21.525196 H 3.4999999 v 1.987402"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccccc" /><path
-           sodipodi:nodetypes="csssscsscccsssscsscc"
+           d="M 3.4999999,23.512598 V 25.5 H 14.5 V 21.525196 H 3.4999999 v 1.987402" /><path
            id="rect8645-3-9"
            style="display:inline;opacity:1;fill:#808080;fill-opacity:1;stroke:#808080;stroke-width:0.929514;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="M 25.499998,23.781495 25.5,15.413559 C 25.5,13.799403 24.568942,12.5 23.412427,12.5 h -2.424855 c -1.156515,0 -2.483072,1.299403 -2.483072,2.913559 v 1.599039 h -2.264856 c -0.963763,0 -1.739644,0.794104 -1.739644,1.780446 v 1.468512 3.519375 m 10.999998,5.64e-4 2e-6,8.367936 c 0,1.614156 -0.931058,2.913559 -2.087573,2.913559 h -2.424855 c -1.156515,0 -2.483072,-1.299403 -2.483072,-2.913559 V 30.550392 H 16.239644 C 15.275881,30.550392 14.5,29.756288 14.5,28.769946 v -1.468512 -3.519375"
-           inkscape:connector-curvature="0" /><path
-           sodipodi:nodetypes="cc"
-           inkscape:connector-curvature="0"
+           d="M 25.499998,23.781495 25.5,15.413559 C 25.5,13.799403 24.568942,12.5 23.412427,12.5 h -2.424855 c -1.156515,0 -2.483072,1.299403 -2.483072,2.913559 v 1.599039 h -2.264856 c -0.963763,0 -1.739644,0.794104 -1.739644,1.780446 v 1.468512 3.519375 m 10.999998,5.64e-4 2e-6,8.367936 c 0,1.614156 -0.931058,2.913559 -2.087573,2.913559 h -2.424855 c -1.156515,0 -2.483072,-1.299403 -2.483072,-2.913559 V 30.550392 H 16.239644 C 15.275881,30.550392 14.5,29.756288 14.5,28.769946 v -1.468512 -3.519375" /><path
            id="path2537-0"
            d="M 18.51661,16.539741 18.5464,30.705846"
            style="fill:#808080;stroke:#808080;stroke-width:0.929514px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /><path
            id="rect8645-2-5-2"
            style="display:inline;opacity:1;fill:#808080;fill-opacity:1;stroke:#808080;stroke-width:0.929514;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="m 36.091538,26.489769 -10e-7,1.058985 c 0,1.06945 -0.863288,1.955925 -2.164732,1.930363 -1.301445,-0.02541 -1.941636,0 -1.941636,0 v 0.201512 c 0,1.544678 -1.158564,2.787985 -2.597679,2.788284 l -1.648306,2.98e-4 c -1.360345,3e-4 -1.22903,0.546236 -1.22903,-2.989646 V 17.520381 c 0,-3.536032 -0.205068,-2.989797 1.22903,-2.989797 h 1.648306 c 1.439115,0 2.597679,1.243607 2.597679,2.788284 v 0.201513 h 1.941637 c 1.199261,0 2.164732,0.860911 2.164732,1.930361 v 2.554332 z m 0.06454,-6.010119 h 8.461471 l -0.05085,6.010119 h -8.188123"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cczccssssssccsccccccc" /><path
+           d="m 36.091538,26.489769 -10e-7,1.058985 c 0,1.06945 -0.863288,1.955925 -2.164732,1.930363 -1.301445,-0.02541 -1.941636,0 -1.941636,0 v 0.201512 c 0,1.544678 -1.158564,2.787985 -2.597679,2.788284 l -1.648306,2.98e-4 c -1.360345,3e-4 -1.22903,0.546236 -1.22903,-2.989646 V 17.520381 c 0,-3.536032 -0.205068,-2.989797 1.22903,-2.989797 h 1.648306 c 1.439115,0 2.597679,1.243607 2.597679,2.788284 v 0.201513 h 1.941637 c 1.199261,0 2.164732,0.860911 2.164732,1.930361 v 2.554332 z m 0.06454,-6.010119 h 8.461471 l -0.05085,6.010119 h -8.188123" /><path
            transform="matrix(1.445753,0,0,1.3224494,-65.097292,-1327.9481)"
            style="opacity:0.794;fill:#808080;fill-opacity:1;stroke:#808080;stroke-width:0.672232px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter8871-4)"
            d="m 64.018476,1016.5423 -0.152427,10.8222 c 2.375507,-3.3036 3.484206,-4.2052 2.972286,-9.2217 0.305009,-1.654 -1.117834,-1.7529 -2.819859,-1.6005 z"
-           id="path8861-9"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccc" /><ellipse
+           id="path8861-9" /><ellipse
            transform="matrix(1.029538,0,0,1.1281495,-39.470994,-1128.0797)"
            style="opacity:0.828;fill:#808080;fill-opacity:1;stroke:#808080;stroke-width:0.862484;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter8835-5)"
            id="path8817-1"
@@ -1012,14 +421,11 @@
            transform="matrix(1.7350569,0,0,1.8824502,-91.814902,-1903.1505)"
            style="opacity:0.862;fill:#808080;fill-opacity:1;stroke:#808080;stroke-width:0.514324px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter2533-6)"
            d="m 70.953811,1023.4014 v -1.8291 l 2.972286,-0.076 z"
-           id="path8875-0"
-           inkscape:connector-curvature="0" /><path
+           id="path8875-0" /><path
            transform="matrix(1.029538,0,0,1.1281495,-39.928294,-1128.6206)"
            style="display:inline;opacity:0.485;fill:#808080;fill-opacity:1;stroke:#808080;stroke-width:0.862484px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter8871-1-6)"
            d="m 53.924652,1016.631 -0.152427,10.8222 c 2.375507,-3.3036 3.484206,-4.2052 2.972286,-9.2217 0.305009,-1.654 -1.117834,-1.7529 -2.819859,-1.6005 z"
-           id="path8861-7-0"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccc" /></g><g
+           id="path8861-7-0" /></g><g
          id="g11331-3-1-1"
          style="display:inline"
          transform="matrix(0.92787456,0,0,0.92766861,-283.31685,-391.9053)"><g
@@ -1051,34 +457,23 @@
            transform="matrix(1.029538,0,0,1.1281495,-40.181606,-1129.0381)"
            style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.927888px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter8813)"
            d="m 53.577367,1026.9835 -0.152425,-8.8407 0.91455,-1.2194 3.124711,-0.076 0.07621,-0.9908 h 0.91455 l -0.07621,1.9054 -3.048499,1.2194 -0.152425,4.9538 z"
-           id="path8791"
-           inkscape:connector-curvature="0" /><path
+           id="path8791" /><path
            id="path8722-7"
            style="display:inline;opacity:1;fill:url(#linearGradient8769);fill-opacity:1;stroke:url(#linearGradient8753);stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="M 3.4999999,23.512598 V 25.5 H 14.5 V 21.525196 H 3.4999999 v 1.987402"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccccc" /><path
-           sodipodi:nodetypes="csssscsscccsssscsscc"
+           d="M 3.4999999,23.512598 V 25.5 H 14.5 V 21.525196 H 3.4999999 v 1.987402" /><path
            id="rect8645-3"
            style="display:inline;opacity:1;fill:url(#linearGradient8761);fill-opacity:1;stroke:#4d73ae;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="M 25.499998,23.781495 25.5,15.413559 C 25.5,13.799403 24.568942,12.5 23.412427,12.5 h -2.424855 c -1.156515,0 -2.483072,1.299403 -2.483072,2.913559 v 1.599039 h -2.264856 c -0.963763,0 -1.739644,0.794104 -1.739644,1.780446 v 1.468512 3.519375 m 10.999998,5.64e-4 2e-6,8.367936 c 0,1.614156 -0.931058,2.913559 -2.087573,2.913559 h -2.424855 c -1.156515,0 -2.483072,-1.299403 -2.483072,-2.913559 V 30.550392 H 16.239644 C 15.275881,30.550392 14.5,29.756288 14.5,28.769946 v -1.468512 -3.519375"
-           inkscape:connector-curvature="0" /><path
-           sodipodi:nodetypes="cc"
-           inkscape:connector-curvature="0"
+           d="M 25.499998,23.781495 25.5,15.413559 C 25.5,13.799403 24.568942,12.5 23.412427,12.5 h -2.424855 c -1.156515,0 -2.483072,1.299403 -2.483072,2.913559 v 1.599039 h -2.264856 c -0.963763,0 -1.739644,0.794104 -1.739644,1.780446 v 1.468512 3.519375 m 10.999998,5.64e-4 2e-6,8.367936 c 0,1.614156 -0.931058,2.913559 -2.087573,2.913559 h -2.424855 c -1.156515,0 -2.483072,-1.299403 -2.483072,-2.913559 V 30.550392 H 16.239644 C 15.275881,30.550392 14.5,29.756288 14.5,28.769946 v -1.468512 -3.519375" /><path
            id="path2537"
            d="M 18.51661,16.539741 18.5464,30.705846"
            style="fill:none;stroke:url(#linearGradient2545);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /><path
            id="rect8645-2-5"
            style="display:inline;opacity:1;fill:url(#linearGradient8779);fill-opacity:1;stroke:url(#linearGradient8787);stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="m 36.091538,26.489769 -10e-7,1.058985 c 0,1.06945 -0.863288,1.955925 -2.164732,1.930363 -1.301445,-0.02541 -1.941636,0 -1.941636,0 v 0.201512 c 0,1.544678 -1.158564,2.787985 -2.597679,2.788284 l -1.648306,2.98e-4 c -1.360345,3e-4 -1.22903,0.546236 -1.22903,-2.989646 V 17.520381 c 0,-3.536032 -0.205068,-2.989797 1.22903,-2.989797 h 1.648306 c 1.439115,0 2.597679,1.243607 2.597679,2.788284 v 0.201513 h 1.941637 c 1.199261,0 2.164732,0.860911 2.164732,1.930361 v 2.554332 z m 0.06454,-6.010119 h 8.461471 l -0.05085,6.010119 h -8.188123"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cczccssssssccsccccccc" /><path
+           d="m 36.091538,26.489769 -10e-7,1.058985 c 0,1.06945 -0.863288,1.955925 -2.164732,1.930363 -1.301445,-0.02541 -1.941636,0 -1.941636,0 v 0.201512 c 0,1.544678 -1.158564,2.787985 -2.597679,2.788284 l -1.648306,2.98e-4 c -1.360345,3e-4 -1.22903,0.546236 -1.22903,-2.989646 V 17.520381 c 0,-3.536032 -0.205068,-2.989797 1.22903,-2.989797 h 1.648306 c 1.439115,0 2.597679,1.243607 2.597679,2.788284 v 0.201513 h 1.941637 c 1.199261,0 2.164732,0.860911 2.164732,1.930361 v 2.554332 z m 0.06454,-6.010119 h 8.461471 l -0.05085,6.010119 h -8.188123" /><path
            transform="matrix(1.445753,0,0,1.3224494,-65.097292,-1327.9481)"
            style="opacity:0.794;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.723208px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter8871)"
            d="m 64.018476,1016.5423 -0.152427,10.8222 c 2.375507,-3.3036 3.484206,-4.2052 2.972286,-9.2217 0.305009,-1.654 -1.117834,-1.7529 -2.819859,-1.6005 z"
-           id="path8861"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccc" /><ellipse
+           id="path8861" /><ellipse
            transform="matrix(1.029538,0,0,1.1281495,-39.470994,-1128.0797)"
            style="opacity:0.828;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.927888;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter8835)"
            id="path8817"
@@ -1089,14 +484,11 @@
            transform="matrix(1.7350569,0,0,1.8824502,-91.814902,-1903.1505)"
            style="opacity:0.862;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.553326px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter2533)"
            d="m 70.953811,1023.4014 v -1.8291 l 2.972286,-0.076 z"
-           id="path8875"
-           inkscape:connector-curvature="0" /><path
+           id="path8875" /><path
            transform="matrix(1.029538,0,0,1.1281495,-39.928294,-1128.6206)"
            style="display:inline;opacity:0.485;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.927888px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter8871-1)"
            d="m 53.924652,1016.631 -0.152427,10.8222 c 2.375507,-3.3036 3.484206,-4.2052 2.972286,-9.2217 0.305009,-1.654 -1.117834,-1.7529 -2.819859,-1.6005 z"
-           id="path8861-7"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccc" /></g></g><rect
+           id="path8861-7" /></g></g><rect
        transform="matrix(1,0,-0.47943681,0.8775764,0,0)"
        style="display:inline;fill:url(#linearGradient4936);fill-opacity:1;stroke:#4c65c0;stroke-width:1.06747;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect4932"
@@ -1105,5 +497,4 @@
        x="574.04755"
        y="1159.136"
        ry="1.8222821"
-       inkscape:label="front"
        rx="1.8222821" /></g></svg>
diff --git a/ui/org.eclipse.pde.ui/icons/wizban/newsiteprj_wiz.svg b/ui/org.eclipse.pde.ui/icons/wizban/newsiteprj_wiz.svg
index 39606489733..bba8926010b 100644
--- a/ui/org.eclipse.pde.ui/icons/wizban/newsiteprj_wiz.svg
+++ b/ui/org.eclipse.pde.ui/icons/wizban/newsiteprj_wiz.svg
@@ -6,14 +6,7 @@
    height="66"
    id="svg2"
    version="1.1"
-   inkscape:version="1.3 (0e150ed, 2023-07-21)"
-   sodipodi:docname="newsiteprj_wiz.svg"
-   inkscape:export-filename="/Users/d021678/git/eclipse.jdt.ui/org.eclipse.jdt.ui/icons/full/wizban/newclass_wiz2.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90"
    xml:space="preserve"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:svg="http://www.w3.org/2000/svg"
@@ -21,307 +14,6 @@
    xmlns:cc="http://creativecommons.org/ns#"
    xmlns:dc="http://purl.org/dc/elements/1.1/"><defs
      id="defs4"><linearGradient
-       inkscape:collect="always"
-       id="linearGradient4541"><stop
-         style="stop-color:#a1adb2;stop-opacity:1"
-         offset="0"
-         id="stop4543" /><stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop4545" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       id="linearGradient4972"><stop
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0"
-         id="stop4974" /><stop
-         style="stop-color:#f5f8fd;stop-opacity:1"
-         offset="1"
-         id="stop4976" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       id="linearGradient4964"><stop
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0"
-         id="stop4966" /><stop
-         style="stop-color:#e8eefa;stop-opacity:1"
-         offset="1"
-         id="stop4968" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       id="linearGradient4956"><stop
-         style="stop-color:#fcfdfe;stop-opacity:1"
-         offset="0"
-         id="stop4958" /><stop
-         style="stop-color:#dee6f8;stop-opacity:1"
-         offset="1"
-         id="stop4960" /></linearGradient><filter
-       style="color-interpolation-filters:sRGB"
-       inkscape:label="Drop Shadow"
-       id="filter8854"><feFlood
-         flood-opacity="0.933333"
-         flood-color="rgb(244,248,254)"
-         result="flood"
-         id="feFlood8856" /><feComposite
-         in="flood"
-         in2="SourceGraphic"
-         operator="in"
-         result="composite1"
-         id="feComposite8858" /><feGaussianBlur
-         in="composite1"
-         stdDeviation="1.2"
-         result="blur"
-         id="feGaussianBlur8860" /><feOffset
-         dx="-1"
-         dy="3"
-         result="offset"
-         id="feOffset8862" /><feComposite
-         in="SourceGraphic"
-         in2="offset"
-         operator="over"
-         result="composite2"
-         id="feComposite8864" /></filter><linearGradient
-       id="linearGradient6122"><stop
-         style="stop-color:#c0c0c0;stop-opacity:1"
-         offset="0"
-         id="stop6124" /><stop
-         id="stop6132"
-         offset="0.5"
-         style="stop-color:#adadad;stop-opacity:1" /><stop
-         style="stop-color:#808080;stop-opacity:1"
-         offset="1"
-         id="stop6126" /></linearGradient><linearGradient
-       id="linearGradient7087"><stop
-         style="stop-color:#17325d;stop-opacity:1;"
-         offset="0"
-         id="stop7089" /><stop
-         id="stop7091"
-         offset="0.25"
-         style="stop-color:#b4d0e2;stop-opacity:1" /><stop
-         id="stop7093"
-         offset="0.5"
-         style="stop-color:#b7d2e4;stop-opacity:1" /><stop
-         style="stop-color:#acc9de;stop-opacity:1"
-         offset="0.75"
-         id="stop7095" /><stop
-         style="stop-color:#3e72a7;stop-opacity:1"
-         offset="1"
-         id="stop7097" /></linearGradient><mask
-       id="mask7366"
-       maskUnits="userSpaceOnUse"><path
-         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;display:inline"
-         d="m -16.593048,1040.862 9.990206,0 0,10.0018 -2.983353,3.0385 -5.966213,0 c -0.53033,-0.022 -1.04064,-0.5519 -1.04064,-1.0385 z"
-         id="path7368"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccccc" /></mask><linearGradient
-       id="linearGradient7584-5"><stop
-         id="stop7586-4"
-         offset="0"
-         style="stop-color:#f9cd5f;stop-opacity:1" /><stop
-         id="stop7588-5"
-         offset="1"
-         style="stop-color:#fbf0b4;stop-opacity:1" /></linearGradient><linearGradient
-       id="linearGradient7592-1"><stop
-         id="stop7594-6"
-         offset="0"
-         style="stop-color:#bd8416;stop-opacity:1" /><stop
-         id="stop7596-9"
-         offset="1"
-         style="stop-color:#a66b10;stop-opacity:1" /></linearGradient><linearGradient
-       id="linearGradient10798-1-9-3-7-6-6-6-2-6-7-98-9-4-1"><stop
-         style="stop-color:#5aad60;stop-opacity:1;"
-         offset="0"
-         id="stop10800-5-2-1-8-20-4-0-2-1-9-0-0-1-1" /><stop
-         id="stop10806-6-8-5-3-9-2-2-7-0-4-2-7-8-9"
-         offset="0.5"
-         style="stop-color:#5bb26a;stop-opacity:1;" /><stop
-         style="stop-color:#a4c589;stop-opacity:1"
-         offset="1"
-         id="stop10802-1-5-3-0-4-6-8-5-5-6-69-6-4-0" /></linearGradient><mask
-       maskUnits="userSpaceOnUse"
-       id="mask7366-4"><path
-         sodipodi:nodetypes="ccccccc"
-         inkscape:connector-curvature="0"
-         id="path7368-2"
-         d="m -16.593048,1040.862 9.990206,0 0,10.0018 -2.983353,3.0385 -5.966213,0 c -0.53033,-0.022 -1.04064,-0.5519 -1.04064,-1.0385 z"
-         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;display:inline" /></mask><linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient7087"
-       id="linearGradient9331"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-20,0)"
-       x1="4.7776356"
-       y1="1039.8118"
-       x2="4.7776356"
-       y2="1041.911" /><linearGradient
-       y2="1041.911"
-       x2="4.7776356"
-       y1="1039.8118"
-       x1="4.7776356"
-       gradientTransform="translate(-18,4.7e-5)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient9333"
-       xlink:href="#linearGradient7087"
-       inkscape:collect="always" /><linearGradient
-       y2="1041.911"
-       x2="4.7776356"
-       y1="1039.8118"
-       x1="4.7776356"
-       gradientTransform="translate(-16,4.7e-5)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient9335"
-       xlink:href="#linearGradient7087"
-       inkscape:collect="always" /><linearGradient
-       y2="1041.911"
-       x2="4.7776356"
-       y1="1039.8118"
-       x1="4.7776356"
-       gradientTransform="translate(-14,4.7e-5)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient9337"
-       xlink:href="#linearGradient7087"
-       inkscape:collect="always" /><linearGradient
-       y2="1041.911"
-       x2="4.7776356"
-       y1="1039.8118"
-       x1="4.7776356"
-       gradientTransform="translate(-12,4.7e-5)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient9339"
-       xlink:href="#linearGradient7087"
-       inkscape:collect="always" /><linearGradient
-       gradientTransform="translate(-80,0)"
-       gradientUnits="userSpaceOnUse"
-       y2="1042.7973"
-       x2="163.22012"
-       y1="1042.7973"
-       x1="88.220117"
-       id="linearGradient68073"
-       xlink:href="#linearGradient4956"
-       inkscape:collect="always" /><linearGradient
-       gradientTransform="translate(-80,0)"
-       gradientUnits="userSpaceOnUse"
-       y2="1032.2669"
-       x2="163.22012"
-       y1="1032.2668"
-       x1="94.469681"
-       id="linearGradient68075"
-       xlink:href="#linearGradient4964"
-       inkscape:collect="always" /><linearGradient
-       gradientTransform="translate(-80,0)"
-       gradientUnits="userSpaceOnUse"
-       y2="1032.2668"
-       x2="152.72206"
-       y1="1032.2668"
-       x1="88.220116"
-       id="linearGradient68077"
-       xlink:href="#linearGradient4972"
-       inkscape:collect="always" /><filter
-       id="filter8854-9"
-       inkscape:label="Drop Shadow"
-       style="color-interpolation-filters:sRGB"><feFlood
-         id="feFlood8856-0"
-         result="flood"
-         flood-color="rgb(244,248,254)"
-         flood-opacity="0.933333" /><feComposite
-         id="feComposite8858-2"
-         result="composite1"
-         operator="in"
-         in2="SourceGraphic"
-         in="flood" /><feGaussianBlur
-         id="feGaussianBlur8860-3"
-         result="blur"
-         stdDeviation="1.2"
-         in="composite1" /><feOffset
-         id="feOffset8862-2"
-         result="offset"
-         dy="3"
-         dx="-1" /><feComposite
-         id="feComposite8864-3"
-         result="composite2"
-         operator="over"
-         in2="offset"
-         in="SourceGraphic" /></filter><linearGradient
-       id="linearGradient10798-1-9-3-7-6-8-9-0-9-1"><stop
-         id="stop10800-5-2-1-8-20-6-4-9-8-2"
-         offset="0"
-         style="stop-color:#7564b1;stop-opacity:1" /><stop
-         style="stop-color:#5d4aa1;stop-opacity:1"
-         offset="0.5"
-         id="stop10806-6-8-5-3-9-24-8-4-3-2" /><stop
-         id="stop10802-1-5-3-0-4-8-4-2-9-2"
-         offset="1"
-         style="stop-color:#9283c3;stop-opacity:1" /></linearGradient><linearGradient
-       id="linearGradient7540-2-3-8-7"><stop
-         id="stop7542-8-7-5-3"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.502" /><stop
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0.47623286"
-         id="stop7544-8-2-0-5" /><stop
-         style="stop-color:#ffffff;stop-opacity:0"
-         offset="0.5"
-         id="stop7546-1-7-9-5" /><stop
-         id="stop7548-98-9-2-4"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       id="linearGradient7272-66-4-5-5-5-8"><stop
-         style="stop-color:#8f6c10;stop-opacity:1"
-         offset="0"
-         id="stop7274-6-0-1-7-4-7" /><stop
-         style="stop-color:#c9a645;stop-opacity:1"
-         offset="1"
-         id="stop7276-66-6-3-9-1-4" /></linearGradient><linearGradient
-       y2="1030.3411"
-       x2="-10.159802"
-       y1="1030.3411"
-       x1="-22.453552"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient10540"
-       xlink:href="#linearGradient7540-2-3-8-7"
-       inkscape:collect="always" /><linearGradient
-       y2="1030.3411"
-       x2="-10.159802"
-       y1="1030.3411"
-       x1="-22.453552"
-       gradientTransform="matrix(0,1,-1,0,1014.0344,1046.6478)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient10542"
-       xlink:href="#linearGradient7540-2-3-8-7"
-       inkscape:collect="always" /><linearGradient
-       y2="1023.2569"
-       x2="-15.945988"
-       y1="1037.4661"
-       x1="-15.945988"
-       gradientTransform="matrix(0.95585117,0,0,0.95585117,-0.71992063,45.488394)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient10544"
-       xlink:href="#linearGradient7272-66-4-5-5-5-8"
-       inkscape:collect="always" /><mask
-       id="mask10620"
-       maskUnits="userSpaceOnUse"><path
-         transform="matrix(0.55482947,0,0,0.55482947,-206.96039,787.08655)"
-         d="m 398.75,468.23718 a 10.625,10.625 0 1 1 -21.25,0 10.625,10.625 0 1 1 21.25,0 z"
-         sodipodi:ry="10.625"
-         sodipodi:rx="10.625"
-         sodipodi:cy="468.23718"
-         sodipodi:cx="388.125"
-         id="path10622"
-         style="font-size:13.58917427px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:2.16621375;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline;font-family:Sans"
-         sodipodi:type="arc" /></mask><linearGradient
-       id="linearGradient4528-9-5-7-9-7-3"><stop
-         id="stop4530-0-5-0-5-8-4"
-         offset="0"
-         style="stop-color:#e0c576;stop-opacity:1;" /><stop
-         id="stop4532-7-9-3-3-6-1"
-         offset="1"
-         style="stop-color:#9e7916;stop-opacity:1" /></linearGradient><linearGradient
-       id="linearGradient6281-8-0-1-6-6-4-2-8-0"><stop
-         style="stop-color:#f7f9fb;stop-opacity:1"
-         offset="0"
-         id="stop6283-0-2-2-1-2-0-1-6-0" /><stop
-         style="stop-color:#ffd680;stop-opacity:1"
-         offset="1"
-         id="stop6285-5-0-9-7-6-9-9-1-9" /></linearGradient><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4972-7"
        id="linearGradient4978"
        x1="88.220116"
@@ -330,7 +22,6 @@
        y2="1032.2668"
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-88.220116,-999.2669)" /><linearGradient
-       inkscape:collect="always"
        id="linearGradient4972-7"><stop
          style="stop-color:#b8ccf1;stop-opacity:0.10196079"
          offset="0"
@@ -338,7 +29,6 @@
          style="stop-color:#6e97e2;stop-opacity:0.10196079"
          offset="1"
          id="stop4976-1" /></linearGradient><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4964-3"
        id="linearGradient4970"
        x1="118.38584"
@@ -347,7 +37,6 @@
        y2="1032.2668"
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-88.220117,-999.2669)" /><linearGradient
-       inkscape:collect="always"
        id="linearGradient4964-3"><stop
          style="stop-color:#ffffff;stop-opacity:0.349"
          offset="0"
@@ -355,7 +44,6 @@
          style="stop-color:#91ade6;stop-opacity:1"
          offset="1"
          id="stop4968-1" /></linearGradient><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4956-2"
        id="linearGradient4962"
        x1="88.220116"
@@ -364,7 +52,6 @@
        y2="1042.7972"
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-88.220116,-999.2669)" /><linearGradient
-       inkscape:collect="always"
        id="linearGradient4956-2"><stop
          style="stop-color:#fcfdfe;stop-opacity:0.25641027"
          offset="0"
@@ -372,36 +59,6 @@
          style="stop-color:#98aae7;stop-opacity:0.40392157"
          offset="1"
          id="stop4960-6" /></linearGradient><linearGradient
-       id="linearGradient3827"><stop
-         id="stop3829"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0;" /><stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0.60149658"
-         id="stop3835" /><stop
-         id="stop3831"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" /></linearGradient><linearGradient
-       id="linearGradient10798-1-9-3-7-6-8-9-0-9-1-0"><stop
-         id="stop10800-5-2-1-8-20-6-4-9-8-2-9"
-         offset="0"
-         style="stop-color:#f3faed;stop-opacity:1" /><stop
-         style="stop-color:#e7f4da;stop-opacity:1"
-         offset="0.65917557"
-         id="stop10806-6-8-5-3-9-24-8-4-3-2-4" /><stop
-         id="stop10802-1-5-3-0-4-8-4-2-9-2-5"
-         offset="1"
-         style="stop-color:#67bf1f;stop-opacity:1" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4541"
-       id="linearGradient5885"
-       x1="41"
-       y1="1007.8622"
-       x2="60"
-       y2="1008.3622"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0,1,-1,0,1034.3618,967.36133)" /><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4204"
        id="linearGradient4210"
        x1="-708.08484"
@@ -410,7 +67,6 @@
        y2="746.83435"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(4.7199388,0,0,4.7199388,2646.1022,-2800.3552)" /><linearGradient
-       inkscape:collect="always"
        id="linearGradient4204"><stop
          style="stop-color:#8e6aae;stop-opacity:1"
          offset="0"
@@ -418,7 +74,6 @@
          style="stop-color:#b29cc6;stop-opacity:1"
          offset="1"
          id="stop4208" /></linearGradient><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4229"
        id="linearGradient4235"
        x1="44.955429"
@@ -427,7 +82,6 @@
        y2="1042.4124"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(4.7197085,0,0,4.720169,-165.73946,-3906.3019)" /><linearGradient
-       inkscape:collect="always"
        id="linearGradient4229"><stop
          style="stop-color:#713e9d;stop-opacity:1;"
          offset="0"
@@ -435,7 +89,6 @@
          style="stop-color:#f2aaf1;stop-opacity:1"
          offset="1"
          id="stop4233" /></linearGradient><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4276"
        id="linearGradient4235-4"
        x1="44.955429"
@@ -444,8 +97,7 @@
        y2="1043.5171"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(-4.7197085,0,0,4.720169,230.66355,-3906.3019)" /><linearGradient
-       id="linearGradient4276"
-       inkscape:collect="always"><stop
+       id="linearGradient4276"><stop
          id="stop4278"
          offset="0"
          style="stop-color:#f2aaf1;stop-opacity:1" /><stop
@@ -458,67 +110,22 @@
          id="stop4280"
          offset="1"
          style="stop-color:#ffffff;stop-opacity:1" /></linearGradient><filter
-       inkscape:collect="always"
        style="color-interpolation-filters:sRGB"
        id="filter1"
        x="-0.40282356"
        y="-0.41407035"
        width="1.8056471"
        height="1.8281407"><feGaussianBlur
-         inkscape:collect="always"
          stdDeviation="4.6777508"
-         id="feGaussianBlur1" /></filter></defs><sodipodi:namedview
-     id="base"
-     pagecolor="#333333"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="8.6451897"
-     inkscape:cx="12.261154"
-     inkscape:cy="38.055845"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1728"
-     inkscape:window-height="1051"
-     inkscape:window-x="0"
-     inkscape:window-y="38"
-     inkscape:window-maximized="1"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="true"
-     inkscape:snap-bbox="true"
-     inkscape:bbox-nodes="true"
-     inkscape:showpageshadow="2"
-     inkscape:pagecheckerboard="0"
-     inkscape:deskcolor="#d1d1d1"><inkscape:grid
-       type="xygrid"
-       id="grid4112"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       originx="0"
-       originy="0"
-       spacingy="1"
-       spacingx="1"
-       units="px" /></sodipodi:namedview><metadata
+         id="feGaussianBlur1" /></filter></defs><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" /></cc:Work></rdf:RDF></metadata><g
-     inkscape:groupmode="layer"
      id="layer2"
-     inkscape:label="Background"
-     style="display:inline"
-     sodipodi:insensitive="true"><path
-       sodipodi:nodetypes="cccc"
-       inkscape:connector-curvature="0"
+     style="display:inline"><path
        id="rect4113-1"
        d="M 75,0 75,66 1e-6,66 C 1e-6,41.2048 50.00969,0 75,0 Z"
        style="display:inline;fill:url(#linearGradient4978);fill-opacity:1;stroke:none" /><path
-       sodipodi:nodetypes="cccc"
-       inkscape:connector-curvature="0"
        id="rect4113-1-0"
        d="M 75,21.0607 75,66 1e-6,66 C 10.625001,47.804 43.509694,25.4357 75,21.0607 Z"
        style="display:inline;opacity:0.40400002;fill:url(#linearGradient4962);fill-opacity:1;stroke:none" /><g
@@ -527,13 +134,9 @@
        transform="matrix(0.27903303,0,0,0.27903303,-14.618136,-107.52874)"><g
          style="fill:#737986;fill-opacity:1;stroke:#595e68;stroke-opacity:1"
          id="g13408-8-2" /></g><path
-       sodipodi:nodetypes="cccc"
-       inkscape:connector-curvature="0"
        id="rect4113-1-7"
        d="M 75,4.0000001e-7 75,66 30.000003,66 C 30.000003,46.1545 47.70944,9.2500004 75,4e-7 Z"
        style="display:inline;opacity:0.18399999;fill:url(#linearGradient4970);fill-opacity:1;stroke:none" /></g><g
-     inkscape:label="Foreground"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-986.3622)"><rect
@@ -545,10 +148,8 @@
        height="27.112787"
        width="27.869774"
        id="rect3394-0"
-       style="display:inline;fill:#c5c3d4;fill-opacity:0.729412;stroke:none;stroke-width:1.0252;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter1)"
-       inkscape:label="pyramid" /><g
+       style="display:inline;fill:#c5c3d4;fill-opacity:0.729412;stroke:none;stroke-width:1.0252;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter1)" /><g
        id="g1"
-       inkscape:label="pyramid"
        style="stroke:none"><rect
          transform="matrix(0.70707229,-0.70714127,0.70707229,0.70714127,0,0)"
          ry="0.56243074"
@@ -558,29 +159,16 @@
          height="31.442156"
          width="31.442156"
          id="rect3394"
-         style="display:inline;fill:#f2aaf1;fill-opacity:1;stroke:url(#linearGradient4210);stroke-width:1;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         inkscape:label="pyramid" /><path
-         sodipodi:nodetypes="cccc"
-         inkscape:connector-curvature="0"
+         style="display:inline;fill:#f2aaf1;fill-opacity:1;stroke:url(#linearGradient4210);stroke-width:1;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /><path
          id="path4212"
          d="m 54.300541,1018.5615 -21.843457,22.0801 0.04063,-21.7796 z"
-         style="display:inline;fill:#8861aa;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         inkscape:label="shadow" /><path
-         sodipodi:nodetypes="cccc"
-         inkscape:connector-curvature="0"
+         style="display:inline;fill:#8861aa;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /><path
          id="path4212-4"
          d="m 53.941194,1018.5615 -21.47419,-21.36714 0.03071,21.66764 z"
-         style="display:inline;fill:url(#linearGradient4235);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         inkscape:label="shadow" /><path
-         sodipodi:nodetypes="cccc"
-         inkscape:connector-curvature="0"
+         style="display:inline;fill:url(#linearGradient4235);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /><path
          id="path4212-9"
          d="m 10.563655,1018.862 21.893429,21.7796 0.04063,-21.7796 z"
-         style="display:inline;fill:#ad86cf;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         inkscape:label="highlight" /><path
-         sodipodi:nodetypes="cccc"
-         inkscape:connector-curvature="0"
+         style="display:inline;fill:#ad86cf;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /><path
          id="path4212-4-2"
          d="m 10.863111,1018.862 21.603893,-21.66764 0.03071,21.66764 z"
-         style="display:inline;fill:url(#linearGradient4235-4);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         inkscape:label="highlight" /></g></g></svg>
+         style="display:inline;fill:url(#linearGradient4235-4);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /></g></g></svg>
diff --git a/ui/org.eclipse.pde.ui/icons/wizban/product_wiz.svg b/ui/org.eclipse.pde.ui/icons/wizban/product_wiz.svg
index 5d1d3bc95ee..7e868c032bc 100644
--- a/ui/org.eclipse.pde.ui/icons/wizban/product_wiz.svg
+++ b/ui/org.eclipse.pde.ui/icons/wizban/product_wiz.svg
@@ -6,14 +6,7 @@
    height="66"
    id="svg2"
    version="1.1"
-   inkscape:version="1.3 (0e150ed, 2023-07-21)"
-   sodipodi:docname="product_wiz.svg"
-   inkscape:export-filename="/Users/d021678/git/eclipse.jdt.ui/org.eclipse.jdt.ui/icons/full/wizban/newclass_wiz2.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90"
    xml:space="preserve"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:svg="http://www.w3.org/2000/svg"
@@ -21,23 +14,20 @@
    xmlns:cc="http://creativecommons.org/ns#"
    xmlns:dc="http://purl.org/dc/elements/1.1/"><defs
      id="defs4"><linearGradient
-       id="linearGradient5904"
-       inkscape:collect="always"><stop
+       id="linearGradient5904"><stop
          id="stop5906"
          offset="0"
          style="stop-color:#c5c6c6;stop-opacity:1" /><stop
          id="stop5908"
          offset="1"
          style="stop-color:#000000;stop-opacity:0;" /></linearGradient><linearGradient
-       id="linearGradient5898"
-       inkscape:collect="always"><stop
+       id="linearGradient5898"><stop
          id="stop5900"
          offset="0"
          style="stop-color:#c0c1c1;stop-opacity:1" /><stop
          id="stop5902"
          offset="1"
          style="stop-color:#000000;stop-opacity:0;" /></linearGradient><linearGradient
-       inkscape:collect="always"
        id="linearGradient4581"><stop
          style="stop-color:#dddddd;stop-opacity:1"
          offset="0"
@@ -45,7 +35,6 @@
          style="stop-color:#9f9f9f;stop-opacity:1"
          offset="1"
          id="stop4585" /></linearGradient><linearGradient
-       inkscape:collect="always"
        id="linearGradient4541"><stop
          style="stop-color:#a1adb2;stop-opacity:1"
          offset="0"
@@ -53,7 +42,6 @@
          style="stop-color:#000000;stop-opacity:0;"
          offset="1"
          id="stop4545" /></linearGradient><linearGradient
-       inkscape:collect="always"
        id="linearGradient4461"><stop
          style="stop-color:#d8d8d8;stop-opacity:1"
          offset="0"
@@ -67,299 +55,6 @@
          style="stop-color:#b4b4b4;stop-opacity:1"
          offset="1"
          id="stop4465" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       id="linearGradient4972"><stop
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0"
-         id="stop4974" /><stop
-         style="stop-color:#f5f8fd;stop-opacity:1"
-         offset="1"
-         id="stop4976" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       id="linearGradient4964"><stop
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0"
-         id="stop4966" /><stop
-         style="stop-color:#e8eefa;stop-opacity:1"
-         offset="1"
-         id="stop4968" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       id="linearGradient4956"><stop
-         style="stop-color:#fcfdfe;stop-opacity:1"
-         offset="0"
-         id="stop4958" /><stop
-         style="stop-color:#dee6f8;stop-opacity:1"
-         offset="1"
-         id="stop4960" /></linearGradient><filter
-       style="color-interpolation-filters:sRGB"
-       inkscape:label="Drop Shadow"
-       id="filter8854"><feFlood
-         flood-opacity="0.933333"
-         flood-color="rgb(244,248,254)"
-         result="flood"
-         id="feFlood8856" /><feComposite
-         in="flood"
-         in2="SourceGraphic"
-         operator="in"
-         result="composite1"
-         id="feComposite8858" /><feGaussianBlur
-         in="composite1"
-         stdDeviation="1.2"
-         result="blur"
-         id="feGaussianBlur8860" /><feOffset
-         dx="-1"
-         dy="3"
-         result="offset"
-         id="feOffset8862" /><feComposite
-         in="SourceGraphic"
-         in2="offset"
-         operator="over"
-         result="composite2"
-         id="feComposite8864" /></filter><linearGradient
-       id="linearGradient6122"><stop
-         style="stop-color:#c0c0c0;stop-opacity:1"
-         offset="0"
-         id="stop6124" /><stop
-         id="stop6132"
-         offset="0.5"
-         style="stop-color:#adadad;stop-opacity:1" /><stop
-         style="stop-color:#808080;stop-opacity:1"
-         offset="1"
-         id="stop6126" /></linearGradient><linearGradient
-       id="linearGradient7087"><stop
-         style="stop-color:#17325d;stop-opacity:1;"
-         offset="0"
-         id="stop7089" /><stop
-         id="stop7091"
-         offset="0.25"
-         style="stop-color:#b4d0e2;stop-opacity:1" /><stop
-         id="stop7093"
-         offset="0.5"
-         style="stop-color:#b7d2e4;stop-opacity:1" /><stop
-         style="stop-color:#acc9de;stop-opacity:1"
-         offset="0.75"
-         id="stop7095" /><stop
-         style="stop-color:#3e72a7;stop-opacity:1"
-         offset="1"
-         id="stop7097" /></linearGradient><mask
-       id="mask7366"
-       maskUnits="userSpaceOnUse"><path
-         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;display:inline"
-         d="m -16.593048,1040.862 9.990206,0 0,10.0018 -2.983353,3.0385 -5.966213,0 c -0.53033,-0.022 -1.04064,-0.5519 -1.04064,-1.0385 z"
-         id="path7368"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccccc" /></mask><linearGradient
-       id="linearGradient7584-5"><stop
-         id="stop7586-4"
-         offset="0"
-         style="stop-color:#f9cd5f;stop-opacity:1" /><stop
-         id="stop7588-5"
-         offset="1"
-         style="stop-color:#fbf0b4;stop-opacity:1" /></linearGradient><linearGradient
-       id="linearGradient7592-1"><stop
-         id="stop7594-6"
-         offset="0"
-         style="stop-color:#bd8416;stop-opacity:1" /><stop
-         id="stop7596-9"
-         offset="1"
-         style="stop-color:#a66b10;stop-opacity:1" /></linearGradient><linearGradient
-       id="linearGradient10798-1-9-3-7-6-6-6-2-6-7-98-9-4-1"><stop
-         style="stop-color:#5aad60;stop-opacity:1;"
-         offset="0"
-         id="stop10800-5-2-1-8-20-4-0-2-1-9-0-0-1-1" /><stop
-         id="stop10806-6-8-5-3-9-2-2-7-0-4-2-7-8-9"
-         offset="0.5"
-         style="stop-color:#5bb26a;stop-opacity:1;" /><stop
-         style="stop-color:#a4c589;stop-opacity:1"
-         offset="1"
-         id="stop10802-1-5-3-0-4-6-8-5-5-6-69-6-4-0" /></linearGradient><mask
-       maskUnits="userSpaceOnUse"
-       id="mask7366-4"><path
-         sodipodi:nodetypes="ccccccc"
-         inkscape:connector-curvature="0"
-         id="path7368-2"
-         d="m -16.593048,1040.862 9.990206,0 0,10.0018 -2.983353,3.0385 -5.966213,0 c -0.53033,-0.022 -1.04064,-0.5519 -1.04064,-1.0385 z"
-         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;display:inline" /></mask><linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient7087"
-       id="linearGradient9331"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-20,0)"
-       x1="4.7776356"
-       y1="1039.8118"
-       x2="4.7776356"
-       y2="1041.911" /><linearGradient
-       y2="1041.911"
-       x2="4.7776356"
-       y1="1039.8118"
-       x1="4.7776356"
-       gradientTransform="translate(-18,4.7e-5)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient9333"
-       xlink:href="#linearGradient7087"
-       inkscape:collect="always" /><linearGradient
-       y2="1041.911"
-       x2="4.7776356"
-       y1="1039.8118"
-       x1="4.7776356"
-       gradientTransform="translate(-16,4.7e-5)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient9335"
-       xlink:href="#linearGradient7087"
-       inkscape:collect="always" /><linearGradient
-       y2="1041.911"
-       x2="4.7776356"
-       y1="1039.8118"
-       x1="4.7776356"
-       gradientTransform="translate(-14,4.7e-5)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient9337"
-       xlink:href="#linearGradient7087"
-       inkscape:collect="always" /><linearGradient
-       y2="1041.911"
-       x2="4.7776356"
-       y1="1039.8118"
-       x1="4.7776356"
-       gradientTransform="translate(-12,4.7e-5)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient9339"
-       xlink:href="#linearGradient7087"
-       inkscape:collect="always" /><linearGradient
-       gradientTransform="translate(-80,0)"
-       gradientUnits="userSpaceOnUse"
-       y2="1042.7973"
-       x2="163.22012"
-       y1="1042.7973"
-       x1="88.220117"
-       id="linearGradient68073"
-       xlink:href="#linearGradient4956"
-       inkscape:collect="always" /><linearGradient
-       gradientTransform="translate(-80,0)"
-       gradientUnits="userSpaceOnUse"
-       y2="1032.2669"
-       x2="163.22012"
-       y1="1032.2668"
-       x1="94.469681"
-       id="linearGradient68075"
-       xlink:href="#linearGradient4964"
-       inkscape:collect="always" /><linearGradient
-       gradientTransform="translate(-80,0)"
-       gradientUnits="userSpaceOnUse"
-       y2="1032.2668"
-       x2="152.72206"
-       y1="1032.2668"
-       x1="88.220116"
-       id="linearGradient68077"
-       xlink:href="#linearGradient4972"
-       inkscape:collect="always" /><filter
-       id="filter8854-9"
-       inkscape:label="Drop Shadow"
-       style="color-interpolation-filters:sRGB"><feFlood
-         id="feFlood8856-0"
-         result="flood"
-         flood-color="rgb(244,248,254)"
-         flood-opacity="0.933333" /><feComposite
-         id="feComposite8858-2"
-         result="composite1"
-         operator="in"
-         in2="SourceGraphic"
-         in="flood" /><feGaussianBlur
-         id="feGaussianBlur8860-3"
-         result="blur"
-         stdDeviation="1.2"
-         in="composite1" /><feOffset
-         id="feOffset8862-2"
-         result="offset"
-         dy="3"
-         dx="-1" /><feComposite
-         id="feComposite8864-3"
-         result="composite2"
-         operator="over"
-         in2="offset"
-         in="SourceGraphic" /></filter><linearGradient
-       id="linearGradient10798-1-9-3-7-6-8-9-0-9-1"><stop
-         id="stop10800-5-2-1-8-20-6-4-9-8-2"
-         offset="0"
-         style="stop-color:#7564b1;stop-opacity:1" /><stop
-         style="stop-color:#5d4aa1;stop-opacity:1"
-         offset="0.5"
-         id="stop10806-6-8-5-3-9-24-8-4-3-2" /><stop
-         id="stop10802-1-5-3-0-4-8-4-2-9-2"
-         offset="1"
-         style="stop-color:#9283c3;stop-opacity:1" /></linearGradient><linearGradient
-       id="linearGradient7540-2-3-8-7"><stop
-         id="stop7542-8-7-5-3"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.502" /><stop
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0.47623286"
-         id="stop7544-8-2-0-5" /><stop
-         style="stop-color:#ffffff;stop-opacity:0"
-         offset="0.5"
-         id="stop7546-1-7-9-5" /><stop
-         id="stop7548-98-9-2-4"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       id="linearGradient7272-66-4-5-5-5-8"><stop
-         style="stop-color:#8f6c10;stop-opacity:1"
-         offset="0"
-         id="stop7274-6-0-1-7-4-7" /><stop
-         style="stop-color:#c9a645;stop-opacity:1"
-         offset="1"
-         id="stop7276-66-6-3-9-1-4" /></linearGradient><linearGradient
-       y2="1030.3411"
-       x2="-10.159802"
-       y1="1030.3411"
-       x1="-22.453552"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient10540"
-       xlink:href="#linearGradient7540-2-3-8-7"
-       inkscape:collect="always" /><linearGradient
-       y2="1030.3411"
-       x2="-10.159802"
-       y1="1030.3411"
-       x1="-22.453552"
-       gradientTransform="matrix(0,1,-1,0,1014.0344,1046.6478)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient10542"
-       xlink:href="#linearGradient7540-2-3-8-7"
-       inkscape:collect="always" /><linearGradient
-       y2="1023.2569"
-       x2="-15.945988"
-       y1="1037.4661"
-       x1="-15.945988"
-       gradientTransform="matrix(0.95585117,0,0,0.95585117,-0.71992063,45.488394)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient10544"
-       xlink:href="#linearGradient7272-66-4-5-5-5-8"
-       inkscape:collect="always" /><mask
-       id="mask10620"
-       maskUnits="userSpaceOnUse"><path
-         transform="matrix(0.55482947,0,0,0.55482947,-206.96039,787.08655)"
-         d="m 398.75,468.23718 a 10.625,10.625 0 1 1 -21.25,0 10.625,10.625 0 1 1 21.25,0 z"
-         sodipodi:ry="10.625"
-         sodipodi:rx="10.625"
-         sodipodi:cy="468.23718"
-         sodipodi:cx="388.125"
-         id="path10622"
-         style="font-size:13.58917427px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:2.16621375;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline;font-family:Sans"
-         sodipodi:type="arc" /></mask><linearGradient
-       id="linearGradient4528-9-5-7-9-7-3"><stop
-         id="stop4530-0-5-0-5-8-4"
-         offset="0"
-         style="stop-color:#e0c576;stop-opacity:1;" /><stop
-         id="stop4532-7-9-3-3-6-1"
-         offset="1"
-         style="stop-color:#9e7916;stop-opacity:1" /></linearGradient><linearGradient
-       id="linearGradient6281-8-0-1-6-6-4-2-8-0"><stop
-         style="stop-color:#f7f9fb;stop-opacity:1"
-         offset="0"
-         id="stop6283-0-2-2-1-2-0-1-6-0" /><stop
-         style="stop-color:#ffd680;stop-opacity:1"
-         offset="1"
-         id="stop6285-5-0-9-7-6-9-9-1-9" /></linearGradient><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4972-7"
        id="linearGradient4978"
        x1="88.220116"
@@ -368,7 +63,6 @@
        y2="1032.2668"
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-88.220116,-999.2669)" /><linearGradient
-       inkscape:collect="always"
        id="linearGradient4972-7"><stop
          style="stop-color:#b8ccf1;stop-opacity:0.10196079"
          offset="0"
@@ -376,7 +70,6 @@
          style="stop-color:#6e97e2;stop-opacity:0.10196079"
          offset="1"
          id="stop4976-1" /></linearGradient><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4964-3"
        id="linearGradient4970"
        x1="118.38584"
@@ -385,7 +78,6 @@
        y2="1032.2668"
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-88.220117,-999.2669)" /><linearGradient
-       inkscape:collect="always"
        id="linearGradient4964-3"><stop
          style="stop-color:#ffffff;stop-opacity:0.349"
          offset="0"
@@ -393,7 +85,6 @@
          style="stop-color:#91ade6;stop-opacity:1"
          offset="1"
          id="stop4968-1" /></linearGradient><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4956-2"
        id="linearGradient4962"
        x1="88.220116"
@@ -402,7 +93,6 @@
        y2="1042.7972"
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-88.220116,-999.2669)" /><linearGradient
-       inkscape:collect="always"
        id="linearGradient4956-2"><stop
          style="stop-color:#fcfdfe;stop-opacity:0.25641027"
          offset="0"
@@ -410,27 +100,6 @@
          style="stop-color:#98aae7;stop-opacity:0.40392157"
          offset="1"
          id="stop4960-6" /></linearGradient><linearGradient
-       id="linearGradient3827"><stop
-         id="stop3829"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0;" /><stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0.60149658"
-         id="stop3835" /><stop
-         id="stop3831"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" /></linearGradient><linearGradient
-       id="linearGradient10798-1-9-3-7-6-8-9-0-9-1-0"><stop
-         id="stop10800-5-2-1-8-20-6-4-9-8-2-9"
-         offset="0"
-         style="stop-color:#f3faed;stop-opacity:1" /><stop
-         style="stop-color:#e7f4da;stop-opacity:1"
-         offset="0.65917557"
-         id="stop10806-6-8-5-3-9-24-8-4-3-2-4" /><stop
-         id="stop10802-1-5-3-0-4-8-4-2-9-2-5"
-         offset="1"
-         style="stop-color:#67bf1f;stop-opacity:1" /></linearGradient><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4994"
        id="linearGradient6375-6"
        x1="50.702839"
@@ -439,15 +108,13 @@
        y2="1011.338"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1.1849336,0,0,0.66623436,3.388291,334.57319)" /><linearGradient
-       id="linearGradient4994"
-       inkscape:collect="always"><stop
+       id="linearGradient4994"><stop
          id="stop4996"
          offset="0"
          style="stop-color:#ffffff;stop-opacity:1" /><stop
          id="stop4998"
          offset="1"
          style="stop-color:#d2f1ff;stop-opacity:1" /></linearGradient><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4902"
        id="linearGradient4238"
        gradientUnits="userSpaceOnUse"
@@ -456,8 +123,7 @@
        y1="1039.059"
        x2="10.632975"
        y2="1051.5835" /><linearGradient
-       id="linearGradient4902"
-       inkscape:collect="always"><stop
+       id="linearGradient4902"><stop
          id="stop4904"
          offset="0"
          style="stop-color:#777777;stop-opacity:0.74901962" /><stop
@@ -467,7 +133,6 @@
          id="stop4906"
          offset="1"
          style="stop-color:#939195;stop-opacity:0.93333334" /></linearGradient><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4461"
        id="linearGradient4467"
        x1="60.069771"
@@ -476,7 +141,6 @@
        y2="997.19556"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(0.99999996,0,0,1.2,-15.999595,-199.27331)" /><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4541"
        id="linearGradient4547"
        x1="41"
@@ -485,7 +149,6 @@
        y2="1008.3622"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1.3158111,0,0,1.3158111,-28.947849,-318.29488)" /><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4541"
        id="linearGradient4547-0"
        x1="41"
@@ -494,7 +157,6 @@
        y2="1008.3622"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(0,1.2632053,-1.2632053,0,1298.6373,956.56996)" /><radialGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4581"
        id="radialGradient4587"
        cx="68.5"
@@ -505,7 +167,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-15.999595,-8.6771508e-4)" /><radialGradient
        gradientTransform="translate(-10.999595,-8.6771508e-4)"
-       inkscape:collect="always"
        xlink:href="#linearGradient4581"
        id="radialGradient4587-5"
        cx="68.5"
@@ -515,7 +176,6 @@
        r="1.5"
        gradientUnits="userSpaceOnUse" /><radialGradient
        gradientTransform="translate(-5.999595,-8.6771508e-4)"
-       inkscape:collect="always"
        xlink:href="#linearGradient4581"
        id="radialGradient4587-0"
        cx="68.5"
@@ -524,16 +184,6 @@
        fy="1004.8622"
        r="1.5"
        gradientUnits="userSpaceOnUse" /><linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4541"
-       id="linearGradient5885"
-       x1="41"
-       y1="1007.8622"
-       x2="60"
-       y2="1008.3622"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0,1,-1,0,1034.3618,967.36133)" /><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient5904"
        id="linearGradient5890"
        gradientUnits="userSpaceOnUse"
@@ -542,7 +192,6 @@
        y1="1007.8622"
        x2="60.03624"
        y2="1007.8358" /><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient5898"
        id="linearGradient5892"
        gradientUnits="userSpaceOnUse"
@@ -551,7 +200,6 @@
        y1="1007.8622"
        x2="59.944244"
        y2="1007.8496" /><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient5517"
        id="linearGradient6406"
        gradientUnits="userSpaceOnUse"
@@ -559,25 +207,21 @@
        y1="1041.0833"
        x2="75.020309"
        y2="1023.2908" /><filter
-       inkscape:collect="always"
        style="color-interpolation-filters:sRGB"
        id="filter4344"
        x="-0.027383926"
        width="1.0547679"
        y="-0.085576576"
        height="1.1711532"><feGaussianBlur
-         inkscape:collect="always"
          stdDeviation="0.57051052"
          id="feGaussianBlur4346" /></filter><linearGradient
-       id="linearGradient5517"
-       inkscape:collect="always"><stop
+       id="linearGradient5517"><stop
          id="stop5519"
          offset="0"
          style="stop-color:#c5c3d4;stop-opacity:0.72941178" /><stop
          id="stop5521"
          offset="1"
          style="stop-color:#c5c3d4;stop-opacity:0.72941178" /></linearGradient><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4994-1"
        id="linearGradient6375-6-4"
        x1="50.702839"
@@ -586,15 +230,13 @@
        y2="1014.1386"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(0.96603716,0,0,1.0044749,-93.045632,-67.42557)" /><linearGradient
-       id="linearGradient4994-1"
-       inkscape:collect="always"><stop
+       id="linearGradient4994-1"><stop
          id="stop4996-8"
          offset="0"
          style="stop-color:#ffffff;stop-opacity:1" /><stop
          id="stop4998-5"
          offset="1"
          style="stop-color:#dbe2eb;stop-opacity:1" /></linearGradient><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4902-9"
        id="linearGradient4238-8"
        gradientUnits="userSpaceOnUse"
@@ -603,15 +245,13 @@
        y1="1038.5779"
        x2="10.544736"
        y2="1052.3228" /><linearGradient
-       id="linearGradient4902-9"
-       inkscape:collect="always"><stop
+       id="linearGradient4902-9"><stop
          id="stop4904-9"
          offset="0"
          style="stop-color:#c7b571;stop-opacity:1;" /><stop
          id="stop4906-9"
          offset="1"
          style="stop-color:#9a9a8f;stop-opacity:1" /></linearGradient><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient6411"
        id="linearGradient4240"
        gradientUnits="userSpaceOnUse"
@@ -620,7 +260,6 @@
        y1="1020.8994"
        x2="47.429596"
        y2="1023.1616" /><linearGradient
-       inkscape:collect="always"
        id="linearGradient6411"><stop
          style="stop-color:#4f605c;stop-opacity:1"
          offset="0"
@@ -628,7 +267,6 @@
          style="stop-color:#dbe2eb;stop-opacity:0"
          offset="1"
          id="stop6415" /></linearGradient><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4258"
        id="linearGradient4264"
        x1="59.220116"
@@ -637,7 +275,6 @@
        y2="1025.2668"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1.7498306,0,0,1.8651544,-151.90129,-956.74278)" /><linearGradient
-       inkscape:collect="always"
        id="linearGradient4258"><stop
          style="stop-color:#f4ae5f;stop-opacity:1;"
          offset="0"
@@ -647,58 +284,15 @@
          style="stop-color:#eec290;stop-opacity:1" /><stop
          style="stop-color:#c7700e;stop-opacity:1"
          offset="1"
-         id="stop4262" /></linearGradient></defs><sodipodi:namedview
-     id="base"
-     pagecolor="#bcbcbc"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="5.6473858"
-     inkscape:cx="25.675597"
-     inkscape:cy="44.091197"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1728"
-     inkscape:window-height="1051"
-     inkscape:window-x="0"
-     inkscape:window-y="38"
-     inkscape:window-maximized="1"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="true"
-     inkscape:snap-bbox="true"
-     inkscape:bbox-nodes="true"
-     inkscape:showpageshadow="2"
-     inkscape:pagecheckerboard="0"
-     inkscape:deskcolor="#d1d1d1"><inkscape:grid
-       type="xygrid"
-       id="grid4112"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       originx="0"
-       originy="0"
-       spacingy="1"
-       spacingx="1"
-       units="px" /></sodipodi:namedview><metadata
+         id="stop4262" /></linearGradient></defs><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" /></cc:Work></rdf:RDF></metadata><g
-     inkscape:groupmode="layer"
      id="layer2"
-     inkscape:label="Background"
-     style="display:inline"
-     sodipodi:insensitive="true"><path
-       sodipodi:nodetypes="cccc"
-       inkscape:connector-curvature="0"
+     style="display:inline"><path
        id="rect4113-1"
        d="M 75,0 75,66 1e-6,66 C 1e-6,41.2048 50.00969,0 75,0 Z"
        style="display:inline;fill:url(#linearGradient4978);fill-opacity:1;stroke:none" /><path
-       sodipodi:nodetypes="cccc"
-       inkscape:connector-curvature="0"
        id="rect4113-1-0"
        d="M 75,21.0607 75,66 1e-6,66 C 10.625001,47.804 43.509694,25.4357 75,21.0607 Z"
        style="display:inline;opacity:0.40400002;fill:url(#linearGradient4962);fill-opacity:1;stroke:none" /><g
@@ -707,129 +301,73 @@
        transform="matrix(0.27903303,0,0,0.27903303,-14.618136,-107.52874)"><g
          style="fill:#737986;fill-opacity:1;stroke:#595e68;stroke-opacity:1"
          id="g13408-8-2" /></g><path
-       sodipodi:nodetypes="cccc"
-       inkscape:connector-curvature="0"
        id="rect4113-1-7"
        d="M 75,4.0000001e-7 75,66 30.000003,66 C 30.000003,46.1545 47.70944,9.2500004 75,4e-7 Z"
        style="display:inline;opacity:0.18399999;fill:url(#linearGradient4970);fill-opacity:1;stroke:none" /></g><g
-     inkscape:label="Foreground"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-986.3622)"><path
-       sodipodi:nodetypes="cccccc"
-       inkscape:connector-curvature="0"
        id="rect4001-3-4-5"
        d="m 61.725004,1022.8099 21.27431,-0.1009 1.654984,3.7793 -20.678174,12.1198 -29.322882,0.1009 z"
        style="display:inline;opacity:0.63;fill:url(#linearGradient6406);fill-opacity:1;stroke:none;filter:url(#filter4344)"
-       transform="matrix(1.4111948,0,0,0.94753947,-45.099875,60.792339)"
-       inkscape:label="shadow" /><g
+       transform="matrix(1.4111948,0,0,0.94753947,-45.099875,60.792339)" /><g
        id="g1"
        transform="matrix(0.96786925,0,0,0.9098568,93.566096,135.43216)"
-       style="stroke-width:1.06563"
-       inkscape:label="paper"><path
-         sodipodi:nodetypes="cccccc"
-         inkscape:connector-curvature="0"
+       style="stroke-width:1.06563"><path
          id="rect4001-3-4-3"
          d="m -75,947.3622 h 23.759832 L -42.08882,957.7551 -42,991.3622 h -33 z"
-         style="display:inline;fill:url(#linearGradient6375-6-4);fill-opacity:1;stroke:none;stroke-width:1.06563"
-         inkscape:label="fll" /><path
-         sodipodi:nodetypes="ccscccc"
-         inkscape:connector-curvature="0"
+         style="display:inline;fill:url(#linearGradient6375-6-4);fill-opacity:1;stroke:none;stroke-width:1.06563" /><path
          id="rect4001-1-3"
          d="m -75.5,946.86218 h 23.755611 c 0,0 7.142644,1.47217 5.331245,4.86412 -0.05617,0.1062 4.913143,5.7835 4.913143,5.7835 v 34.3524 H -75.5 Z"
-         style="display:inline;fill:none;stroke:url(#linearGradient4238-8);stroke-width:1.06563;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1"
-         inkscape:label="border" /><path
-         sodipodi:nodetypes="cccccc"
-         inkscape:connector-curvature="0"
+         style="display:inline;fill:none;stroke:url(#linearGradient4238-8);stroke-width:1.06563;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1" /><path
          id="rect4001-3-9-0"
          d="M -51.17218,947.05565 -42,957.504 v 10.8582 l -13.460738,-9.4981 c 1.765426,-3.8089 3.044415,-7.7874 4.288484,-11.80845 z"
-         style="display:inline;fill:url(#linearGradient4240);fill-opacity:1;stroke:none;stroke-width:1.06563"
-         inkscape:label="shadow" /><path
-         sodipodi:nodetypes="cccc"
+         style="display:inline;fill:url(#linearGradient4240);fill-opacity:1;stroke:none;stroke-width:1.06563" /><path
          id="path5675-4"
          d="m -51.772983,946.25928 c 1.979191,2.74202 4.365887,6.24982 2.596924,12.24302 4.070558,-2.3415 8.288172,-1.0995 8.288172,-1.0995 0,-5.5953 -6.679314,-11.40728 -10.885096,-11.14352 z"
-         style="display:inline;fill:url(#linearGradient4264);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.06563px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         inkscape:connector-curvature="0"
-         inkscape:label="edge" /></g><g
+         style="display:inline;fill:url(#linearGradient4264);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.06563px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /></g><g
        id="g8799"
-       inkscape:label="window"
        transform="matrix(0.83331095,0,0,0.85367583,-15.915988,158.71882)"
        style="stroke-width:1.18563"><path
          style="display:inline;fill:url(#linearGradient6375-6);fill-opacity:1;stroke:none;stroke-width:1.18563"
          d="m 25.000405,1007.361 41,3e-4 c 0,0 -0.06713,15.3717 0,29 h -41 z"
-         id="rect4001-3-4"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc"
-         inkscape:label="background" /><path
-         inkscape:connector-curvature="0"
+         id="rect4001-3-4" /><path
          id="path4539-4-7"
          d="m 39.47337,1008.3613 v 27.0009"
-         style="display:inline;fill:none;fill-rule:evenodd;stroke:#a1a2a7;stroke-width:1.18563px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.894118"
-         inkscape:label="grid-middle" /><path
-         inkscape:connector-curvature="0"
+         style="display:inline;fill:none;fill-rule:evenodd;stroke:#a1a2a7;stroke-width:1.18563px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.894118" /><path
          id="path4539-4-7-6"
          d="M 38.973372,1024.8622 H 26"
-         style="display:inline;fill:none;fill-rule:evenodd;stroke:#a1a2a7;stroke-width:1.18563px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.894118"
-         inkscape:label="grid-right" /><path
-         inkscape:connector-curvature="0"
+         style="display:inline;fill:none;fill-rule:evenodd;stroke:#a1a2a7;stroke-width:1.18563px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.894118" /><path
          id="path4539-4-7-6-3"
          d="M 65,1019.8622 H 39.973369"
-         style="display:inline;fill:none;fill-rule:evenodd;stroke:#a1a2a7;stroke-width:1.18563px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.894118"
-         inkscape:label="grid-right" /><path
+         style="display:inline;fill:none;fill-rule:evenodd;stroke:#a1a2a7;stroke-width:1.18563px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.894118" /><path
          style="display:inline;fill:none;stroke:url(#linearGradient4238);stroke-width:1.18563;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1"
          d="m 24.5,995.86533 c 18.334725,0.11446 42.000815,0 42.000815,0 v 40.99577 H 24.5 Z"
-         id="rect4001-1"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc"
-         inkscape:label="outer_box" /><path
-         inkscape:connector-curvature="0"
+         id="rect4001-1" /><path
          id="path4539"
          d="M 25.000406,1007.8613 H 50.000817"
-         style="fill:none;fill-rule:evenodd;stroke:url(#linearGradient4547);stroke-width:1.18563px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         inkscape:label="box-acent" /><path
-         inkscape:connector-curvature="0"
+         style="fill:none;fill-rule:evenodd;stroke:url(#linearGradient4547);stroke-width:1.18563px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /><path
          id="path4539-4"
          d="m 25.500406,1008.3613 v 24.0009"
-         style="display:inline;fill:none;fill-rule:evenodd;stroke:url(#linearGradient4547-0);stroke-width:1.18563px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         inkscape:label="box-acent" /><path
-         inkscape:connector-curvature="0"
+         style="display:inline;fill:none;fill-rule:evenodd;stroke:url(#linearGradient4547-0);stroke-width:1.18563px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /><path
          id="path4539-6"
          d="m 66.000816,1035.8622 h -40"
-         style="fill:none;fill-rule:evenodd;stroke:url(#linearGradient5890);stroke-width:1.18563px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         inkscape:label="box-acent" /><path
-         inkscape:connector-curvature="0"
+         style="fill:none;fill-rule:evenodd;stroke:url(#linearGradient5890);stroke-width:1.18563px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /><path
          id="path4539-4-6"
          d="m 65.500818,1035.3623 v -26.0001"
-         style="display:inline;fill:none;fill-rule:evenodd;stroke:url(#linearGradient5892);stroke-width:1.18563px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         inkscape:label="box-acent" /><path
+         style="display:inline;fill:none;fill-rule:evenodd;stroke:url(#linearGradient5892);stroke-width:1.18563px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /><path
          style="display:inline;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.18563"
          d="m 25.000405,1001.3613 41,10e-5 c 0,0 -0.06713,3.1803 0,5.9999 h -41 z"
-         id="rect4001-3-4-1"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc"
-         inkscape:label="toolbar" /><path
+         id="rect4001-3-4-1" /><path
          style="display:inline;fill:url(#radialGradient4587);fill-opacity:1;stroke:none;stroke-width:1.18563"
          d="m 51.000405,1003.3613 3,10e-5 c 0,0 -0.005,1.5901 0,2.9999 h -3 z"
-         id="rect4001-3-4-1-1-8"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc"
-         inkscape:label="toolbar-item" /><path
+         id="rect4001-3-4-1-1-8" /><path
          style="display:inline;fill:url(#radialGradient4587-5);fill-opacity:1;stroke:none;stroke-width:1.18563"
          d="m 56.000405,1003.3613 3,10e-5 c 0,0 -0.005,1.5901 0,2.9999 h -3 z"
-         id="rect4001-3-4-1-1-8-5"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc"
-         inkscape:label="toolbar-item" /><path
+         id="rect4001-3-4-1-1-8-5" /><path
          style="display:inline;fill:url(#radialGradient4587-0);fill-opacity:1;stroke:none;stroke-width:1.18563"
          d="m 61.000405,1003.3613 3,10e-5 c 0,0 -0.005,1.5901 0,2.9999 h -3 z"
-         id="rect4001-3-4-1-1-8-3"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc"
-         inkscape:label="toobar-item" /><path
+         id="rect4001-3-4-1-1-8-3" /><path
          style="display:inline;fill:url(#linearGradient4467);fill-opacity:1;stroke:none;stroke-width:1.18563"
          d="m 25.000405,996.36133 41,1e-4 c 0,0 -0.0671,3.1803 0,5.99987 h -41 z"
-         id="rect4001-3-4-1-6"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc"
-         inkscape:label="window-title" /></g></g></svg>
+         id="rect4001-3-4-1-6" /></g></g></svg>
diff --git a/ui/org.eclipse.pde.ui/icons/wizban/schema_wiz.svg b/ui/org.eclipse.pde.ui/icons/wizban/schema_wiz.svg
index e28489edab4..36b50777bf8 100644
--- a/ui/org.eclipse.pde.ui/icons/wizban/schema_wiz.svg
+++ b/ui/org.eclipse.pde.ui/icons/wizban/schema_wiz.svg
@@ -6,14 +6,7 @@
    height="66"
    id="svg2"
    version="1.1"
-   inkscape:version="1.3 (0e150ed, 2023-07-21)"
-   sodipodi:docname="schema_wiz.svg"
-   inkscape:export-filename="/Users/d021678/git/eclipse.jdt.ui/org.eclipse.jdt.ui/icons/full/wizban/newclass_wiz2.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90"
    xml:space="preserve"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:svg="http://www.w3.org/2000/svg"
@@ -21,307 +14,6 @@
    xmlns:cc="http://creativecommons.org/ns#"
    xmlns:dc="http://purl.org/dc/elements/1.1/"><defs
      id="defs4"><linearGradient
-       inkscape:collect="always"
-       id="linearGradient4541"><stop
-         style="stop-color:#a1adb2;stop-opacity:1"
-         offset="0"
-         id="stop4543" /><stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop4545" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       id="linearGradient4972"><stop
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0"
-         id="stop4974" /><stop
-         style="stop-color:#f5f8fd;stop-opacity:1"
-         offset="1"
-         id="stop4976" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       id="linearGradient4964"><stop
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0"
-         id="stop4966" /><stop
-         style="stop-color:#e8eefa;stop-opacity:1"
-         offset="1"
-         id="stop4968" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       id="linearGradient4956"><stop
-         style="stop-color:#fcfdfe;stop-opacity:1"
-         offset="0"
-         id="stop4958" /><stop
-         style="stop-color:#dee6f8;stop-opacity:1"
-         offset="1"
-         id="stop4960" /></linearGradient><filter
-       style="color-interpolation-filters:sRGB"
-       inkscape:label="Drop Shadow"
-       id="filter8854"><feFlood
-         flood-opacity="0.933333"
-         flood-color="rgb(244,248,254)"
-         result="flood"
-         id="feFlood8856" /><feComposite
-         in="flood"
-         in2="SourceGraphic"
-         operator="in"
-         result="composite1"
-         id="feComposite8858" /><feGaussianBlur
-         in="composite1"
-         stdDeviation="1.2"
-         result="blur"
-         id="feGaussianBlur8860" /><feOffset
-         dx="-1"
-         dy="3"
-         result="offset"
-         id="feOffset8862" /><feComposite
-         in="SourceGraphic"
-         in2="offset"
-         operator="over"
-         result="composite2"
-         id="feComposite8864" /></filter><linearGradient
-       id="linearGradient6122"><stop
-         style="stop-color:#c0c0c0;stop-opacity:1"
-         offset="0"
-         id="stop6124" /><stop
-         id="stop6132"
-         offset="0.5"
-         style="stop-color:#adadad;stop-opacity:1" /><stop
-         style="stop-color:#808080;stop-opacity:1"
-         offset="1"
-         id="stop6126" /></linearGradient><linearGradient
-       id="linearGradient7087"><stop
-         style="stop-color:#17325d;stop-opacity:1;"
-         offset="0"
-         id="stop7089" /><stop
-         id="stop7091"
-         offset="0.25"
-         style="stop-color:#b4d0e2;stop-opacity:1" /><stop
-         id="stop7093"
-         offset="0.5"
-         style="stop-color:#b7d2e4;stop-opacity:1" /><stop
-         style="stop-color:#acc9de;stop-opacity:1"
-         offset="0.75"
-         id="stop7095" /><stop
-         style="stop-color:#3e72a7;stop-opacity:1"
-         offset="1"
-         id="stop7097" /></linearGradient><mask
-       id="mask7366"
-       maskUnits="userSpaceOnUse"><path
-         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;display:inline"
-         d="m -16.593048,1040.862 9.990206,0 0,10.0018 -2.983353,3.0385 -5.966213,0 c -0.53033,-0.022 -1.04064,-0.5519 -1.04064,-1.0385 z"
-         id="path7368"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccccc" /></mask><linearGradient
-       id="linearGradient7584-5"><stop
-         id="stop7586-4"
-         offset="0"
-         style="stop-color:#f9cd5f;stop-opacity:1" /><stop
-         id="stop7588-5"
-         offset="1"
-         style="stop-color:#fbf0b4;stop-opacity:1" /></linearGradient><linearGradient
-       id="linearGradient7592-1"><stop
-         id="stop7594-6"
-         offset="0"
-         style="stop-color:#bd8416;stop-opacity:1" /><stop
-         id="stop7596-9"
-         offset="1"
-         style="stop-color:#a66b10;stop-opacity:1" /></linearGradient><linearGradient
-       id="linearGradient10798-1-9-3-7-6-6-6-2-6-7-98-9-4-1"><stop
-         style="stop-color:#5aad60;stop-opacity:1;"
-         offset="0"
-         id="stop10800-5-2-1-8-20-4-0-2-1-9-0-0-1-1" /><stop
-         id="stop10806-6-8-5-3-9-2-2-7-0-4-2-7-8-9"
-         offset="0.5"
-         style="stop-color:#5bb26a;stop-opacity:1;" /><stop
-         style="stop-color:#a4c589;stop-opacity:1"
-         offset="1"
-         id="stop10802-1-5-3-0-4-6-8-5-5-6-69-6-4-0" /></linearGradient><mask
-       maskUnits="userSpaceOnUse"
-       id="mask7366-4"><path
-         sodipodi:nodetypes="ccccccc"
-         inkscape:connector-curvature="0"
-         id="path7368-2"
-         d="m -16.593048,1040.862 9.990206,0 0,10.0018 -2.983353,3.0385 -5.966213,0 c -0.53033,-0.022 -1.04064,-0.5519 -1.04064,-1.0385 z"
-         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;display:inline" /></mask><linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient7087"
-       id="linearGradient9331"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-20,0)"
-       x1="4.7776356"
-       y1="1039.8118"
-       x2="4.7776356"
-       y2="1041.911" /><linearGradient
-       y2="1041.911"
-       x2="4.7776356"
-       y1="1039.8118"
-       x1="4.7776356"
-       gradientTransform="translate(-18,4.7e-5)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient9333"
-       xlink:href="#linearGradient7087"
-       inkscape:collect="always" /><linearGradient
-       y2="1041.911"
-       x2="4.7776356"
-       y1="1039.8118"
-       x1="4.7776356"
-       gradientTransform="translate(-16,4.7e-5)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient9335"
-       xlink:href="#linearGradient7087"
-       inkscape:collect="always" /><linearGradient
-       y2="1041.911"
-       x2="4.7776356"
-       y1="1039.8118"
-       x1="4.7776356"
-       gradientTransform="translate(-14,4.7e-5)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient9337"
-       xlink:href="#linearGradient7087"
-       inkscape:collect="always" /><linearGradient
-       y2="1041.911"
-       x2="4.7776356"
-       y1="1039.8118"
-       x1="4.7776356"
-       gradientTransform="translate(-12,4.7e-5)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient9339"
-       xlink:href="#linearGradient7087"
-       inkscape:collect="always" /><linearGradient
-       gradientTransform="translate(-80,0)"
-       gradientUnits="userSpaceOnUse"
-       y2="1042.7973"
-       x2="163.22012"
-       y1="1042.7973"
-       x1="88.220117"
-       id="linearGradient68073"
-       xlink:href="#linearGradient4956"
-       inkscape:collect="always" /><linearGradient
-       gradientTransform="translate(-80,0)"
-       gradientUnits="userSpaceOnUse"
-       y2="1032.2669"
-       x2="163.22012"
-       y1="1032.2668"
-       x1="94.469681"
-       id="linearGradient68075"
-       xlink:href="#linearGradient4964"
-       inkscape:collect="always" /><linearGradient
-       gradientTransform="translate(-80,0)"
-       gradientUnits="userSpaceOnUse"
-       y2="1032.2668"
-       x2="152.72206"
-       y1="1032.2668"
-       x1="88.220116"
-       id="linearGradient68077"
-       xlink:href="#linearGradient4972"
-       inkscape:collect="always" /><filter
-       id="filter8854-9"
-       inkscape:label="Drop Shadow"
-       style="color-interpolation-filters:sRGB"><feFlood
-         id="feFlood8856-0"
-         result="flood"
-         flood-color="rgb(244,248,254)"
-         flood-opacity="0.933333" /><feComposite
-         id="feComposite8858-2"
-         result="composite1"
-         operator="in"
-         in2="SourceGraphic"
-         in="flood" /><feGaussianBlur
-         id="feGaussianBlur8860-3"
-         result="blur"
-         stdDeviation="1.2"
-         in="composite1" /><feOffset
-         id="feOffset8862-2"
-         result="offset"
-         dy="3"
-         dx="-1" /><feComposite
-         id="feComposite8864-3"
-         result="composite2"
-         operator="over"
-         in2="offset"
-         in="SourceGraphic" /></filter><linearGradient
-       id="linearGradient10798-1-9-3-7-6-8-9-0-9-1"><stop
-         id="stop10800-5-2-1-8-20-6-4-9-8-2"
-         offset="0"
-         style="stop-color:#7564b1;stop-opacity:1" /><stop
-         style="stop-color:#5d4aa1;stop-opacity:1"
-         offset="0.5"
-         id="stop10806-6-8-5-3-9-24-8-4-3-2" /><stop
-         id="stop10802-1-5-3-0-4-8-4-2-9-2"
-         offset="1"
-         style="stop-color:#9283c3;stop-opacity:1" /></linearGradient><linearGradient
-       id="linearGradient7540-2-3-8-7"><stop
-         id="stop7542-8-7-5-3"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.502" /><stop
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0.47623286"
-         id="stop7544-8-2-0-5" /><stop
-         style="stop-color:#ffffff;stop-opacity:0"
-         offset="0.5"
-         id="stop7546-1-7-9-5" /><stop
-         id="stop7548-98-9-2-4"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       id="linearGradient7272-66-4-5-5-5-8"><stop
-         style="stop-color:#8f6c10;stop-opacity:1"
-         offset="0"
-         id="stop7274-6-0-1-7-4-7" /><stop
-         style="stop-color:#c9a645;stop-opacity:1"
-         offset="1"
-         id="stop7276-66-6-3-9-1-4" /></linearGradient><linearGradient
-       y2="1030.3411"
-       x2="-10.159802"
-       y1="1030.3411"
-       x1="-22.453552"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient10540"
-       xlink:href="#linearGradient7540-2-3-8-7"
-       inkscape:collect="always" /><linearGradient
-       y2="1030.3411"
-       x2="-10.159802"
-       y1="1030.3411"
-       x1="-22.453552"
-       gradientTransform="matrix(0,1,-1,0,1014.0344,1046.6478)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient10542"
-       xlink:href="#linearGradient7540-2-3-8-7"
-       inkscape:collect="always" /><linearGradient
-       y2="1023.2569"
-       x2="-15.945988"
-       y1="1037.4661"
-       x1="-15.945988"
-       gradientTransform="matrix(0.95585117,0,0,0.95585117,-0.71992063,45.488394)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient10544"
-       xlink:href="#linearGradient7272-66-4-5-5-5-8"
-       inkscape:collect="always" /><mask
-       id="mask10620"
-       maskUnits="userSpaceOnUse"><path
-         transform="matrix(0.55482947,0,0,0.55482947,-206.96039,787.08655)"
-         d="m 398.75,468.23718 a 10.625,10.625 0 1 1 -21.25,0 10.625,10.625 0 1 1 21.25,0 z"
-         sodipodi:ry="10.625"
-         sodipodi:rx="10.625"
-         sodipodi:cy="468.23718"
-         sodipodi:cx="388.125"
-         id="path10622"
-         style="font-size:13.58917427px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:2.16621375;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline;font-family:Sans"
-         sodipodi:type="arc" /></mask><linearGradient
-       id="linearGradient4528-9-5-7-9-7-3"><stop
-         id="stop4530-0-5-0-5-8-4"
-         offset="0"
-         style="stop-color:#e0c576;stop-opacity:1;" /><stop
-         id="stop4532-7-9-3-3-6-1"
-         offset="1"
-         style="stop-color:#9e7916;stop-opacity:1" /></linearGradient><linearGradient
-       id="linearGradient6281-8-0-1-6-6-4-2-8-0"><stop
-         style="stop-color:#f7f9fb;stop-opacity:1"
-         offset="0"
-         id="stop6283-0-2-2-1-2-0-1-6-0" /><stop
-         style="stop-color:#ffd680;stop-opacity:1"
-         offset="1"
-         id="stop6285-5-0-9-7-6-9-9-1-9" /></linearGradient><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4972-7"
        id="linearGradient4978"
        x1="88.220116"
@@ -330,7 +22,6 @@
        y2="1032.2668"
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-88.220116,-999.2669)" /><linearGradient
-       inkscape:collect="always"
        id="linearGradient4972-7"><stop
          style="stop-color:#b8ccf1;stop-opacity:0.10196079"
          offset="0"
@@ -338,7 +29,6 @@
          style="stop-color:#6e97e2;stop-opacity:0.10196079"
          offset="1"
          id="stop4976-1" /></linearGradient><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4964-3"
        id="linearGradient4970"
        x1="118.38584"
@@ -347,7 +37,6 @@
        y2="1032.2668"
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-88.220117,-999.2669)" /><linearGradient
-       inkscape:collect="always"
        id="linearGradient4964-3"><stop
          style="stop-color:#ffffff;stop-opacity:0.349"
          offset="0"
@@ -355,7 +44,6 @@
          style="stop-color:#91ade6;stop-opacity:1"
          offset="1"
          id="stop4968-1" /></linearGradient><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4956-2"
        id="linearGradient4962"
        x1="88.220116"
@@ -364,7 +52,6 @@
        y2="1042.7972"
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-88.220116,-999.2669)" /><linearGradient
-       inkscape:collect="always"
        id="linearGradient4956-2"><stop
          style="stop-color:#fcfdfe;stop-opacity:0.25641027"
          offset="0"
@@ -372,36 +59,6 @@
          style="stop-color:#98aae7;stop-opacity:0.40392157"
          offset="1"
          id="stop4960-6" /></linearGradient><linearGradient
-       id="linearGradient3827"><stop
-         id="stop3829"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0;" /><stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0.60149658"
-         id="stop3835" /><stop
-         id="stop3831"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" /></linearGradient><linearGradient
-       id="linearGradient10798-1-9-3-7-6-8-9-0-9-1-0"><stop
-         id="stop10800-5-2-1-8-20-6-4-9-8-2-9"
-         offset="0"
-         style="stop-color:#f3faed;stop-opacity:1" /><stop
-         style="stop-color:#e7f4da;stop-opacity:1"
-         offset="0.65917557"
-         id="stop10806-6-8-5-3-9-24-8-4-3-2-4" /><stop
-         id="stop10802-1-5-3-0-4-8-4-2-9-2-5"
-         offset="1"
-         style="stop-color:#67bf1f;stop-opacity:1" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4541"
-       id="linearGradient5885"
-       x1="41"
-       y1="1007.8622"
-       x2="60"
-       y2="1008.3622"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0,1,-1,0,1034.3618,967.36133)" /><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient5517"
        id="linearGradient6406"
        gradientUnits="userSpaceOnUse"
@@ -409,25 +66,21 @@
        y1="1041.0833"
        x2="75.020309"
        y2="1023.2908" /><filter
-       inkscape:collect="always"
        style="color-interpolation-filters:sRGB"
        id="filter4344"
        x="-0.027383926"
        width="1.0547679"
        y="-0.085576576"
        height="1.1711532"><feGaussianBlur
-         inkscape:collect="always"
          stdDeviation="0.57051052"
          id="feGaussianBlur4346" /></filter><linearGradient
-       id="linearGradient5517"
-       inkscape:collect="always"><stop
+       id="linearGradient5517"><stop
          id="stop5519"
          offset="0"
          style="stop-color:#c5c3d4;stop-opacity:0.72941178" /><stop
          id="stop5521"
          offset="1"
          style="stop-color:#c5c3d4;stop-opacity:0.72941178" /></linearGradient><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4994-1"
        id="linearGradient6375-6-4"
        x1="50.702839"
@@ -436,15 +89,13 @@
        y2="1014.1386"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(0.96603716,0,0,1.0044749,-93.045632,-67.42557)" /><linearGradient
-       id="linearGradient4994-1"
-       inkscape:collect="always"><stop
+       id="linearGradient4994-1"><stop
          id="stop4996-8"
          offset="0"
          style="stop-color:#ffffff;stop-opacity:1" /><stop
          id="stop4998-5"
          offset="1"
          style="stop-color:#dbe2eb;stop-opacity:1" /></linearGradient><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4902-9"
        id="linearGradient4238-8"
        gradientUnits="userSpaceOnUse"
@@ -453,15 +104,13 @@
        y1="1038.5779"
        x2="10.544736"
        y2="1052.3228" /><linearGradient
-       id="linearGradient4902-9"
-       inkscape:collect="always"><stop
+       id="linearGradient4902-9"><stop
          id="stop4904-9"
          offset="0"
          style="stop-color:#c7b571;stop-opacity:1;" /><stop
          id="stop4906-9"
          offset="1"
          style="stop-color:#9a9a8f;stop-opacity:1" /></linearGradient><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient6411"
        id="linearGradient4240"
        gradientUnits="userSpaceOnUse"
@@ -470,7 +119,6 @@
        y1="1020.8994"
        x2="47.429596"
        y2="1023.1616" /><linearGradient
-       inkscape:collect="always"
        id="linearGradient6411"><stop
          style="stop-color:#4f605c;stop-opacity:1"
          offset="0"
@@ -478,7 +126,6 @@
          style="stop-color:#dbe2eb;stop-opacity:0"
          offset="1"
          id="stop6415" /></linearGradient><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4258"
        id="linearGradient4264"
        x1="59.220116"
@@ -487,7 +134,6 @@
        y2="1025.2668"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1.7498306,0,0,1.8651544,-151.90129,-956.74278)" /><linearGradient
-       inkscape:collect="always"
        id="linearGradient4258"><stop
          style="stop-color:#f4ae5f;stop-opacity:1;"
          offset="0"
@@ -505,10 +151,8 @@
        x1="51.658199"
        id="linearGradient8769"
        xlink:href="#linearGradient8767"
-       inkscape:collect="always"
        gradientTransform="matrix(2.7500001,0,0,0.99370101,-129.87501,-991.91286)" /><linearGradient
-       id="linearGradient8767"
-       inkscape:collect="always"><stop
+       id="linearGradient8767"><stop
          id="stop8763"
          offset="0"
          style="stop-color:#6a8ec1;stop-opacity:1" /><stop
@@ -522,10 +166,8 @@
        x1="50"
        id="linearGradient8753"
        xlink:href="#linearGradient8751"
-       inkscape:collect="always"
        gradientTransform="matrix(2.7500001,0,0,0.99370101,-129.87501,-991.91286)" /><linearGradient
-       id="linearGradient8751"
-       inkscape:collect="always"><stop
+       id="linearGradient8751"><stop
          id="stop8747"
          offset="0"
          style="stop-color:#2e5d8f;stop-opacity:1" /><stop
@@ -539,17 +181,14 @@
        x1="57"
        id="linearGradient8761"
        xlink:href="#linearGradient8759"
-       inkscape:collect="always"
        gradientTransform="matrix(1.0999999,0,0,1.1281495,-43.249997,-1129.0318)" /><linearGradient
-       id="linearGradient8759"
-       inkscape:collect="always"><stop
+       id="linearGradient8759"><stop
          id="stop8755"
          offset="0"
          style="stop-color:#d3e0eb;stop-opacity:1" /><stop
          id="stop8757"
          offset="1"
          style="stop-color:#5179b5;stop-opacity:1" /></linearGradient><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient2543"
        id="linearGradient2545"
        x1="18.423391"
@@ -557,7 +196,6 @@
        x2="18.436228"
        y2="30.334658"
        gradientUnits="userSpaceOnUse" /><linearGradient
-       inkscape:collect="always"
        id="linearGradient2543"><stop
          style="stop-color:#4f76b0;stop-opacity:1"
          offset="0"
@@ -573,72 +211,25 @@
        width="1.626688"
        x="-0.313344"
        id="filter8835"
-       style="color-interpolation-filters:sRGB"
-       inkscape:collect="always"><feGaussianBlur
+       style="color-interpolation-filters:sRGB"><feGaussianBlur
          id="feGaussianBlur8837"
-         stdDeviation="0.49751501"
-         inkscape:collect="always" /></filter><filter
+         stdDeviation="0.49751501" /></filter><filter
        height="1.2365698"
        y="-0.11828489"
        width="1.8310951"
        x="-0.41554753"
        id="filter8871-1"
-       style="color-interpolation-filters:sRGB"
-       inkscape:collect="always"><feGaussianBlur
+       style="color-interpolation-filters:sRGB"><feGaussianBlur
          id="feGaussianBlur8873-8"
-         stdDeviation="0.53588249"
-         inkscape:collect="always" /></filter></defs><sodipodi:namedview
-     id="base"
-     pagecolor="#bcbcbc"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="6.9866172"
-     inkscape:cx="6.1546238"
-     inkscape:cy="58.683622"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1728"
-     inkscape:window-height="1051"
-     inkscape:window-x="0"
-     inkscape:window-y="38"
-     inkscape:window-maximized="1"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="true"
-     inkscape:snap-bbox="true"
-     inkscape:bbox-nodes="true"
-     inkscape:showpageshadow="2"
-     inkscape:pagecheckerboard="0"
-     inkscape:deskcolor="#d1d1d1"><inkscape:grid
-       type="xygrid"
-       id="grid4112"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       originx="0"
-       originy="0"
-       spacingy="1"
-       spacingx="1"
-       units="px" /></sodipodi:namedview><metadata
+         stdDeviation="0.53588249" /></filter></defs><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" /></cc:Work></rdf:RDF></metadata><g
-     inkscape:groupmode="layer"
      id="layer2"
-     inkscape:label="Background"
-     style="display:inline"
-     sodipodi:insensitive="true"><path
-       sodipodi:nodetypes="cccc"
-       inkscape:connector-curvature="0"
+     style="display:inline"><path
        id="rect4113-1"
        d="M 75,0 75,66 1e-6,66 C 1e-6,41.2048 50.00969,0 75,0 Z"
        style="display:inline;fill:url(#linearGradient4978);fill-opacity:1;stroke:none" /><path
-       sodipodi:nodetypes="cccc"
-       inkscape:connector-curvature="0"
        id="rect4113-1-0"
        d="M 75,21.0607 75,66 1e-6,66 C 10.625001,47.804 43.509694,25.4357 75,21.0607 Z"
        style="display:inline;opacity:0.40400002;fill:url(#linearGradient4962);fill-opacity:1;stroke:none" /><g
@@ -647,85 +238,51 @@
        transform="matrix(0.27903303,0,0,0.27903303,-14.618136,-107.52874)"><g
          style="fill:#737986;fill-opacity:1;stroke:#595e68;stroke-opacity:1"
          id="g13408-8-2" /></g><path
-       sodipodi:nodetypes="cccc"
-       inkscape:connector-curvature="0"
        id="rect4113-1-7"
        d="M 75,4.0000001e-7 75,66 30.000003,66 C 30.000003,46.1545 47.70944,9.2500004 75,4e-7 Z"
        style="display:inline;opacity:0.18399999;fill:url(#linearGradient4970);fill-opacity:1;stroke:none" /></g><g
-     inkscape:label="Foreground"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-986.3622)"><path
-       sodipodi:nodetypes="cccccc"
-       inkscape:connector-curvature="0"
        id="rect4001-3-4-5"
        d="m 61.725004,1022.8099 21.27431,-0.1009 1.654984,3.7793 -20.678174,12.1198 -29.322882,0.1009 z"
        style="display:inline;opacity:0.63;fill:url(#linearGradient6406);fill-opacity:1;stroke:none;filter:url(#filter4344)"
-       transform="matrix(1.4111948,0,0,0.94753947,-45.099875,60.792339)"
-       inkscape:label="shadow" /><g
+       transform="matrix(1.4111948,0,0,0.94753947,-45.099875,60.792339)" /><g
        id="g1"
        transform="matrix(0.96786925,0,0,0.9098568,86.581979,138.61948)"
-       style="stroke-width:1.06563"
-       inkscape:label="paper"><path
-         sodipodi:nodetypes="cccccc"
-         inkscape:connector-curvature="0"
+       style="stroke-width:1.06563"><path
          id="rect4001-3-4-3"
          d="m -75,947.3622 h 23.759832 L -42.08882,957.7551 -42,991.3622 h -33 z"
-         style="display:inline;fill:url(#linearGradient6375-6-4);fill-opacity:1;stroke:none;stroke-width:1.06563"
-         inkscape:label="fll" /><path
-         sodipodi:nodetypes="ccscccc"
-         inkscape:connector-curvature="0"
+         style="display:inline;fill:url(#linearGradient6375-6-4);fill-opacity:1;stroke:none;stroke-width:1.06563" /><path
          id="rect4001-1-3"
          d="m -75.5,946.86218 h 23.755611 c 0,0 7.142644,1.47217 5.331245,4.86412 -0.05617,0.1062 4.913143,5.7835 4.913143,5.7835 v 34.3524 H -75.5 Z"
-         style="display:inline;fill:none;stroke:url(#linearGradient4238-8);stroke-width:1.06563;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1"
-         inkscape:label="border" /><path
-         sodipodi:nodetypes="cccccc"
-         inkscape:connector-curvature="0"
+         style="display:inline;fill:none;stroke:url(#linearGradient4238-8);stroke-width:1.06563;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1" /><path
          id="rect4001-3-9-0"
          d="M -51.17218,947.05565 -42,957.504 v 10.8582 l -13.460738,-9.4981 c 1.765426,-3.8089 3.044415,-7.7874 4.288484,-11.80845 z"
-         style="display:inline;fill:url(#linearGradient4240);fill-opacity:1;stroke:none;stroke-width:1.06563"
-         inkscape:label="shadow" /><path
-         sodipodi:nodetypes="cccc"
+         style="display:inline;fill:url(#linearGradient4240);fill-opacity:1;stroke:none;stroke-width:1.06563" /><path
          id="path5675-4"
          d="m -51.772983,946.25928 c 1.979191,2.74202 4.365887,6.24982 2.596924,12.24302 4.070558,-2.3415 8.288172,-1.0995 8.288172,-1.0995 0,-5.5953 -6.679314,-11.40728 -10.885096,-11.14352 z"
-         style="display:inline;fill:url(#linearGradient4264);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.06563px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         inkscape:connector-curvature="0"
-         inkscape:label="edge" /></g><g
+         style="display:inline;fill:url(#linearGradient4264);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.06563px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /></g><g
        id="g2558-3"
        style="display:inline;stroke-width:0.756541"
-       inkscape:label="plug"
        transform="matrix(1.4361414,0,0,1.2165529,-2.2132118,997.54893)"><path
          id="path8722-7"
          style="display:inline;opacity:1;fill:url(#linearGradient8769);fill-opacity:1;stroke:url(#linearGradient8753);stroke-width:0.756541;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="M 4.9119978,26.270258 14.5,26.269889 v -4.976795 l -9.5880022,3.7e-4 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc"
-         inkscape:label="cord" /><path
-         sodipodi:nodetypes="csssscsscccsssscsscc"
+         d="M 4.9119978,26.270258 14.5,26.269889 v -4.976795 l -9.5880022,3.7e-4 z" /><path
          id="rect8645-3"
          style="display:inline;opacity:1;fill:url(#linearGradient8761);fill-opacity:1;stroke:#4d73ae;stroke-width:0.756541;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="M 25.499998,23.781495 25.5,15.413559 C 25.5,13.799403 24.568942,12.5 23.412427,12.5 h -2.424855 c -1.156515,0 -2.483072,1.299403 -2.483072,2.913559 v 1.599039 h -2.264856 c -0.963763,0 -1.739644,0.794104 -1.739644,1.780446 v 1.468512 3.519375 m 10.999998,5.64e-4 2e-6,8.367936 c 0,1.614156 -0.931058,2.913559 -2.087573,2.913559 h -2.424855 c -1.156515,0 -2.483072,-1.299403 -2.483072,-2.913559 V 30.550392 H 16.239644 C 15.275881,30.550392 14.5,29.756288 14.5,28.769946 v -1.468512 -3.519375"
-         inkscape:connector-curvature="0"
-         inkscape:label="plug" /><path
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
+         d="M 25.499998,23.781495 25.5,15.413559 C 25.5,13.799403 24.568942,12.5 23.412427,12.5 h -2.424855 c -1.156515,0 -2.483072,1.299403 -2.483072,2.913559 v 1.599039 h -2.264856 c -0.963763,0 -1.739644,0.794104 -1.739644,1.780446 v 1.468512 3.519375 m 10.999998,5.64e-4 2e-6,8.367936 c 0,1.614156 -0.931058,2.913559 -2.087573,2.913559 h -2.424855 c -1.156515,0 -2.483072,-1.299403 -2.483072,-2.913559 V 30.550392 H 16.239644 C 15.275881,30.550392 14.5,29.756288 14.5,28.769946 v -1.468512 -3.519375" /><path
          id="path2537"
          d="M 18.51661,16.539741 18.5464,30.705846"
-         style="display:inline;fill:none;stroke:url(#linearGradient2545);stroke-width:0.756541px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         inkscape:label="line" /><ellipse
+         style="display:inline;fill:none;stroke:url(#linearGradient2545);stroke-width:0.756541px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /><ellipse
          transform="matrix(1.029538,0,0,1.1281495,-39.470994,-1128.0797)"
          style="opacity:0.828;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.701988;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter8835)"
          id="path8817"
          cx="59.521938"
          cy="1014.637"
          rx="1.9053118"
-         ry="1.9815242"
-         inkscape:label="highlight" /><path
+         ry="1.9815242" /><path
          transform="matrix(1.029538,0,0,1.1281495,-39.928294,-1128.6206)"
          style="display:inline;opacity:0.485;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.701988px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter8871-1)"
          d="m 53.924652,1016.631 -0.152427,10.8222 c 2.375507,-3.3036 3.484206,-4.2052 2.972286,-9.2217 0.305009,-1.654 -1.117834,-1.7529 -2.819859,-1.6005 z"
-         id="path8861-7"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccc"
-         inkscape:label="highlight" /></g></g></svg>
+         id="path8861-7" /></g></g></svg>
diff --git a/ui/org.eclipse.pde.ui/icons/wizban/target_wiz.svg b/ui/org.eclipse.pde.ui/icons/wizban/target_wiz.svg
index 410066e26b0..4db360842b2 100644
--- a/ui/org.eclipse.pde.ui/icons/wizban/target_wiz.svg
+++ b/ui/org.eclipse.pde.ui/icons/wizban/target_wiz.svg
@@ -6,13 +6,6 @@
    height="66"
    id="svg2"
    version="1.1"
-   inkscape:version="1.3 (0e150ed, 2023-07-21)"
-   sodipodi:docname="target_wiz.svg"
-   inkscape:export-filename="/Users/d021678/git/eclipse.jdt.ui/org.eclipse.jdt.ui/icons/full/wizban/newclass_wiz2.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:svg="http://www.w3.org/2000/svg"
@@ -22,7 +15,6 @@
   <defs
      id="defs4">
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient8785">
       <stop
          style="stop-color:#bb8d2d;stop-opacity:1"
@@ -38,7 +30,6 @@
          id="stop8783" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient8777">
       <stop
          style="stop-color:#fbeaab;stop-opacity:1;"
@@ -50,7 +41,6 @@
          id="stop8775" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient8767">
       <stop
          style="stop-color:#6a8ec1;stop-opacity:1"
@@ -62,7 +52,6 @@
          id="stop8765" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient8759">
       <stop
          style="stop-color:#d3e0eb;stop-opacity:1"
@@ -74,7 +63,6 @@
          id="stop8757" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient8751">
       <stop
          style="stop-color:#2e5d8f;stop-opacity:1"
@@ -86,7 +74,6 @@
          id="stop8749" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient8490">
       <stop
          style="stop-color:#fdfefd;stop-opacity:1"
@@ -98,7 +85,6 @@
          id="stop8488" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient8458">
       <stop
          style="stop-color:#c1cee6;stop-opacity:1"
@@ -110,393 +96,6 @@
          id="stop8456" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       id="linearGradient4972">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0"
-         id="stop4974" />
-      <stop
-         style="stop-color:#f5f8fd;stop-opacity:1"
-         offset="1"
-         id="stop4976" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient4964">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0"
-         id="stop4966" />
-      <stop
-         style="stop-color:#e8eefa;stop-opacity:1"
-         offset="1"
-         id="stop4968" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient4956">
-      <stop
-         style="stop-color:#fcfdfe;stop-opacity:1"
-         offset="0"
-         id="stop4958" />
-      <stop
-         style="stop-color:#dee6f8;stop-opacity:1"
-         offset="1"
-         id="stop4960" />
-    </linearGradient>
-    <filter
-       style="color-interpolation-filters:sRGB"
-       inkscape:label="Drop Shadow"
-       id="filter8854">
-      <feFlood
-         flood-opacity="0.933333"
-         flood-color="rgb(244,248,254)"
-         result="flood"
-         id="feFlood8856" />
-      <feComposite
-         in="flood"
-         in2="SourceGraphic"
-         operator="in"
-         result="composite1"
-         id="feComposite8858" />
-      <feGaussianBlur
-         in="composite1"
-         stdDeviation="1.2"
-         result="blur"
-         id="feGaussianBlur8860" />
-      <feOffset
-         dx="-1"
-         dy="3"
-         result="offset"
-         id="feOffset8862" />
-      <feComposite
-         in="SourceGraphic"
-         in2="offset"
-         operator="over"
-         result="composite2"
-         id="feComposite8864" />
-    </filter>
-    <linearGradient
-       id="linearGradient6122">
-      <stop
-         style="stop-color:#c0c0c0;stop-opacity:1"
-         offset="0"
-         id="stop6124" />
-      <stop
-         id="stop6132"
-         offset="0.5"
-         style="stop-color:#adadad;stop-opacity:1" />
-      <stop
-         style="stop-color:#808080;stop-opacity:1"
-         offset="1"
-         id="stop6126" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient7087">
-      <stop
-         style="stop-color:#17325d;stop-opacity:1;"
-         offset="0"
-         id="stop7089" />
-      <stop
-         id="stop7091"
-         offset="0.25"
-         style="stop-color:#b4d0e2;stop-opacity:1" />
-      <stop
-         id="stop7093"
-         offset="0.5"
-         style="stop-color:#b7d2e4;stop-opacity:1" />
-      <stop
-         style="stop-color:#acc9de;stop-opacity:1"
-         offset="0.75"
-         id="stop7095" />
-      <stop
-         style="stop-color:#3e72a7;stop-opacity:1"
-         offset="1"
-         id="stop7097" />
-    </linearGradient>
-    <mask
-       id="mask7366"
-       maskUnits="userSpaceOnUse">
-      <path
-         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;display:inline"
-         d="m -16.593048,1040.862 9.990206,0 0,10.0018 -2.983353,3.0385 -5.966213,0 c -0.53033,-0.022 -1.04064,-0.5519 -1.04064,-1.0385 z"
-         id="path7368"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccccc" />
-    </mask>
-    <linearGradient
-       id="linearGradient7584-5">
-      <stop
-         id="stop7586-4"
-         offset="0"
-         style="stop-color:#f9cd5f;stop-opacity:1" />
-      <stop
-         id="stop7588-5"
-         offset="1"
-         style="stop-color:#fbf0b4;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient7592-1">
-      <stop
-         id="stop7594-6"
-         offset="0"
-         style="stop-color:#bd8416;stop-opacity:1" />
-      <stop
-         id="stop7596-9"
-         offset="1"
-         style="stop-color:#a66b10;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10798-1-9-3-7-6-6-6-2-6-7-98-9-4-1">
-      <stop
-         style="stop-color:#5aad60;stop-opacity:1;"
-         offset="0"
-         id="stop10800-5-2-1-8-20-4-0-2-1-9-0-0-1-1" />
-      <stop
-         id="stop10806-6-8-5-3-9-2-2-7-0-4-2-7-8-9"
-         offset="0.5"
-         style="stop-color:#5bb26a;stop-opacity:1;" />
-      <stop
-         style="stop-color:#a4c589;stop-opacity:1"
-         offset="1"
-         id="stop10802-1-5-3-0-4-6-8-5-5-6-69-6-4-0" />
-    </linearGradient>
-    <mask
-       maskUnits="userSpaceOnUse"
-       id="mask7366-4">
-      <path
-         sodipodi:nodetypes="ccccccc"
-         inkscape:connector-curvature="0"
-         id="path7368-2"
-         d="m -16.593048,1040.862 9.990206,0 0,10.0018 -2.983353,3.0385 -5.966213,0 c -0.53033,-0.022 -1.04064,-0.5519 -1.04064,-1.0385 z"
-         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;display:inline" />
-    </mask>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient7087"
-       id="linearGradient9331"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-20,0)"
-       x1="4.7776356"
-       y1="1039.8118"
-       x2="4.7776356"
-       y2="1041.911" />
-    <linearGradient
-       y2="1041.911"
-       x2="4.7776356"
-       y1="1039.8118"
-       x1="4.7776356"
-       gradientTransform="translate(-18,4.7e-5)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient9333"
-       xlink:href="#linearGradient7087"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="1041.911"
-       x2="4.7776356"
-       y1="1039.8118"
-       x1="4.7776356"
-       gradientTransform="translate(-16,4.7e-5)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient9335"
-       xlink:href="#linearGradient7087"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="1041.911"
-       x2="4.7776356"
-       y1="1039.8118"
-       x1="4.7776356"
-       gradientTransform="translate(-14,4.7e-5)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient9337"
-       xlink:href="#linearGradient7087"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="1041.911"
-       x2="4.7776356"
-       y1="1039.8118"
-       x1="4.7776356"
-       gradientTransform="translate(-12,4.7e-5)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient9339"
-       xlink:href="#linearGradient7087"
-       inkscape:collect="always" />
-    <linearGradient
-       gradientTransform="translate(-80,0)"
-       gradientUnits="userSpaceOnUse"
-       y2="1042.7973"
-       x2="163.22012"
-       y1="1042.7973"
-       x1="88.220117"
-       id="linearGradient68073"
-       xlink:href="#linearGradient4956"
-       inkscape:collect="always" />
-    <linearGradient
-       gradientTransform="translate(-80,0)"
-       gradientUnits="userSpaceOnUse"
-       y2="1032.2669"
-       x2="163.22012"
-       y1="1032.2668"
-       x1="94.469681"
-       id="linearGradient68075"
-       xlink:href="#linearGradient4964"
-       inkscape:collect="always" />
-    <linearGradient
-       gradientTransform="translate(-80,0)"
-       gradientUnits="userSpaceOnUse"
-       y2="1032.2668"
-       x2="152.72206"
-       y1="1032.2668"
-       x1="88.220116"
-       id="linearGradient68077"
-       xlink:href="#linearGradient4972"
-       inkscape:collect="always" />
-    <filter
-       id="filter8854-9"
-       inkscape:label="Drop Shadow"
-       style="color-interpolation-filters:sRGB">
-      <feFlood
-         id="feFlood8856-0"
-         result="flood"
-         flood-color="rgb(244,248,254)"
-         flood-opacity="0.933333" />
-      <feComposite
-         id="feComposite8858-2"
-         result="composite1"
-         operator="in"
-         in2="SourceGraphic"
-         in="flood" />
-      <feGaussianBlur
-         id="feGaussianBlur8860-3"
-         result="blur"
-         stdDeviation="1.2"
-         in="composite1" />
-      <feOffset
-         id="feOffset8862-2"
-         result="offset"
-         dy="3"
-         dx="-1" />
-      <feComposite
-         id="feComposite8864-3"
-         result="composite2"
-         operator="over"
-         in2="offset"
-         in="SourceGraphic" />
-    </filter>
-    <linearGradient
-       id="linearGradient10798-1-9-3-7-6-8-9-0-9-1">
-      <stop
-         id="stop10800-5-2-1-8-20-6-4-9-8-2"
-         offset="0"
-         style="stop-color:#7564b1;stop-opacity:1" />
-      <stop
-         style="stop-color:#5d4aa1;stop-opacity:1"
-         offset="0.5"
-         id="stop10806-6-8-5-3-9-24-8-4-3-2" />
-      <stop
-         id="stop10802-1-5-3-0-4-8-4-2-9-2"
-         offset="1"
-         style="stop-color:#9283c3;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient7540-2-3-8-7">
-      <stop
-         id="stop7542-8-7-5-3"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.502" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0.47623286"
-         id="stop7544-8-2-0-5" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0"
-         offset="0.5"
-         id="stop7546-1-7-9-5" />
-      <stop
-         id="stop7548-98-9-2-4"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient7272-66-4-5-5-5-8">
-      <stop
-         style="stop-color:#8f6c10;stop-opacity:1"
-         offset="0"
-         id="stop7274-6-0-1-7-4-7" />
-      <stop
-         style="stop-color:#c9a645;stop-opacity:1"
-         offset="1"
-         id="stop7276-66-6-3-9-1-4" />
-    </linearGradient>
-    <linearGradient
-       y2="1030.3411"
-       x2="-10.159802"
-       y1="1030.3411"
-       x1="-22.453552"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient10540"
-       xlink:href="#linearGradient7540-2-3-8-7"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="1030.3411"
-       x2="-10.159802"
-       y1="1030.3411"
-       x1="-22.453552"
-       gradientTransform="matrix(0,1,-1,0,1014.0344,1046.6478)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient10542"
-       xlink:href="#linearGradient7540-2-3-8-7"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="1023.2569"
-       x2="-15.945988"
-       y1="1037.4661"
-       x1="-15.945988"
-       gradientTransform="matrix(0.95585117,0,0,0.95585117,-0.71992063,45.488394)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient10544"
-       xlink:href="#linearGradient7272-66-4-5-5-5-8"
-       inkscape:collect="always" />
-    <mask
-       id="mask10620"
-       maskUnits="userSpaceOnUse">
-      <path
-         transform="matrix(0.55482947,0,0,0.55482947,-206.96039,787.08655)"
-         d="m 398.75,468.23718 a 10.625,10.625 0 1 1 -21.25,0 10.625,10.625 0 1 1 21.25,0 z"
-         sodipodi:ry="10.625"
-         sodipodi:rx="10.625"
-         sodipodi:cy="468.23718"
-         sodipodi:cx="388.125"
-         id="path10622"
-         style="font-size:13.58917427px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:2.16621375;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline;font-family:Sans"
-         sodipodi:type="arc" />
-    </mask>
-    <linearGradient
-       id="linearGradient4528-9-5-7-9-7-3">
-      <stop
-         id="stop4530-0-5-0-5-8-4"
-         offset="0"
-         style="stop-color:#e0c576;stop-opacity:1;" />
-      <stop
-         id="stop4532-7-9-3-3-6-1"
-         offset="1"
-         style="stop-color:#9e7916;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient6281-8-0-1-6-6-4-2-8-0">
-      <stop
-         style="stop-color:#f7f9fb;stop-opacity:1"
-         offset="0"
-         id="stop6283-0-2-2-1-2-0-1-6-0" />
-      <stop
-         style="stop-color:#ffd680;stop-opacity:1"
-         offset="1"
-         id="stop6285-5-0-9-7-6-9-9-1-9" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4972-7"
        id="linearGradient4978"
        x1="88.220116"
@@ -506,7 +105,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-88.220116,-999.2669)" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4972-7">
       <stop
          style="stop-color:#b8ccf1;stop-opacity:0.10196079"
@@ -518,7 +116,6 @@
          id="stop4976-1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4964-3"
        id="linearGradient4970"
        x1="118.38584"
@@ -528,7 +125,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-88.220117,-999.2669)" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4964-3">
       <stop
          style="stop-color:#ffffff;stop-opacity:0.349"
@@ -540,7 +136,6 @@
          id="stop4968-1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4956-2"
        id="linearGradient4962"
        x1="88.220116"
@@ -550,7 +145,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-88.220116,-999.2669)" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4956-2">
       <stop
          style="stop-color:#fcfdfe;stop-opacity:0.25641027"
@@ -562,37 +156,6 @@
          id="stop4960-6" />
     </linearGradient>
     <linearGradient
-       id="linearGradient3827">
-      <stop
-         id="stop3829"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0.60149658"
-         id="stop3835" />
-      <stop
-         id="stop3831"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10798-1-9-3-7-6-8-9-0-9-1-0">
-      <stop
-         id="stop10800-5-2-1-8-20-6-4-9-8-2-9"
-         offset="0"
-         style="stop-color:#f3faed;stop-opacity:1" />
-      <stop
-         style="stop-color:#e7f4da;stop-opacity:1"
-         offset="0.65917557"
-         id="stop10806-6-8-5-3-9-24-8-4-3-2-4" />
-      <stop
-         id="stop10802-1-5-3-0-4-8-4-2-9-2-5"
-         offset="1"
-         style="stop-color:#67bf1f;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4994"
        id="linearGradient6375-6"
        x1="50.702839"
@@ -602,8 +165,7 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(0.95292719,0,0,0.9400082,-4.3529074,51.703107)" />
     <linearGradient
-       id="linearGradient4994"
-       inkscape:collect="always">
+       id="linearGradient4994">
       <stop
          id="stop4996"
          offset="0"
@@ -614,7 +176,6 @@
          style="stop-color:#dbe2eb;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4902"
        id="linearGradient4238"
        gradientUnits="userSpaceOnUse"
@@ -624,8 +185,7 @@
        x2="10.544736"
        y2="1052.3228" />
     <linearGradient
-       id="linearGradient4902"
-       inkscape:collect="always">
+       id="linearGradient4902">
       <stop
          id="stop4904"
          offset="0"
@@ -636,7 +196,6 @@
          style="stop-color:#9a9a8f;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient6411"
        id="linearGradient4240"
        gradientUnits="userSpaceOnUse"
@@ -646,7 +205,6 @@
        x2="47.429596"
        y2="1023.1616" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient6411">
       <stop
          style="stop-color:#4f605c;stop-opacity:1"
@@ -658,7 +216,6 @@
          id="stop6415" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4258"
        id="linearGradient4264"
        x1="59.220116"
@@ -668,7 +225,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1.7683014,0,0,1.8268252,-65.185236,-863.52445)" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4258">
       <stop
          style="stop-color:#f4ae5f;stop-opacity:1;"
@@ -689,15 +245,12 @@
        width="1.0967932"
        x="-0.048396592"
        id="filter4285-9"
-       style="color-interpolation-filters:sRGB"
-       inkscape:collect="always">
+       style="color-interpolation-filters:sRGB">
       <feGaussianBlur
          id="feGaussianBlur4287-9"
-         stdDeviation="0.10000000000000001"
-         inkscape:collect="always" />
+         stdDeviation="0.10000000000000001" />
     </filter>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4308"
        id="linearGradient6406"
        gradientUnits="userSpaceOnUse"
@@ -706,7 +259,6 @@
        x2="75.020309"
        y2="1023.2908" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4308">
       <stop
          style="stop-color:#d5d2d9;stop-opacity:1"
@@ -718,7 +270,6 @@
          id="stop4312" />
     </linearGradient>
     <filter
-       inkscape:collect="always"
        style="color-interpolation-filters:sRGB"
        id="filter4344"
        x="-0.027383926"
@@ -726,12 +277,10 @@
        y="-0.085576576"
        height="1.1711532">
       <feGaussianBlur
-         inkscape:collect="always"
          stdDeviation="0.57051052"
          id="feGaussianBlur4346" />
     </filter>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient8458"
        id="linearGradient8460"
        x1="44"
@@ -740,7 +289,6 @@
        y2="1038.3622"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient8490"
        id="linearGradient8492"
        x1="89"
@@ -750,7 +298,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-52.5,-34.49997)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient8490"
        id="linearGradient8492-0"
        x1="89"
@@ -760,7 +307,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(0.41176473,0,0,0.41176481,3.676469,589.53652)" />
     <filter
-       inkscape:collect="always"
        style="color-interpolation-filters:sRGB"
        id="filter8641"
        x="-0.096127967"
@@ -768,21 +314,10 @@
        y="-0.1596458"
        height="1.3192916">
       <feGaussianBlur
-         inkscape:collect="always"
          stdDeviation="0.92592472"
          id="feGaussianBlur8643" />
     </filter>
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8751"
-       id="linearGradient8753"
-       x1="50"
-       y1="1019.3622"
-       x2="50"
-       y2="1024.3622"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient8759"
        id="linearGradient8761"
        x1="57"
@@ -790,35 +325,7 @@
        x2="62"
        y2="1030.3622"
        gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8767"
-       id="linearGradient8769"
-       x1="51.658199"
-       y1="1020.4141"
-       x2="51.933025"
-       y2="1023.234"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8777"
-       id="linearGradient8779"
-       x1="63.98344"
-       y1="1016.2225"
-       x2="68.598152"
-       y2="1026.0538"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8785"
-       id="linearGradient8787"
-       x1="68.47998"
-       y1="1015.6127"
-       x2="67.683601"
-       y2="1028.4165"
-       gradientUnits="userSpaceOnUse" />
     <filter
-       inkscape:collect="always"
        style="color-interpolation-filters:sRGB"
        id="filter8813"
        x="-0.53770523"
@@ -826,12 +333,10 @@
        y="-0.24307477"
        height="1.4861495">
       <feGaussianBlur
-         inkscape:collect="always"
          stdDeviation="1.1269452"
          id="feGaussianBlur8815" />
     </filter>
     <filter
-       inkscape:collect="always"
        style="color-interpolation-filters:sRGB"
        id="filter8835"
        x="-0.313344"
@@ -839,12 +344,10 @@
        y="-0.30129232"
        height="1.6025846">
       <feGaussianBlur
-         inkscape:collect="always"
          stdDeviation="0.49751501"
          id="feGaussianBlur8837" />
     </filter>
     <filter
-       inkscape:collect="always"
        style="color-interpolation-filters:sRGB"
        id="filter8871"
        x="-0.41554753"
@@ -852,12 +355,10 @@
        y="-0.11828489"
        height="1.2365698">
       <feGaussianBlur
-         inkscape:collect="always"
          stdDeviation="0.53588249"
          id="feGaussianBlur8873" />
     </filter>
     <filter
-       inkscape:collect="always"
        style="color-interpolation-filters:sRGB"
        id="filter8881"
        x="-0.49425547"
@@ -865,12 +366,10 @@
        y="-0.77112415"
        height="2.5422483">
       <feGaussianBlur
-         inkscape:collect="always"
          stdDeviation="0.61211194"
          id="feGaussianBlur8883" />
     </filter>
     <filter
-       inkscape:collect="always"
        style="color-interpolation-filters:sRGB"
        id="filter8996"
        x="-0.088669853"
@@ -878,12 +377,10 @@
        y="-0.11527081"
        height="1.2305416">
       <feGaussianBlur
-         inkscape:collect="always"
          stdDeviation="0.5635"
          id="feGaussianBlur8998" />
     </filter>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient8767"
        id="linearGradient9006"
        gradientUnits="userSpaceOnUse"
@@ -892,7 +389,6 @@
        x2="51.933025"
        y2="1023.234" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient8751"
        id="linearGradient9008"
        gradientUnits="userSpaceOnUse"
@@ -901,7 +397,6 @@
        x2="50"
        y2="1024.3622" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient8777"
        id="linearGradient9010"
        gradientUnits="userSpaceOnUse"
@@ -910,7 +405,6 @@
        x2="68.598152"
        y2="1026.0538" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient8785"
        id="linearGradient9012"
        gradientUnits="userSpaceOnUse"
@@ -919,7 +413,6 @@
        x2="67.683601"
        y2="1028.4165" />
     <filter
-       inkscape:collect="always"
        style="color-interpolation-filters:sRGB"
        id="filter8871-1"
        x="-0.41554753"
@@ -927,55 +420,10 @@
        y="-0.11828489"
        height="1.2365698">
       <feGaussianBlur
-         inkscape:collect="always"
          stdDeviation="0.53588249"
          id="feGaussianBlur8873-8" />
     </filter>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#bcbcbc"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="9.2780981"
-     inkscape:cx="36.699332"
-     inkscape:cy="43.435626"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1728"
-     inkscape:window-height="1051"
-     inkscape:window-x="355"
-     inkscape:window-y="223"
-     inkscape:window-maximized="0"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="false"
-     inkscape:snap-bbox="true"
-     inkscape:bbox-nodes="true"
-     inkscape:object-nodes="false"
-     inkscape:snap-bbox-midpoints="false"
-     inkscape:snap-bbox-edge-midpoints="false"
-     inkscape:snap-object-midpoints="true"
-     inkscape:snap-others="false"
-     inkscape:showpageshadow="2"
-     inkscape:pagecheckerboard="0"
-     inkscape:deskcolor="#d1d1d1">
-    <inkscape:grid
-       type="xygrid"
-       id="grid4112"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       originx="0"
-       originy="0"
-       spacingy="1"
-       spacingx="1"
-       units="px" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -988,20 +436,13 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:groupmode="layer"
      id="layer2"
-     inkscape:label="Background"
-     style="display:inline"
-     sodipodi:insensitive="true">
+     style="display:inline">
     <path
-       sodipodi:nodetypes="cccc"
-       inkscape:connector-curvature="0"
        id="rect4113-1"
        d="M 75,0 75,66 1e-6,66 C 1e-6,41.2048 50.00969,0 75,0 Z"
        style="display:inline;fill:url(#linearGradient4978);fill-opacity:1;stroke:none" />
     <path
-       sodipodi:nodetypes="cccc"
-       inkscape:connector-curvature="0"
        id="rect4113-1-0"
        d="M 75,21.0607 75,66 1e-6,66 C 10.625001,47.804 43.509694,25.4357 75,21.0607 Z"
        style="display:inline;opacity:0.40400002;fill:url(#linearGradient4962);fill-opacity:1;stroke:none" />
@@ -1014,67 +455,40 @@
          id="g13408-8-2" />
     </g>
     <path
-       sodipodi:nodetypes="cccc"
-       inkscape:connector-curvature="0"
        id="rect4113-1-7"
        d="M 75,4.0000001e-7 75,66 30.000003,66 C 30.000003,46.1545 47.70944,9.2500004 75,4e-7 Z"
        style="display:inline;opacity:0.18399999;fill:url(#linearGradient4970);fill-opacity:1;stroke:none" />
   </g>
   <g
-     inkscape:label="Foreground"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-986.3622)">
     <path
-       sodipodi:nodetypes="cccccc"
-       inkscape:connector-curvature="0"
        id="rect4001-3-4-5"
        d="m 61.725004,1022.8099 21.27431,-0.1009 1.654984,3.7793 -20.678174,12.1198 -29.322882,0.1009 z"
        style="display:inline;opacity:0.62999998;fill:url(#linearGradient6406);fill-opacity:1;stroke:none;filter:url(#filter4344)"
        transform="matrix(1.0651476,0,0,0.83720885,-20.627749,171.5995)" />
     <path
-       sodipodi:nodetypes="cccccc"
-       inkscape:connector-curvature="0"
        id="rect4001-3-4"
        d="m 13.663391,1000.9751 23.221829,0.3871 9.027157,9.726 0.08762,31.1905 -32.37689,0.2595 z"
        style="display:inline;fill:url(#linearGradient6375-6);fill-opacity:1;stroke:none;stroke-width:1" />
     <path
-       sodipodi:nodetypes="ccscccc"
-       inkscape:connector-curvature="0"
        id="rect4001-1"
        d="m 13.5,1000.8622 h 23.04854 c 0,0 6.930048,1.3741 5.172564,4.5397 -0.0545,0.099 4.766907,5.3979 4.766907,5.3979 v 32.0624 H 13.5 Z"
        style="fill:none;stroke:url(#linearGradient4238);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1" />
     <path
-       sodipodi:nodetypes="cccccc"
-       inkscape:connector-curvature="0"
        id="rect4001-3-9-0"
        d="m 37.370949,1001.3622 8.629053,9.3172 v 9.6828 l -12.663665,-8.4699 c 1.660888,-3.3965 2.864141,-6.9443 4.034543,-10.5301 z"
        style="display:inline;fill:url(#linearGradient4240);fill-opacity:1;stroke:none;stroke-width:1.00000012" />
     <path
-       sodipodi:nodetypes="cccc"
        id="path5675-4"
        d="m 36,1000.3707 c 2.000085,2.6856 4.411975,6.1214 2.624338,11.9915 4.113526,-2.2935 8.37566,-1.077 8.37566,-1.077 0,-5.4803 -6.749821,-11.1729 -10.999998,-10.9145 z"
-       style="display:inline;fill:url(#linearGradient4264);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       inkscape:connector-curvature="0" />
+       style="display:inline;fill:url(#linearGradient4264);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
     <path
-       sodipodi:type="star"
        style="display:inline;opacity:0.9;fill:#ffffff;fill-opacity:0.81584156;stroke:none;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;filter:url(#filter4285-9)"
        id="path4252-6"
-       sodipodi:sides="4"
-       sodipodi:cx="4.7729707"
-       sodipodi:cy="1041.2474"
-       sodipodi:r1="3.3255017"
-       sodipodi:r2="0.49178758"
-       sodipodi:arg1="2.432965"
-       sodipodi:arg2="-3.0800218"
-       inkscape:flatsided="false"
-       inkscape:rounded="0"
-       inkscape:randomized="-0.017554997"
        d="m 2.2999628,1043.3702 1.9823895,-2.1047 -1.6734053,-2.5419 2.1987064,2.0209 2.4513363,-1.6427 -2.0383649,2.1623 1.7419712,2.4882 -2.2030799,-2.0431 z"
-       transform="matrix(0,0.85573635,-0.89764149,0,975.36983,1001.8184)"
-       inkscape:transform-center-x="-0.020119543"
-       inkscape:transform-center-y="0.26977445" />
+       transform="matrix(0,0.85573635,-0.89764149,0,975.36983,1001.8184)" />
     <g
        id="g8557"
        transform="translate(-14,2.5936079e-5)">
@@ -1103,43 +517,32 @@
     <path
        style="opacity:0.52100004;fill:#ffffff;fill-opacity:0.81584156;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter8641)"
        d="m 17.207763,1028.749 c 7.306631,-6.772 14.405975,-7.9839 22.922194,-6.4311 -4.27551,-7.06 -6.952168,-8.5211 -15.538905,-6.8744 -4.413263,2.3533 -8.532831,6.1883 -7.383289,13.3055 z"
-       id="path8579"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccc" />
+       id="path8579" />
     <g
        id="g9048"
        transform="translate(-43.990779,-20.979869)">
       <path
-         inkscape:connector-curvature="0"
          id="path8791"
          d="m 53.577367,1026.9835 -0.152425,-8.8407 0.91455,-1.2194 3.124711,-0.076 0.07621,-0.9908 h 0.91455 l -0.07621,1.9054 -3.048499,1.2194 -0.152425,4.9538 z"
          style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter8813)" />
       <path
          transform="matrix(1.0486083,0,0,1.0499923,-3.0656229,-51.085241)"
-         inkscape:connector-curvature="0"
          d="m 70.499999,1023.8622 -10e-7,0.7084 c 0,0.7154 -0.630695,1.3084 -1.581494,1.2913 -0.950799,-0.017 -1.418505,0 -1.418505,0 v 0.1348 c 0,1.0333 -0.846416,1.865 -1.897793,1.8652 l -1.204207,2e-4 c -0.993831,2e-4 -0.897896,0.3654 -0.897896,-1.9999 v -8 c 0,-2.3654 -0.149817,-2 0.897896,-2 h 1.204207 c 1.051377,0 1.897793,0.8319 1.897793,1.8652 v 0.1348 h 1.418506 c 0.876148,0 1.581494,0.5759 1.581494,1.2913 v 1.7087 z m 0.01,-3 h 3.99 v 3 h -3.7903 m -8.209702,-2 2e-6,-7.4174 c 0,-1.4308 -0.846416,-2.5826 -1.897793,-2.5826 h -2.204414 c -1.051377,0 -1.897793,1.1518 -1.897793,2.5826 v 1.4174 h -2.418506 c -0.876148,0 -1.581494,0.7039 -1.581494,1.5782 v 1.3017 3.1196 m 9.999998,5e-4 2e-6,7.4174 c 0,1.4308 -0.846416,2.5826 -1.897793,2.5826 h -2.204414 c -1.051377,0 -1.897793,-1.1518 -1.897793,-2.5826 v -1.4174 h -2.418506 c -0.876148,0 -1.581494,-0.7039 -1.581494,-1.5782 v -1.3017 -3.1196 m -4,-5e-4 v 2 h 4 v -4 h -4 v 2"
          style="display:inline;opacity:1;fill:#fdf6d8;fill-opacity:0.88627451;stroke:#f9f2d9;stroke-width:1.90603244;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.92941176;filter:url(#filter8996)"
          id="rect8645-2-5-3" />
       <path
-         sodipodi:nodetypes="cccccc"
-         inkscape:connector-curvature="0"
          d="m 48.5,1021.8622 v 2 h 4 v -4 h -4 v 2"
          style="display:inline;opacity:1;fill:url(#linearGradient9006);fill-opacity:1;stroke:url(#linearGradient9008);stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
          id="path8722-7" />
       <path
-         inkscape:connector-curvature="0"
          d="m 62.499998,1021.8622 2e-6,-7.4174 c 0,-1.4308 -0.846416,-2.5826 -1.897793,-2.5826 h -2.204414 c -1.051377,0 -1.897793,1.1518 -1.897793,2.5826 v 1.4174 h -2.418506 c -0.876148,0 -1.581494,0.7039 -1.581494,1.5782 v 1.3017 3.1196 m 9.999998,5e-4 2e-6,7.4174 c 0,1.4308 -0.846416,2.5826 -1.897793,2.5826 h -2.204414 c -1.051377,0 -1.897793,-1.1518 -1.897793,-2.5826 v -1.4174 h -2.418506 c -0.876148,0 -1.581494,-0.7039 -1.581494,-1.5782 v -1.3017 -3.1196"
          style="display:inline;opacity:1;fill:url(#linearGradient8761);fill-opacity:1;stroke:#4d73ae;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
          id="rect8645-3" />
       <path
-         sodipodi:nodetypes="cczccssssssccsccccccc"
-         inkscape:connector-curvature="0"
          d="m 70.5,1023.8622 -10e-7,0.7084 c 0,0.7154 -0.630695,1.3084 -1.581494,1.2913 -0.950799,-0.017 -1.418505,0 -1.418505,0 v 0.1348 c 0,1.0333 -0.846416,1.865 -1.897793,1.8652 l -1.204207,2e-4 c -0.993831,2e-4 -0.897896,0.3654 -0.897896,-1.9999 v -8 c 0,-2.3654 -0.149817,-2 0.897896,-2 h 1.204207 c 1.051377,0 1.897793,0.8319 1.897793,1.8652 v 0.1348 h 1.418506 c 0.876148,0 1.581494,0.5759 1.581494,1.2913 v 1.7087 z m 0.01,-3 h 3.99 v 3 h -3.7903"
          style="display:inline;opacity:1;fill:url(#linearGradient9010);fill-opacity:1;stroke:url(#linearGradient9012);stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
          id="rect8645-2-5" />
       <path
-         sodipodi:nodetypes="cccc"
-         inkscape:connector-curvature="0"
          id="path8861"
          d="m 64.018476,1016.5423 -0.152427,10.8222 c 2.375507,-3.3036 3.484206,-4.2052 2.972286,-9.2217 0.305009,-1.654 -1.117834,-1.7529 -2.819859,-1.6005 z"
          style="opacity:0.63899997;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter8871)" />
@@ -1151,13 +554,10 @@
          id="path8817"
          style="opacity:0.70499998;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter8835)" />
       <path
-         inkscape:connector-curvature="0"
          id="path8875"
          d="m 70.953811,1023.4014 v -1.8291 l 2.972286,-0.076 z"
          style="opacity:0.86199999;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter8881)" />
       <path
-         sodipodi:nodetypes="cccc"
-         inkscape:connector-curvature="0"
          id="path8861-7"
          d="m 53.924652,1016.631 -0.152427,10.8222 c 2.375507,-3.3036 3.484206,-4.2052 2.972286,-9.2217 0.305009,-1.654 -1.117834,-1.7529 -2.819859,-1.6005 z"
          style="display:inline;opacity:0.48500001;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter8871-1)" />
diff --git a/ui/org.eclipse.pde.ui/icons/wizban/xhtml_wiz.svg b/ui/org.eclipse.pde.ui/icons/wizban/xhtml_wiz.svg
index 65941be261f..2e0b92435b6 100644
--- a/ui/org.eclipse.pde.ui/icons/wizban/xhtml_wiz.svg
+++ b/ui/org.eclipse.pde.ui/icons/wizban/xhtml_wiz.svg
@@ -6,14 +6,7 @@
    height="66"
    id="svg2"
    version="1.1"
-   inkscape:version="1.3 (0e150ed, 2023-07-21)"
-   sodipodi:docname="xhtml_wiz.svg"
-   inkscape:export-filename="/Users/d021678/git/eclipse.jdt.ui/org.eclipse.jdt.ui/icons/full/wizban/newclass_wiz2.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90"
    xml:space="preserve"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:svg="http://www.w3.org/2000/svg"
@@ -21,299 +14,6 @@
    xmlns:cc="http://creativecommons.org/ns#"
    xmlns:dc="http://purl.org/dc/elements/1.1/"><defs
      id="defs4"><linearGradient
-       inkscape:collect="always"
-       id="linearGradient4972"><stop
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0"
-         id="stop4974" /><stop
-         style="stop-color:#f5f8fd;stop-opacity:1"
-         offset="1"
-         id="stop4976" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       id="linearGradient4964"><stop
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0"
-         id="stop4966" /><stop
-         style="stop-color:#e8eefa;stop-opacity:1"
-         offset="1"
-         id="stop4968" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       id="linearGradient4956"><stop
-         style="stop-color:#fcfdfe;stop-opacity:1"
-         offset="0"
-         id="stop4958" /><stop
-         style="stop-color:#dee6f8;stop-opacity:1"
-         offset="1"
-         id="stop4960" /></linearGradient><filter
-       style="color-interpolation-filters:sRGB"
-       inkscape:label="Drop Shadow"
-       id="filter8854"><feFlood
-         flood-opacity="0.933333"
-         flood-color="rgb(244,248,254)"
-         result="flood"
-         id="feFlood8856" /><feComposite
-         in="flood"
-         in2="SourceGraphic"
-         operator="in"
-         result="composite1"
-         id="feComposite8858" /><feGaussianBlur
-         in="composite1"
-         stdDeviation="1.2"
-         result="blur"
-         id="feGaussianBlur8860" /><feOffset
-         dx="-1"
-         dy="3"
-         result="offset"
-         id="feOffset8862" /><feComposite
-         in="SourceGraphic"
-         in2="offset"
-         operator="over"
-         result="composite2"
-         id="feComposite8864" /></filter><linearGradient
-       id="linearGradient6122"><stop
-         style="stop-color:#c0c0c0;stop-opacity:1"
-         offset="0"
-         id="stop6124" /><stop
-         id="stop6132"
-         offset="0.5"
-         style="stop-color:#adadad;stop-opacity:1" /><stop
-         style="stop-color:#808080;stop-opacity:1"
-         offset="1"
-         id="stop6126" /></linearGradient><linearGradient
-       id="linearGradient7087"><stop
-         style="stop-color:#17325d;stop-opacity:1;"
-         offset="0"
-         id="stop7089" /><stop
-         id="stop7091"
-         offset="0.25"
-         style="stop-color:#b4d0e2;stop-opacity:1" /><stop
-         id="stop7093"
-         offset="0.5"
-         style="stop-color:#b7d2e4;stop-opacity:1" /><stop
-         style="stop-color:#acc9de;stop-opacity:1"
-         offset="0.75"
-         id="stop7095" /><stop
-         style="stop-color:#3e72a7;stop-opacity:1"
-         offset="1"
-         id="stop7097" /></linearGradient><mask
-       id="mask7366"
-       maskUnits="userSpaceOnUse"><path
-         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;display:inline"
-         d="m -16.593048,1040.862 9.990206,0 0,10.0018 -2.983353,3.0385 -5.966213,0 c -0.53033,-0.022 -1.04064,-0.5519 -1.04064,-1.0385 z"
-         id="path7368"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccccc" /></mask><linearGradient
-       id="linearGradient7584-5"><stop
-         id="stop7586-4"
-         offset="0"
-         style="stop-color:#f9cd5f;stop-opacity:1" /><stop
-         id="stop7588-5"
-         offset="1"
-         style="stop-color:#fbf0b4;stop-opacity:1" /></linearGradient><linearGradient
-       id="linearGradient7592-1"><stop
-         id="stop7594-6"
-         offset="0"
-         style="stop-color:#bd8416;stop-opacity:1" /><stop
-         id="stop7596-9"
-         offset="1"
-         style="stop-color:#a66b10;stop-opacity:1" /></linearGradient><linearGradient
-       id="linearGradient10798-1-9-3-7-6-6-6-2-6-7-98-9-4-1"><stop
-         style="stop-color:#5aad60;stop-opacity:1;"
-         offset="0"
-         id="stop10800-5-2-1-8-20-4-0-2-1-9-0-0-1-1" /><stop
-         id="stop10806-6-8-5-3-9-2-2-7-0-4-2-7-8-9"
-         offset="0.5"
-         style="stop-color:#5bb26a;stop-opacity:1;" /><stop
-         style="stop-color:#a4c589;stop-opacity:1"
-         offset="1"
-         id="stop10802-1-5-3-0-4-6-8-5-5-6-69-6-4-0" /></linearGradient><mask
-       maskUnits="userSpaceOnUse"
-       id="mask7366-4"><path
-         sodipodi:nodetypes="ccccccc"
-         inkscape:connector-curvature="0"
-         id="path7368-2"
-         d="m -16.593048,1040.862 9.990206,0 0,10.0018 -2.983353,3.0385 -5.966213,0 c -0.53033,-0.022 -1.04064,-0.5519 -1.04064,-1.0385 z"
-         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;display:inline" /></mask><linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient7087"
-       id="linearGradient9331"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-20,0)"
-       x1="4.7776356"
-       y1="1039.8118"
-       x2="4.7776356"
-       y2="1041.911" /><linearGradient
-       y2="1041.911"
-       x2="4.7776356"
-       y1="1039.8118"
-       x1="4.7776356"
-       gradientTransform="translate(-18,4.7e-5)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient9333"
-       xlink:href="#linearGradient7087"
-       inkscape:collect="always" /><linearGradient
-       y2="1041.911"
-       x2="4.7776356"
-       y1="1039.8118"
-       x1="4.7776356"
-       gradientTransform="translate(-16,4.7e-5)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient9335"
-       xlink:href="#linearGradient7087"
-       inkscape:collect="always" /><linearGradient
-       y2="1041.911"
-       x2="4.7776356"
-       y1="1039.8118"
-       x1="4.7776356"
-       gradientTransform="translate(-14,4.7e-5)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient9337"
-       xlink:href="#linearGradient7087"
-       inkscape:collect="always" /><linearGradient
-       y2="1041.911"
-       x2="4.7776356"
-       y1="1039.8118"
-       x1="4.7776356"
-       gradientTransform="translate(-12,4.7e-5)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient9339"
-       xlink:href="#linearGradient7087"
-       inkscape:collect="always" /><linearGradient
-       gradientTransform="translate(-80,0)"
-       gradientUnits="userSpaceOnUse"
-       y2="1042.7973"
-       x2="163.22012"
-       y1="1042.7973"
-       x1="88.220117"
-       id="linearGradient68073"
-       xlink:href="#linearGradient4956"
-       inkscape:collect="always" /><linearGradient
-       gradientTransform="translate(-80,0)"
-       gradientUnits="userSpaceOnUse"
-       y2="1032.2669"
-       x2="163.22012"
-       y1="1032.2668"
-       x1="94.469681"
-       id="linearGradient68075"
-       xlink:href="#linearGradient4964"
-       inkscape:collect="always" /><linearGradient
-       gradientTransform="translate(-80,0)"
-       gradientUnits="userSpaceOnUse"
-       y2="1032.2668"
-       x2="152.72206"
-       y1="1032.2668"
-       x1="88.220116"
-       id="linearGradient68077"
-       xlink:href="#linearGradient4972"
-       inkscape:collect="always" /><filter
-       id="filter8854-9"
-       inkscape:label="Drop Shadow"
-       style="color-interpolation-filters:sRGB"><feFlood
-         id="feFlood8856-0"
-         result="flood"
-         flood-color="rgb(244,248,254)"
-         flood-opacity="0.933333" /><feComposite
-         id="feComposite8858-2"
-         result="composite1"
-         operator="in"
-         in2="SourceGraphic"
-         in="flood" /><feGaussianBlur
-         id="feGaussianBlur8860-3"
-         result="blur"
-         stdDeviation="1.2"
-         in="composite1" /><feOffset
-         id="feOffset8862-2"
-         result="offset"
-         dy="3"
-         dx="-1" /><feComposite
-         id="feComposite8864-3"
-         result="composite2"
-         operator="over"
-         in2="offset"
-         in="SourceGraphic" /></filter><linearGradient
-       id="linearGradient10798-1-9-3-7-6-8-9-0-9-1"><stop
-         id="stop10800-5-2-1-8-20-6-4-9-8-2"
-         offset="0"
-         style="stop-color:#7564b1;stop-opacity:1" /><stop
-         style="stop-color:#5d4aa1;stop-opacity:1"
-         offset="0.5"
-         id="stop10806-6-8-5-3-9-24-8-4-3-2" /><stop
-         id="stop10802-1-5-3-0-4-8-4-2-9-2"
-         offset="1"
-         style="stop-color:#9283c3;stop-opacity:1" /></linearGradient><linearGradient
-       id="linearGradient7540-2-3-8-7"><stop
-         id="stop7542-8-7-5-3"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.502" /><stop
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0.47623286"
-         id="stop7544-8-2-0-5" /><stop
-         style="stop-color:#ffffff;stop-opacity:0"
-         offset="0.5"
-         id="stop7546-1-7-9-5" /><stop
-         id="stop7548-98-9-2-4"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       id="linearGradient7272-66-4-5-5-5-8"><stop
-         style="stop-color:#8f6c10;stop-opacity:1"
-         offset="0"
-         id="stop7274-6-0-1-7-4-7" /><stop
-         style="stop-color:#c9a645;stop-opacity:1"
-         offset="1"
-         id="stop7276-66-6-3-9-1-4" /></linearGradient><linearGradient
-       y2="1030.3411"
-       x2="-10.159802"
-       y1="1030.3411"
-       x1="-22.453552"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient10540"
-       xlink:href="#linearGradient7540-2-3-8-7"
-       inkscape:collect="always" /><linearGradient
-       y2="1030.3411"
-       x2="-10.159802"
-       y1="1030.3411"
-       x1="-22.453552"
-       gradientTransform="matrix(0,1,-1,0,1014.0344,1046.6478)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient10542"
-       xlink:href="#linearGradient7540-2-3-8-7"
-       inkscape:collect="always" /><linearGradient
-       y2="1023.2569"
-       x2="-15.945988"
-       y1="1037.4661"
-       x1="-15.945988"
-       gradientTransform="matrix(0.95585117,0,0,0.95585117,-0.71992063,45.488394)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient10544"
-       xlink:href="#linearGradient7272-66-4-5-5-5-8"
-       inkscape:collect="always" /><mask
-       id="mask10620"
-       maskUnits="userSpaceOnUse"><path
-         transform="matrix(0.55482947,0,0,0.55482947,-206.96039,787.08655)"
-         d="m 398.75,468.23718 a 10.625,10.625 0 1 1 -21.25,0 10.625,10.625 0 1 1 21.25,0 z"
-         sodipodi:ry="10.625"
-         sodipodi:rx="10.625"
-         sodipodi:cy="468.23718"
-         sodipodi:cx="388.125"
-         id="path10622"
-         style="font-size:13.58917427px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:2.16621375;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline;font-family:Sans"
-         sodipodi:type="arc" /></mask><linearGradient
-       id="linearGradient4528-9-5-7-9-7-3"><stop
-         id="stop4530-0-5-0-5-8-4"
-         offset="0"
-         style="stop-color:#e0c576;stop-opacity:1;" /><stop
-         id="stop4532-7-9-3-3-6-1"
-         offset="1"
-         style="stop-color:#9e7916;stop-opacity:1" /></linearGradient><linearGradient
-       id="linearGradient6281-8-0-1-6-6-4-2-8-0"><stop
-         style="stop-color:#f7f9fb;stop-opacity:1"
-         offset="0"
-         id="stop6283-0-2-2-1-2-0-1-6-0" /><stop
-         style="stop-color:#ffd680;stop-opacity:1"
-         offset="1"
-         id="stop6285-5-0-9-7-6-9-9-1-9" /></linearGradient><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4972-7"
        id="linearGradient4978"
        x1="88.220116"
@@ -322,7 +22,6 @@
        y2="1032.2668"
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-88.220116,-999.2669)" /><linearGradient
-       inkscape:collect="always"
        id="linearGradient4972-7"><stop
          style="stop-color:#b8ccf1;stop-opacity:0.10196079"
          offset="0"
@@ -330,7 +29,6 @@
          style="stop-color:#6e97e2;stop-opacity:0.10196079"
          offset="1"
          id="stop4976-1" /></linearGradient><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4964-3"
        id="linearGradient4970"
        x1="118.38584"
@@ -339,7 +37,6 @@
        y2="1032.2668"
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-88.220117,-999.2669)" /><linearGradient
-       inkscape:collect="always"
        id="linearGradient4964-3"><stop
          style="stop-color:#ffffff;stop-opacity:0.349"
          offset="0"
@@ -347,7 +44,6 @@
          style="stop-color:#91ade6;stop-opacity:1"
          offset="1"
          id="stop4968-1" /></linearGradient><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4956-2"
        id="linearGradient4962"
        x1="88.220116"
@@ -356,7 +52,6 @@
        y2="1042.7972"
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-88.220116,-999.2669)" /><linearGradient
-       inkscape:collect="always"
        id="linearGradient4956-2"><stop
          style="stop-color:#fcfdfe;stop-opacity:0.25641027"
          offset="0"
@@ -364,43 +59,20 @@
          style="stop-color:#98aae7;stop-opacity:0.40392157"
          offset="1"
          id="stop4960-6" /></linearGradient><linearGradient
-       id="linearGradient3827"><stop
-         id="stop3829"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0;" /><stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0.60149658"
-         id="stop3835" /><stop
-         id="stop3831"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" /></linearGradient><linearGradient
-       id="linearGradient10798-1-9-3-7-6-8-9-0-9-1-0"><stop
-         id="stop10800-5-2-1-8-20-6-4-9-8-2-9"
-         offset="0"
-         style="stop-color:#f3faed;stop-opacity:1" /><stop
-         style="stop-color:#e7f4da;stop-opacity:1"
-         offset="0.65917557"
-         id="stop10806-6-8-5-3-9-24-8-4-3-2-4" /><stop
-         id="stop10802-1-5-3-0-4-8-4-2-9-2-5"
-         offset="1"
-         style="stop-color:#67bf1f;stop-opacity:1" /></linearGradient><linearGradient
-       id="linearGradient4994"
-       inkscape:collect="always"><stop
+       id="linearGradient4994"><stop
          id="stop4996"
          offset="0"
          style="stop-color:#ffffff;stop-opacity:1" /><stop
          id="stop4998"
          offset="1"
          style="stop-color:#dbe2eb;stop-opacity:1" /></linearGradient><linearGradient
-       id="linearGradient4902"
-       inkscape:collect="always"><stop
+       id="linearGradient4902"><stop
          id="stop4904"
          offset="0"
          style="stop-color:#c7b571;stop-opacity:1;" /><stop
          id="stop4906"
          offset="1"
          style="stop-color:#9a9a8f;stop-opacity:1" /></linearGradient><linearGradient
-       inkscape:collect="always"
        id="linearGradient6411"><stop
          style="stop-color:#4f605c;stop-opacity:1"
          offset="0"
@@ -408,7 +80,6 @@
          style="stop-color:#dbe2eb;stop-opacity:0"
          offset="1"
          id="stop6415" /></linearGradient><linearGradient
-       inkscape:collect="always"
        id="linearGradient4258"><stop
          style="stop-color:#f4ae5f;stop-opacity:1;"
          offset="0"
@@ -419,7 +90,6 @@
          style="stop-color:#c7700e;stop-opacity:1"
          offset="1"
          id="stop4262" /></linearGradient><radialGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient8396"
        id="radialGradient7578"
        gradientUnits="userSpaceOnUse"
@@ -446,8 +116,7 @@
        gradientTransform="matrix(1.4450739,0,0,1.4450739,51.863251,1074.9307)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient7603"
-       xlink:href="#linearGradient8382-7"
-       inkscape:collect="always" /><linearGradient
+       xlink:href="#linearGradient8382-7" /><linearGradient
        id="linearGradient8382-7"><stop
          style="stop-color:#fffcf2;stop-opacity:1"
          offset="0"
@@ -461,7 +130,6 @@
          style="stop-color:#77775c;stop-opacity:1"
          offset="1"
          id="stop8386-4" /></linearGradient><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient8382-7"
        id="linearGradient7571"
        gradientUnits="userSpaceOnUse"
@@ -470,7 +138,6 @@
        x2="14.059898"
        y2="12.665515"
        gradientTransform="matrix(1.4450739,0,0,1.4450739,51.863251,1074.6807)" /><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient7580"
        id="linearGradient7576"
        gradientUnits="userSpaceOnUse"
@@ -479,15 +146,13 @@
        x2="-1030.4867"
        y2="328.19562"
        gradientTransform="matrix(0.02493804,0,0,0.02493638,91.009097,1076.6755)" /><linearGradient
-       id="linearGradient7580"
-       inkscape:collect="always"><stop
+       id="linearGradient7580"><stop
          id="stop7582"
          offset="0"
          style="stop-color:#4f4d70;stop-opacity:1" /><stop
          id="stop7584"
          offset="1"
          style="stop-color:#4fa8ca;stop-opacity:1" /></linearGradient><radialGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient8349"
        id="radialGradient7574"
        gradientUnits="userSpaceOnUse"
@@ -497,7 +162,6 @@
        fx="-992.8103"
        fy="395.31625"
        r="232.85715" /><linearGradient
-       inkscape:collect="always"
        id="linearGradient8349"><stop
          style="stop-color:#ffffff;stop-opacity:1;"
          offset="0"
@@ -505,7 +169,6 @@
          style="stop-color:#ffffff;stop-opacity:0;"
          offset="1"
          id="stop8353" /></linearGradient><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4994"
        id="linearGradient4630"
        gradientUnits="userSpaceOnUse"
@@ -514,7 +177,6 @@
        y1="1052.4476"
        x2="22.530088"
        y2="1014.1386" /><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4902"
        id="linearGradient4632"
        gradientUnits="userSpaceOnUse"
@@ -523,7 +185,6 @@
        y1="1038.5779"
        x2="10.544736"
        y2="1052.3228" /><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient6411"
        id="linearGradient4634"
        gradientUnits="userSpaceOnUse"
@@ -532,7 +193,6 @@
        y1="1020.8994"
        x2="47.429596"
        y2="1023.1616" /><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4258"
        id="linearGradient4341-5"
        gradientUnits="userSpaceOnUse"
@@ -541,7 +201,6 @@
        x2="62.220116"
        y2="1025.2668"
        gradientTransform="matrix(0.88977825,0,0,0.88984413,-36.401252,99.537447)" /><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4994"
        id="linearGradient8635"
        gradientUnits="userSpaceOnUse"
@@ -550,7 +209,6 @@
        y1="1052.4476"
        x2="22.530088"
        y2="1014.1386" /><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4902"
        id="linearGradient8637"
        gradientUnits="userSpaceOnUse"
@@ -559,7 +217,6 @@
        y1="1038.5779"
        x2="10.544736"
        y2="1052.3228" /><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient6411"
        id="linearGradient8639"
        gradientUnits="userSpaceOnUse"
@@ -568,7 +225,6 @@
        y1="1020.4026"
        x2="47.429596"
        y2="1023.1616" /><linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4258"
        id="linearGradient8641"
        gradientUnits="userSpaceOnUse"
@@ -577,67 +233,22 @@
        y1="1021.2669"
        x2="62.220116"
        y2="1025.2668" /><filter
-       inkscape:collect="always"
        style="color-interpolation-filters:sRGB"
        id="filter3"
        x="-0.13824222"
        y="-0.3378463"
        width="1.2764844"
        height="1.6756926"><feGaussianBlur
-         inkscape:collect="always"
          stdDeviation="1.8275986"
-         id="feGaussianBlur3" /></filter></defs><sodipodi:namedview
-     id="base"
-     pagecolor="#3e3e3e"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="4.544427"
-     inkscape:cx="32.457337"
-     inkscape:cy="75.477063"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1728"
-     inkscape:window-height="1051"
-     inkscape:window-x="0"
-     inkscape:window-y="38"
-     inkscape:window-maximized="1"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="true"
-     inkscape:snap-bbox="true"
-     inkscape:bbox-nodes="true"
-     inkscape:showpageshadow="2"
-     inkscape:pagecheckerboard="0"
-     inkscape:deskcolor="#d1d1d1"><inkscape:grid
-       type="xygrid"
-       id="grid4112"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       originx="0"
-       originy="0"
-       spacingy="1"
-       spacingx="1"
-       units="px" /></sodipodi:namedview><metadata
+         id="feGaussianBlur3" /></filter></defs><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" /></cc:Work></rdf:RDF></metadata><g
-     inkscape:groupmode="layer"
      id="layer2"
-     inkscape:label="Background"
-     style="display:inline"
-     sodipodi:insensitive="true"><path
-       sodipodi:nodetypes="cccc"
-       inkscape:connector-curvature="0"
+     style="display:inline"><path
        id="rect4113-1"
        d="M 75,0 75,66 1e-6,66 C 1e-6,41.2048 50.00969,0 75,0 Z"
        style="display:inline;fill:url(#linearGradient4978);fill-opacity:1;stroke:none" /><path
-       sodipodi:nodetypes="cccc"
-       inkscape:connector-curvature="0"
        id="rect4113-1-0"
        d="M 75,21.0607 75,66 1e-6,66 C 10.625001,47.804 43.509694,25.4357 75,21.0607 Z"
        style="display:inline;opacity:0.40400002;fill:url(#linearGradient4962);fill-opacity:1;stroke:none" /><g
@@ -646,13 +257,9 @@
        transform="matrix(0.27903303,0,0,0.27903303,-14.618136,-107.52874)"><g
          style="fill:#737986;fill-opacity:1;stroke:#595e68;stroke-opacity:1"
          id="g13408-8-2" /></g><path
-       sodipodi:nodetypes="cccc"
-       inkscape:connector-curvature="0"
        id="rect4113-1-7"
        d="M 75,4.0000001e-7 75,66 30.000003,66 C 30.000003,46.1545 47.70944,9.2500004 75,4e-7 Z"
        style="display:inline;opacity:0.18399999;fill:url(#linearGradient4970);fill-opacity:1;stroke:none" /></g><g
-     inkscape:label="Foreground"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-986.3622)"><ellipse
@@ -661,113 +268,81 @@
        cx="34.435028"
        cy="1040.0292"
        rx="15.864316"
-       ry="6.4914675"
-       inkscape:label="drop-shadow" /><g
+       ry="6.4914675" /><g
        id="g1"
-       inkscape:label="world"
        transform="matrix(2.83038,0,0,2.6775594,-159.42795,-1892.4068)"
        style="stroke-width:0.363252"><circle
          style="display:inline;fill:url(#radialGradient7578);fill-opacity:1;stroke:none;stroke-width:0.00911804"
          id="path3800-3-8"
          cx="68.493622"
          cy="1089.8557"
-         r="5.8449821"
-         inkscape:label="ocean" /><path
-         inkscape:connector-curvature="0"
+         r="5.8449821" /><path
          id="path3800-3-8-0-8"
          d="m 69.11382,1084.3236 c -0.08358,-10e-5 -0.146685,0.025 0,0.045 0.101849,0.014 -0.05818,0.061 0.09032,0.045 0.07519,-0.065 -0.01658,-0.09 -0.09032,-0.09 z m -1.806342,0.045 c -0.08085,0.016 -0.146193,0.071 -0.225793,0.09 0.167199,-0.042 0.324172,-0.063 0.496744,-0.09 -0.08865,0.014 -0.183662,-0.017 -0.270951,0 z m 0.722537,0 c -0.100838,0.019 -0.125577,0.038 0,0.045 0.08577,-0.039 0.08961,-0.048 0.135475,-0.045 -0.05026,0 -0.09312,-0.014 -0.135475,0 z m 1.625708,0 c -0.0091,-8e-4 -0.03685,0.046 -0.04516,0.045 -0.01605,0.03 -0.129334,0.049 0.04516,0.045 0.0048,0.019 0.01431,0.067 0.04516,0.045 0.01156,-0.019 0.01983,-0.077 0.04516,-0.09 -0.03183,0 -0.05829,-0.039 -0.09032,-0.045 z m -1.128964,0.045 c -0.02416,6e-4 -0.03418,0.051 -0.04516,0.09 -0.09662,-0.065 -0.29735,-0.055 -0.361269,-0.045 -0.05552,0.027 -0.05,0.055 0.135476,0.045 0.103958,0 -0.01496,0.032 -0.09032,0.045 0.02251,0 0.01773,10e-4 0.09032,0 0.09883,0 0.621851,-0.055 0.31611,-0.09 0.02353,-0.04 -0.02653,-0.045 -0.04516,-0.045 z m 0.722537,0 c -0.01127,0.014 0.02183,0.048 0.135475,0.045 0.03143,-0.042 0.03666,-0.046 0,-0.045 -0.03753,5e-4 -0.12416,-0.014 -0.135475,0 z m -0.451586,0.045 c -0.01501,6e-4 8e-5,0.039 0,0.045 0,0 0.04516,0 0.04516,0 z m 0.04516,0.045 c -0.04631,0.014 -0.04368,0.033 0.09032,0.045 -0.03234,0 -0.123857,0.062 0.04516,0.045 0.132571,-0.04 0.176165,-0.1373 0.04516,-0.1358 -0.01358,1e-4 -0.02783,0.043 -0.04516,0.045 0.01672,0.017 -0.08916,-0.014 -0.135476,0 z m 1.128964,-0.045 c -0.01387,0.017 -0.03883,0.027 -0.04516,0.045 -0.009,0.026 0.01026,0.077 0,0.09 -0.0072,0 -0.03152,0 -0.04516,0 -0.05439,-3e-4 -0.162088,0.014 -0.180634,0 -0.153773,-0.014 -0.07519,0.025 -0.04516,0.045 0.138264,0.014 0.297103,0.08 0.31611,0.09 0.136704,0.014 0.03662,-0.1584 0.270951,-0.09 -0.0059,-0.024 0.0011,-0.039 0.04516,-0.045 -0.105129,-0.035 -0.208457,-0.1069 -0.316109,-0.1358 z m -0.722537,0.045 c 0.01559,0.014 0.002,0.033 0.04516,0.045 0.06509,-0.037 0.0069,-0.045 -0.04516,-0.045 z m -1.625708,0.045 c -0.253349,0.1142 -0.426184,0.1817 -0.406427,0.271 0.180027,-0.019 0.371333,-0.1717 0.587061,-0.1807 0.223903,-0.075 -0.05272,-0.085 -0.180634,-0.09 z m 1.445074,0.045 c -0.0409,0.016 -0.01728,0.074 0.09032,0.09 0.02965,-0.053 -0.0091,-0.091 -0.04516,-0.09 -0.01504,2e-4 -0.03153,0 -0.04516,0 z m -0.677379,0.045 c -0.04481,0 -0.05671,0.036 0,0.09 0.172461,-0.032 0.0655,-0.091 0,-0.09 z m 0.31611,0.045 c -0.137831,0.038 0.04928,0.025 -0.09032,0.09 -0.207472,-0.068 -0.03163,0.1658 0,0.1807 0.04266,0 0.131011,-0.088 0.180635,-0.1359 -0.03626,-0.026 0.01566,-0.071 0.04516,-0.09 3.77e-4,-0.014 -0.01069,-0.04 -0.04516,-0.045 -0.0196,0 -0.06061,9e-4 -0.09032,0 z m 1.716025,0 c -0.004,0 -0.01945,0.029 0,0.045 0.07818,0.033 0.02507,0.035 0.04516,0.045 0.03601,0.071 0.313666,0.1649 0.180634,0.1359 0.135678,0.027 0.416206,0.3372 0.361268,0.2257 0.04163,0.069 0.111546,0.3245 0.09032,0.2258 0.0104,0 0.09364,0.062 0.09032,0.09 0.07303,0.017 0.09192,0.066 0.09032,0.09 0.01387,0 0.03951,0.059 0,0.045 0,0 -0.04516,0 -0.04516,0 0.0066,0 -0.0061,0.043 0,0.045 0.123612,0.045 0.0056,0.1286 0.04516,0.1359 -0.04496,4e-4 -0.04601,0.036 -0.04516,0.045 0.0078,0 -0.0058,0.042 0,0.045 0.01988,0 -0.03053,0.046 0.09032,0.045 -0.02273,-9e-4 -0.102253,0.014 -0.135475,0 0.01098,0 0.0066,0.027 0.04516,0.045 -0.05684,0.014 -0.08789,0.068 -0.09032,0.09 0.156122,-0.053 0.09485,0.022 0.04516,0.045 0.04858,0 0.08897,0.019 0.09032,0.045 0.01497,0 0.03866,0.033 0,0.045 -0.0022,0 0.004,0.039 0,0.045 0.0072,0 -0.0046,0.041 0,0.045 -0.08747,0.03 -0.03464,0.1041 0,0.1359 -0.002,7e-4 0.0424,0.014 0.04516,0 -0.0084,0.09 0.04516,0.2208 0.04516,0.1806 0.08871,0.084 0.176136,0.1171 0.180634,0.09 0.02958,0 0.141039,0.071 0.135476,0.09 0.04514,0.014 0.07444,0 0.04516,-0.045 0.0042,-0.02 -0.0097,-0.055 0,-0.09 0.01272,-0.048 0.01607,-0.066 0,-0.045 -0.04244,-0.038 0.08587,-0.075 0.04516,-0.09 0.04006,-0.039 0.02247,-0.3081 0.04516,-0.1806 0.124681,-0.045 0.167427,0.042 0.180635,-0.045 3.52e-4,0.069 0.06373,0.014 0.09032,0 0.0064,0 0.04063,0 0.04516,0 0.03445,-0.027 -0.01487,-0.1848 0.04516,-0.1359 0.07386,0.1171 0.333387,0.12 0.406427,0.045 -0.06679,-0.035 -0.100563,-0.071 -0.135476,-0.09 -0.05608,-0.02 -0.07516,-0.078 -0.09032,-0.09 0.0149,0 0.03384,0.029 0.09032,0.045 0.02376,0.022 0.03107,-0.014 0.04516,0 -0.04337,-0.059 -0.08394,-0.1445 -0.09032,-0.1358 -0.04805,-0.045 -0.05874,-0.053 -0.04516,-0.045 -0.07471,-0.052 -0.0069,-0.071 0.09032,0 -0.503631,-0.4665 -1.072016,-0.862 -1.716025,-1.1289 -0.03867,0 -0.236008,-0.039 -0.31611,-0.045 z m -2.619196,0.045 c -0.05805,0.035 -0.103164,0.066 -0.180634,0.09 0.08266,0 -0.436024,0.1185 0.04516,0.09 -0.06329,0.036 -0.540547,0.059 -0.180634,0.1806 -0.12825,0.2039 0.586882,-0.068 0.406427,0 0.06181,-0.017 0.09822,0.091 0.225793,0.09 0.162503,-0.03 0.129551,-0.1228 0.09032,-0.1358 0.0322,-0.02 0.06892,-0.048 0.09032,-0.045 -0.05185,-0.059 -0.08393,-0.087 0,-0.1806 -0.05951,0.04 -0.194185,0.088 -0.180634,0 0.0082,-0.059 0.01776,-0.1739 -0.04516,-0.09 -0.09198,0.024 -0.17661,0.014 -0.225793,0 -0.0104,0 -0.04373,0 -0.04516,0 z m 1.535391,0.09 c -0.107831,0.033 -0.344638,0.2215 -0.09032,0.271 -0.04356,-0.014 -0.07185,0 -0.09032,0 0.04418,0.037 0.112152,0.1069 0.09032,0.09 0.04681,0.014 0.147535,0.032 0.225793,0.045 0.105317,0.019 0.193436,0.033 0.135476,0.045 0.130201,0.058 0.05777,-0.1893 0.135475,0.045 0.128077,0.02 0.27517,0.1141 0.135476,0.1358 -0.0069,10e-5 -0.01567,0.081 0,0.045 0.0402,0.062 0.150499,0.1579 0.135476,0.09 0.08315,0.065 -0.110548,0.1569 -0.180635,0.1806 0.0177,0.059 -0.03884,0.1113 -0.09032,0.1359 0.06264,-0.014 0.246448,0.246 0.180635,0.1806 -0.02867,0.014 -0.02299,0.022 0,0.045 -0.0098,0 0.02185,0.061 0.04516,0.045 0.09743,0.065 0.245697,0.1257 0.270951,0.1358 0.01,-0.036 -0.04431,-0.1257 -0.09032,-0.1806 0.01185,0 0.02392,-0.014 0.04516,0 0.04767,0.014 0.146999,0.027 0.135476,0.09 0.04169,-0.036 -0.0049,-0.1807 0,-0.1807 -0.1151,-0.1611 -0.108568,-0.098 -0.135476,-0.2257 -0.02711,-0.023 0.167583,-0.014 0.135476,0 0.02048,0.032 0.0404,0.062 0.04516,0.09 -0.01575,0 0.140056,-0.068 0.135475,0.045 0.03637,-0.023 0.03461,-0.061 0.04516,-0.09 0.168702,0 -0.05389,-0.052 0,-0.045 0.01402,-0.1011 -0.11841,-0.053 -0.09032,-0.1358 -0.04477,-0.051 -0.130837,-0.1156 -0.09032,-0.045 -0.01753,0 -0.07007,-0.058 -0.09032,-0.09 0.0078,-0.02 -0.0017,-0.058 0.135476,-0.045 -0.05561,-0.017 -0.08386,-0.032 -0.09032,-0.045 0.01798,-0.016 0.03208,-0.055 -0.09032,-0.045 -0.0299,-0.03 0.01838,-0.038 0.04516,-0.045 -6.12e-4,-0.014 -0.01171,-0.02 -0.04516,-0.045 -0.109146,0.048 -0.0098,-0.017 -0.04516,-0.045 -0.02155,0.014 -0.04663,0.014 -0.04516,0 0.09383,-0.043 0.01718,-0.1055 -0.04516,-0.09 0.02032,-0.019 -0.02958,-0.066 -0.09032,-0.045 -0.106357,-0.024 0.01585,0 -0.09032,-0.09 -0.01676,-0.038 -0.01501,-0.09 -0.04516,-0.09 -0.05507,2e-4 -0.07881,0.043 -0.09032,0.045 -0.01653,-0.046 -0.0349,-0.062 -0.04516,-0.045 0.0046,-0.056 -0.03548,-0.1055 -0.180634,-0.045 -0.07579,0.02 -0.05127,0.1577 -0.09032,0.09 -0.0397,-0.032 -0.06827,-0.027 -0.09032,0 -0.02205,0.028 -0.02562,0.071 0,0.09 -0.08386,0.017 -0.04658,-0.035 0,-0.09 0.06987,-0.084 0.144175,-0.1831 0.04516,-0.1806 -0.02027,4e-4 -0.04897,-0.014 -0.09032,0 z m -2.528879,0.09 c -0.04168,0.016 -0.138857,0.061 -0.225793,0.09 -0.08448,0.02 -0.177462,0.014 -0.135476,0 -0.03442,-0.014 -0.225251,0.104 -0.31611,-0.045 -0.15475,0.014 -0.22998,0 -0.316109,0 -0.01172,0 -0.03348,0 -0.04516,0 -0.51809,0.2744 -0.988949,0.6277 -1.399916,1.0387 -0.05146,0.048 -0.09312,0.1229 -0.135475,0.1807 -0.06051,0.084 -0.07162,0.1445 0,0.09 -0.08021,0.088 -0.106752,0.2593 0.04516,0.1358 -0.127771,0.1948 -0.324817,0.3604 -0.451586,0.4968 0.207116,-0.1689 0.390662,-0.3587 0.587061,-0.5419 0.01575,-0.084 0.1341,-0.1329 0.225793,-0.1806 -0.09124,0.084 -0.180188,0.2231 -0.09032,0.1358 0.0882,-0.035 0.212553,-0.1668 0.270951,-0.2257 -0.0011,0 0.04432,0 0.04516,0 0.01399,-4e-4 0.02171,0 0,0.045 0.04249,0.014 0.1853,0.077 0.225793,0.09 0.04562,-0.023 0.147873,0.085 0.135476,0.1358 0.0124,-0.014 0.03244,-0.022 0.04516,-0.09 0.0099,-0.039 -0.03141,0.2057 0,0.1807 -0.01275,0.029 -0.0353,0.061 -0.04516,0.09 0,0 -0.04516,0.045 -0.04516,0.045 -0.0081,0.019 -0.0064,0.039 0,0.045 0,0 0.04516,-0.045 0.04516,-0.045 -0.0034,0.014 -0.0015,0.035 0,0.045 -0.005,5e-4 -0.02389,0.059 0,0.045 0.0046,0 0.03764,-4e-4 0.04516,0 -0.02653,0.027 -0.01638,0.036 0,0.045 0.01488,0.014 5.5e-5,0.041 -0.04516,0.09 -0.01454,0.014 0.02371,0.025 0,0.045 -0.02886,0.095 0.01342,0.1359 0.04516,0.1359 -0.01798,0.079 -0.01867,0.1579 0,0.1806 -0.0415,0.059 -0.07669,0.1416 -0.04516,0.09 0.07378,-0.014 0.0011,0.1257 -0.04516,0.1806 0.02834,-0.014 0.07674,-0.026 0.180634,-0.09 -0.0082,0.025 0.123813,0.082 0.04516,0.1359 0.03263,0.051 0.02895,0.1286 0,0.1806 -0.01908,0.033 -0.0424,0.038 -0.04516,0.045 -0.05049,-0.2244 -0.182126,0.3601 -0.180634,0.2257 -0.09281,0.2171 -0.184077,0.401 -0.225793,0.6322 -0.08139,0.1739 -0.02076,0.4711 0.04516,0.4065 0.04001,0.1529 0.01708,0.3703 0.180634,0.4064 0.155322,0.152 0.10817,0.4311 0.270952,0.5871 0.02048,0.12 -0.128768,0.1931 0.04516,0.2258 0.113208,0.2501 0.133117,0.4109 0.270951,0.3612 -0.09169,-0.1055 -0.25631,-0.5183 -0.225793,-0.4966 -0.07931,-0.1287 -0.173621,-0.4827 0,-0.3613 0.07233,0.1521 0.132911,0.363 0.270952,0.4967 0.0043,0.1563 0.22556,0.3085 0.270951,0.5419 -0.03782,0.1572 0.02529,0.2692 0.180634,0.3612 0.218358,0.061 0.436111,0.2914 0.677379,0.1807 0.156357,-0.027 0.289166,0.3063 0.496744,0.2709 0.229001,0.023 0.220627,0.081 0.361268,0.271 -0.01156,0.1828 0.112181,-0.048 0.135476,0.1806 0.07209,-0.014 0.307461,0.062 0.361268,0.09 0.008,-0.1884 0.269413,-0.1286 0.225793,0.045 0.0747,0.1574 0.06241,0.3712 -0.09032,0.4967 -0.101184,0.04 -0.200609,0.2345 -0.225793,0.3161 0.227877,-0.024 0.131112,0.3285 0.04516,0.3613 0.205709,0.1171 0.276077,0.371 0.406427,0.5419 0.08621,0.1857 0.388537,0.1857 0.496745,0.3613 0.02814,0.2003 -0.01387,0.35 0,0.5419 -0.08689,0.1501 0.0177,0.3206 -0.04516,0.4516 -0.07473,0.1185 -0.115361,0.3503 0.04516,0.3612 -0.0084,0.039 -0.07266,0.092 -0.09032,0.1359 -0.0056,0.014 0,0.037 0,0.045 -0.112398,0 -0.08498,0.022 -0.04516,0.045 0,0 0.04516,0.045 0.04516,0.045 0.01329,5e-4 0.02896,0.014 0.04516,0 0.01402,0.014 -0.01,0.038 0,0.045 0.136082,-0.014 0.273318,-0.022 0.406427,-0.045 -0.182325,-0.026 0.237626,-0.1416 0,-0.1807 0.0987,-0.026 0.0774,-0.091 0.180634,-0.1358 0.0084,-0.042 0.196108,-0.2228 0.361268,-0.2257 0.411132,-0.071 -0.203677,-0.3353 0.180634,-0.2259 0.116964,0.065 0.29323,-0.1387 0.361268,-0.2257 -0.05939,0.1585 0.281741,-0.3464 0.270952,-0.3613 0.152708,-0.1141 0.609512,-0.2704 0.451585,-0.2709 0.207422,-0.1445 0.281629,-0.4255 0.31611,-0.6775 0.174726,-0.1458 0.295933,-0.4276 0.31611,-0.4967 -0.03568,-0.1242 -0.504442,-0.2372 -0.361268,-0.2258 -0.09757,-0.046 -0.233604,-0.068 -0.270952,0 -0.0094,-0.091 -0.304507,-0.12 -0.225792,-0.09 -0.04999,0.036 -0.06761,0.019 -0.09032,0.045 -0.08046,0.091 -0.03829,0.1402 -0.135475,0.045 0.07592,-0.014 0.116516,-0.022 0.135475,-0.045 0.02843,-0.035 0.0011,-0.084 -0.04516,-0.09 -0.0077,6e-4 -0.04117,0 -0.04516,0 -0.0056,0 -0.0429,0 -0.04516,0 -0.03051,0.014 -0.06114,0.051 -0.09032,0.09 -0.08452,-0.025 -0.05975,-0.4036 0.09032,-0.3162 -0.04208,-0.1644 -0.180697,-0.2458 -0.361269,-0.2709 -0.226956,0.053 -0.267778,-0.088 -0.406428,-0.2258 -0.12468,0.029 -0.226532,-0.1741 -0.225792,-0.1806 -0.170932,0.1199 -0.602057,-0.014 -0.677378,-0.045 -0.07045,0 -0.113251,0.051 -0.09032,0.1806 -0.206379,0.081 0.108481,-0.3398 -0.09032,-0.2257 -0.128959,0.162 -0.280423,0.02 -0.31611,0.2257 -0.133785,0.2002 -0.09785,0.082 -0.31611,0 -0.251648,0.1373 -0.45284,-0.023 -0.406427,-0.1806 0.05422,-0.1344 -0.01026,-0.3454 0,-0.3613 -0.06094,-0.014 -0.195335,-0.087 -0.361269,-0.045 -0.246457,0.08 0.06764,-0.1517 0,-0.2258 -0.01619,-0.075 -0.120895,-0.3133 0.04516,-0.3161 -0.247612,-0.039 -0.264447,0.1746 -0.361268,0.3161 -0.0863,-0.074 -0.302964,0.075 -0.406427,-0.09 -0.179455,-0.1674 -0.16357,-0.4262 -0.09032,-0.6322 0.0687,-0.079 -0.0041,-0.3479 0.180634,-0.3613 0.172498,-0.097 0.118395,-0.1272 0.361268,-0.09 0.05499,0.014 0.126242,-0.1012 0.225793,0 0.0094,-0.1448 0.439329,-0.085 0.31611,-0.09 0.08587,0.1098 0.246796,0.014 0.270952,0.2259 -0.01344,0.075 0.142137,0.2426 0.180634,0.316 0.169985,-0.2103 -0.187016,-0.5442 0.09032,-0.7225 0.159459,-0.107 0.428687,-0.2989 0.406427,-0.3161 0.01301,0 0.026,-0.042 0.04516,-0.045 -0.01344,-0.014 -0.01026,-0.03 -0.04516,-0.045 0.08519,-0.064 0.01448,-0.2354 0,-0.2709 0.0055,0 0.101155,-0.1952 0.09032,0.045 0.03461,0.2464 0.06759,-0.1026 0.09032,-0.1807 0.0452,-0.03 0.08222,-0.074 0.135475,-0.1358 0.0077,-0.014 0.03254,0 0.04516,0 0.04512,-0.043 0.102095,-0.1084 0.180635,-0.09 0.166978,-0.014 0.07412,-0.014 0.09032,-0.1806 0.113308,-0.133 0.258747,-0.1768 0.31611,-0.1807 -0.0461,-0.072 0.156313,-0.014 0.225792,-0.045 -0.07598,0.039 -0.223603,0.1755 -0.04516,0.2259 0.03367,-0.1416 0.343512,-0.1402 0.31611,-0.2259 -0.0039,-0.014 -0.02468,0.019 -0.04516,0 -0.210821,0.091 -0.329963,-0.2102 -0.270952,-0.2257 -0.212243,-0.046 0.384506,-0.1315 0,-0.1806 -0.317741,0.091 -0.597593,0.3519 -0.225793,0 0.177503,-0.055 0.196233,-0.2214 0.406428,-0.1358 0.136068,0.02 0.347227,0.1156 0.451585,-0.045 0.104349,0.029 0.233393,-0.082 0.180635,-0.1359 0.05896,-0.08 -0.02912,-0.1657 -0.04516,-0.1358 -0.01055,-0.074 -0.115635,-0.035 -0.180634,0 0.0053,-0.014 -0.01857,-0.025 0,-0.045 0.05017,-0.03 0.248185,-0.045 0.04516,-0.1359 -0.06626,0.025 -0.157196,-0.052 -0.09032,-0.045 -0.132657,-0.084 -0.07231,-0.2902 -0.09032,-0.2258 0.04756,-0.069 0.08129,-0.1875 0,-0.1358 -0.116054,0.016 0.0048,-0.069 -0.09032,-0.1806 -0.0026,-0.03 -0.03958,-0.036 -0.04516,-0.045 -0.02613,0.046 -0.09116,0.1199 -0.09032,0.09 -0.0039,0.071 -0.174478,0.1098 -0.180634,0.09 -0.07276,0.03 0.03444,-0.071 -0.135476,-0.09 -0.01477,-0.026 -0.01754,-0.1055 -0.04516,-0.1359 0.15668,0.065 0.206565,-0.1513 0.04516,-0.1358 -0.05439,-0.042 -0.357893,-0.1402 -0.225793,-0.1807 -0.200677,-0.1069 -0.247223,-0.014 -0.31611,0.1359 0.06246,0 -0.06841,0.1228 0,0.1358 -0.09434,0.1315 -0.02214,0.3989 0,0.4516 -0.0052,0.1041 -0.239914,0.361 -0.316109,0.2257 -0.04092,0.1041 -0.103554,0.3613 -0.04516,0.271 0.03178,0.1185 -0.08633,0.03 -0.135476,0.045 -0.119681,-0.1 -0.109262,-0.2182 -0.04516,-0.4065 -0.03478,-0.1704 -0.223877,-0.029 -0.31611,-0.2257 -0.07438,-0.097 -0.278593,-0.1869 -0.361269,-0.1807 0.0474,-0.2799 -0.188827,-0.027 -0.09032,-0.2258 0.03785,-0.1539 0.16659,-0.2857 0.270952,-0.3613 0.07663,-0.055 0.137267,-0.014 0.09032,-0.1358 0.182851,0.1758 0.08571,-0.023 0.09032,-0.045 0.168566,0.097 0.129536,-0.09 0.270951,0 0.06816,-0.014 0.115606,-0.027 0.135476,-0.045 0.03516,-0.033 -0.0032,-0.098 -0.04516,-0.1359 0.178419,0.092 0.196885,-0.2188 0.31611,-0.09 0.0051,0 0.02697,-0.042 0.04516,0 0.17381,0.029 0.142296,-0.2815 0.180634,-0.1806 0.01484,0 -0.0064,-0.043 0,-0.045 -0.03571,-0.032 -0.07068,-0.065 -0.09032,-0.09 -0.06392,0.051 -0.170448,0.1286 -0.225793,0.1806 -0.03445,0.017 -0.054,0.058 -0.04516,0.045 -0.08305,-0.014 0.07733,-0.3585 -0.09032,-0.2257 -0.03918,0.032 -0.06835,0.045 -0.09032,0.045 -0.0104,-0.035 -0.009,-0.1127 0.04516,-0.1358 -0.11984,-0.059 0.102268,-0.061 0,-0.2259 -0.06704,-0.068 -0.211871,0.1629 -0.180634,0.09 -0.20411,0.072 0.216982,0.151 -0.04516,0.1806 0.186072,0.035 -0.11247,0.2885 -0.135476,0.1807 -0.09621,0.092 0.08105,-0.2178 0,-0.1359 -0.02632,0 -0.09958,0 -0.135476,0 -0.0012,0 -0.02827,0.02 0,0.045 0.0055,0.038 -0.330384,-0.037 -0.406427,-0.045 -0.05374,-0.052 -0.06724,-0.093 -0.135475,-0.09 -0.124204,0 -0.150668,0.1496 -0.180634,0.1807 -0.111517,0.1214 -0.13773,-0.097 -0.04516,-0.09 -0.134609,-0.023 -0.225598,-0.061 -0.270952,-0.09 -0.0033,-0.017 -0.02208,-0.075 -0.04516,-0.09 -0.114594,-0.1513 -0.229456,-0.2437 -0.31611,-0.1358 -0.159354,0.1621 -0.08913,-0.049 -0.135475,-0.045 -0.0085,5e-4 -0.02415,-0.019 -0.04516,0 z m 1.716025,0.3613 h 0.04516 c 0.08851,0.022 0.01697,-0.1791 -0.04516,-0.1807 -0.01011,-2e-4 -0.03498,0.035 -0.04516,0.045 -0.11364,0.051 -0.160962,0.023 0,0.09 l 0.04516,0.045 z m 0.361269,0.5419 c -0.0079,0.014 -0.0117,0.072 0,0.045 0.0048,0.035 0.08076,0.1112 0.09032,0.09 0.15424,-0.195 0.164664,0.046 0.31611,0 -0.03415,-0.04 -0.227202,-0.261 -0.225793,-0.271 -0.05786,-3e-4 -0.156921,0.1055 -0.180634,0.1359 z m 1.399914,2.3933 c 0.0016,0.014 0.01286,0 0.04516,0 0.02961,-0.048 0.103626,0.014 0.04516,-0.1358 -0.0038,0.014 -0.09519,0.098 -0.09032,0.1358 z m -5.102916,-0.7676 c 0.02219,0.046 0.01172,0.1141 0,0.09 0.06356,0.033 0.08657,0.1257 0.180634,0.09 0.02836,-0.081 -0.112878,-0.1272 -0.180634,-0.1807 z m 4.651331,-1.9419 c -0.06072,-10e-5 -0.231662,0.094 -0.04516,0.09 0.06634,-0.065 0.07481,-0.09 0.04516,-0.09 z m 1.309598,0.09 c -0.05374,-2e-4 -0.06829,0.1402 0.09032,0.1358 -0.04105,-0.09 -0.06407,-0.1358 -0.09032,-0.1358 z m 1.535391,0.9484 c 0.02032,0.016 0.02788,0.074 0.04516,0.09 -0.03007,-0.041 -0.02595,-0.091 -0.04516,-0.09 z m 0.04516,0.09 c 0.07977,0.068 -0.03724,0.1199 0.135475,0.1806 l 0.04516,0.045 c 0.104508,0.014 0.05055,-0.1823 0.04516,-0.2257 -0.08876,-0.014 -0.177523,0.071 -0.180634,0 -0.01127,-0.019 -0.03513,0.014 -0.04516,0 z m -3.612685,0.1806 c -0.02996,0 -0.110215,0.1185 0,0.09 0.03486,-0.04 0.01272,-0.091 0,-0.09 z m -0.316109,0.4064 c -0.04649,4e-4 -0.0422,0.065 0.09032,0.045 -0.01562,-0.035 -0.07069,-0.045 -0.09032,-0.045 z m 4.922282,0.3162 c 0.02285,0.065 0.03779,0.117 0.09032,0.2257 0.01546,0 0.02498,0.026 0.04516,0.045 -0.04052,-0.092 -0.09033,-0.1807 -0.135475,-0.271 z m -0.180634,0.045 c -0.0026,0.088 0.04016,0.2547 0.09032,0.3612 0.0082,0.017 -0.0074,0.03 0,0.045 -0.0045,6e-4 -0.01373,0.049 0,0.045 0.003,0 0.04264,0 0.04516,0 -0.04351,0.1471 0.05649,0.1713 0,0.2259 0.201321,0.042 0.08532,-0.2345 0.04516,-0.3162 -0.05098,-0.1669 -0.167239,-0.3111 -0.180635,-0.3613 z m -3.386892,0.1358 c -0.05487,10e-5 -0.03402,0.081 0.180634,0.1358 -0.05527,-0.082 -0.140591,-0.1358 -0.180634,-0.1358 z m 0.541903,0 c -0.04708,0.08 -0.09808,0.1676 -0.180635,0.1806 -0.05662,0.074 0.103049,0.181 0.270952,0.1359 -0.0013,0.042 -0.06347,0.117 0.09032,0.045 0.01597,-0.038 -0.0059,-0.046 0,-0.045 0,0 0.04516,0.045 0.04516,0.045 0.0055,0.04 0.01156,0.097 0.04516,0.09 0.121487,-0.1185 -0.04139,-0.094 -0.04516,-0.1359 -0.0013,-0.014 0.0012,-0.055 0.04516,-0.09 -0.145799,0.081 -0.211123,-0.059 -0.09032,-0.09 -0.19025,-0.016 -0.02279,-0.03 -0.09032,-0.09 -0.103309,0.062 -0.115679,0.014 -0.09032,-0.045 z m 2.79983,0.09 c -0.01468,9e-4 -0.03501,0.014 -0.04516,0.045 -0.01171,0.058 0.02377,0.2852 0.04516,0.2259 0.01494,0.014 0.01387,0.062 0.04516,0.045 0.141545,-0.022 0.02559,-0.3205 -0.04516,-0.316 z m 0.406427,0.1358 c 0.01685,0.1416 -0.002,0.3213 0,0.3613 -0.05686,0.077 -0.144873,0.1199 -0.180634,0.1358 0.07341,0.08 -0.01626,0.3265 0.04516,0.4064 -0.122759,-0.016 -0.140562,0.2322 -0.135475,0.3162 -0.01455,0.2338 0.150043,0.3205 0.180634,0.316 0.165256,0 0.194273,-0.4905 0.180634,-0.3613 0.02171,-0.2263 0.177348,-0.2855 0.225793,0 -0.07153,-0.4133 -0.162611,-0.7953 -0.31611,-1.1741 z m 0,1.5354 c -0.07381,0.019 -0.108785,0.056 -0.04516,0.09 -0.155097,-0.022 -0.26964,0.6838 -0.270952,0.5419 -0.174871,0.1601 -0.273942,0.3996 -0.31611,0.6322 0.09247,0.1928 0.04996,0.7639 0,0.6775 0.04069,0.117 0.14247,0.4104 0.135476,0.2709 0.05247,0.159 0.220336,0.3128 0.361268,0.1359 0.196646,-0.1599 0.3696,-0.1979 0.225793,0.1358 0.200782,-0.5907 0.361269,-1.193 0.361269,-1.8516 0,-0.063 -0.04318,-0.1185 -0.04516,-0.1806 -0.126574,-0.1431 -0.353445,-0.4402 -0.180634,-0.4516 -0.06779,-0.02 -0.151984,-0.019 -0.225793,0 z m -5.735136,1.1291 c -0.07149,-6e-4 -0.109219,0.043 -0.180635,0.089 -0.04014,0.049 0.02093,0.055 0.09032,0.045 0,0 0.04516,0 0.04516,0 0.04747,-0.014 0.08867,-0.036 0.09032,-0.045 0.009,0.014 0.613981,0.2571 0.361269,0.1807 0.02809,0.02 0.04955,0.032 0.04516,0.045 0.0053,0.014 0.03601,0.049 0.180634,0.045 0.208289,-0.065 -0.190365,-0.1866 -0.180634,-0.1807 -0.01957,-0.014 -0.02504,-0.035 -0.04516,-0.045 -0.02554,-0.038 -0.03158,-0.045 -0.04516,-0.045 -0.105924,-0.053 -0.248041,-0.089 -0.361268,-0.089 z m -5.148076,0.089 c -0.01985,0 -0.05147,0.056 0,0.09 0.0185,-0.063 0.01358,-0.091 0,-0.09 z m 6.006088,0.2258 c -0.03209,5e-4 -0.05499,0.033 -0.04516,0.045 0.02298,0.016 -0.01,0.033 0,0.045 -0.0094,-2e-4 -0.01896,0.059 0,0.045 -0.02114,0 -0.02792,0.043 -0.04516,0.045 0.12221,-0.067 0.110953,0.078 0.180635,0.045 0.02858,-0.095 0.375135,-0.032 0.270951,-0.1359 -0.02182,-0.051 -0.264998,-0.092 -0.361268,-0.09 z m 0.587062,0.1358 c -0.05835,0 -0.187045,0.1171 0,0.09 0.01783,-0.039 0.02464,-0.091 0,-0.09 z m -1.083806,0.045 c 0.0097,0.014 0.01912,0.032 0.04516,0.045 h 0.04516 c 0.172535,-0.016 -0.01402,-0.046 -0.09032,-0.045 z m -1.219281,1.6257 c -0.0163,0 -0.0011,0.1185 0.04516,0.09 -0.0078,-0.061 -0.03802,-0.09 -0.04516,-0.09 z"
          style="display:none;fill:url(#linearGradient7603);fill-opacity:1;stroke:#767554;stroke-width:0.181626;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /><path
-         inkscape:connector-curvature="0"
          id="path3800-3-8-0"
          d="m 69.11382,1084.0736 c -0.08358,-10e-5 -0.146685,0.025 0,0.045 0.101849,0.014 -0.05818,0.061 0.09032,0.045 0.07519,-0.065 -0.01658,-0.09 -0.09032,-0.09 z m -1.806342,0.045 c -0.08085,0.016 -0.146193,0.071 -0.225793,0.09 0.167199,-0.042 0.324172,-0.063 0.496744,-0.09 -0.08865,0.014 -0.183662,-0.017 -0.270951,0 z m 0.722537,0 c -0.100838,0.019 -0.125577,0.038 0,0.045 0.08577,-0.039 0.08961,-0.048 0.135475,-0.045 -0.05026,0 -0.09312,-0.014 -0.135475,0 z m 1.625708,0 c -0.0091,-8e-4 -0.03685,0.046 -0.04516,0.045 -0.01605,0.03 -0.129334,0.049 0.04516,0.045 0.0048,0.019 0.01431,0.067 0.04516,0.045 0.01156,-0.019 0.01983,-0.077 0.04516,-0.09 -0.03183,0 -0.05829,-0.039 -0.09032,-0.045 z m -1.128964,0.045 c -0.02416,6e-4 -0.03418,0.051 -0.04516,0.09 -0.09662,-0.065 -0.29735,-0.055 -0.361269,-0.045 -0.05552,0.027 -0.05,0.055 0.135476,0.045 0.103958,0 -0.01496,0.032 -0.09032,0.045 0.02251,0 0.01773,10e-4 0.09032,0 0.09883,0 0.621851,-0.055 0.31611,-0.09 0.02353,-0.04 -0.02653,-0.045 -0.04516,-0.045 z m 0.722537,0 c -0.01127,0.014 0.02183,0.048 0.135475,0.045 0.03143,-0.042 0.03666,-0.046 0,-0.045 -0.03753,5e-4 -0.12416,-0.014 -0.135475,0 z m -0.451586,0.045 c -0.01501,6e-4 8e-5,0.039 0,0.045 0,0 0.04516,0 0.04516,0 z m 0.04516,0.045 c -0.04631,0.014 -0.04368,0.033 0.09032,0.045 -0.03234,0 -0.123857,0.062 0.04516,0.045 0.132571,-0.04 0.176165,-0.1373 0.04516,-0.1358 -0.01358,1e-4 -0.02783,0.043 -0.04516,0.045 0.01672,0.017 -0.08916,-0.014 -0.135476,0 z m 1.128964,-0.045 c -0.01387,0.017 -0.03883,0.027 -0.04516,0.045 -0.009,0.026 0.01026,0.077 0,0.09 -0.0072,0 -0.03152,0 -0.04516,0 -0.05439,-3e-4 -0.162088,0.014 -0.180634,0 -0.153773,-0.014 -0.07519,0.025 -0.04516,0.045 0.138264,0.014 0.297103,0.08 0.31611,0.09 0.136704,0.014 0.03662,-0.1584 0.270951,-0.09 -0.0059,-0.024 0.0011,-0.039 0.04516,-0.045 -0.105129,-0.035 -0.208457,-0.1069 -0.316109,-0.1358 z m -0.722537,0.045 c 0.01559,0.014 0.002,0.033 0.04516,0.045 0.06509,-0.037 0.0069,-0.045 -0.04516,-0.045 z m -1.625708,0.045 c -0.253349,0.1142 -0.426184,0.1817 -0.406427,0.271 0.180027,-0.019 0.371333,-0.1717 0.587061,-0.1807 0.223903,-0.075 -0.05272,-0.085 -0.180634,-0.09 z m 1.445074,0.045 c -0.0409,0.016 -0.01728,0.074 0.09032,0.09 0.02965,-0.053 -0.0091,-0.091 -0.04516,-0.09 -0.01504,2e-4 -0.03153,0 -0.04516,0 z m -0.677379,0.045 c -0.04481,0 -0.05671,0.036 0,0.09 0.172461,-0.032 0.0655,-0.091 0,-0.09 z m 0.31611,0.045 c -0.137831,0.038 0.04928,0.025 -0.09032,0.09 -0.207472,-0.068 -0.03163,0.1658 0,0.1807 0.04266,0 0.131011,-0.088 0.180635,-0.1359 -0.03626,-0.026 0.01566,-0.071 0.04516,-0.09 3.77e-4,-0.014 -0.01069,-0.04 -0.04516,-0.045 -0.0196,0 -0.06061,9e-4 -0.09032,0 z m 1.716025,0 c -0.004,0 -0.01945,0.029 0,0.045 0.07818,0.033 0.02507,0.035 0.04516,0.045 0.03601,0.071 0.313666,0.1649 0.180634,0.1359 0.135678,0.027 0.416206,0.3372 0.361268,0.2257 0.04163,0.069 0.111546,0.3245 0.09032,0.2258 0.0104,0 0.09364,0.062 0.09032,0.09 0.07303,0.017 0.09192,0.066 0.09032,0.09 0.01387,0 0.03951,0.059 0,0.045 0,0 -0.04516,0 -0.04516,0 0.0066,0 -0.0061,0.043 0,0.045 0.123612,0.045 0.0056,0.1286 0.04516,0.1359 -0.04496,4e-4 -0.04601,0.036 -0.04516,0.045 0.0078,0 -0.0058,0.042 0,0.045 0.01988,0 -0.03053,0.046 0.09032,0.045 -0.02273,-9e-4 -0.102253,0.014 -0.135475,0 0.01098,0 0.0066,0.027 0.04516,0.045 -0.05684,0.014 -0.08789,0.068 -0.09032,0.09 0.156122,-0.053 0.09485,0.022 0.04516,0.045 0.04858,0 0.08897,0.019 0.09032,0.045 0.01497,0 0.03866,0.033 0,0.045 -0.0022,0 0.004,0.039 0,0.045 0.0072,0 -0.0046,0.041 0,0.045 -0.08747,0.03 -0.03464,0.1041 0,0.1359 -0.002,7e-4 0.0424,0.014 0.04516,0 -0.0084,0.09 0.04516,0.2208 0.04516,0.1806 0.08871,0.084 0.176136,0.1171 0.180634,0.09 0.02958,0 0.141039,0.071 0.135476,0.09 0.04514,0.014 0.07444,0 0.04516,-0.045 0.0042,-0.02 -0.0097,-0.055 0,-0.09 0.01272,-0.048 0.01607,-0.066 0,-0.045 -0.04244,-0.038 0.08587,-0.075 0.04516,-0.09 0.04006,-0.039 0.02247,-0.3081 0.04516,-0.1806 0.124681,-0.045 0.167427,0.042 0.180635,-0.045 3.52e-4,0.069 0.06373,0.014 0.09032,0 0.0064,0 0.04063,0 0.04516,0 0.03445,-0.027 -0.01487,-0.1848 0.04516,-0.1359 0.07386,0.1171 0.333387,0.12 0.406427,0.045 -0.06679,-0.035 -0.100563,-0.071 -0.135476,-0.09 -0.05608,-0.02 -0.07516,-0.078 -0.09032,-0.09 0.0149,0 0.03384,0.029 0.09032,0.045 0.02376,0.022 0.03107,-0.014 0.04516,0 -0.04337,-0.059 -0.08394,-0.1445 -0.09032,-0.1358 -0.04805,-0.045 -0.05874,-0.053 -0.04516,-0.045 -0.07471,-0.052 -0.0069,-0.071 0.09032,0 -0.503631,-0.4665 -1.072016,-0.862 -1.716025,-1.1289 -0.03867,0 -0.236008,-0.039 -0.31611,-0.045 z m -2.619196,0.045 c -0.05805,0.035 -0.103164,0.066 -0.180634,0.09 0.08266,0 -0.436024,0.1185 0.04516,0.09 -0.06329,0.036 -0.540547,0.059 -0.180634,0.1806 -0.12825,0.2039 0.586882,-0.068 0.406427,0 0.06181,-0.017 0.09822,0.091 0.225793,0.09 0.162503,-0.03 0.129551,-0.1228 0.09032,-0.1358 0.0322,-0.02 0.06892,-0.048 0.09032,-0.045 -0.05185,-0.059 -0.08393,-0.087 0,-0.1806 -0.05951,0.04 -0.194185,0.088 -0.180634,0 0.0082,-0.059 0.01776,-0.1739 -0.04516,-0.09 -0.09198,0.024 -0.17661,0.014 -0.225793,0 -0.0104,0 -0.04373,0 -0.04516,0 z m 1.535391,0.09 c -0.107831,0.033 -0.344638,0.2215 -0.09032,0.271 -0.04356,-0.014 -0.07185,-10e-4 -0.09032,0 0.04418,0.037 0.112152,0.1069 0.09032,0.09 0.04681,0.014 0.147535,0.032 0.225793,0.045 0.105317,0.019 0.193436,0.033 0.135476,0.045 0.130201,0.058 0.05777,-0.1893 0.135475,0.045 0.128077,0.02 0.27517,0.1141 0.135476,0.1358 -0.0069,10e-5 -0.01567,0.081 0,0.045 0.0402,0.062 0.150499,0.1579 0.135476,0.09 0.08315,0.065 -0.110548,0.1569 -0.180635,0.1806 0.0177,0.059 -0.03884,0.1113 -0.09032,0.1359 0.06264,-0.014 0.246448,0.246 0.180635,0.1806 -0.02867,0.014 -0.02299,0.022 0,0.045 -0.0098,0 0.02185,0.061 0.04516,0.045 0.09743,0.065 0.245697,0.1257 0.270951,0.1358 0.01,-0.036 -0.04431,-0.1257 -0.09032,-0.1806 0.01185,0 0.02392,-0.014 0.04516,0 0.04767,0.014 0.146999,0.027 0.135476,0.09 0.04169,-0.036 -0.0049,-0.1807 0,-0.1807 -0.1151,-0.1611 -0.108568,-0.098 -0.135476,-0.2257 -0.02711,-0.023 0.167583,-0.014 0.135476,0 0.02048,0.032 0.0404,0.062 0.04516,0.09 -0.01575,0 0.140056,-0.068 0.135475,0.045 0.03637,-0.023 0.03461,-0.061 0.04516,-0.09 0.168702,0 -0.05389,-0.052 0,-0.045 0.01402,-0.1011 -0.11841,-0.053 -0.09032,-0.1358 -0.04477,-0.051 -0.130837,-0.1156 -0.09032,-0.045 -0.01753,0 -0.07007,-0.058 -0.09032,-0.09 0.0078,-0.02 -0.0017,-0.058 0.135476,-0.045 -0.05561,-0.017 -0.08386,-0.032 -0.09032,-0.045 0.01798,-0.016 0.03208,-0.055 -0.09032,-0.045 -0.0299,-0.03 0.01838,-0.038 0.04516,-0.045 -6.12e-4,-0.014 -0.01171,-0.02 -0.04516,-0.045 -0.109146,0.048 -0.0098,-0.017 -0.04516,-0.045 -0.02155,0.014 -0.04663,0.014 -0.04516,0 0.09383,-0.043 0.01718,-0.1055 -0.04516,-0.09 0.02032,-0.019 -0.02958,-0.066 -0.09032,-0.045 -0.106357,-0.024 0.01585,0 -0.09032,-0.09 -0.01676,-0.038 -0.01501,-0.09 -0.04516,-0.09 -0.05507,2e-4 -0.07881,0.043 -0.09032,0.045 -0.01653,-0.046 -0.0349,-0.062 -0.04516,-0.045 0.0046,-0.056 -0.03548,-0.1055 -0.180634,-0.045 -0.07579,0.02 -0.05127,0.1577 -0.09032,0.09 -0.0397,-0.032 -0.06827,-0.027 -0.09032,0 -0.02205,0.028 -0.02562,0.071 0,0.09 -0.08386,0.017 -0.04658,-0.035 0,-0.09 0.06987,-0.084 0.144175,-0.1831 0.04516,-0.1806 -0.02027,4e-4 -0.04897,-0.014 -0.09032,0 z m -2.528879,0.09 c -0.04168,0.016 -0.138857,0.061 -0.225793,0.09 -0.08448,0.02 -0.177462,0.014 -0.135476,0 -0.03442,-0.014 -0.225251,0.104 -0.31611,-0.045 -0.15475,0.014 -0.22998,0 -0.316109,0 -0.01172,0 -0.03348,0 -0.04516,0 -0.51809,0.2744 -0.988949,0.6277 -1.399916,1.0387 -0.05146,0.048 -0.09312,0.1229 -0.135475,0.1807 -0.06051,0.084 -0.07162,0.1445 0,0.09 -0.08021,0.088 -0.106752,0.2593 0.04516,0.1358 -0.127771,0.1948 -0.324817,0.3604 -0.451586,0.4968 0.207116,-0.1689 0.390662,-0.3587 0.587061,-0.5419 0.01575,-0.084 0.1341,-0.1329 0.225793,-0.1806 -0.09124,0.084 -0.180188,0.2231 -0.09032,0.1358 0.0882,-0.035 0.212553,-0.1668 0.270951,-0.2257 -0.0011,0 0.04432,0 0.04516,0 0.01399,-4e-4 0.02171,0 0,0.045 0.04249,0.014 0.1853,0.077 0.225793,0.09 0.04562,-0.023 0.147873,0.085 0.135476,0.1358 0.0124,-0.014 0.03244,-0.022 0.04516,-0.09 0.0099,-0.039 -0.03141,0.2057 0,0.1807 -0.01275,0.029 -0.0353,0.061 -0.04516,0.09 0,0 -0.04516,0.045 -0.04516,0.045 -0.0081,0.019 -0.0064,0.039 0,0.045 0,0 0.04516,-0.045 0.04516,-0.045 -0.0034,0.014 -0.0015,0.035 0,0.045 -0.005,5e-4 -0.02389,0.059 0,0.045 0.0046,0 0.03764,-4e-4 0.04516,0 -0.02653,0.027 -0.01638,0.036 0,0.045 0.01488,0.014 5.5e-5,0.041 -0.04516,0.09 -0.01454,0.014 0.02371,0.025 0,0.045 -0.02886,0.095 0.01342,0.1359 0.04516,0.1359 -0.01798,0.079 -0.01867,0.1579 0,0.1806 -0.0415,0.059 -0.07669,0.1416 -0.04516,0.09 0.07378,-0.014 0.0011,0.1257 -0.04516,0.1806 0.02834,-0.014 0.07674,-0.026 0.180634,-0.09 -0.0082,0.025 0.123813,0.082 0.04516,0.1359 0.03263,0.051 0.02895,0.1286 0,0.1806 -0.01908,0.033 -0.0424,0.038 -0.04516,0.045 -0.05049,-0.2244 -0.182126,0.3601 -0.180634,0.2257 -0.09281,0.2171 -0.184077,0.401 -0.225793,0.6322 -0.08139,0.1739 -0.02076,0.4711 0.04516,0.4065 0.04001,0.1529 0.01708,0.3703 0.180634,0.4064 0.155322,0.152 0.10817,0.4311 0.270952,0.5871 0.02048,0.12 -0.128768,0.1931 0.04516,0.2258 0.113208,0.2501 0.133117,0.4109 0.270951,0.3612 -0.09169,-0.1055 -0.25631,-0.5183 -0.225793,-0.4966 -0.07931,-0.1287 -0.173621,-0.4827 0,-0.3613 0.07233,0.1521 0.132911,0.363 0.270952,0.4967 0.0043,0.1563 0.22556,0.3085 0.270951,0.5419 -0.03782,0.1572 0.02529,0.2692 0.180634,0.3612 0.218358,0.061 0.436111,0.2914 0.677379,0.1807 0.156357,-0.027 0.289166,0.3063 0.496744,0.2709 0.229001,0.023 0.220627,0.081 0.361268,0.271 -0.01156,0.1828 0.112181,-0.048 0.135476,0.1806 0.07209,-0.014 0.307461,0.062 0.361268,0.09 0.008,-0.1884 0.269413,-0.1286 0.225793,0.045 0.0747,0.1574 0.06241,0.3712 -0.09032,0.4967 -0.101184,0.04 -0.200609,0.2345 -0.225793,0.3161 0.227877,-0.024 0.131112,0.3285 0.04516,0.3613 0.205709,0.1171 0.276077,0.371 0.406427,0.5419 0.08621,0.1857 0.388537,0.1857 0.496745,0.3613 0.02814,0.2003 -0.01387,0.35 0,0.5419 -0.08689,0.1501 0.0177,0.3206 -0.04516,0.4516 -0.07473,0.1185 -0.115361,0.3503 0.04516,0.3612 -0.0084,0.039 -0.07266,0.092 -0.09032,0.1359 -0.0056,0.014 0,0.037 0,0.045 -0.112398,0 -0.08498,0.022 -0.04516,0.045 0,0 0.04516,0.045 0.04516,0.045 0.01329,5e-4 0.02896,0.014 0.04516,0 0.01402,0.014 -0.01,0.038 0,0.045 0.136082,-0.014 0.273318,-0.022 0.406427,-0.045 -0.182325,-0.026 0.237626,-0.1416 0,-0.1807 0.0987,-0.026 0.0774,-0.091 0.180634,-0.1358 0.0084,-0.042 0.196108,-0.2228 0.361268,-0.2257 0.411132,-0.071 -0.203677,-0.3353 0.180634,-0.2259 0.116964,0.065 0.29323,-0.1387 0.361268,-0.2257 -0.05939,0.1585 0.281741,-0.3464 0.270952,-0.3613 0.152708,-0.1141 0.609512,-0.2704 0.451585,-0.2709 0.207422,-0.1445 0.281629,-0.4255 0.31611,-0.6775 0.174726,-0.1458 0.295933,-0.4276 0.31611,-0.4967 -0.03568,-0.1242 -0.504442,-0.2372 -0.361268,-0.2258 -0.09757,-0.046 -0.233604,-0.068 -0.270952,0 -0.0094,-0.091 -0.304507,-0.12 -0.225792,-0.09 -0.04999,0.036 -0.06761,0.019 -0.09032,0.045 -0.08046,0.091 -0.03829,0.1402 -0.135475,0.045 0.07592,-0.014 0.116516,-0.022 0.135475,-0.045 0.02843,-0.035 0.0011,-0.084 -0.04516,-0.09 -0.0077,6e-4 -0.04117,0 -0.04516,0 -0.0056,0 -0.0429,0 -0.04516,0 -0.03051,0.014 -0.06114,0.051 -0.09032,0.09 -0.08452,-0.025 -0.05975,-0.4036 0.09032,-0.3162 -0.04208,-0.1644 -0.180697,-0.2458 -0.361269,-0.2709 -0.226956,0.053 -0.267778,-0.088 -0.406428,-0.2258 -0.12468,0.029 -0.226532,-0.1741 -0.225792,-0.1806 -0.170932,0.1199 -0.602057,-0.014 -0.677378,-0.045 -0.07045,0 -0.113251,0.051 -0.09032,0.1806 -0.206379,0.081 0.108481,-0.3398 -0.09032,-0.2257 -0.128959,0.162 -0.280423,0.02 -0.31611,0.2257 -0.133785,0.2002 -0.09785,0.082 -0.31611,0 -0.251648,0.1373 -0.45284,-0.023 -0.406427,-0.1806 0.05422,-0.1344 -0.01026,-0.3454 0,-0.3613 -0.06094,-0.014 -0.195335,-0.087 -0.361269,-0.045 -0.246457,0.08 0.06764,-0.1517 0,-0.2258 -0.01619,-0.075 -0.120895,-0.3133 0.04516,-0.3161 -0.247612,-0.039 -0.264447,0.1746 -0.361268,0.3161 -0.0863,-0.074 -0.302964,0.075 -0.406427,-0.09 -0.179455,-0.1674 -0.16357,-0.4262 -0.09032,-0.6322 0.0687,-0.079 -0.0041,-0.3479 0.180634,-0.3613 0.172498,-0.097 0.118395,-0.1272 0.361268,-0.09 0.05499,0.014 0.126242,-0.1012 0.225793,0 0.0094,-0.1448 0.439329,-0.085 0.31611,-0.09 0.08587,0.1098 0.246796,0.014 0.270952,0.2259 -0.01344,0.075 0.142137,0.2426 0.180634,0.316 0.169985,-0.2103 -0.187016,-0.5442 0.09032,-0.7225 0.159459,-0.107 0.428687,-0.2989 0.406427,-0.3161 0.01301,0 0.026,-0.042 0.04516,-0.045 -0.01344,-0.014 -0.01026,-0.03 -0.04516,-0.045 0.08519,-0.064 0.01448,-0.2354 0,-0.2709 0.0055,0 0.101155,-0.1952 0.09032,0.045 0.03461,0.2464 0.06759,-0.1026 0.09032,-0.1807 0.0452,-0.03 0.08222,-0.074 0.135475,-0.1358 0.0077,-0.014 0.03254,0 0.04516,0 0.04512,-0.043 0.102095,-0.1084 0.180635,-0.09 0.166978,-0.014 0.07412,-0.014 0.09032,-0.1806 0.113308,-0.133 0.258747,-0.1768 0.31611,-0.1807 -0.0461,-0.072 0.156313,-0.014 0.225792,-0.045 -0.07598,0.039 -0.223603,0.1755 -0.04516,0.2259 0.03367,-0.1416 0.343512,-0.1402 0.31611,-0.2259 -0.0039,-0.014 -0.02468,0.019 -0.04516,0 -0.210821,0.091 -0.329963,-0.2102 -0.270952,-0.2257 -0.212243,-0.046 0.384506,-0.1315 0,-0.1806 -0.317741,0.091 -0.597593,0.3519 -0.225793,0 0.177503,-0.055 0.196233,-0.2214 0.406428,-0.1358 0.136068,0.02 0.347227,0.1156 0.451585,-0.045 0.104349,0.029 0.233393,-0.082 0.180635,-0.1359 0.05896,-0.08 -0.02912,-0.1657 -0.04516,-0.1358 -0.01055,-0.074 -0.115635,-0.035 -0.180634,0 0.0053,-0.014 -0.01857,-0.025 0,-0.045 0.05017,-0.03 0.248185,-0.045 0.04516,-0.1359 -0.06626,0.025 -0.157196,-0.052 -0.09032,-0.045 -0.132657,-0.084 -0.07231,-0.2902 -0.09032,-0.2258 0.04756,-0.069 0.08129,-0.1875 0,-0.1358 -0.116054,0.016 0.0048,-0.069 -0.09032,-0.1806 -0.0026,-0.03 -0.03958,-0.036 -0.04516,-0.045 -0.02613,0.046 -0.09116,0.1199 -0.09032,0.09 -0.0039,0.071 -0.174478,0.1098 -0.180634,0.09 -0.07276,0.03 0.03444,-0.071 -0.135476,-0.09 -0.01477,-0.026 -0.01754,-0.1055 -0.04516,-0.1359 0.15668,0.065 0.206565,-0.1513 0.04516,-0.1358 -0.05439,-0.042 -0.357893,-0.1402 -0.225793,-0.1807 -0.200677,-0.1069 -0.247223,-0.014 -0.31611,0.1359 0.06246,0 -0.06841,0.1228 0,0.1358 -0.09434,0.1315 -0.02214,0.3989 0,0.4516 -0.0052,0.1041 -0.239914,0.361 -0.316109,0.2257 -0.04092,0.1041 -0.103554,0.3613 -0.04516,0.271 0.03178,0.1185 -0.08633,0.03 -0.135476,0.045 -0.119681,-0.1 -0.109262,-0.2182 -0.04516,-0.4065 -0.03478,-0.1704 -0.223877,-0.029 -0.31611,-0.2257 -0.07438,-0.097 -0.278593,-0.1869 -0.361269,-0.1807 0.0474,-0.2799 -0.188827,-0.027 -0.09032,-0.2258 0.03785,-0.1539 0.16659,-0.2857 0.270952,-0.3613 0.07663,-0.055 0.137267,-0.014 0.09032,-0.1358 0.182851,0.1758 0.08571,-0.023 0.09032,-0.045 0.168566,0.097 0.129536,-0.09 0.270951,0 0.06816,-0.014 0.115606,-0.027 0.135476,-0.045 0.03516,-0.033 -0.0032,-0.098 -0.04516,-0.1359 0.178419,0.092 0.196885,-0.2188 0.31611,-0.09 0.0051,0 0.02697,-0.042 0.04516,0 0.17381,0.029 0.142296,-0.2815 0.180634,-0.1806 0.01484,0 -0.0064,-0.043 0,-0.045 -0.03571,-0.032 -0.07068,-0.065 -0.09032,-0.09 -0.06392,0.051 -0.170448,0.1286 -0.225793,0.1806 -0.03445,0.017 -0.054,0.058 -0.04516,0.045 -0.08305,-0.014 0.07733,-0.3585 -0.09032,-0.2257 -0.03918,0.032 -0.06835,0.045 -0.09032,0.045 -0.0104,-0.035 -0.009,-0.1127 0.04516,-0.1358 -0.11984,-0.059 0.102268,-0.061 0,-0.2259 -0.06704,-0.068 -0.211871,0.1629 -0.180634,0.09 -0.20411,0.072 0.216982,0.151 -0.04516,0.1806 0.186072,0.035 -0.11247,0.2885 -0.135476,0.1807 -0.09621,0.092 0.08105,-0.2178 0,-0.1359 -0.02632,0 -0.09958,0 -0.135476,0 -0.0012,0 -0.02827,0.02 0,0.045 0.0055,0.038 -0.330384,-0.037 -0.406427,-0.045 -0.05374,-0.052 -0.06724,-0.093 -0.135475,-0.09 -0.124204,0 -0.150668,0.1496 -0.180634,0.1807 -0.111517,0.1214 -0.13773,-0.097 -0.04516,-0.09 -0.134609,-0.023 -0.225598,-0.061 -0.270952,-0.09 -0.0033,-0.017 -0.02208,-0.075 -0.04516,-0.09 -0.114594,-0.1513 -0.229456,-0.2437 -0.31611,-0.1358 -0.159354,0.1621 -0.08913,-0.049 -0.135475,-0.045 -0.0085,5e-4 -0.02415,-0.019 -0.04516,0 z m 1.716025,0.3613 h 0.04516 c 0.08851,0.022 0.01697,-0.1791 -0.04516,-0.1807 -0.01011,-2e-4 -0.03498,0.035 -0.04516,0.045 -0.11364,0.051 -0.160962,0.023 0,0.09 l 0.04516,0.045 z m 0.361269,0.5419 c -0.0079,0.014 -0.0117,0.072 0,0.045 0.0048,0.035 0.08076,0.1112 0.09032,0.09 0.15424,-0.195 0.164664,0.046 0.31611,0 -0.03415,-0.04 -0.227202,-0.261 -0.225793,-0.271 -0.05786,-3e-4 -0.156921,0.1055 -0.180634,0.1359 z m 1.399914,2.3933 c 0.0016,0.014 0.01286,0 0.04516,0 0.02961,-0.048 0.103626,0.014 0.04516,-0.1358 -0.0038,0.014 -0.09519,0.098 -0.09032,0.1358 z m -5.102916,-0.7676 c 0.02219,0.046 0.01172,0.1141 0,0.09 0.06356,0.033 0.08657,0.1257 0.180634,0.09 0.02836,-0.081 -0.112878,-0.1272 -0.180634,-0.1807 z m 4.651331,-1.9419 c -0.06072,-10e-5 -0.231662,0.094 -0.04516,0.09 0.06634,-0.065 0.07481,-0.09 0.04516,-0.09 z m 1.309598,0.09 c -0.05374,-2e-4 -0.06829,0.1402 0.09032,0.1358 -0.04105,-0.09 -0.06407,-0.1358 -0.09032,-0.1358 z m 1.535391,0.9484 c 0.02032,0.016 0.02788,0.074 0.04516,0.09 -0.03007,-0.041 -0.02595,-0.091 -0.04516,-0.09 z m 0.04516,0.09 c 0.07977,0.068 -0.03724,0.1199 0.135475,0.1806 l 0.04516,0.045 c 0.104508,0.014 0.05055,-0.1823 0.04516,-0.2257 -0.08876,-0.014 -0.177523,0.071 -0.180634,0 -0.01127,-0.019 -0.03513,0.014 -0.04516,0 z m -3.612685,0.1806 c -0.02996,0 -0.110215,0.1185 0,0.09 0.03486,-0.04 0.01272,-0.091 0,-0.09 z m -0.316109,0.4064 c -0.04649,4e-4 -0.0422,0.065 0.09032,0.045 -0.01562,-0.035 -0.07069,-0.045 -0.09032,-0.045 z m 4.922282,0.3162 c 0.02285,0.065 0.03779,0.117 0.09032,0.2257 0.01546,0 0.02498,0.026 0.04516,0.045 -0.04052,-0.092 -0.09033,-0.1807 -0.135475,-0.271 z m -0.180634,0.045 c -0.0026,0.088 0.04016,0.2547 0.09032,0.3612 0.0082,0.017 -0.0074,0.03 0,0.045 -0.0045,6e-4 -0.01373,0.049 0,0.045 0.003,0 0.04264,0 0.04516,0 -0.04351,0.1471 0.05649,0.1713 0,0.2259 0.201321,0.042 0.08532,-0.2345 0.04516,-0.3162 -0.05098,-0.1669 -0.167239,-0.3111 -0.180635,-0.3613 z m -3.386892,0.1358 c -0.05487,10e-5 -0.03402,0.081 0.180634,0.1358 -0.05527,-0.082 -0.140591,-0.1358 -0.180634,-0.1358 z m 0.541903,0 c -0.04708,0.08 -0.09808,0.1676 -0.180635,0.1806 -0.05662,0.074 0.103049,0.181 0.270952,0.1359 -0.0013,0.042 -0.06347,0.117 0.09032,0.045 0.01597,-0.038 -0.0059,-0.046 0,-0.045 0,0 0.04516,0.045 0.04516,0.045 0.0055,0.04 0.01156,0.097 0.04516,0.09 0.121487,-0.1185 -0.04139,-0.094 -0.04516,-0.1359 -0.0013,-0.014 0.0012,-0.055 0.04516,-0.09 -0.145799,0.081 -0.211123,-0.059 -0.09032,-0.09 -0.19025,-0.016 -0.02279,-0.03 -0.09032,-0.09 -0.103309,0.062 -0.115679,0.014 -0.09032,-0.045 z m 2.79983,0.09 c -0.01468,9e-4 -0.03501,0.014 -0.04516,0.045 -0.01171,0.058 0.02377,0.2852 0.04516,0.2259 0.01494,0.014 0.01387,0.062 0.04516,0.045 0.141545,-0.022 0.02559,-0.3205 -0.04516,-0.316 z m 0.406427,0.1358 c 0.01685,0.1416 -0.002,0.3213 0,0.3613 -0.05686,0.077 -0.144873,0.1199 -0.180634,0.1358 0.07341,0.08 -0.01626,0.3265 0.04516,0.4064 -0.122759,-0.016 -0.140562,0.2322 -0.135475,0.3162 -0.01455,0.2338 0.150043,0.3205 0.180634,0.316 0.165256,0 0.194273,-0.4905 0.180634,-0.3613 0.02171,-0.2263 0.177348,-0.2855 0.225793,0 -0.07153,-0.4133 -0.162611,-0.7953 -0.31611,-1.1741 z m 0,1.5354 c -0.07381,0.019 -0.108785,0.056 -0.04516,0.09 -0.155097,-0.022 -0.26964,0.6838 -0.270952,0.5419 -0.174871,0.1601 -0.273942,0.3996 -0.31611,0.6322 0.09247,0.1928 0.04996,0.7639 0,0.6775 0.04069,0.117 0.14247,0.4104 0.135476,0.2709 0.05247,0.159 0.220336,0.3128 0.361268,0.1359 0.196646,-0.1599 0.3696,-0.1979 0.225793,0.1358 0.200782,-0.5907 0.361269,-1.193 0.361269,-1.8516 0,-0.063 -0.04318,-0.1185 -0.04516,-0.1806 -0.126574,-0.1431 -0.353445,-0.4402 -0.180634,-0.4516 -0.06779,-0.02 -0.151984,-0.019 -0.225793,0 z m -5.735136,1.1291 c -0.07149,-6e-4 -0.109219,0.043 -0.180635,0.089 -0.04014,0.049 0.02093,0.055 0.09032,0.045 0,0 0.04516,0 0.04516,0 0.04747,-0.014 0.08867,-0.036 0.09032,-0.045 0.009,0.014 0.613981,0.2571 0.361269,0.1807 0.02809,0.02 0.04955,0.032 0.04516,0.045 0.0053,0.014 0.03601,0.049 0.180634,0.045 0.208289,-0.065 -0.190365,-0.1866 -0.180634,-0.1807 -0.01957,-0.014 -0.02504,-0.035 -0.04516,-0.045 -0.02554,-0.038 -0.03158,-0.045 -0.04516,-0.045 -0.105924,-0.053 -0.248041,-0.089 -0.361268,-0.089 z m -5.148076,0.089 c -0.01985,0 -0.05147,0.056 0,0.09 0.0185,-0.063 0.01358,-0.091 0,-0.09 z m 6.006088,0.2258 c -0.03209,5e-4 -0.05499,0.033 -0.04516,0.045 0.02298,0.016 -0.01,0.033 0,0.045 -0.0094,-2e-4 -0.01896,0.059 0,0.045 -0.02114,0 -0.02792,0.043 -0.04516,0.045 0.12221,-0.067 0.110953,0.078 0.180635,0.045 0.02858,-0.095 0.375135,-0.032 0.270951,-0.1359 -0.02182,-0.051 -0.264998,-0.092 -0.361268,-0.09 z m 0.587062,0.1358 c -0.05835,0 -0.187045,0.1171 0,0.09 0.01783,-0.039 0.02464,-0.091 0,-0.09 z m -1.083806,0.045 c 0.0097,0.014 0.01912,0.032 0.04516,0.045 h 0.04516 c 0.172535,-0.016 -0.01402,-0.046 -0.09032,-0.045 z m -1.219281,1.6257 c -0.0163,0 -0.0011,0.1185 0.04516,0.09 -0.0078,-0.061 -0.03802,-0.09 -0.04516,-0.09 z"
-         style="display:inline;fill:url(#linearGradient7571);fill-opacity:1;stroke:none;stroke-width:0.363252"
-         inkscape:label="land" /><circle
+         style="display:inline;fill:url(#linearGradient7571);fill-opacity:1;stroke:none;stroke-width:0.363252" /><circle
          style="display:inline;fill:url(#radialGradient7574);fill-opacity:1;stroke:none;stroke-width:0.00911804"
          id="path3800-3-8-9"
          cx="68.493629"
          cy="1089.8557"
-         r="5.8449821"
-         inkscape:label="highlight" /><ellipse
+         r="5.8449821" /><ellipse
          style="display:inline;fill:none;stroke:url(#linearGradient7576);stroke-width:0.274616;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
          id="path3800-3-8-1"
          cx="68.493622"
          cy="1089.8082"
-         inkscape:label="outline"
          rx="5.8070006"
          ry="5.8066154" /></g><g
        id="g2"
        transform="matrix(1,0,0,1.1186491,27.479899,-126.048)"
-       style="display:inline;stroke-width:0.945482"
-       inkscape:label="pages"><path
+       style="display:inline;stroke-width:0.945482"><path
          style="display:inline;fill:url(#linearGradient4630);fill-opacity:1;stroke:none;stroke-width:0.945482"
          d="m 2.7402587,1008.1045 12.6520103,0.055 3.793989,4.2591 0.252832,16.8937 H 2.5574698 Z"
          id="rect4001-3-4-3-5"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccc"
          transform="matrix(1.1120937,0,0,1.183099,-0.241874,-184.44221)" /><path
          style="display:inline;fill:none;stroke:url(#linearGradient4632);stroke-width:0.824275;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1"
          d="M 2.4999821,1007.8643 H 14.931093 c 0,0 3.167964,0.7101 2.253474,2.3418 -0.02836,0.051 2.315433,2.712 2.315433,2.712 v 15.9441 H 2.4999821 Z"
          id="rect4001-1-1-6"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccscccc"
          transform="matrix(1.1120937,0,0,1.183099,-0.241874,-184.44221)" /><path
          style="display:inline;fill:url(#linearGradient4634);fill-opacity:1;stroke:none;stroke-width:0.945482"
          d="m 14.638089,1007.7925 4.361912,4.9847 v 5.18 l -6.542591,-4.5311 c 0.897707,-1.8172 1.548066,-3.7153 2.180667,-5.6336 z"
          id="rect4001-3-9-0-0-4"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccc"
          transform="matrix(1.1120937,0,0,1.183099,-0.241874,-184.44221)" /><path
-         inkscape:connector-curvature="0"
          style="display:inline;fill:url(#linearGradient4341-5);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.945482px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
          d="m 14.513385,1007.3621 c 1.006407,1.3083 2.220028,3.058 1.320521,5.9172 C 17.90376,1012.1622 20,1012.7952 20,1012.7952 c 0,-2.6696 -3.348,-5.5589 -5.486615,-5.4331 z"
          id="path5675-4-4-9"
-         sodipodi:nodetypes="cccc"
          transform="matrix(1.1120937,0,0,1.183099,-0.241874,-184.44221)" /><path
-         sodipodi:nodetypes="cccccc"
-         inkscape:connector-curvature="0"
          id="rect4001-3-4-3-5-9"
          d="m 9,1004.3622 h 14.445 l 4.555,4.679 v 18.321 H 9 Z"
          style="display:inline;fill:url(#linearGradient8635);fill-opacity:1;stroke:none;stroke-width:0.945482" /><path
-         sodipodi:nodetypes="ccscccc"
-         inkscape:connector-curvature="0"
          id="rect4001-1-1-6-5"
          d="M 8.5103683,1003.9386 H 23.065147 c 0,0 3.709163,0.8086 2.638446,2.6667 -0.03321,0.058 2.71099,3.0882 2.71099,3.0882 v 18.1562 H 8.5103683 Z"
          style="fill:none;stroke:url(#linearGradient8637);stroke-width:0.945482;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1" /><path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
          id="rect4001-3-9-0-0-4-4"
          d="M 23.405958,1004.3956 28,1009.3622 v 6 l -7.831128,-5.0902 c 1.128149,-2.3616 2.489968,-3.7779 3.237086,-5.8764 z"
          style="display:inline;fill:url(#linearGradient8639);fill-opacity:1;stroke:none;stroke-width:0.945482" /><path
-         sodipodi:nodetypes="cccc"
          id="path5675-4-4-9-6"
          d="m 22.57608,1003.3667 c 1.178336,1.4898 2.599286,3.4823 1.546112,6.7381 2.423457,-1.272 4.877808,-0.5512 4.877808,-0.5512 0,-3.04 -3.919955,-6.3301 -6.42392,-6.1869 z"
-         style="display:inline;fill:url(#linearGradient8641);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.945482px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         inkscape:connector-curvature="0" /><g
+         style="display:inline;fill:url(#linearGradient8641);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.945482px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /><g
          id="g3"
-         inkscape:label="lines"
          style="display:inline"
          transform="matrix(1,0,0,0.89393537,-27.919998,161.44311)"><path
            style="display:inline;fill:none;fill-rule:evenodd;stroke:#bbc5d8;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
            d="M 39,948.3622 H 50"
-           id="path4696-0-2"
-           inkscape:connector-curvature="0" /><path
+           id="path4696-0-2" /><path
            style="display:inline;fill:none;fill-rule:evenodd;stroke:#bbc5d8;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
            d="M 39,951.40696 H 50"
-           id="path4696-0-2-9"
-           inkscape:connector-curvature="0" /><path
+           id="path4696-0-2-9" /><path
            style="display:inline;fill:none;fill-rule:evenodd;stroke:#bbc5d8;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
            d="m 39,954.40696 h 8.807905"
-           id="path4696-0-2-5"
-           inkscape:connector-curvature="0" /><path
+           id="path4696-0-2-5" /><path
            style="display:inline;fill:none;fill-rule:evenodd;stroke:#bbc5d8;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
            d="m 38.909242,958.40555 h 11"
-           id="path4696-0-2-6"
-           inkscape:connector-curvature="0" /><path
+           id="path4696-0-2-6" /><path
            style="display:inline;fill:none;fill-rule:evenodd;stroke:#bbc5d8;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
            d="M 39,961.40696 H 50"
-           id="path4696-0-2-6-2"
-           inkscape:connector-curvature="0" /><path
+           id="path4696-0-2-6-2" /><path
            style="display:inline;fill:none;fill-rule:evenodd;stroke:#bbc5d8;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
            d="m 39,964.3622 h 8.807905"
-           id="path4696-0-2-5-8"
-           inkscape:connector-curvature="0" /></g></g></g></svg>
+           id="path4696-0-2-5-8" /></g></g></g></svg>
diff --git a/ui/org.eclipse.pde.unittest.junit/icons/full/obj16/julaunchpgn.svg b/ui/org.eclipse.pde.unittest.junit/icons/full/obj16/julaunchpgn.svg
index 28a6664eb6c..108f09e77ba 100644
--- a/ui/org.eclipse.pde.unittest.junit/icons/full/obj16/julaunchpgn.svg
+++ b/ui/org.eclipse.pde.unittest.junit/icons/full/obj16/julaunchpgn.svg
@@ -2,304 +2,19 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="julaunchpgn.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient5103-3-7">
-      <stop
-         style="stop-color:#c1ebca;stop-opacity:1"
-         offset="0"
-         id="stop5105-5-4" />
-      <stop
-         id="stop7550-07-0"
-         offset="0.26694915"
-         style="stop-color:#b3dac7;stop-opacity:1" />
-      <stop
-         id="stop7548-6-9"
-         offset="0.51694918"
-         style="stop-color:#9ec2c3;stop-opacity:1" />
-      <stop
-         style="stop-color:#7a99bb;stop-opacity:1"
-         offset="1"
-         id="stop5107-7-48" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3955-1">
-      <stop
-         id="stop3957-4"
-         offset="0"
-         style="stop-color:#c38536;stop-opacity:1" />
-      <stop
-         style="stop-color:#f2dc91;stop-opacity:1"
-         offset="0.15381166"
-         id="stop3959-2" />
-      <stop
-         style="stop-color:#fbdc8b;stop-opacity:1"
-         offset="0.5"
-         id="stop3961-1" />
-      <stop
-         id="stop3963-4"
-         offset="0.75"
-         style="stop-color:#e6bd7a;stop-opacity:1" />
-      <stop
-         id="stop3965-5"
-         offset="1"
-         style="stop-color:#ba772f;stop-opacity:1" />
-    </linearGradient>
-    <mask
-       maskUnits="userSpaceOnUse"
-       id="mask5159">
-      <g
-         style="font-size:11.05178356px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:0.24860173;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline;font-family:AustralianFlyingCorpsStencil;-inkscape-font-specification:AustralianFlyingCorpsStencil"
-         transform="matrix(0.33025863,0,0,0.33025863,-142.45111,929.04872)"
-         id="g5161">
-        <rect
-           style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:3.02792978;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline"
-           id="rect5163"
-           width="15"
-           height="16.625"
-           x="463.74335"
-           y="368.49503"
-           rx="2.625"
-           ry="2.625" />
-        <path
-           style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:3.02792978;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
-           d="m 463.24874,374.64819 31.13385,0 c 1.45425,0 2.625,1.17075 2.625,2.625 l 0,19.0178 c 0,1.45425 -1.17076,2.63221 -2.625,2.625 l -31.13385,-0.15421 c -1.45423,-0.007 -2.625,-1.17075 -2.625,-2.625 l 0,-18.86359 c 0,-1.45425 1.17075,-2.625 2.625,-2.625 z"
-           id="path5165"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="sssssssss" />
-        <path
-           style="fill:#ffffff;stroke:#ffffff;stroke-width:3.02792978;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-           d="m 462.26171,374.64819 20.09375,0"
-           id="path5167"
-           inkscape:connector-curvature="0" />
-      </g>
-    </mask>
-    <mask
-       maskUnits="userSpaceOnUse"
-       id="mask5153">
-      <g
-         id="g5155"
-         style="display:inline"
-         transform="matrix(0.84489245,0,0,0.84489245,66.961974,62.982434)">
-        <path
-           transform="matrix(1.1835826,0,0,1.1835826,-79.255026,-74.544902)"
-           sodipodi:nodetypes="sssssssss"
-           inkscape:connector-curvature="0"
-           id="path5157"
-           d="m 462.77563,373.22885 29.11636,0 c 1.45425,0 2.625,1.17075 2.625,2.625 l 0,18.76896 c 0,1.45425 -1.17412,2.52598 -2.625,2.625 l -29.11636,1.98708 c -1.45088,0.099 -2.625,-1.17075 -2.625,-2.625 l 0,-20.75604 c 0,-1.45425 1.17075,-2.625 2.625,-2.625 z"
-           style="display:inline;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1" />
-      </g>
-    </mask>
-    <linearGradient
-       id="linearGradient11146-4-4-3-4">
-      <stop
-         style="stop-color:#faefba;stop-opacity:1"
-         offset="0"
-         id="stop11150-4-72-2-0" />
-      <stop
-         id="stop11152-9-0-2-9"
-         offset="1"
-         style="stop-color:#9e6542;stop-opacity:1" />
-    </linearGradient>
-    <mask
-       maskUnits="userSpaceOnUse"
-       id="mask5153-1">
-      <g
-         id="g5155-0"
-         style="display:inline"
-         transform="matrix(0.84489245,0,0,0.84489245,66.961974,62.982434)">
-        <path
-           transform="matrix(1.1835826,0,0,1.1835826,-79.255026,-74.544902)"
-           sodipodi:nodetypes="sssssssss"
-           inkscape:connector-curvature="0"
-           id="path5157-4"
-           d="m 462.77563,373.22885 29.11636,0 c 1.45425,0 2.625,1.17075 2.625,2.625 l 0,18.76896 c 0,1.45425 -1.17412,2.52598 -2.625,2.625 l -29.11636,1.98708 c -1.45088,0.099 -2.625,-1.17075 -2.625,-2.625 l 0,-20.75604 c 0,-1.45425 1.17075,-2.625 2.625,-2.625 z"
-           style="display:inline;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1" />
-      </g>
-    </mask>
-    <linearGradient
-       id="linearGradient4284">
-      <stop
-         style="stop-color:#6588c1;stop-opacity:0"
-         offset="0"
-         id="stop4286" />
-      <stop
-         id="stop4288"
-         offset="0.49999967"
-         style="stop-color:#becce3;stop-opacity:1" />
-      <stop
-         style="stop-color:#809dcb;stop-opacity:0"
-         offset="1"
-         id="stop4290" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10448-9-7-0-5">
-      <stop
-         id="stop10450-3-5-6-7"
-         offset="0"
-         style="stop-color:#cf9307;stop-opacity:1" />
-      <stop
-         style="stop-color:#f7d87b;stop-opacity:1"
-         offset="0.5"
-         id="stop10456-4-1-5-3" />
-      <stop
-         id="stop10452-22-7-8-4"
-         offset="1"
-         style="stop-color:#ebb313;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10440-1-0-0-3">
-      <stop
-         id="stop10442-43-2-0-9"
-         offset="0"
-         style="stop-color:#ae7603;stop-opacity:1;" />
-      <stop
-         style="stop-color:#e8d8a3;stop-opacity:1"
-         offset="0.5"
-         id="stop10521-1-2-5-3" />
-      <stop
-         id="stop10444-3-4-0-4"
-         offset="1"
-         style="stop-color:#bb9221;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10748-8">
-      <stop
-         style="stop-color:#ecac18;stop-opacity:1"
-         offset="0"
-         id="stop10750-5" />
-      <stop
-         id="stop10752-8"
-         offset="0.25"
-         style="stop-color:#f1ce66;stop-opacity:1" />
-      <stop
-         id="stop10754-8"
-         offset="0.5"
-         style="stop-color:#f6e5a6;stop-opacity:1" />
-      <stop
-         style="stop-color:#f1cf6c;stop-opacity:1"
-         offset="0.75"
-         id="stop10756-4" />
-      <stop
-         style="stop-color:#e5b630;stop-opacity:1"
-         offset="1"
-         id="stop10758-7" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10448-90">
-      <stop
-         id="stop10450-0"
-         offset="0"
-         style="stop-color:#ecac18;stop-opacity:1" />
-      <stop
-         style="stop-color:#ffe38d;stop-opacity:1"
-         offset="0.25"
-         id="stop10458-2" />
-      <stop
-         style="stop-color:#fdf5d2;stop-opacity:1"
-         offset="0.5"
-         id="stop10456-96" />
-      <stop
-         id="stop10460-3"
-         offset="0.75"
-         style="stop-color:#ffeba7;stop-opacity:1" />
-      <stop
-         id="stop10452-1"
-         offset="1"
-         style="stop-color:#e5b630;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10414-9">
-      <stop
-         id="stop10416-3"
-         offset="0"
-         style="stop-color:#5078b9;stop-opacity:1;" />
-      <stop
-         style="stop-color:#6d8cbd;stop-opacity:1"
-         offset="0.5"
-         id="stop10422-8" />
-      <stop
-         id="stop10418-4"
-         offset="1"
-         style="stop-color:#5f88c9;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10432-3">
-      <stop
-         style="stop-color:#1f4d9a;stop-opacity:1"
-         offset="0"
-         id="stop10434-4" />
-      <stop
-         id="stop10436-2"
-         offset="0.5"
-         style="stop-color:#4e6da1;stop-opacity:1" />
-      <stop
-         style="stop-color:#567ebc;stop-opacity:1"
-         offset="1"
-         id="stop10438-9" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10157-6">
-      <stop
-         id="stop10159-5"
-         offset="0"
-         style="stop-color:#6588c1;stop-opacity:1" />
-      <stop
-         style="stop-color:#becce3;stop-opacity:1"
-         offset="0.5"
-         id="stop10165-9" />
-      <stop
-         id="stop10161-55"
-         offset="1"
-         style="stop-color:#809dcb;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10396-5">
-      <stop
-         id="stop10398-7"
-         offset="0"
-         style="stop-color:#1b3e79;stop-opacity:1;" />
-      <stop
-         style="stop-color:#728fbf;stop-opacity:1"
-         offset="0.5"
-         id="stop10404-9" />
-      <stop
-         id="stop10400-9"
-         offset="1"
-         style="stop-color:#1f4d9a;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10149-6-5-4">
-      <stop
-         id="stop10151-5-7-2"
-         offset="0"
-         style="stop-color:#1f4d9a;stop-opacity:1" />
-      <stop
-         style="stop-color:#b9c7df;stop-opacity:1"
-         offset="0.5"
-         id="stop10394-3" />
-      <stop
-         id="stop10153-8-1-2"
-         offset="1"
-         style="stop-color:#567ebc;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4317"
        id="linearGradient4323"
        x1="19.792524"
@@ -308,7 +23,6 @@
        y2="1064.6748"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4317">
       <stop
          style="stop-color:#f8e8a8;stop-opacity:1"
@@ -328,7 +42,6 @@
          id="stop4321" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4311"
        id="linearGradient4307"
        gradientUnits="userSpaceOnUse"
@@ -337,8 +50,7 @@
        x2="18.92688"
        y2="1065.5569" />
     <linearGradient
-       id="linearGradient4311"
-       inkscape:collect="always">
+       id="linearGradient4311">
       <stop
          id="stop4313"
          offset="0"
@@ -349,7 +61,6 @@
          style="stop-color:#a87000;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4311"
        id="linearGradient4309"
        gradientUnits="userSpaceOnUse"
@@ -358,7 +69,6 @@
        x2="17.04467"
        y2="1063.8405" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4258"
        id="linearGradient4264"
        x1="17.04467"
@@ -367,7 +77,6 @@
        y2="1063.8405"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4258">
       <stop
          style="stop-color:#5888c8;stop-opacity:1"
@@ -379,7 +88,6 @@
          id="stop4262" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4250"
        id="linearGradient4256"
        x1="18.92688"
@@ -388,7 +96,6 @@
        y2="1065.5569"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4250">
       <stop
          style="stop-color:#7090c0;stop-opacity:1"
@@ -400,31 +107,6 @@
          id="stop4254" />
     </linearGradient>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="5.6568543"
-     inkscape:cx="3.3251661"
-     inkscape:cy="-6.5658793"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1-4"
-     showgrid="true"
-     inkscape:window-width="1086"
-     inkscape:window-height="787"
-     inkscape:window-x="908"
-     inkscape:window-y="755"
-     inkscape:window-maximized="0"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid4092" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -438,8 +120,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
@@ -450,8 +130,7 @@
       <g
          transform="matrix(0.73056116,0,0,0.72750345,11.535974,295.24315)"
          style="display:inline"
-         id="layer1-4"
-         inkscape:label="Layer 1">
+         id="layer1-4">
         <g
            transform="scale(1.0565022,0.94651957)"
            style="font-style:normal;font-weight:normal;font-size:20.8505249px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#21844f;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
@@ -459,9 +138,7 @@
           <path
              d="m 5.6273186,1103.2213 c -0.1425329,0.013 -0.2511294,0.068 -0.3257895,0.1629 -0.07466,0.095 -0.1119901,0.1935 -0.1119901,0.2953 l 0,5.8673 c 0,0.8688 -0.081447,1.6494 -0.2443421,2.3417 -0.1628947,0.6923 -0.424205,1.2794 -0.7839309,1.7613 -0.3597258,0.4819 -0.8314418,0.8552 -1.4151479,1.1199 -0.5837061,0.2579 -2.04072776,0.3868 -2.88235048,0.3868 -0.33936401,0 -0.85413537,-0.031 -1.17992482,-0.092 -0.3257894,-0.054 -0.6176425,-0.1185 -0.8755591,-0.1934 -0.2579167,-0.068 -0.4751097,-0.1324 -0.6515789,-0.1935 -0.169682,-0.061 -0.2680976,-0.099 -0.2952467,-0.112 l 0,-3.5633 1.2522532,0 0.4581414,2.5452 c 0.020362,0.1019 0.061086,0.1901 0.122171,0.2647 0.067873,0.068 0.1459266,0.1222 0.2341612,0.1629 0.0882346,0.041 0.18325656,0.071 0.28506577,0.092 0.10859648,0.013 0.21379932,0.02 0.31560853,0.02 0.47510961,0 0.87895279,-0.092 1.21152952,-0.2749 0.33257668,-0.1832 0.60406788,-0.4581 0.81447368,-0.8246 0.2104056,-0.3665 0.3631194,-0.8247 0.4581414,-1.3744 0.095022,-0.5498 0.1425329,-1.1912 0.1425329,-1.9242 l 0,-6.0099 c 0,-0.1018 -0.03733,-0.2002 -0.1119902,-0.2953 -0.067873,-0.095 -0.1764693,-0.1493 -0.3257894,-0.1629 l -1.31333875,-0.081 0,-0.8959 6.25223515,0 0,0.8959 -1.0293349,0.081 z"
              style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Abyssinica SIL';fill:#21844f;fill-opacity:1"
-             id="path4283"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccsscccsccccccccscscscsscccccccc" />
+             id="path4283" />
         </g>
         <g
            transform="scale(0.9979051,1.0020993)"
@@ -470,9 +147,7 @@
           <path
              d="m 14.784451,1044.6623 c -0.0953,0.01 -0.166775,0.043 -0.214425,0.104 -0.04332,0.061 -0.06498,0.1235 -0.06498,0.1884 l 0,5.0553 c 0,0.5458 -0.07364,1.018 -0.220922,1.4165 -0.147282,0.3985 -0.366039,0.7277 -0.65627,0.9876 -0.2859,0.2599 -0.643275,0.4527 -1.072124,0.5783 -0.424518,0.1257 -0.914013,0.1885 -1.468485,0.1885 -1.1002807,0 -2.8564448,-0.2664 -3.3892579,-0.7993 -0.5328131,-0.5328 -0.7992196,-1.3233 -0.7992196,-2.3716 l 0,-5.0553 c 0,-0.065 -0.023825,-0.1275 -0.071475,-0.1884 -0.043318,-0.061 -0.112627,-0.095 -0.2079271,-0.104 l -0.7082516,-0.052 0,-0.5718 4.6249862,0 0,0.5718 -0.760234,0.052 c -0.0953,0.01 -0.1667748,0.043 -0.2144248,0.104 -0.043318,0.061 -0.064977,0.1235 -0.064977,0.1884 l 0,4.7109 c 0,0.3899 0.030323,0.7472 0.090968,1.0721 0.060645,0.3205 0.1732725,0.5956 0.3378815,0.8252 0.1646093,0.2296 0.3920293,0.4094 0.6822603,0.5393 0.294563,0.1257 0.373541,0.1885 0.837046,0.1885 0.459172,0 0.385956,-0.067 0.680519,-0.2015 0.294563,-0.1343 0.526315,-0.3184 0.695256,-0.5523 0.168941,-0.2382 0.2859,-0.5176 0.350877,-0.8382 0.06498,-0.3205 0.09747,-0.6649 0.09747,-1.0331 l 0,-4.7109 c 0,-0.065 -0.02599,-0.1275 -0.07797,-0.1884 -0.04765,-0.061 -0.119128,-0.095 -0.214425,-0.104 l -0.760233,-0.052 0,-0.5718 3.34157,0 0,0.5718 z"
              style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Abyssinica SIL';-inkscape-font-specification:'Abyssinica SIL';fill:#d8424f;fill-opacity:1"
-             id="path4286"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccsssccscssccccccccsscscscccssccccccc" />
+             id="path4286" />
         </g>
         <g
            style="display:inline"
@@ -485,8 +160,6 @@
                id="g4266-0"
                style="display:inline">
               <path
-                 sodipodi:nodetypes="ssssccs"
-                 inkscape:connector-curvature="0"
                  id="path4242-9"
                  d="m 19.520119,1060.4831 c 0.341806,-0.3409 1.0254,0.4474 1.0254,0.9295 l 0,2.9581 c 0,0.5003 -0.709328,1.5082 -1.063991,1.1545 -1.323187,-1.3197 -1.935031,-2.0399 -1.935031,-2.0399 l 0,-0.9787 c 0,0 0.739057,-0.7922 1.973622,-2.0235 z"
                  style="fill:url(#linearGradient4323);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4307);stroke-width:0.89697278;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
@@ -511,9 +184,7 @@
             <path
                style="fill:#a8c0d8;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4256);stroke-width:0.89697278;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
                d="m 19.520119,1060.4831 c 0.341806,-0.3409 1.0254,1.0466 1.0254,1.5287 l 0,2.4522 c 0,0.5003 -0.709328,1.4149 -1.063991,1.0612 -1.323187,-1.3197 -1.935031,-2.0399 -1.935031,-2.0399 l 0,-0.9787 c 0,0 0.739057,-0.7922 1.973622,-2.0235 z"
-               id="path4242"
-               inkscape:connector-curvature="0"
-               sodipodi:nodetypes="ssssccs" />
+               id="path4242" />
           </g>
         </g>
       </g>
diff --git a/ui/org.eclipse.pde.unittest.junit/icons/full/obj16/test.svg b/ui/org.eclipse.pde.unittest.junit/icons/full/obj16/test.svg
index d70ecb6d71e..8d2c0355925 100644
--- a/ui/org.eclipse.pde.unittest.junit/icons/full/obj16/test.svg
+++ b/ui/org.eclipse.pde.unittest.junit/icons/full/obj16/test.svg
@@ -2,24 +2,19 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="test.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4902-3"
        id="linearGradient4908-2"
        x1="10.544736"
@@ -29,7 +24,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-2.9501748,-1.044194)" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4902-3">
       <stop
          style="stop-color:#bfb688;stop-opacity:1"
@@ -41,7 +35,6 @@
          id="stop4906-2" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4994-6">
       <stop
          style="stop-color:#f9fafc;stop-opacity:1;"
@@ -60,34 +53,8 @@
        gradientUnits="userSpaceOnUse"
        id="linearGradient4101"
        xlink:href="#linearGradient4994-6"
-       inkscape:collect="always"
        gradientTransform="translate(-2.9501748,-1.044194)" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="32.000002"
-     inkscape:cx="14.104336"
-     inkscape:cy="7.6199383"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1440"
-     inkscape:window-height="900"
-     inkscape:window-x="1097"
-     inkscape:window-y="566"
-     inkscape:window-maximized="0"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3999" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -101,98 +68,68 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
     <path
        style="display:inline;fill:url(#linearGradient4101);fill-opacity:1;stroke:none"
        d="m 2.5471077,1037.8597 7.0096695,0 3.4683068,0.1004 0,12.8608 -10.4779763,0 z"
-       id="rect4001-3"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccc" />
+       id="rect4001-3" />
     <path
        style="display:inline;fill:none;stroke:url(#linearGradient4908-2);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1"
        d="m 2.5471077,1037.8597 10.8839173,0 0.03855,3.0066 0,9.9546 -10.9224643,0 z"
-       id="rect4001"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccc" />
+       id="rect4001" />
     <g
        id="g4191"
        transform="translate(-1.0035218,-18.203124)">
       <path
-         inkscape:connector-curvature="0"
          id="path4185"
          d="m 5.5312498,1057.5932 0,9.4565 5.5000002,0"
-         style="fill:none;fill-rule:evenodd;stroke:#49a068;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         sodipodi:nodetypes="ccc" />
+         style="fill:none;fill-rule:evenodd;stroke:#49a068;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
       <path
-         inkscape:connector-curvature="0"
          id="path4187"
          d="m 5.5624998,1061.0654 5.4687502,0"
-         style="fill:none;fill-rule:evenodd;stroke:#49a068;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         sodipodi:nodetypes="cc" />
+         style="fill:none;fill-rule:evenodd;stroke:#49a068;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
       <path
-         inkscape:connector-curvature="0"
          id="path4189"
          d="m 5.4999998,1064.0497 5.5312502,0"
-         style="fill:none;fill-rule:evenodd;stroke:#49a068;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         sodipodi:nodetypes="cc" />
+         style="fill:none;fill-rule:evenodd;stroke:#49a068;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
       <path
-         inkscape:connector-curvature="0"
          id="path4187-6"
          d="m 12.002674,1061.0654 1.005138,0"
-         style="display:inline;fill:none;fill-rule:evenodd;stroke:#49a068;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         sodipodi:nodetypes="cc" />
+         style="display:inline;fill:none;fill-rule:evenodd;stroke:#49a068;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
       <path
-         inkscape:connector-curvature="0"
          id="path4187-6-4"
          d="m 12.002674,1064.0672 1.005138,0"
-         style="display:inline;fill:none;fill-rule:evenodd;stroke:#49a068;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         sodipodi:nodetypes="cc" />
+         style="display:inline;fill:none;fill-rule:evenodd;stroke:#49a068;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
       <path
-         inkscape:connector-curvature="0"
          id="path4187-6-4-2"
          d="m 12.002674,1067.0669 1.005138,0"
-         style="display:inline;fill:none;fill-rule:evenodd;stroke:#49a068;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         sodipodi:nodetypes="cc" />
+         style="display:inline;fill:none;fill-rule:evenodd;stroke:#49a068;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
       <path
          style="fill:none;fill-rule:evenodd;stroke:#49a068;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.2154696"
          d="m 6.5056962,1057.5723 0,2.4969 4.4857088,0"
-         id="path4278"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccc" />
+         id="path4278" />
       <path
          style="display:inline;fill:none;fill-rule:evenodd;stroke:#49a068;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.2154696"
          d="m 6.0416574,1063.0523 4.9497476,0"
-         id="path4278-4"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
+         id="path4278-4" />
       <path
          style="display:inline;fill:none;fill-rule:evenodd;stroke:#49a068;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.2154696"
          d="m 6.0416574,1066.0796 4.9497476,0"
-         id="path4278-4-0"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
+         id="path4278-4-0" />
       <path
          style="display:inline;fill:none;fill-rule:evenodd;stroke:#49a068;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.2154696"
          d="m 11.985774,1066.0796 1.016466,0"
-         id="path4278-4-0-3"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
+         id="path4278-4-0-3" />
       <path
          style="display:inline;fill:none;fill-rule:evenodd;stroke:#49a068;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.2154696"
          d="m 11.985774,1063.0744 1.016466,0"
-         id="path4278-4-0-3-7"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
+         id="path4278-4-0-3-7" />
       <path
          style="display:inline;fill:none;fill-rule:evenodd;stroke:#49a068;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.2154696"
          d="m 11.985774,1060.0692 1.016466,0"
-         id="path4278-4-0-3-7-2"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
+         id="path4278-4-0-3-7-2" />
     </g>
   </g>
 </svg>
diff --git a/ui/org.eclipse.pde/eclipse32.svg b/ui/org.eclipse.pde/eclipse32.svg
index f01610e8fe4..651a6a14afb 100644
--- a/ui/org.eclipse.pde/eclipse32.svg
+++ b/ui/org.eclipse.pde/eclipse32.svg
@@ -7,13 +7,6 @@
    viewBox="0 0 2.7234042 2.7234042"
    version="1.1"
    id="SVGRoot"
-   sodipodi:docname="eclipse32.svg"
-   inkscape:export-xdpi="96"
-   inkscape:export-ydpi="96"
-   inkscape:version="1.3 (0e150ed, 2023-07-21)"
-   inkscape:export-filename="eclipse32.png"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
@@ -73,39 +66,6 @@
          id="stop48" />
     </linearGradient>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#8b8b8b"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="19.955631"
-     inkscape:cx="8.0177872"
-     inkscape:cy="15.384129"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1920"
-     inkscape:window-height="1027"
-     inkscape:window-x="0"
-     inkscape:window-y="25"
-     inkscape:window-maximized="1"
-     inkscape:grid-bbox="true"
-     showguides="false"
-     inkscape:pagecheckerboard="0"
-     inkscape:showpageshadow="0"
-     inkscape:deskcolor="#505050">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2674"
-       originx="0"
-       originy="0"
-       spacingy="1"
-       spacingx="1"
-       units="px"
-       visible="true" />
-  </sodipodi:namedview>
   <metadata
      id="metadata1981">
     <rdf:RDF>
@@ -118,63 +78,50 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1">
     <path
        d="M 0.62737081,1.1063823 H 0.43526716 c -0.007028,0.055477 -0.0118169,0.1121088 -0.0139899,0.1701839 H 0.64959642 0.76412945 2.4173353 2.5682392 c -0.0022,-0.058075 -0.00697,-0.1147067 -0.014063,-0.1701839"
        id="path4"
-       inkscape:connector-curvature="0"
        style="fill:#2c2255;stroke-width:0.144079" />
     <path
        d="m 0.44092995,1.4468076 c 0.00215,0.058114 0.00686,0.1147552 0.0138298,0.1702125 h 0.1974322 0.14964812 1.59890983 0.1486275 c 0.007,-0.055458 0.011762,-0.1120989 0.013942,-0.1702125"
        id="path6"
-       inkscape:connector-curvature="0"
        style="fill:#2c2255;stroke-width:0.143262" />
     <path
-       inkscape:connector-curvature="0"
        style="fill:#2c2255;stroke-width:0.132772"
        d="M 0.82690487,1.7021281 H 0.4562943 C 0.505366,1.8646102 0.59642396,2.0102357 0.72973708,2.13894 0.94226706,2.3441095 1.1978255,2.4465559 1.4966776,2.4465559 c 0.059739,0 0.1176203,-0.0043 0.1738404,-0.01248 C 1.89562,2.4012859 2.0926998,2.303046 2.2615598,2.1389402 2.3957359,2.0102763 2.4874371,1.8646106 2.5368841,1.7021282 H 2.3864847 2.1665616 Z"
        id="path2" />
     <path
-       inkscape:connector-curvature="0"
        style="fill:#2c2255;stroke-width:0.132615"
        d="M 2.5337307,0.99982932 C 2.4844544,0.83688047 2.3929672,0.69055553 2.2590699,0.56094 2.0910856,0.39835447 1.8950636,0.30081153 1.6712688,0.26799105 c -0.056605,-0.008308 -0.1149107,-0.012672 -0.1751144,-0.012672 -0.298084,0 -0.55300775,0.10190115 -0.7649694,0.30561987 -0.1330134,0.12961533 -0.22388345,0.27594043 -0.27280603,0.4388893"
        id="path10" />
     <path
        d="M 0.84343884,0.93616972 H 0.48728386 C 0.47557735,0.99159172 0.46802581,1.048443 0.46077447,1.1063822 H 0.64421001 0.8004043 2.1921242 2.3892232 2.5300959 C 2.5228203,1.0484742 2.5134498,0.99162252 2.5017788,0.93616972"
        id="path57"
-       inkscape:connector-curvature="0"
        style="fill:#ffffff;stroke-width:0.146677" />
     <path
        d="M 2.2377713,1.2765662 C 2.2341513,1.2182316 2.2266113,1.1613399 2.2153933,1.1063823 H 0.78888378 c -0.011234,0.054929 -0.018774,0.1118201 -0.0224006,0.1701839 z"
        id="path37"
-       inkscape:connector-curvature="0"
        style="fill:url(#SVGID_1_);stroke-width:0.144573" />
     <path
        d="M 2.2377075,1.4468076 H 0.76649315 c 0.003626,0.058345 0.011122,0.1152458 0.0223776,0.1702125 H 2.2153519 c 0.01124,-0.054967 0.01872,-0.1118679 0.022356,-0.1702125 z"
        id="path44"
-       inkscape:connector-curvature="0"
        style="fill:url(#SVGID_2_);stroke-width:0.144583" />
     <path
        d="m 1.503658,2.1140691 c 0.3027925,0 0.5637948,-0.1686359 0.6839895,-0.4119424 H 0.81966858 C 0.93986352,1.9454336 1.2008657,2.1140691 1.503658,2.1140691 Z"
        id="path51"
-       inkscape:connector-curvature="0"
        style="fill:url(#SVGID_3_);stroke-width:0.133164" />
     <path
        d="M 0.66694898,1.4468074 H 0.77345496 2.2281205 2.4192171 2.5643858 c 10e-4,-0.027074 0.00157,-0.054334 0.00157,-0.08178 0,-0.029685 -7.634e-4,-0.059121 -0.00195,-0.088432 H 2.4191943 2.2280987 0.77343311 0.65940372 0.43402718 c -0.001177,0.029281 -0.001942,0.058748 -0.001942,0.088432 0,0.027447 5.67e-4,0.054707 0.00157,0.08178 z"
        id="path55"
-       inkscape:connector-curvature="0"
        style="fill:#ffffff;stroke-width:0.148948" />
     <path
        d="M 2.3764373,1.6170203 H 2.1826736 0.81452295 0.66831161 0.47511889 c 0.006938,0.057908 0.0148292,0.1147289 0.0261454,0.1702127 H 0.85678709 2.1404094 2.3511381 2.4883794 C 2.4996673,1.73178 2.5087916,1.6749596 2.5157506,1.6170203 Z"
        id="path59"
-       inkscape:connector-curvature="0"
        style="fill:#ffffff;stroke-width:0.145657" />
     <path
        d="m 0.33321635,1.3466565 c 0,-0.59449504 0.43835624,-1.08845737 1.00861495,-1.17533874 -0.014148,-5.295e-4 -0.028365,-0.001105 -0.042649,-0.001105 -0.63993915,0 -1.15875676,0.52672127 -1.15875676,1.17644374 0,0.649746 0.51879501,1.1764441 1.15875676,1.1764441 0.01433,0 0.028546,-5.524e-4 0.042739,-0.00108 C 0.77157259,2.4351371 0.33321635,1.9411748 0.33321635,1.3466565 Z"
        id="path12"
-       inkscape:connector-curvature="0"
        style="fill:#f7941e;stroke-width:0.133164" />
     <ellipse
        style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.0713786;stroke-linecap:square;stroke-miterlimit:3;stroke-opacity:0.921569"
diff --git a/ui/org.eclipse.pde/images/topiclabel/ov_eclplugindev48.svg b/ui/org.eclipse.pde/images/topiclabel/ov_eclplugindev48.svg
index 8f01ebb337e..a311b257351 100644
--- a/ui/org.eclipse.pde/images/topiclabel/ov_eclplugindev48.svg
+++ b/ui/org.eclipse.pde/images/topiclabel/ov_eclplugindev48.svg
@@ -2,21 +2,17 @@
 <!-- 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"
    version="1.1"
    id="svg1052"
    width="48"
    height="48"
    viewBox="0 0 48 48"
-   sodipodi:docname="ov_eclplugindev48.svg"
-   inkscape:version="0.92.4 (5da689c313, 2019-01-14)">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <metadata
      id="metadata1058">
     <rdf:RDF>
@@ -25,14 +21,13 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
   <defs
      id="defs1056">
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient2543">
       <stop
          style="stop-color:#4f76b0;stop-opacity:1"
@@ -48,8 +43,7 @@
          id="stop2541" />
     </linearGradient>
     <linearGradient
-       id="linearGradient8785"
-       inkscape:collect="always">
+       id="linearGradient8785">
       <stop
          id="stop8781"
          offset="0"
@@ -64,8 +58,7 @@
          style="stop-color:#b07905;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       id="linearGradient8777"
-       inkscape:collect="always">
+       id="linearGradient8777">
       <stop
          id="stop8773"
          offset="0"
@@ -76,8 +69,7 @@
          style="stop-color:#deb241;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       id="linearGradient8767"
-       inkscape:collect="always">
+       id="linearGradient8767">
       <stop
          id="stop8763"
          offset="0"
@@ -88,8 +80,7 @@
          style="stop-color:#80a1cf;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       id="linearGradient8759"
-       inkscape:collect="always">
+       id="linearGradient8759">
       <stop
          id="stop8755"
          offset="0"
@@ -100,8 +91,7 @@
          style="stop-color:#5179b5;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       id="linearGradient8751"
-       inkscape:collect="always">
+       id="linearGradient8751">
       <stop
          id="stop8747"
          offset="0"
@@ -111,422 +101,6 @@
          offset="1"
          style="stop-color:#6085bb;stop-opacity:1" />
     </linearGradient>
-    <linearGradient
-       id="linearGradient4972"
-       inkscape:collect="always">
-      <stop
-         id="stop4974"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1" />
-      <stop
-         id="stop4976"
-         offset="1"
-         style="stop-color:#f5f8fd;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4964"
-       inkscape:collect="always">
-      <stop
-         id="stop4966"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1" />
-      <stop
-         id="stop4968"
-         offset="1"
-         style="stop-color:#e8eefa;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4956"
-       inkscape:collect="always">
-      <stop
-         id="stop4958"
-         offset="0"
-         style="stop-color:#fcfdfe;stop-opacity:1" />
-      <stop
-         id="stop4960"
-         offset="1"
-         style="stop-color:#dee6f8;stop-opacity:1" />
-    </linearGradient>
-    <filter
-       id="filter8854"
-       inkscape:label="Drop Shadow"
-       style="color-interpolation-filters:sRGB">
-      <feFlood
-         id="feFlood8856"
-         result="flood"
-         flood-color="rgb(244,248,254)"
-         flood-opacity="0.933333" />
-      <feComposite
-         id="feComposite8858"
-         result="composite1"
-         operator="in"
-         in2="SourceGraphic"
-         in="flood" />
-      <feGaussianBlur
-         id="feGaussianBlur8860"
-         result="blur"
-         stdDeviation="1.2"
-         in="composite1" />
-      <feOffset
-         id="feOffset8862"
-         result="offset"
-         dy="3"
-         dx="-1" />
-      <feComposite
-         id="feComposite8864"
-         result="composite2"
-         operator="over"
-         in2="offset"
-         in="SourceGraphic" />
-    </filter>
-    <linearGradient
-       id="linearGradient6122">
-      <stop
-         id="stop6124"
-         offset="0"
-         style="stop-color:#c0c0c0;stop-opacity:1" />
-      <stop
-         style="stop-color:#adadad;stop-opacity:1"
-         offset="0.5"
-         id="stop6132" />
-      <stop
-         id="stop6126"
-         offset="1"
-         style="stop-color:#808080;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient7087">
-      <stop
-         id="stop7089"
-         offset="0"
-         style="stop-color:#17325d;stop-opacity:1;" />
-      <stop
-         style="stop-color:#b4d0e2;stop-opacity:1"
-         offset="0.25"
-         id="stop7091" />
-      <stop
-         style="stop-color:#b7d2e4;stop-opacity:1"
-         offset="0.5"
-         id="stop7093" />
-      <stop
-         id="stop7095"
-         offset="0.75"
-         style="stop-color:#acc9de;stop-opacity:1" />
-      <stop
-         id="stop7097"
-         offset="1"
-         style="stop-color:#3e72a7;stop-opacity:1" />
-    </linearGradient>
-    <mask
-       maskUnits="userSpaceOnUse"
-       id="mask7366">
-      <path
-         sodipodi:nodetypes="ccccccc"
-         inkscape:connector-curvature="0"
-         id="path7368"
-         d="m -16.593048,1040.862 9.990206,0 0,10.0018 -2.983353,3.0385 -5.966213,0 c -0.53033,-0.022 -1.04064,-0.5519 -1.04064,-1.0385 z"
-         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;display:inline" />
-    </mask>
-    <linearGradient
-       id="linearGradient7584-5">
-      <stop
-         style="stop-color:#f9cd5f;stop-opacity:1"
-         offset="0"
-         id="stop7586-4" />
-      <stop
-         style="stop-color:#fbf0b4;stop-opacity:1"
-         offset="1"
-         id="stop7588-5" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient7592-1">
-      <stop
-         style="stop-color:#bd8416;stop-opacity:1"
-         offset="0"
-         id="stop7594-6" />
-      <stop
-         style="stop-color:#a66b10;stop-opacity:1"
-         offset="1"
-         id="stop7596-9" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10798-1-9-3-7-6-6-6-2-6-7-98-9-4-1">
-      <stop
-         id="stop10800-5-2-1-8-20-4-0-2-1-9-0-0-1-1"
-         offset="0"
-         style="stop-color:#5aad60;stop-opacity:1;" />
-      <stop
-         style="stop-color:#5bb26a;stop-opacity:1;"
-         offset="0.5"
-         id="stop10806-6-8-5-3-9-2-2-7-0-4-2-7-8-9" />
-      <stop
-         id="stop10802-1-5-3-0-4-6-8-5-5-6-69-6-4-0"
-         offset="1"
-         style="stop-color:#a4c589;stop-opacity:1" />
-    </linearGradient>
-    <mask
-       id="mask7366-4"
-       maskUnits="userSpaceOnUse">
-      <path
-         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;display:inline"
-         d="m -16.593048,1040.862 9.990206,0 0,10.0018 -2.983353,3.0385 -5.966213,0 c -0.53033,-0.022 -1.04064,-0.5519 -1.04064,-1.0385 z"
-         id="path7368-2"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccccc" />
-    </mask>
-    <linearGradient
-       y2="1041.911"
-       x2="4.7776356"
-       y1="1039.8118"
-       x1="4.7776356"
-       gradientTransform="translate(-20,0)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient9331"
-       xlink:href="#linearGradient7087"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient7087"
-       id="linearGradient9333"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-18,4.7e-5)"
-       x1="4.7776356"
-       y1="1039.8118"
-       x2="4.7776356"
-       y2="1041.911" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient7087"
-       id="linearGradient9335"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-16,4.7e-5)"
-       x1="4.7776356"
-       y1="1039.8118"
-       x2="4.7776356"
-       y2="1041.911" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient7087"
-       id="linearGradient9337"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-14,4.7e-5)"
-       x1="4.7776356"
-       y1="1039.8118"
-       x2="4.7776356"
-       y2="1041.911" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient7087"
-       id="linearGradient9339"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-12,4.7e-5)"
-       x1="4.7776356"
-       y1="1039.8118"
-       x2="4.7776356"
-       y2="1041.911" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4956"
-       id="linearGradient68073"
-       x1="88.220117"
-       y1="1042.7973"
-       x2="163.22012"
-       y2="1042.7973"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-80,0)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4964"
-       id="linearGradient68075"
-       x1="94.469681"
-       y1="1032.2668"
-       x2="163.22012"
-       y2="1032.2669"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-80,0)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4972"
-       id="linearGradient68077"
-       x1="88.220116"
-       y1="1032.2668"
-       x2="152.72206"
-       y2="1032.2668"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-80,0)" />
-    <filter
-       style="color-interpolation-filters:sRGB"
-       inkscape:label="Drop Shadow"
-       id="filter8854-9">
-      <feFlood
-         flood-opacity="0.933333"
-         flood-color="rgb(244,248,254)"
-         result="flood"
-         id="feFlood8856-0" />
-      <feComposite
-         in="flood"
-         in2="SourceGraphic"
-         operator="in"
-         result="composite1"
-         id="feComposite8858-2" />
-      <feGaussianBlur
-         in="composite1"
-         stdDeviation="1.2"
-         result="blur"
-         id="feGaussianBlur8860-3" />
-      <feOffset
-         dx="-1"
-         dy="3"
-         result="offset"
-         id="feOffset8862-2" />
-      <feComposite
-         in="SourceGraphic"
-         in2="offset"
-         operator="over"
-         result="composite2"
-         id="feComposite8864-3" />
-    </filter>
-    <linearGradient
-       id="linearGradient10798-1-9-3-7-6-8-9-0-9-1">
-      <stop
-         style="stop-color:#7564b1;stop-opacity:1"
-         offset="0"
-         id="stop10800-5-2-1-8-20-6-4-9-8-2" />
-      <stop
-         id="stop10806-6-8-5-3-9-24-8-4-3-2"
-         offset="0.5"
-         style="stop-color:#5d4aa1;stop-opacity:1" />
-      <stop
-         style="stop-color:#9283c3;stop-opacity:1"
-         offset="1"
-         id="stop10802-1-5-3-0-4-8-4-2-9-2" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient7540-2-3-8-7">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.502"
-         offset="0"
-         id="stop7542-8-7-5-3" />
-      <stop
-         id="stop7544-8-2-0-5"
-         offset="0.47623286"
-         style="stop-color:#ffffff;stop-opacity:1" />
-      <stop
-         id="stop7546-1-7-9-5"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop7548-98-9-2-4" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient7272-66-4-5-5-5-8"
-       inkscape:collect="always">
-      <stop
-         id="stop7274-6-0-1-7-4-7"
-         offset="0"
-         style="stop-color:#8f6c10;stop-opacity:1" />
-      <stop
-         id="stop7276-66-6-3-9-1-4"
-         offset="1"
-         style="stop-color:#c9a645;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient7540-2-3-8-7"
-       id="linearGradient10540"
-       gradientUnits="userSpaceOnUse"
-       x1="-22.453552"
-       y1="1030.3411"
-       x2="-10.159802"
-       y2="1030.3411" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient7540-2-3-8-7"
-       id="linearGradient10542"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0,1,-1,0,1014.0344,1046.6478)"
-       x1="-22.453552"
-       y1="1030.3411"
-       x2="-10.159802"
-       y2="1030.3411" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient7272-66-4-5-5-5-8"
-       id="linearGradient10544"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.95585117,0,0,0.95585117,-0.71992063,45.488394)"
-       x1="-15.945988"
-       y1="1037.4661"
-       x2="-15.945988"
-       y2="1023.2569" />
-    <mask
-       maskUnits="userSpaceOnUse"
-       id="mask10620">
-      <path
-         sodipodi:type="arc"
-         style="font-size:13.58917427px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:2.16621375;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline;font-family:Sans"
-         id="path10622"
-         sodipodi:cx="388.125"
-         sodipodi:cy="468.23718"
-         sodipodi:rx="10.625"
-         sodipodi:ry="10.625"
-         d="m 398.75,468.23718 a 10.625,10.625 0 1 1 -21.25,0 10.625,10.625 0 1 1 21.25,0 z"
-         transform="matrix(0.55482947,0,0,0.55482947,-206.96039,787.08655)" />
-    </mask>
-    <linearGradient
-       id="linearGradient4528-9-5-7-9-7-3">
-      <stop
-         style="stop-color:#e0c576;stop-opacity:1;"
-         offset="0"
-         id="stop4530-0-5-0-5-8-4" />
-      <stop
-         style="stop-color:#9e7916;stop-opacity:1"
-         offset="1"
-         id="stop4532-7-9-3-3-6-1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient6281-8-0-1-6-6-4-2-8-0">
-      <stop
-         id="stop6283-0-2-2-1-2-0-1-6-0"
-         offset="0"
-         style="stop-color:#f7f9fb;stop-opacity:1" />
-      <stop
-         id="stop6285-5-0-9-7-6-9-9-1-9"
-         offset="1"
-         style="stop-color:#ffd680;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3827">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="0"
-         id="stop3829" />
-      <stop
-         id="stop3835"
-         offset="0.60149658"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop3831" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10798-1-9-3-7-6-8-9-0-9-1-0">
-      <stop
-         style="stop-color:#f3faed;stop-opacity:1"
-         offset="0"
-         id="stop10800-5-2-1-8-20-6-4-9-8-2-9" />
-      <stop
-         id="stop10806-6-8-5-3-9-24-8-4-3-2-4"
-         offset="0.65917557"
-         style="stop-color:#e7f4da;stop-opacity:1" />
-      <stop
-         style="stop-color:#67bf1f;stop-opacity:1"
-         offset="1"
-         id="stop10802-1-5-3-0-4-8-4-2-9-2-5" />
-    </linearGradient>
     <linearGradient
        gradientUnits="userSpaceOnUse"
        y2="1024.3622"
@@ -535,7 +109,6 @@
        x1="50"
        id="linearGradient8753"
        xlink:href="#linearGradient8751"
-       inkscape:collect="always"
        gradientTransform="matrix(2.7500001,0,0,0.99370101,-129.87501,-991.91286)" />
     <linearGradient
        gradientUnits="userSpaceOnUse"
@@ -545,7 +118,6 @@
        x1="57"
        id="linearGradient8761"
        xlink:href="#linearGradient8759"
-       inkscape:collect="always"
        gradientTransform="matrix(1.0999999,0,0,1.1281495,-43.249997,-1129.0318)" />
     <linearGradient
        gradientUnits="userSpaceOnUse"
@@ -555,7 +127,6 @@
        x1="51.658199"
        id="linearGradient8769"
        xlink:href="#linearGradient8767"
-       inkscape:collect="always"
        gradientTransform="matrix(2.7500001,0,0,0.99370101,-129.87501,-991.91286)" />
     <linearGradient
        gradientUnits="userSpaceOnUse"
@@ -565,7 +136,6 @@
        x1="63.98344"
        id="linearGradient8779"
        xlink:href="#linearGradient8777"
-       inkscape:collect="always"
        gradientTransform="matrix(1.3687895,0,0,1.494898,-60.408122,-1504.0798)" />
     <linearGradient
        gradientUnits="userSpaceOnUse"
@@ -575,75 +145,63 @@
        x1="68.47998"
        id="linearGradient8787"
        xlink:href="#linearGradient8785"
-       inkscape:collect="always"
        gradientTransform="matrix(1.3687895,0,0,1.494898,-60.408122,-1504.0798)" />
     <filter
        height="1.4861495"
-       y="-0.24307476"
+       y="-0.24307477"
        width="2.0754105"
        x="-0.53770523"
        id="filter8813"
-       style="color-interpolation-filters:sRGB"
-       inkscape:collect="always">
+       style="color-interpolation-filters:sRGB">
       <feGaussianBlur
          id="feGaussianBlur8815"
-         stdDeviation="1.1269452"
-         inkscape:collect="always" />
+         stdDeviation="1.1269452" />
     </filter>
     <filter
        height="1.6025846"
-       y="-0.30129231"
+       y="-0.30129232"
        width="1.626688"
-       x="-0.31334399"
+       x="-0.313344"
        id="filter8835"
-       style="color-interpolation-filters:sRGB"
-       inkscape:collect="always">
+       style="color-interpolation-filters:sRGB">
       <feGaussianBlur
          id="feGaussianBlur8837"
-         stdDeviation="0.49751501"
-         inkscape:collect="always" />
+         stdDeviation="0.49751501" />
     </filter>
     <filter
-       height="1.3642128"
-       y="-0.18210639"
-       width="1.8989758"
-       x="-0.4494879"
+       height="1.2365698"
+       y="-0.11828489"
+       width="1.8310951"
+       x="-0.41554753"
        id="filter8871"
-       style="color-interpolation-filters:sRGB"
-       inkscape:collect="always">
+       style="color-interpolation-filters:sRGB">
       <feGaussianBlur
          id="feGaussianBlur8873"
-         stdDeviation="0.53588249"
-         inkscape:collect="always" />
+         stdDeviation="0.53588249" />
     </filter>
     <filter
-       height="1.3642128"
-       y="-0.18210639"
-       width="1.8989758"
-       x="-0.44948789"
+       height="1.2365698"
+       y="-0.11828489"
+       width="1.8310951"
+       x="-0.41554753"
        id="filter8871-1"
-       style="color-interpolation-filters:sRGB"
-       inkscape:collect="always">
+       style="color-interpolation-filters:sRGB">
       <feGaussianBlur
          id="feGaussianBlur8873-8"
-         stdDeviation="0.53588249"
-         inkscape:collect="always" />
+         stdDeviation="0.53588249" />
     </filter>
     <filter
-       inkscape:collect="always"
        style="color-interpolation-filters:sRGB"
        id="filter2533"
-       x="-0.59377656"
+       x="-0.59377657"
        width="2.1875531"
-       y="-0.92639429"
+       y="-0.92639431"
        height="2.8527886">
       <feGaussianBlur
-         inkscape:collect="always"
          stdDeviation="0.73536407"
          id="feGaussianBlur2535" />
     </filter>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient2543"
        id="linearGradient2545"
        x1="18.423391"
@@ -652,111 +210,72 @@
        y2="30.334658"
        gradientUnits="userSpaceOnUse" />
     <filter
-       height="1.4861495"
-       y="-0.24307476"
-       width="2.0754106"
-       x="-0.53770524"
+       height="1.5429226"
+       y="-0.28183149"
+       width="2.2508696"
+       x="-0.62393302"
        id="filter8813-5"
-       style="color-interpolation-filters:sRGB"
-       inkscape:collect="always">
+       style="color-interpolation-filters:sRGB">
       <feGaussianBlur
          id="feGaussianBlur8815-0"
-         stdDeviation="1.1269452"
-         inkscape:collect="always" />
+         stdDeviation="1.1269452" />
     </filter>
     <filter
-       height="1.3642128"
-       y="-0.18210639"
-       width="1.8989758"
-       x="-0.44948789"
+       height="1.3657108"
+       y="-0.14956416"
+       width="2.0529236"
+       x="-0.52900042"
        id="filter8871-4"
-       style="color-interpolation-filters:sRGB"
-       inkscape:collect="always">
+       style="color-interpolation-filters:sRGB">
       <feGaussianBlur
          id="feGaussianBlur8873-9"
-         stdDeviation="0.53588249"
-         inkscape:collect="always" />
+         stdDeviation="0.53588249" />
     </filter>
     <filter
-       height="1.6025846"
-       y="-0.3012923"
-       width="1.626688"
-       x="-0.313344"
+       height="1.8202162"
+       y="-0.4101081"
+       width="1.8530248"
+       x="-0.42651241"
        id="filter8835-5"
-       style="color-interpolation-filters:sRGB"
-       inkscape:collect="always">
+       style="color-interpolation-filters:sRGB">
       <feGaussianBlur
          id="feGaussianBlur8837-4"
-         stdDeviation="0.49751501"
-         inkscape:collect="always" />
+         stdDeviation="0.49751501" />
     </filter>
     <filter
-       inkscape:collect="always"
        style="color-interpolation-filters:sRGB"
        id="filter2533-6"
-       x="-0.59377658"
-       width="2.1875532"
-       y="-0.92639428"
-       height="2.8527887">
+       x="-0.68029659"
+       width="2.58171"
+       y="-1.0736972"
+       height="3.2469455">
       <feGaussianBlur
-         inkscape:collect="always"
          stdDeviation="0.73536407"
          id="feGaussianBlur2535-0" />
     </filter>
     <filter
-       height="1.3642128"
-       y="-0.18210639"
-       width="1.8989758"
-       x="-0.44948789"
+       height="1.4022611"
+       y="-0.15841812"
+       width="2.115705"
+       x="-0.56110939"
        id="filter8871-1-6"
-       style="color-interpolation-filters:sRGB"
-       inkscape:collect="always">
+       style="color-interpolation-filters:sRGB">
       <feGaussianBlur
          id="feGaussianBlur8873-8-9"
-         stdDeviation="0.53588249"
-         inkscape:collect="always" />
+         stdDeviation="0.53588249" />
     </filter>
     <filter
-       inkscape:collect="always"
        style="color-interpolation-filters:sRGB"
        id="filter2728"
-       x="-0.05296703"
-       width="1.1059341"
-       y="-0.096524195"
-       height="1.1930484">
+       x="-0.064270157"
+       width="1.1285403"
+       y="-0.11712239"
+       height="1.2342448">
       <feGaussianBlur
-         inkscape:collect="always"
          stdDeviation="0.90744768"
          id="feGaussianBlur2730" />
     </filter>
   </defs>
-  <sodipodi:namedview
-     pagecolor="#dadada"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1920"
-     inkscape:window-height="1017"
-     id="namedview1054"
-     showgrid="true"
-     inkscape:snap-bbox="true"
-     inkscape:snap-nodes="false"
-     inkscape:bbox-nodes="true"
-     inkscape:zoom="9.8333333"
-     inkscape:cx="22.573123"
-     inkscape:cy="18.806221"
-     inkscape:window-x="-8"
-     inkscape:window-y="-8"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg1052">
-    <inkscape:grid
-       type="xygrid"
-       id="grid1605" />
-  </sodipodi:namedview>
   <g
      transform="matrix(1.0729615,0,0,1.0787087,-1.2096914,-0.17204372)"
      id="g2558-4"
@@ -765,39 +284,28 @@
        transform="matrix(1.029538,0,0,1.1281495,-40.181606,-1129.0381)"
        style="fill:#808080;fill-opacity:1;stroke:#808080;stroke-width:0.86248446px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter8813-5)"
        d="m 53.577367,1026.9835 -0.152425,-8.8407 0.91455,-1.2194 3.124711,-0.076 0.07621,-0.9908 h 0.91455 l -0.07621,1.9054 -3.048499,1.2194 -0.152425,4.9538 z"
-       id="path8791-1"
-       inkscape:connector-curvature="0" />
+       id="path8791-1" />
     <path
        id="path8722-7-8"
        style="display:inline;opacity:1;fill:#808080;fill-opacity:1;stroke:#808080;stroke-width:0.92951375;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 3.4999999,23.512598 V 25.5 H 14.5 V 21.525196 H 3.4999999 v 1.987402"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccc" />
+       d="M 3.4999999,23.512598 V 25.5 H 14.5 V 21.525196 H 3.4999999 v 1.987402" />
     <path
-       sodipodi:nodetypes="csssscsscccsssscsscc"
        id="rect8645-3-9"
        style="display:inline;opacity:1;fill:#808080;fill-opacity:1;stroke:#808080;stroke-width:0.92951363;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 25.499998,23.781495 25.5,15.413559 C 25.5,13.799403 24.568942,12.5 23.412427,12.5 h -2.424855 c -1.156515,0 -2.483072,1.299403 -2.483072,2.913559 v 1.599039 h -2.264856 c -0.963763,0 -1.739644,0.794104 -1.739644,1.780446 v 1.468512 3.519375 m 10.999998,5.64e-4 2e-6,8.367936 c 0,1.614156 -0.931058,2.913559 -2.087573,2.913559 h -2.424855 c -1.156515,0 -2.483072,-1.299403 -2.483072,-2.913559 V 30.550392 H 16.239644 C 15.275881,30.550392 14.5,29.756288 14.5,28.769946 v -1.468512 -3.519375"
-       inkscape:connector-curvature="0" />
+       d="M 25.499998,23.781495 25.5,15.413559 C 25.5,13.799403 24.568942,12.5 23.412427,12.5 h -2.424855 c -1.156515,0 -2.483072,1.299403 -2.483072,2.913559 v 1.599039 h -2.264856 c -0.963763,0 -1.739644,0.794104 -1.739644,1.780446 v 1.468512 3.519375 m 10.999998,5.64e-4 2e-6,8.367936 c 0,1.614156 -0.931058,2.913559 -2.087573,2.913559 h -2.424855 c -1.156515,0 -2.483072,-1.299403 -2.483072,-2.913559 V 30.550392 H 16.239644 C 15.275881,30.550392 14.5,29.756288 14.5,28.769946 v -1.468512 -3.519375" />
     <path
-       sodipodi:nodetypes="cc"
-       inkscape:connector-curvature="0"
        id="path2537-0"
        d="M 18.51661,16.539741 18.5464,30.705846"
        style="fill:#808080;stroke:#808080;stroke-width:0.92951375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
     <path
        id="rect8645-2-5-2"
        style="display:inline;opacity:1;fill:#808080;fill-opacity:1;stroke:#808080;stroke-width:0.92951369;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 36.091538,26.489769 -10e-7,1.058985 c 0,1.06945 -0.863288,1.955925 -2.164732,1.930363 -1.301445,-0.02541 -1.941636,0 -1.941636,0 v 0.201512 c 0,1.544678 -1.158564,2.787985 -2.597679,2.788284 l -1.648306,2.98e-4 c -1.360345,3e-4 -1.22903,0.546236 -1.22903,-2.989646 V 17.520381 c 0,-3.536032 -0.205068,-2.989797 1.22903,-2.989797 h 1.648306 c 1.439115,0 2.597679,1.243607 2.597679,2.788284 v 0.201513 h 1.941637 c 1.199261,0 2.164732,0.860911 2.164732,1.930361 v 2.554332 z m 0.06454,-6.010119 h 8.461471 l -0.05085,6.010119 h -8.188123"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cczccssssssccsccccccc" />
+       d="m 36.091538,26.489769 -10e-7,1.058985 c 0,1.06945 -0.863288,1.955925 -2.164732,1.930363 -1.301445,-0.02541 -1.941636,0 -1.941636,0 v 0.201512 c 0,1.544678 -1.158564,2.787985 -2.597679,2.788284 l -1.648306,2.98e-4 c -1.360345,3e-4 -1.22903,0.546236 -1.22903,-2.989646 V 17.520381 c 0,-3.536032 -0.205068,-2.989797 1.22903,-2.989797 h 1.648306 c 1.439115,0 2.597679,1.243607 2.597679,2.788284 v 0.201513 h 1.941637 c 1.199261,0 2.164732,0.860911 2.164732,1.930361 v 2.554332 z m 0.06454,-6.010119 h 8.461471 l -0.05085,6.010119 h -8.188123" />
     <path
        transform="matrix(1.445753,0,0,1.3224494,-65.097292,-1327.9481)"
        style="opacity:0.794;fill:#808080;fill-opacity:1;stroke:#808080;stroke-width:0.67223209px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter8871-4)"
        d="m 64.018476,1016.5423 -0.152427,10.8222 c 2.375507,-3.3036 3.484206,-4.2052 2.972286,-9.2217 0.305009,-1.654 -1.117834,-1.7529 -2.819859,-1.6005 z"
-       id="path8861-9"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccc" />
+       id="path8861-9" />
     <ellipse
        transform="matrix(1.029538,0,0,1.1281495,-39.470994,-1128.0797)"
        style="opacity:0.828;fill:#808080;fill-opacity:1;stroke:#808080;stroke-width:0.86248446;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter8835-5)"
@@ -810,15 +318,12 @@
        transform="matrix(1.7350569,0,0,1.8824502,-91.814902,-1903.1505)"
        style="opacity:0.86199999;fill:#808080;fill-opacity:1;stroke:#808080;stroke-width:0.51432449px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter2533-6)"
        d="m 70.953811,1023.4014 v -1.8291 l 2.972286,-0.076 z"
-       id="path8875-0"
-       inkscape:connector-curvature="0" />
+       id="path8875-0" />
     <path
        transform="matrix(1.029538,0,0,1.1281495,-39.928294,-1128.6206)"
        style="display:inline;opacity:0.48500001;fill:#808080;fill-opacity:1;stroke:#808080;stroke-width:0.86248446px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter8871-1-6)"
        d="m 53.924652,1016.631 -0.152427,10.8222 c 2.375507,-3.3036 3.484206,-4.2052 2.972286,-9.2217 0.305009,-1.654 -1.117834,-1.7529 -2.819859,-1.6005 z"
-       id="path8861-7-0"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccc" />
+       id="path8861-7-0" />
   </g>
   <g
      id="g11331-3-1-1"
@@ -866,39 +371,28 @@
        transform="matrix(1.029538,0,0,1.1281495,-40.181606,-1129.0381)"
        style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.9278878px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter8813)"
        d="m 53.577367,1026.9835 -0.152425,-8.8407 0.91455,-1.2194 3.124711,-0.076 0.07621,-0.9908 h 0.91455 l -0.07621,1.9054 -3.048499,1.2194 -0.152425,4.9538 z"
-       id="path8791"
-       inkscape:connector-curvature="0" />
+       id="path8791" />
     <path
        id="path8722-7"
        style="display:inline;opacity:1;fill:url(#linearGradient8769);fill-opacity:1;stroke:url(#linearGradient8753);stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 3.4999999,23.512598 V 25.5 H 14.5 V 21.525196 H 3.4999999 v 1.987402"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccc" />
+       d="M 3.4999999,23.512598 V 25.5 H 14.5 V 21.525196 H 3.4999999 v 1.987402" />
     <path
-       sodipodi:nodetypes="csssscsscccsssscsscc"
        id="rect8645-3"
        style="display:inline;opacity:1;fill:url(#linearGradient8761);fill-opacity:1;stroke:#4d73ae;stroke-width:0.99999988;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 25.499998,23.781495 25.5,15.413559 C 25.5,13.799403 24.568942,12.5 23.412427,12.5 h -2.424855 c -1.156515,0 -2.483072,1.299403 -2.483072,2.913559 v 1.599039 h -2.264856 c -0.963763,0 -1.739644,0.794104 -1.739644,1.780446 v 1.468512 3.519375 m 10.999998,5.64e-4 2e-6,8.367936 c 0,1.614156 -0.931058,2.913559 -2.087573,2.913559 h -2.424855 c -1.156515,0 -2.483072,-1.299403 -2.483072,-2.913559 V 30.550392 H 16.239644 C 15.275881,30.550392 14.5,29.756288 14.5,28.769946 v -1.468512 -3.519375"
-       inkscape:connector-curvature="0" />
+       d="M 25.499998,23.781495 25.5,15.413559 C 25.5,13.799403 24.568942,12.5 23.412427,12.5 h -2.424855 c -1.156515,0 -2.483072,1.299403 -2.483072,2.913559 v 1.599039 h -2.264856 c -0.963763,0 -1.739644,0.794104 -1.739644,1.780446 v 1.468512 3.519375 m 10.999998,5.64e-4 2e-6,8.367936 c 0,1.614156 -0.931058,2.913559 -2.087573,2.913559 h -2.424855 c -1.156515,0 -2.483072,-1.299403 -2.483072,-2.913559 V 30.550392 H 16.239644 C 15.275881,30.550392 14.5,29.756288 14.5,28.769946 v -1.468512 -3.519375" />
     <path
-       sodipodi:nodetypes="cc"
-       inkscape:connector-curvature="0"
        id="path2537"
        d="m 18.51661,16.539741 0.02979,14.166105"
        style="fill:none;stroke:url(#linearGradient2545);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
     <path
        id="rect8645-2-5"
        style="display:inline;opacity:1;fill:url(#linearGradient8779);fill-opacity:1;stroke:url(#linearGradient8787);stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 36.091538,26.489769 -10e-7,1.058985 c 0,1.06945 -0.863288,1.955925 -2.164732,1.930363 -1.301445,-0.02541 -1.941636,0 -1.941636,0 v 0.201512 c 0,1.544678 -1.158564,2.787985 -2.597679,2.788284 l -1.648306,2.98e-4 c -1.360345,3e-4 -1.22903,0.546236 -1.22903,-2.989646 V 17.520381 c 0,-3.536032 -0.205068,-2.989797 1.22903,-2.989797 h 1.648306 c 1.439115,0 2.597679,1.243607 2.597679,2.788284 v 0.201513 h 1.941637 c 1.199261,0 2.164732,0.860911 2.164732,1.930361 v 2.554332 z m 0.06454,-6.010119 h 8.461471 l -0.05085,6.010119 h -8.188123"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cczccssssssccsccccccc" />
+       d="m 36.091538,26.489769 -10e-7,1.058985 c 0,1.06945 -0.863288,1.955925 -2.164732,1.930363 -1.301445,-0.02541 -1.941636,0 -1.941636,0 v 0.201512 c 0,1.544678 -1.158564,2.787985 -2.597679,2.788284 l -1.648306,2.98e-4 c -1.360345,3e-4 -1.22903,0.546236 -1.22903,-2.989646 V 17.520381 c 0,-3.536032 -0.205068,-2.989797 1.22903,-2.989797 h 1.648306 c 1.439115,0 2.597679,1.243607 2.597679,2.788284 v 0.201513 h 1.941637 c 1.199261,0 2.164732,0.860911 2.164732,1.930361 v 2.554332 z m 0.06454,-6.010119 h 8.461471 l -0.05085,6.010119 h -8.188123" />
     <path
        transform="matrix(1.445753,0,0,1.3224494,-65.097292,-1327.9481)"
        style="opacity:0.794;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.72320831px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter8871)"
        d="m 64.018476,1016.5423 -0.152427,10.8222 c 2.375507,-3.3036 3.484206,-4.2052 2.972286,-9.2217 0.305009,-1.654 -1.117834,-1.7529 -2.819859,-1.6005 z"
-       id="path8861"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccc" />
+       id="path8861" />
     <ellipse
        transform="matrix(1.029538,0,0,1.1281495,-39.470994,-1128.0797)"
        style="opacity:0.828;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.9278878;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter8835)"
@@ -911,14 +405,11 @@
        transform="matrix(1.7350569,0,0,1.8824502,-91.814902,-1903.1505)"
        style="opacity:0.86199999;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.55332637px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter2533)"
        d="m 70.953811,1023.4014 v -1.8291 l 2.972286,-0.076 z"
-       id="path8875"
-       inkscape:connector-curvature="0" />
+       id="path8875" />
     <path
        transform="matrix(1.029538,0,0,1.1281495,-39.928294,-1128.6206)"
        style="display:inline;opacity:0.48500001;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.9278878px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter8871-1)"
        d="m 53.924652,1016.631 -0.152427,10.8222 c 2.375507,-3.3036 3.484206,-4.2052 2.972286,-9.2217 0.305009,-1.654 -1.117834,-1.7529 -2.819859,-1.6005 z"
-       id="path8861-7"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccc" />
+       id="path8861-7" />
   </g>
 </svg>
diff --git a/ui/org.eclipse.pde/images/topiclabel/sa_samplecube48.svg b/ui/org.eclipse.pde/images/topiclabel/sa_samplecube48.svg
index 7ced8552791..28a006c8035 100644
--- a/ui/org.eclipse.pde/images/topiclabel/sa_samplecube48.svg
+++ b/ui/org.eclipse.pde/images/topiclabel/sa_samplecube48.svg
@@ -2,21 +2,17 @@
 <!-- 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"
    version="1.1"
    id="svg8489"
    width="48"
    height="48"
    viewBox="0 0 48 48"
-   sodipodi:docname="sa_samplecube48.svg"
-   inkscape:version="0.92.4 (5da689c313, 2019-01-14)">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <metadata
      id="metadata8495">
     <rdf:RDF>
@@ -25,14 +21,13 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
   <defs
      id="defs8493">
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient9162">
       <stop
          style="stop-color:#2b97e3;stop-opacity:1;"
@@ -44,8 +39,7 @@
          id="stop9160" />
     </linearGradient>
     <linearGradient
-       id="linearGradient9152"
-       inkscape:collect="always">
+       id="linearGradient9152">
       <stop
          id="stop9148"
          offset="0"
@@ -56,7 +50,6 @@
          style="stop-color:#26218a;stop-opacity:0.86666667" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient9136">
       <stop
          style="stop-color:#2b3996;stop-opacity:1"
@@ -72,7 +65,6 @@
          id="stop9134" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient9120">
       <stop
          style="stop-color:#ccffff;stop-opacity:1"
@@ -84,7 +76,6 @@
          id="stop9118" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient9112">
       <stop
          style="stop-color:#241b89;stop-opacity:0.86666667"
@@ -96,7 +87,6 @@
          id="stop9110" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient9102">
       <stop
          style="stop-color:#ffffff;stop-opacity:1;"
@@ -108,7 +98,6 @@
          id="stop9100" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient9102"
        id="linearGradient9104"
        x1="39.406223"
@@ -117,7 +106,6 @@
        y2="20.027334"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient9112"
        id="linearGradient9114"
        x1="21.791878"
@@ -126,7 +114,6 @@
        y2="31.874369"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient9120"
        id="linearGradient9122"
        x1="22.730659"
@@ -135,7 +122,6 @@
        y2="4.5864873"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient9136"
        id="linearGradient9138"
        x1="23.589479"
@@ -144,7 +130,6 @@
        y2="24.287952"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient9152"
        id="linearGradient9146"
        x1="39.553352"
@@ -153,7 +138,6 @@
        y2="14.580217"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient9162"
        id="linearGradient9164"
        x1="21.428932"
@@ -163,7 +147,6 @@
        gradientUnits="userSpaceOnUse" />
     <linearGradient
        gradientTransform="matrix(-1,0,0,1,47.386158,0.27431587)"
-       inkscape:collect="always"
        xlink:href="#linearGradient9162"
        id="linearGradient9164-6"
        x1="21.428932"
@@ -172,78 +155,36 @@
        y2="16.21615"
        gradientUnits="userSpaceOnUse" />
   </defs>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1920"
-     inkscape:window-height="1017"
-     id="namedview8491"
-     showgrid="true"
-     inkscape:snap-global="false"
-     showguides="false"
-     inkscape:zoom="13.906433"
-     inkscape:cx="31.842005"
-     inkscape:cy="23.941042"
-     inkscape:window-x="-8"
-     inkscape:window-y="-8"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg8489">
-    <inkscape:grid
-       type="xygrid"
-       id="grid9042" />
-  </sodipodi:namedview>
   <path
      style="fill:url(#linearGradient9104);stroke:url(#linearGradient9114);stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;fill-opacity:1"
      d="M 7.406644,29.447435 23.586206,42.534904 39.406222,31.029437 23.478342,19.344198 Z"
-     id="path9044"
-     inkscape:connector-curvature="0"
-     sodipodi:nodetypes="ccccc" />
+     id="path9044" />
   <path
      style="fill:url(#linearGradient9164);fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
      d="M 7.8740535,29.339572 23.082842,41.492221 23.298569,24.090203 7.9100081,14.310556 Z"
-     id="path9156"
-     inkscape:connector-curvature="0"
-     sodipodi:nodetypes="ccccc" />
+     id="path9156" />
   <path
      style="fill:none;stroke:url(#linearGradient9146);stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
      d="m 39.478132,30.921574 -1e-6,-18.013246"
-     id="path9061-8"
-     inkscape:connector-curvature="0"
-     sodipodi:nodetypes="cc" />
+     id="path9061-8" />
   <path
      style="fill:none;stroke:#428ac0;stroke-width:0.99999994px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:0.86666667"
      d="M 7.3706895,29.404698 7.4066436,13.562296"
-     id="path9061-4"
-     inkscape:connector-curvature="0"
-     sodipodi:nodetypes="cc" />
+     id="path9061-4" />
   <path
      style="fill:none;stroke:#ff29d9;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
      d="M 23.478343,19.48161 23.586206,3.8541807"
-     id="path9061-6"
-     inkscape:connector-curvature="0"
-     sodipodi:nodetypes="cc" />
+     id="path9061-6" />
   <path
      style="fill:#54b1ea;fill-opacity:0.86666667;stroke:url(#linearGradient9122);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
      d="M 7.3931504,13.524287 23.62356,23.874845 39.410176,12.784133 23.53495,3.8165494 Z"
-     id="path9044-9"
-     inkscape:connector-curvature="0"
-     sodipodi:nodetypes="ccccc" />
+     id="path9044-9" />
   <path
      style="fill:url(#linearGradient9164-6);fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
      d="M 39.283291,30.834227 23.99823,41.741113 23.858774,24.135705 39.120217,13.517075 Z"
-     id="path9156-5"
-     inkscape:connector-curvature="0"
-     sodipodi:nodetypes="ccccc" />
+     id="path9156-5" />
   <path
      style="fill:none;stroke:url(#linearGradient9138);stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
      d="M 23.586206,42.534904 23.694069,23.874475"
-     id="path9061"
-     inkscape:connector-curvature="0"
-     sodipodi:nodetypes="cc" />
+     id="path9061" />
 </svg>
diff --git a/ui/org.eclipse.pde/images/topiclabel/sa_sampleorb48.svg b/ui/org.eclipse.pde/images/topiclabel/sa_sampleorb48.svg
index 3b86a68170e..16fdbffebc0 100644
--- a/ui/org.eclipse.pde/images/topiclabel/sa_sampleorb48.svg
+++ b/ui/org.eclipse.pde/images/topiclabel/sa_sampleorb48.svg
@@ -2,21 +2,17 @@
 <!-- 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"
    version="1.1"
    id="svg7816"
    width="48"
    height="48"
    viewBox="0 0 48 48"
-   sodipodi:docname="sa_sampleorb48.svg"
-   inkscape:version="0.92.4 (5da689c313, 2019-01-14)">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <metadata
      id="metadata7822">
     <rdf:RDF>
@@ -25,14 +21,13 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
   <defs
      id="defs7820">
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient8417">
       <stop
          style="stop-color:#ff9c08;stop-opacity:1"
@@ -44,7 +39,6 @@
          id="stop8415" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient8377">
       <stop
          style="stop-color:#ffdd96;stop-opacity:1"
@@ -56,7 +50,6 @@
          id="stop8375" />
     </linearGradient>
     <radialGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient8377"
        id="radialGradient8379"
        cx="19.901178"
@@ -66,7 +59,6 @@
        r="20.000001"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient8417"
        id="linearGradient8419"
        x1="24.206474"
@@ -75,7 +67,6 @@
        y2="42.538124"
        gradientUnits="userSpaceOnUse" />
     <filter
-       inkscape:collect="always"
        style="color-interpolation-filters:sRGB"
        id="filter8437"
        x="-0.028317032"
@@ -83,52 +74,21 @@
        y="-0.049404382"
        height="1.0988088">
       <feGaussianBlur
-         inkscape:collect="always"
          stdDeviation="0.46012818"
          id="feGaussianBlur8439" />
     </filter>
     <filter
-       inkscape:collect="always"
        style="color-interpolation-filters:sRGB"
        id="filter8485"
-       x="-0.1464"
-       width="1.2928"
-       y="-0.1464"
-       height="1.2928">
+       x="-0.13769223"
+       width="1.2753845"
+       y="-0.13769223"
+       height="1.2753845">
       <feGaussianBlur
-         inkscape:collect="always"
          stdDeviation="1.3861866"
          id="feGaussianBlur8487" />
     </filter>
   </defs>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1920"
-     inkscape:window-height="1017"
-     id="namedview7818"
-     showgrid="true"
-     inkscape:snap-bbox="true"
-     inkscape:bbox-nodes="true"
-     inkscape:snap-nodes="false"
-     inkscape:snap-global="false"
-     inkscape:zoom="13.906433"
-     inkscape:cx="53.938689"
-     inkscape:cy="20.306442"
-     inkscape:window-x="-8"
-     inkscape:window-y="-8"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg7816">
-    <inkscape:grid
-       type="xygrid"
-       id="grid8369" />
-  </sodipodi:namedview>
   <circle
      style="opacity:1;fill:url(#radialGradient8379);fill-opacity:1;stroke:none;stroke-width:1.00199997;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
      id="path8371"
@@ -138,9 +98,7 @@
   <path
      id="path8405"
      style="fill:url(#linearGradient8419);stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1;filter:url(#filter8437)"
-     d="M 23.189527,24.427621 C 16.295989,20.036435 10.04395,20.99038 5.4936455,21.992809 l -0.907366,0.161767 c -0.05709,0.607794 -0.08628,1.2237 -0.08628,1.846424 0,10.769001 8.7299995,19.499001 19.4990005,19.499001 10.769001,0 19.499001,-8.73 19.499001,-19.499001 -8.246841,0.354891 -14.678041,3.734795 -20.308474,0.426621 z"
-     inkscape:connector-curvature="0"
-     sodipodi:nodetypes="cccsscc" />
+     d="M 23.189527,24.427621 C 16.295989,20.036435 10.04395,20.99038 5.4936455,21.992809 l -0.907366,0.161767 c -0.05709,0.607794 -0.08628,1.2237 -0.08628,1.846424 0,10.769001 8.7299995,19.499001 19.4990005,19.499001 10.769001,0 19.499001,-8.73 19.499001,-19.499001 -8.246841,0.354891 -14.678041,3.734795 -20.308474,0.426621 z" />
   <circle
      style="opacity:1;fill:none;fill-opacity:1;stroke:#cea702;stroke-width:1.00199997;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
      id="path8371-4"
@@ -148,21 +106,8 @@
      cy="24"
      r="19.499001" />
   <path
-     sodipodi:type="star"
      style="opacity:0.828;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.26146662;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;filter:url(#filter8485)"
      id="path8467"
-     sodipodi:sides="4"
-     sodipodi:cx="68.919258"
-     sodipodi:cy="21.080738"
-     sodipodi:r1="15.543029"
-     sodipodi:r2="2.9951024"
-     sodipodi:arg1="0.8902751"
-     sodipodi:arg2="1.7196715"
-     inkscape:flatsided="false"
-     inkscape:rounded="0"
-     inkscape:randomized="0"
      d="M 78.698904,33.161477 68.475007,24.04271 56.838519,30.860384 65.957286,20.636487 59.139612,8.9999987 69.363509,18.118766 80.999998,11.301092 71.88123,21.524989 Z"
-     inkscape:transform-center-x="2.3256224"
-     inkscape:transform-center-y="-0.64810878"
      transform="matrix(0.78662081,-0.11028004,0.11028004,0.78662081,-36.478945,9.7286969)" />
 </svg>
diff --git a/ui/org.eclipse.pde/images/topiclabel/tu_createplugin48.svg b/ui/org.eclipse.pde/images/topiclabel/tu_createplugin48.svg
index 41e52d224b4..4a2abe70caf 100644
--- a/ui/org.eclipse.pde/images/topiclabel/tu_createplugin48.svg
+++ b/ui/org.eclipse.pde/images/topiclabel/tu_createplugin48.svg
@@ -2,21 +2,17 @@
 <!-- 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"
    version="1.1"
    id="svg5848"
    width="48"
    height="48"
    viewBox="0 0 48 48"
-   sodipodi:docname="tu_createplugin48.svg"
-   inkscape:version="0.92.4 (5da689c313, 2019-01-14)">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <metadata
      id="metadata5854">
     <rdf:RDF>
@@ -25,14 +21,13 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
   <defs
      id="defs5852">
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient7493">
       <stop
          style="stop-color:#f3af53;stop-opacity:1"
@@ -44,7 +39,6 @@
          id="stop7491" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient7483">
       <stop
          style="stop-color:#c8ae6a;stop-opacity:1"
@@ -60,99 +54,84 @@
          id="stop7481" />
     </linearGradient>
     <filter
-       height="1.1930484"
-       y="-0.096524194"
-       width="1.1059341"
-       x="-0.052967031"
+       height="1.238807"
+       y="-0.11940352"
+       width="1.1310438"
+       x="-0.065521913"
        id="filter2728"
-       style="color-interpolation-filters:sRGB"
-       inkscape:collect="always">
+       style="color-interpolation-filters:sRGB">
       <feGaussianBlur
          id="feGaussianBlur2730"
-         stdDeviation="0.90744768"
-         inkscape:collect="always" />
+         stdDeviation="0.90744768" />
     </filter>
     <filter
-       inkscape:collect="always"
        style="color-interpolation-filters:sRGB"
        id="filter8813-5"
-       x="-0.53770524"
-       width="2.0754106"
-       y="-0.24307476"
-       height="1.4861495">
+       x="-0.63348224"
+       width="2.2703006"
+       y="-0.28612358"
+       height="1.5492099">
       <feGaussianBlur
-         inkscape:collect="always"
          stdDeviation="1.1269452"
          id="feGaussianBlur8815-0" />
     </filter>
     <filter
-       inkscape:collect="always"
        style="color-interpolation-filters:sRGB"
        id="filter8871-4"
-       x="-0.44948789"
-       width="1.8989758"
-       y="-0.18210639"
-       height="1.3642128">
+       x="-0.54156467"
+       width="2.07749"
+       y="-0.15302865"
+       height="1.3800129">
       <feGaussianBlur
-         inkscape:collect="always"
          stdDeviation="0.53588249"
          id="feGaussianBlur8873-9" />
     </filter>
     <filter
-       inkscape:collect="always"
        style="color-interpolation-filters:sRGB"
        id="filter8835-5"
-       x="-0.313344"
-       width="1.626688"
-       y="-0.3012923"
-       height="1.6025846">
+       x="-0.43904515"
+       width="1.8780903"
+       y="-0.42215882"
+       height="1.8443176">
       <feGaussianBlur
-         inkscape:collect="always"
          stdDeviation="0.49751501"
          id="feGaussianBlur8837-4" />
     </filter>
     <filter
-       height="2.8527887"
-       y="-0.92639428"
-       width="2.1875532"
-       x="-0.59377658"
+       height="3.2905961"
+       y="-1.0900101"
+       width="2.6253606"
+       x="-0.68987818"
        id="filter2533-6"
-       style="color-interpolation-filters:sRGB"
-       inkscape:collect="always">
+       style="color-interpolation-filters:sRGB">
       <feGaussianBlur
          id="feGaussianBlur2535-0"
-         stdDeviation="0.73536407"
-         inkscape:collect="always" />
+         stdDeviation="0.73536407" />
     </filter>
     <filter
-       inkscape:collect="always"
        style="color-interpolation-filters:sRGB"
        id="filter8871-1-6"
-       x="-0.44948789"
-       width="1.8989758"
-       y="-0.18210639"
-       height="1.3642128">
+       x="-0.57722952"
+       width="2.1472241"
+       y="-0.1628634"
+       height="1.4206113">
       <feGaussianBlur
-         inkscape:collect="always"
          stdDeviation="0.53588249"
          id="feGaussianBlur8873-8-9" />
     </filter>
     <filter
-       inkscape:collect="always"
        style="color-interpolation-filters:sRGB"
        id="filter8813"
-       x="-0.53770524"
-       width="2.0754106"
-       y="-0.24307476"
+       x="-0.53770523"
+       width="2.0754105"
+       y="-0.24307477"
        height="1.4861495">
       <feGaussianBlur
-         inkscape:collect="always"
          stdDeviation="1.1269452"
          id="feGaussianBlur8815" />
     </filter>
     <linearGradient
        gradientTransform="matrix(2.2176286,0,0,1.0000001,-100.99025,-990.36223)"
-       inkscape:collect="always"
        xlink:href="#linearGradient8767"
        id="linearGradient8769"
        x1="51.658199"
@@ -161,7 +140,6 @@
        y2="1023.234"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient8767">
       <stop
          style="stop-color:#6a8ec1;stop-opacity:1"
@@ -174,7 +152,6 @@
     </linearGradient>
     <linearGradient
        gradientTransform="matrix(2.2176286,0,0,1.0000001,-100.99025,-990.36223)"
-       inkscape:collect="always"
        xlink:href="#linearGradient8751"
        id="linearGradient8753"
        x1="50"
@@ -183,7 +160,6 @@
        y2="1024.3622"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient8751">
       <stop
          style="stop-color:#2e5d8f;stop-opacity:1"
@@ -196,7 +172,6 @@
     </linearGradient>
     <linearGradient
        gradientTransform="matrix(0.89999981,0,0,0.90000003,-31.749992,-888.17597)"
-       inkscape:collect="always"
        xlink:href="#linearGradient8759"
        id="linearGradient8761"
        x1="57"
@@ -205,7 +180,6 @@
        y2="1030.3622"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient8759">
       <stop
          style="stop-color:#d3e0eb;stop-opacity:1"
@@ -224,11 +198,9 @@
        x1="18.423391"
        id="linearGradient2545"
        xlink:href="#linearGradient2543"
-       inkscape:collect="always"
        gradientTransform="matrix(0.80641038,0,0,0.80641038,3.5680128,12.663232)" />
     <linearGradient
-       id="linearGradient2543"
-       inkscape:collect="always">
+       id="linearGradient2543">
       <stop
          id="stop2539"
          offset="0"
@@ -244,7 +216,6 @@
     </linearGradient>
     <linearGradient
        gradientTransform="matrix(1.1038061,0,0,1.1626968,-44.583609,-1156.6159)"
-       inkscape:collect="always"
        xlink:href="#linearGradient8777"
        id="linearGradient8779"
        x1="63.98344"
@@ -253,7 +224,6 @@
        y2="1026.0538"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient8777">
       <stop
          style="stop-color:#fbeaab;stop-opacity:1;"
@@ -266,7 +236,6 @@
     </linearGradient>
     <linearGradient
        gradientTransform="matrix(1.1038061,0,0,1.1626968,-44.583609,-1156.6159)"
-       inkscape:collect="always"
        xlink:href="#linearGradient8785"
        id="linearGradient8787"
        x1="68.47998"
@@ -275,7 +244,6 @@
        y2="1028.4165"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient8785">
       <stop
          style="stop-color:#bb8d2d;stop-opacity:1"
@@ -291,59 +259,50 @@
          id="stop8783" />
     </linearGradient>
     <filter
-       inkscape:collect="always"
        style="color-interpolation-filters:sRGB"
        id="filter8871"
-       x="-0.44948789"
-       width="1.8989758"
-       y="-0.18210639"
-       height="1.3642128">
+       x="-0.41554753"
+       width="1.8310951"
+       y="-0.11828489"
+       height="1.2365698">
       <feGaussianBlur
-         inkscape:collect="always"
          stdDeviation="0.53588249"
          id="feGaussianBlur8873" />
     </filter>
     <filter
-       inkscape:collect="always"
        style="color-interpolation-filters:sRGB"
        id="filter8835"
        x="-0.313344"
        width="1.626688"
-       y="-0.3012923"
+       y="-0.30129232"
        height="1.6025846">
       <feGaussianBlur
-         inkscape:collect="always"
          stdDeviation="0.49751501"
          id="feGaussianBlur8837" />
     </filter>
     <filter
-       height="2.8527887"
-       y="-0.92639428"
-       width="2.1875532"
-       x="-0.59377658"
+       height="2.8527886"
+       y="-0.92639431"
+       width="2.1875531"
+       x="-0.59377657"
        id="filter2533"
-       style="color-interpolation-filters:sRGB"
-       inkscape:collect="always">
+       style="color-interpolation-filters:sRGB">
       <feGaussianBlur
          id="feGaussianBlur2535"
-         stdDeviation="0.73536407"
-         inkscape:collect="always" />
+         stdDeviation="0.73536407" />
     </filter>
     <filter
-       inkscape:collect="always"
        style="color-interpolation-filters:sRGB"
        id="filter8871-1"
-       x="-0.44948789"
-       width="1.8989758"
-       y="-0.18210639"
-       height="1.3642128">
+       x="-0.41554753"
+       width="1.8310951"
+       y="-0.11828489"
+       height="1.2365698">
       <feGaussianBlur
-         inkscape:collect="always"
          stdDeviation="0.53588249"
          id="feGaussianBlur8873-8" />
     </filter>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient7483"
        id="linearGradient7485"
        x1="23"
@@ -352,7 +311,6 @@
        y2="10.680824"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient7493"
        id="linearGradient7495"
        x1="9.1864405"
@@ -361,7 +319,6 @@
        y2="29.427965"
        gradientUnits="userSpaceOnUse" />
     <filter
-       inkscape:collect="always"
        style="color-interpolation-filters:sRGB"
        id="filter7531"
        x="-0.12272727"
@@ -369,92 +326,52 @@
        y="-0.096428571"
        height="1.1928571">
       <feGaussianBlur
-         inkscape:collect="always"
          stdDeviation="0.5625"
          id="feGaussianBlur7533" />
     </filter>
     <filter
-       inkscape:collect="always"
        style="color-interpolation-filters:sRGB"
        id="filter7531-4"
-       x="-0.12272727"
-       width="1.2454545"
-       y="-0.096428573"
-       height="1.1928571">
+       x="-0.0675"
+       width="1.135"
+       y="-0.3375"
+       height="1.675">
       <feGaussianBlur
-         inkscape:collect="always"
          stdDeviation="0.5625"
          id="feGaussianBlur7533-4" />
     </filter>
     <filter
-       inkscape:collect="always"
        style="color-interpolation-filters:sRGB"
        id="filter7531-4-0"
-       x="-0.12272727"
-       width="1.2454545"
-       y="-0.096428573"
-       height="1.1928571">
+       x="-0.2357654"
+       width="1.4715308"
+       y="-0.4404309"
+       height="1.8808618">
       <feGaussianBlur
-         inkscape:collect="always"
          stdDeviation="0.5625"
          id="feGaussianBlur7533-4-7" />
     </filter>
     <filter
-       inkscape:collect="always"
        style="color-interpolation-filters:sRGB"
        id="filter7629"
-       x="-0.079016129"
-       width="1.1580323"
-       y="-0.092433962"
-       height="1.1848679">
+       x="-0.094173693"
+       width="1.1883474"
+       y="-0.11016545"
+       height="1.2203309">
       <feGaussianBlur
-         inkscape:collect="always"
          stdDeviation="1.020625"
          id="feGaussianBlur7631" />
     </filter>
   </defs>
-  <sodipodi:namedview
-     pagecolor="#c0c0c0"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1920"
-     inkscape:window-height="1017"
-     id="namedview5850"
-     showgrid="true"
-     inkscape:snap-bbox="true"
-     inkscape:snap-nodes="false"
-     inkscape:snap-bbox-midpoints="true"
-     inkscape:snap-global="true"
-     inkscape:bbox-nodes="true"
-     inkscape:zoom="9.8333333"
-     inkscape:cx="19.524979"
-     inkscape:cy="26.393754"
-     inkscape:window-x="-8"
-     inkscape:window-y="-8"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg5848">
-    <inkscape:grid
-       type="xygrid"
-       id="grid7443" />
-  </sodipodi:namedview>
   <path
      style="opacity:0.53399999;fill:#f1f1f1;fill-opacity:1;stroke:#f1f1f1;stroke-width:0.93976897px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter7629)"
      d="M 10.550499,31.9495 V 9.4494999 h 3 l 1.5,-4 h 15 l 2.5,4 h 9 V 31.9495 Z"
      id="path7477-0"
-     inkscape:connector-curvature="0"
-     sodipodi:nodetypes="ccccccccc"
      transform="matrix(1.1322903,0,0,1,-5.4967276,0)" />
   <path
      style="fill:url(#linearGradient7495);stroke:url(#linearGradient7485);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1"
      d="M 7.5,32 V 9.5 h 3 l 1.5,-4 h 15 l 2.5,4 h 9 V 32 Z"
-     id="path7477"
-     inkscape:connector-curvature="0"
-     sodipodi:nodetypes="ccccccccc" />
+     id="path7477" />
   <g
      transform="matrix(0.97000337,0,0,0.96713473,0.60827826,9.9830673)"
      id="g2558-4"
@@ -463,39 +380,28 @@
        transform="matrix(1.029538,0,0,1.1281495,-40.181606,-1129.0381)"
        style="fill:#f1f1f1;fill-opacity:1;stroke:#f1f1f1;stroke-width:0.95799959px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter8813-5)"
        d="m 53.577367,1026.9835 -0.152425,-8.8407 0.91455,-1.2194 3.124711,-0.076 0.07621,-0.9908 h 0.91455 l -0.07621,1.9054 -3.048499,1.2194 -0.152425,4.9538 z"
-       id="path8791-1"
-       inkscape:connector-curvature="0" />
+       id="path8791-1" />
     <path
        id="path8722-7-8"
        style="display:inline;opacity:1;fill:#f1f1f1;fill-opacity:1;stroke:#f1f1f1;stroke-width:1.03245199;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 3.4999999,23.512598 V 25.5 H 14.5 V 21.525196 H 3.4999999 v 1.987402"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccc" />
+       d="M 3.4999999,23.512598 V 25.5 H 14.5 V 21.525196 H 3.4999999 v 1.987402" />
     <path
-       sodipodi:nodetypes="csssscsscccsssscsscc"
        id="rect8645-3-9"
        style="display:inline;opacity:1;fill:#f1f1f1;fill-opacity:1;stroke:#f1f1f1;stroke-width:1.03245187;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 25.499998,23.781495 25.5,15.413559 C 25.5,13.799403 24.568942,12.5 23.412427,12.5 h -2.424855 c -1.156515,0 -2.483072,1.299403 -2.483072,2.913559 v 1.599039 h -2.264856 c -0.963763,0 -1.739644,0.794104 -1.739644,1.780446 v 1.468512 3.519375 m 10.999998,5.64e-4 2e-6,8.367936 c 0,1.614156 -0.931058,2.913559 -2.087573,2.913559 h -2.424855 c -1.156515,0 -2.483072,-1.299403 -2.483072,-2.913559 V 30.550392 H 16.239644 C 15.275881,30.550392 14.5,29.756288 14.5,28.769946 v -1.468512 -3.519375"
-       inkscape:connector-curvature="0" />
+       d="M 25.499998,23.781495 25.5,15.413559 C 25.5,13.799403 24.568942,12.5 23.412427,12.5 h -2.424855 c -1.156515,0 -2.483072,1.299403 -2.483072,2.913559 v 1.599039 h -2.264856 c -0.963763,0 -1.739644,0.794104 -1.739644,1.780446 v 1.468512 3.519375 m 10.999998,5.64e-4 2e-6,8.367936 c 0,1.614156 -0.931058,2.913559 -2.087573,2.913559 h -2.424855 c -1.156515,0 -2.483072,-1.299403 -2.483072,-2.913559 V 30.550392 H 16.239644 C 15.275881,30.550392 14.5,29.756288 14.5,28.769946 v -1.468512 -3.519375" />
     <path
-       sodipodi:nodetypes="cc"
-       inkscape:connector-curvature="0"
        id="path2537-0"
        d="M 18.51661,16.539741 18.5464,30.705846"
        style="fill:#f1f1f1;fill-opacity:1;stroke:#f1f1f1;stroke-width:1.03245199px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
     <path
        id="rect8645-2-5-2"
        style="display:inline;opacity:1;fill:#f1f1f1;fill-opacity:1;stroke:#f1f1f1;stroke-width:1.03245199;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 36.091538,26.489769 -10e-7,1.058985 c 0,1.06945 -0.863288,1.955925 -2.164732,1.930363 -1.301445,-0.02541 -1.941636,0 -1.941636,0 v 0.201512 c 0,1.544678 -1.158564,2.787985 -2.597679,2.788284 l -1.648306,2.98e-4 c -1.360345,3e-4 -1.22903,0.546236 -1.22903,-2.989646 V 17.520381 c 0,-3.536032 -0.205068,-2.989797 1.22903,-2.989797 h 1.648306 c 1.439115,0 2.597679,1.243607 2.597679,2.788284 v 0.201513 h 1.941637 c 1.199261,0 2.164732,0.860911 2.164732,1.930361 v 2.554332 z m 0.06454,-6.010119 h 8.461471 l -0.05085,6.010119 h -8.188123"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cczccssssssccsccccccc" />
+       d="m 36.091538,26.489769 -10e-7,1.058985 c 0,1.06945 -0.863288,1.955925 -2.164732,1.930363 -1.301445,-0.02541 -1.941636,0 -1.941636,0 v 0.201512 c 0,1.544678 -1.158564,2.787985 -2.597679,2.788284 l -1.648306,2.98e-4 c -1.360345,3e-4 -1.22903,0.546236 -1.22903,-2.989646 V 17.520381 c 0,-3.536032 -0.205068,-2.989797 1.22903,-2.989797 h 1.648306 c 1.439115,0 2.597679,1.243607 2.597679,2.788284 v 0.201513 h 1.941637 c 1.199261,0 2.164732,0.860911 2.164732,1.930361 v 2.554332 z m 0.06454,-6.010119 h 8.461471 l -0.05085,6.010119 h -8.188123" />
     <path
        transform="matrix(1.445753,0,0,1.3224494,-65.097292,-1327.9481)"
        style="opacity:0.794;fill:#f1f1f1;fill-opacity:1;stroke:#f1f1f1;stroke-width:0.74667788px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter8871-4)"
        d="m 64.018476,1016.5423 -0.152427,10.8222 c 2.375507,-3.3036 3.484206,-4.2052 2.972286,-9.2217 0.305009,-1.654 -1.117834,-1.7529 -2.819859,-1.6005 z"
-       id="path8861-9"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccc" />
+       id="path8861-9" />
     <ellipse
        transform="matrix(1.029538,0,0,1.1281495,-39.470994,-1128.0797)"
        style="opacity:0.828;fill:#f1f1f1;fill-opacity:1;stroke:#f1f1f1;stroke-width:0.95799959;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter8835-5)"
@@ -508,15 +414,12 @@
        transform="matrix(1.7350569,0,0,1.8824502,-91.814902,-1903.1505)"
        style="opacity:0.86199999;fill:#f1f1f1;fill-opacity:1;stroke:#f1f1f1;stroke-width:0.57128292px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter2533-6)"
        d="m 70.953811,1023.4014 v -1.8291 l 2.972286,-0.076 z"
-       id="path8875-0"
-       inkscape:connector-curvature="0" />
+       id="path8875-0" />
     <path
        transform="matrix(1.029538,0,0,1.1281495,-39.928294,-1128.6206)"
        style="display:inline;opacity:0.48500001;fill:#f1f1f1;fill-opacity:1;stroke:#f1f1f1;stroke-width:0.95799959px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter8871-1-6)"
        d="m 53.924652,1016.631 -0.152427,10.8222 c 2.375507,-3.3036 3.484206,-4.2052 2.972286,-9.2217 0.305009,-1.654 -1.117834,-1.7529 -2.819859,-1.6005 z"
-       id="path8861-7-0"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccc" />
+       id="path8861-7-0" />
   </g>
   <g
      id="g11331-3-1-1"
@@ -561,42 +464,29 @@
   <path
      style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter7531);opacity:0.679"
      d="M 37,16 V 30 H 26 c 6.658348,-3.823627 9.284585,-8.783481 11,-14 z"
-     id="path7497"
-     inkscape:connector-curvature="0"
-     sodipodi:nodetypes="cccc" />
+     id="path7497" />
   <path
-     inkscape:connector-curvature="0"
      id="path8791"
      d="m 53.577367,1026.9835 -0.152425,-8.8407 0.91455,-1.2194 3.124711,-0.076 0.07621,-0.9908 h 0.91455 l -0.07621,1.9054 -3.048499,1.2194 -0.152425,4.9538 z"
      style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.15063965px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter8813)"
      transform="matrix(0.83023013,0,0,0.90975147,-28.544967,-897.67515)" />
   <path
-     sodipodi:nodetypes="cccccc"
-     inkscape:connector-curvature="0"
      d="m 6.5647431,31.500001 v 2 H 15.435257 V 29.5 H 6.5647431 v 2.000001"
      style="display:inline;opacity:1;fill:url(#linearGradient8769);fill-opacity:1;stroke:url(#linearGradient8753);stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
      id="path8722-7" />
   <path
-     inkscape:connector-curvature="0"
      d="m 24.499997,31.5 2e-6,-6.67566 c 0,-1.28772 -0.761775,-2.32434 -1.708014,-2.32434 h -1.983972 c -0.94624,0 -2.319241,1.03662 -2.319241,2.32434 V 26.1 h -1.565428 c -0.788532,0 -1.423345,0.633509 -1.423345,1.420381 v 1.171529 2.80764 m 8.999998,4.5e-4 2e-6,6.67566 c 0,1.28772 -0.761775,2.32434 -1.708014,2.32434 h -1.983972 c -0.94624,0 -2.319241,-1.03662 -2.319241,-2.32434 V 36.9 h -1.565428 c -0.788532,0 -1.423345,-0.633509 -1.423345,-1.42038 v -1.17153 -2.80764"
      style="display:inline;opacity:1;fill:url(#linearGradient8761);fill-opacity:1;stroke:#4d73ae;stroke-width:0.99999982;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     id="rect8645-3"
-     sodipodi:nodetypes="csssscsscccsssscsscc" />
+     id="rect8645-3" />
   <path
      style="fill:none;stroke:url(#linearGradient2545);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
      d="m 18.499999,26.001051 0.02402,11.423694"
-     id="path2537"
-     inkscape:connector-curvature="0"
-     sodipodi:nodetypes="cc" />
+     id="path2537" />
   <path
-     sodipodi:nodetypes="cczccssssssccsccccccc"
-     inkscape:connector-curvature="0"
      d="m 33.234719,32.602945 -10e-7,2.046109 c 0,0.831794 -0.660209,1.820827 -1.709707,1.800946 -1.049499,-0.01976 -1.925302,-0.01192 -1.925302,-0.01192 V 36.5 c 0,1.201415 -0.610687,1.999995 -1.771204,1.999995 H 26.5 c -1.096997,0 -0.991809,0.40092 -0.991809,-2.349206 V 26.84922 c 0,-2.750243 -0.165369,-2.325394 0.991103,-2.325394 h 1.329211 c 1.160517,0 1.699294,0.607702 1.699294,1.809116 v 0.156732 l 1.925302,0.03595 c 0.966928,0.01806 1.781618,0.993188 1.781618,1.82498 v 1.9867 z M 33.322714,29.474461 40.5,29.474 V 33.5 h -7.285502"
      style="display:inline;opacity:1;fill:url(#linearGradient8779);fill-opacity:1;stroke:url(#linearGradient8787);stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
      id="rect8645-2-5" />
   <path
-     sodipodi:nodetypes="cccc"
-     inkscape:connector-curvature="0"
      id="path8861"
      d="m 64.018476,1016.5423 -0.152427,10.8222 c 2.375507,-3.3036 3.484206,-4.2052 2.972286,-9.2217 0.305009,-1.654 -1.117834,-1.7529 -2.819859,-1.6005 z"
      style="opacity:0.794;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.89682412px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter8871)"
@@ -610,14 +500,11 @@
      style="opacity:0.828;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.15063965;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter8835)"
      transform="matrix(0.83023013,0,0,0.90975147,-27.971922,-896.90229)" />
   <path
-     inkscape:connector-curvature="0"
      id="path8875"
      d="m 70.953811,1023.4014 v -1.8291 l 2.972286,-0.076 z"
      style="opacity:0.86199999;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.68615979px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter2533)"
      transform="matrix(1.3991679,0,0,1.5180274,-70.182593,-1521.9274)" />
   <path
-     sodipodi:nodetypes="cccc"
-     inkscape:connector-curvature="0"
      id="path8861-7"
      d="m 53.924652,1016.631 -0.152427,10.8222 c 2.375507,-3.3036 3.484206,-4.2052 2.972286,-9.2217 0.305009,-1.654 -1.117834,-1.7529 -2.819859,-1.6005 z"
      style="display:inline;opacity:0.48500001;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.15063965px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter8871-1)"
@@ -626,14 +513,10 @@
      style="opacity:0.94899998;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter7531-4)"
      d="m 21.280908,19.438184 v 4 h -20 c 6,-3 20,1 20,-4 z"
      id="path7497-7"
-     inkscape:connector-curvature="0"
-     sodipodi:nodetypes="cccc"
      transform="rotate(-180,15,16.952797)" />
   <path
      style="opacity:0.989;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter7531-4-0)"
      d="m 22.323591,20.373004 -1.042683,3.06518 -4.683348,-0.07191 c 4.417998,-1.993272 3.281119,-0.186502 5.726031,-2.99327 z"
      id="path7497-7-9"
-     inkscape:connector-curvature="0"
-     sodipodi:nodetypes="cccc"
      transform="rotate(-180,17.002102,14.872163)" />
 </svg>
diff --git a/ui/org.eclipse.pde/images/topiclabel/tu_rcpapp48.svg b/ui/org.eclipse.pde/images/topiclabel/tu_rcpapp48.svg
index 8865c631e54..66b897e4858 100644
--- a/ui/org.eclipse.pde/images/topiclabel/tu_rcpapp48.svg
+++ b/ui/org.eclipse.pde/images/topiclabel/tu_rcpapp48.svg
@@ -2,21 +2,17 @@
 <!-- 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"
    version="1.1"
    id="svg3580"
    width="48"
    height="48"
    viewBox="0 0 48 48"
-   sodipodi:docname="tu_rcpapp48.svg"
-   inkscape:version="0.92.4 (5da689c313, 2019-01-14)">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <metadata
      id="metadata3586">
     <rdf:RDF>
@@ -25,14 +21,13 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
   <defs
      id="defs3584">
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient5381">
       <stop
          style="stop-color:#fee860;stop-opacity:1"
@@ -44,7 +39,6 @@
          id="stop5379" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient5369">
       <stop
          style="stop-color:#eceee2;stop-opacity:1"
@@ -56,7 +50,6 @@
          id="stop5367" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient5359">
       <stop
          style="stop-color:#33aade;stop-opacity:1"
@@ -68,15 +61,13 @@
          id="stop5357" />
     </linearGradient>
     <filter
-       inkscape:collect="always"
        style="color-interpolation-filters:sRGB"
        id="filter11539"
-       x="-0.051510248"
-       width="1.1030205"
-       y="-0.054155994"
-       height="1.108312">
+       x="-0.063705376"
+       width="1.1274108"
+       y="-0.067055775"
+       height="1.1340333">
       <feGaussianBlur
-         inkscape:collect="always"
          stdDeviation="0.87996598"
          id="feGaussianBlur11541" />
     </filter>
@@ -88,10 +79,8 @@
        y1="1052.4476"
        x1="50.702839"
        id="linearGradient6375-6"
-       xlink:href="#linearGradient4994"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4994" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4994">
       <stop
          style="stop-color:#ffffff;stop-opacity:1"
@@ -110,10 +99,8 @@
        gradientTransform="matrix(4.0867057,0,0,3.0380179,-18.95426,-3152.6798)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient4238"
-       xlink:href="#linearGradient4902"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4902" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4902">
       <stop
          style="stop-color:#777777;stop-opacity:0.74901962"
@@ -136,11 +123,9 @@
        y1="1001.3622"
        x1="60.069771"
        id="linearGradient4467"
-       xlink:href="#linearGradient4461"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4461" />
     <linearGradient
-       id="linearGradient4461"
-       inkscape:collect="always">
+       id="linearGradient4461">
       <stop
          id="stop4463"
          offset="0"
@@ -167,11 +152,9 @@
        cy="1004.8622"
        cx="68.5"
        id="radialGradient4587"
-       xlink:href="#linearGradient4581"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4581" />
     <linearGradient
-       id="linearGradient4581"
-       inkscape:collect="always">
+       id="linearGradient4581">
       <stop
          id="stop4583"
          offset="0"
@@ -189,11 +172,9 @@
        y1="1007.8622"
        x1="41"
        id="linearGradient4547"
-       xlink:href="#linearGradient4541"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4541" />
     <linearGradient
-       id="linearGradient4541"
-       inkscape:collect="always">
+       id="linearGradient4541">
       <stop
          id="stop4543"
          offset="0"
@@ -211,8 +192,7 @@
        y1="1007.8622"
        x1="41"
        id="linearGradient4547-0"
-       xlink:href="#linearGradient4541"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient4541" />
     <radialGradient
        gradientUnits="userSpaceOnUse"
        r="1.5"
@@ -222,7 +202,6 @@
        cx="68.5"
        id="radialGradient4587-5"
        xlink:href="#linearGradient4581"
-       inkscape:collect="always"
        gradientTransform="translate(-32.988494,-993.3371)" />
     <radialGradient
        gradientUnits="userSpaceOnUse"
@@ -233,7 +212,6 @@
        cx="68.5"
        id="radialGradient4587-0"
        xlink:href="#linearGradient4581"
-       inkscape:collect="always"
        gradientTransform="translate(-27.988515,-993.3371)" />
     <linearGradient
        y2="1007.8358"
@@ -243,10 +221,8 @@
        gradientTransform="matrix(-2.055096,0,0,-1.2274096,128.28231,1278.6346)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient5890"
-       xlink:href="#linearGradient5904"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient5904" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient5904">
       <stop
          style="stop-color:#c5c6c6;stop-opacity:1"
@@ -265,10 +241,8 @@
        gradientTransform="matrix(0,-1.3017002,2.1794835,0,-2153.0837,94.469052)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient5892"
-       xlink:href="#linearGradient5898"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient5898" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient5898">
       <stop
          style="stop-color:#c0c1c1;stop-opacity:1"
@@ -280,7 +254,6 @@
          id="stop5902" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient5359"
        id="linearGradient5361"
        x1="60.249371"
@@ -290,7 +263,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-36.999999,-0.99999892)" />
     <radialGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient5369"
        id="radialGradient5371"
        cx="46.702271"
@@ -301,7 +273,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-32.999999,-1.0000018)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient5381"
        id="linearGradient5383"
        x1="31.473469"
@@ -311,104 +282,56 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1.0327789,0,0,0.9570945,-0.25892067,1.195307)" />
   </defs>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1920"
-     inkscape:window-height="1017"
-     id="namedview3582"
-     showgrid="true"
-     inkscape:snap-bbox="true"
-     inkscape:bbox-nodes="true"
-     inkscape:snap-nodes="false"
-     inkscape:zoom="13.906433"
-     inkscape:cx="40.594321"
-     inkscape:cy="27.927866"
-     inkscape:window-x="-8"
-     inkscape:window-y="-8"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg3580">
-    <inkscape:grid
-       type="xygrid"
-       id="grid5351" />
-  </sodipodi:namedview>
   <path
      style="opacity:0.50700001;fill:#808080;stroke:#808080;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;filter:url(#filter11539)"
      d="m 5.123419,6.137084 c 17.897821,0.108917 40.999967,0 40.999967,0 V 45.134028 H 5.123419 Z"
-     id="rect4001-1-0"
-     inkscape:connector-curvature="0"
-     sodipodi:nodetypes="ccccc" />
+     id="rect4001-1-0" />
   <path
      style="display:inline;fill:url(#linearGradient6375-6);fill-opacity:1;stroke:none;stroke-width:1"
      d="m 4,14.025166 40.022996,2.9e-4 c 0,0 -0.0655,14.85449 0,28.02424 H 4 Z"
-     id="rect4001-3-4"
-     inkscape:connector-curvature="0"
-     sodipodi:nodetypes="ccccc" />
+     id="rect4001-3-4" />
   <path
      style="fill:none;stroke:url(#linearGradient4238);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1"
      d="m 3.511519,3.528184 c 17.897821,0.108917 40.999967,0 40.999967,0 V 42.525128 H 3.511519 Z"
-     id="rect4001-1"
-     inkscape:connector-curvature="0"
-     sodipodi:nodetypes="ccccc" />
+     id="rect4001-1" />
   <path
      style="display:inline;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1"
      d="m 4,8.756212 40.022996,9.5e-5 c 0,0 -0.0655,3.025236 0,5.70736 H 4 Z"
-     id="rect4001-3-4-1"
-     inkscape:connector-curvature="0"
-     sodipodi:nodetypes="ccccc" />
+     id="rect4001-3-4-1" />
   <path
      style="display:inline;fill:url(#linearGradient4467);fill-opacity:1;stroke:none;stroke-width:1"
      d="m 4,4 40.022996,8.4e-5 c 0,0 -0.0655,2.663589 0,5.025082 H 4 Z"
-     id="rect4001-3-4-1-6"
-     inkscape:connector-curvature="0"
-     sodipodi:nodetypes="ccccc" />
+     id="rect4001-3-4-1-6" />
   <path
      style="display:inline;fill:url(#radialGradient4587);fill-opacity:1;stroke:none;stroke-width:1"
      d="m 29.0115,10.025166 3,10e-5 c 0,0 -0.005,1.5901 0,2.9999 h -3 z"
-     id="rect4001-3-4-1-1-8"
-     inkscape:connector-curvature="0"
-     sodipodi:nodetypes="ccccc" />
+     id="rect4001-3-4-1-1-8" />
   <path
-     inkscape:connector-curvature="0"
      id="path4539"
      d="M 4.011501,14.525166 H 28.416168"
      style="fill:none;fill-rule:evenodd;stroke:url(#linearGradient4547);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
   <path
-     inkscape:connector-curvature="0"
      id="path4539-4"
      d="M 4.488086,15.025166 V 38.245582"
      style="display:inline;fill:none;fill-rule:evenodd;stroke:url(#linearGradient4547-0);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
   <path
      style="display:inline;fill:url(#radialGradient4587-5);fill-opacity:1;stroke:none;stroke-width:1"
      d="m 34.0115,10.025166 2.999996,10e-5 c 0,0 -0.005,1.5901 0,2.9999 H 34.0115 Z"
-     id="rect4001-3-4-1-1-8-5"
-     inkscape:connector-curvature="0"
-     sodipodi:nodetypes="ccccc" />
+     id="rect4001-3-4-1-1-8-5" />
   <path
      style="display:inline;fill:url(#radialGradient4587-0);fill-opacity:1;stroke:none;stroke-width:1"
      d="m 39.011496,10.025166 3,10e-5 c 0,0 -0.005,1.5901 0,2.9999 h -3 z"
-     id="rect4001-3-4-1-1-8-3"
-     inkscape:connector-curvature="0"
-     sodipodi:nodetypes="ccccc" />
+     id="rect4001-3-4-1-1-8-3" />
   <path
-     inkscape:connector-curvature="0"
      id="path4539-6"
      d="M 44.023396,41.574932 H 4.976572"
      style="fill:none;fill-rule:evenodd;stroke:url(#linearGradient5890);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
   <path
-     inkscape:connector-curvature="0"
      id="path4539-4-6"
      d="M 43.535316,41.099406 V 16.367007"
      style="display:inline;fill:none;fill-rule:evenodd;stroke:url(#linearGradient5892);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
   <g
      id="layer3"
-     inkscape:label="old"
      transform="translate(-93.963076,-19.144326)" />
   <g
      id="g11331-3-1-1"
@@ -466,6 +389,5 @@
   <path
      style="fill:url(#linearGradient5383);fill-opacity:1;stroke:#b08a10;stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
      d="M 26.873698,36.464279 H 37.981753 L 32.097128,28.848876 Z"
-     id="path5375"
-     inkscape:connector-curvature="0" />
+     id="path5375" />
 </svg>
diff --git a/ui/org.eclipse.pde/images/topiclabel/wn_pluginenviro48.svg b/ui/org.eclipse.pde/images/topiclabel/wn_pluginenviro48.svg
index c2bfcd8b696..30b53e6c4cd 100644
--- a/ui/org.eclipse.pde/images/topiclabel/wn_pluginenviro48.svg
+++ b/ui/org.eclipse.pde/images/topiclabel/wn_pluginenviro48.svg
@@ -2,21 +2,17 @@
 <!-- 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"
    version="1.1"
    id="svg2732"
    width="48"
    height="48"
    viewBox="0 0 48 48"
-   sodipodi:docname="wn_pluginenviro48.svg"
-   inkscape:version="0.92.4 (5da689c313, 2019-01-14)">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <metadata
      id="metadata2738">
     <rdf:RDF>
@@ -25,14 +21,13 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
   <defs
      id="defs2736">
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3576">
       <stop
          style="stop-color:#144f93;stop-opacity:1;"
@@ -44,7 +39,6 @@
          id="stop3574" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3539">
       <stop
          style="stop-color:#b3cde1;stop-opacity:1"
@@ -56,95 +50,81 @@
          id="stop3537" />
     </linearGradient>
     <filter
-       inkscape:collect="always"
        style="color-interpolation-filters:sRGB"
        id="filter2728"
-       x="-0.052967031"
-       width="1.1059341"
-       y="-0.096524194"
-       height="1.1930484">
+       x="-0.064270157"
+       width="1.1285403"
+       y="-0.11712239"
+       height="1.2342448">
       <feGaussianBlur
-         inkscape:collect="always"
          stdDeviation="0.90744768"
          id="feGaussianBlur2730" />
     </filter>
     <filter
-       height="1.4861495"
-       y="-0.24307476"
-       width="2.0754106"
-       x="-0.53770524"
+       height="1.5429226"
+       y="-0.28183149"
+       width="2.2508696"
+       x="-0.62393302"
        id="filter8813-5"
-       style="color-interpolation-filters:sRGB"
-       inkscape:collect="always">
+       style="color-interpolation-filters:sRGB">
       <feGaussianBlur
          id="feGaussianBlur8815-0"
-         stdDeviation="1.1269452"
-         inkscape:collect="always" />
+         stdDeviation="1.1269452" />
     </filter>
     <filter
-       height="1.3642128"
-       y="-0.18210639"
-       width="1.8989758"
-       x="-0.44948789"
+       height="1.3657108"
+       y="-0.14956416"
+       width="2.0529236"
+       x="-0.52900042"
        id="filter8871-4"
-       style="color-interpolation-filters:sRGB"
-       inkscape:collect="always">
+       style="color-interpolation-filters:sRGB">
       <feGaussianBlur
          id="feGaussianBlur8873-9"
-         stdDeviation="0.53588249"
-         inkscape:collect="always" />
+         stdDeviation="0.53588249" />
     </filter>
     <filter
-       height="1.6025846"
-       y="-0.3012923"
-       width="1.626688"
-       x="-0.313344"
+       height="1.8202162"
+       y="-0.4101081"
+       width="1.8530248"
+       x="-0.42651241"
        id="filter8835-5"
-       style="color-interpolation-filters:sRGB"
-       inkscape:collect="always">
+       style="color-interpolation-filters:sRGB">
       <feGaussianBlur
          id="feGaussianBlur8837-4"
-         stdDeviation="0.49751501"
-         inkscape:collect="always" />
+         stdDeviation="0.49751501" />
     </filter>
     <filter
-       inkscape:collect="always"
        style="color-interpolation-filters:sRGB"
        id="filter2533-6"
-       x="-0.59377658"
-       width="2.1875532"
-       y="-0.92639428"
-       height="2.8527887">
+       x="-0.68029659"
+       width="2.58171"
+       y="-1.0736972"
+       height="3.2469455">
       <feGaussianBlur
-         inkscape:collect="always"
          stdDeviation="0.73536407"
          id="feGaussianBlur2535-0" />
     </filter>
     <filter
-       height="1.3642128"
-       y="-0.18210639"
-       width="1.8989758"
-       x="-0.44948789"
+       height="1.4022611"
+       y="-0.15841812"
+       width="2.115705"
+       x="-0.56110939"
        id="filter8871-1-6"
-       style="color-interpolation-filters:sRGB"
-       inkscape:collect="always">
+       style="color-interpolation-filters:sRGB">
       <feGaussianBlur
          id="feGaussianBlur8873-8-9"
-         stdDeviation="0.53588249"
-         inkscape:collect="always" />
+         stdDeviation="0.53588249" />
     </filter>
     <filter
        height="1.4861495"
-       y="-0.24307476"
-       width="2.0754106"
-       x="-0.53770524"
+       y="-0.24307477"
+       width="2.0754105"
+       x="-0.53770523"
        id="filter8813"
-       style="color-interpolation-filters:sRGB"
-       inkscape:collect="always">
+       style="color-interpolation-filters:sRGB">
       <feGaussianBlur
          id="feGaussianBlur8815"
-         stdDeviation="1.1269452"
-         inkscape:collect="always" />
+         stdDeviation="1.1269452" />
     </filter>
     <linearGradient
        gradientUnits="userSpaceOnUse"
@@ -154,11 +134,9 @@
        x1="51.658199"
        id="linearGradient8769"
        xlink:href="#linearGradient8767"
-       inkscape:collect="always"
        gradientTransform="matrix(2.7500001,0,0,0.99370101,-129.87501,-991.91286)" />
     <linearGradient
-       id="linearGradient8767"
-       inkscape:collect="always">
+       id="linearGradient8767">
       <stop
          id="stop8763"
          offset="0"
@@ -176,11 +154,9 @@
        x1="50"
        id="linearGradient8753"
        xlink:href="#linearGradient8751"
-       inkscape:collect="always"
        gradientTransform="matrix(2.7500001,0,0,0.99370101,-129.87501,-991.91286)" />
     <linearGradient
-       id="linearGradient8751"
-       inkscape:collect="always">
+       id="linearGradient8751">
       <stop
          id="stop8747"
          offset="0"
@@ -198,11 +174,9 @@
        x1="57"
        id="linearGradient8761"
        xlink:href="#linearGradient8759"
-       inkscape:collect="always"
        gradientTransform="matrix(1.0999999,0,0,1.1281495,-43.249997,-1129.0318)" />
     <linearGradient
-       id="linearGradient8759"
-       inkscape:collect="always">
+       id="linearGradient8759">
       <stop
          id="stop8755"
          offset="0"
@@ -213,7 +187,6 @@
          style="stop-color:#5179b5;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient2543"
        id="linearGradient2545"
        x1="18.423391"
@@ -222,7 +195,6 @@
        y2="30.334658"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient2543">
       <stop
          style="stop-color:#4f76b0;stop-opacity:1"
@@ -245,11 +217,9 @@
        x1="63.98344"
        id="linearGradient8779"
        xlink:href="#linearGradient8777"
-       inkscape:collect="always"
        gradientTransform="matrix(1.3687895,0,0,1.494898,-60.408122,-1504.0798)" />
     <linearGradient
-       id="linearGradient8777"
-       inkscape:collect="always">
+       id="linearGradient8777">
       <stop
          id="stop8773"
          offset="0"
@@ -267,11 +237,9 @@
        x1="68.47998"
        id="linearGradient8787"
        xlink:href="#linearGradient8785"
-       inkscape:collect="always"
        gradientTransform="matrix(1.3687895,0,0,1.494898,-60.408122,-1504.0798)" />
     <linearGradient
-       id="linearGradient8785"
-       inkscape:collect="always">
+       id="linearGradient8785">
       <stop
          id="stop8781"
          offset="0"
@@ -286,59 +254,50 @@
          style="stop-color:#b07905;stop-opacity:1" />
     </linearGradient>
     <filter
-       height="1.3642128"
-       y="-0.18210639"
-       width="1.8989758"
-       x="-0.44948789"
+       height="1.2365698"
+       y="-0.11828489"
+       width="1.8310951"
+       x="-0.41554753"
        id="filter8871"
-       style="color-interpolation-filters:sRGB"
-       inkscape:collect="always">
+       style="color-interpolation-filters:sRGB">
       <feGaussianBlur
          id="feGaussianBlur8873"
-         stdDeviation="0.53588249"
-         inkscape:collect="always" />
+         stdDeviation="0.53588249" />
     </filter>
     <filter
        height="1.6025846"
-       y="-0.3012923"
+       y="-0.30129232"
        width="1.626688"
        x="-0.313344"
        id="filter8835"
-       style="color-interpolation-filters:sRGB"
-       inkscape:collect="always">
+       style="color-interpolation-filters:sRGB">
       <feGaussianBlur
          id="feGaussianBlur8837"
-         stdDeviation="0.49751501"
-         inkscape:collect="always" />
+         stdDeviation="0.49751501" />
     </filter>
     <filter
-       inkscape:collect="always"
        style="color-interpolation-filters:sRGB"
        id="filter2533"
-       x="-0.59377658"
-       width="2.1875532"
-       y="-0.92639428"
-       height="2.8527887">
+       x="-0.59377657"
+       width="2.1875531"
+       y="-0.92639431"
+       height="2.8527886">
       <feGaussianBlur
-         inkscape:collect="always"
          stdDeviation="0.73536407"
          id="feGaussianBlur2535" />
     </filter>
     <filter
-       height="1.3642128"
-       y="-0.18210639"
-       width="1.8989758"
-       x="-0.44948789"
+       height="1.2365698"
+       y="-0.11828489"
+       width="1.8310951"
+       x="-0.41554753"
        id="filter8871-1"
-       style="color-interpolation-filters:sRGB"
-       inkscape:collect="always">
+       style="color-interpolation-filters:sRGB">
       <feGaussianBlur
          id="feGaussianBlur8873-8"
-         stdDeviation="0.53588249"
-         inkscape:collect="always" />
+         stdDeviation="0.53588249" />
     </filter>
     <radialGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient3539"
        id="radialGradient3541"
        cx="23"
@@ -349,7 +308,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-1.3220339,-15.355932)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient3576"
        id="linearGradient3578"
        x1="32"
@@ -358,30 +316,6 @@
        y2="31"
        gradientUnits="userSpaceOnUse" />
   </defs>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1920"
-     inkscape:window-height="1017"
-     id="namedview2734"
-     showgrid="true"
-     inkscape:zoom="9.8333333"
-     inkscape:cx="24"
-     inkscape:cy="24"
-     inkscape:window-x="-8"
-     inkscape:window-y="-8"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg2732">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3531" />
-  </sodipodi:namedview>
   <circle
      style="opacity:1;fill:url(#radialGradient3541);fill-opacity:1;stroke:#144f93;stroke-width:1.00157475;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
      id="path3533"
@@ -396,39 +330,28 @@
        transform="matrix(1.029538,0,0,1.1281495,-40.181606,-1129.0381)"
        style="fill:#f1f1f1;fill-opacity:1;stroke:#f1f1f1;stroke-width:0.86248446px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter8813-5)"
        d="m 53.577367,1026.9835 -0.152425,-8.8407 0.91455,-1.2194 3.124711,-0.076 0.07621,-0.9908 h 0.91455 l -0.07621,1.9054 -3.048499,1.2194 -0.152425,4.9538 z"
-       id="path8791-1"
-       inkscape:connector-curvature="0" />
+       id="path8791-1" />
     <path
        id="path8722-7-8"
        style="display:inline;opacity:1;fill:#f1f1f1;fill-opacity:1;stroke:#f1f1f1;stroke-width:0.92951375;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 3.4999999,23.512598 V 25.5 H 14.5 V 21.525196 H 3.4999999 v 1.987402"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccc" />
+       d="M 3.4999999,23.512598 V 25.5 H 14.5 V 21.525196 H 3.4999999 v 1.987402" />
     <path
-       sodipodi:nodetypes="csssscsscccsssscsscc"
        id="rect8645-3-9"
        style="display:inline;opacity:1;fill:#f1f1f1;fill-opacity:1;stroke:#f1f1f1;stroke-width:0.92951363;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 25.499998,23.781495 25.5,15.413559 C 25.5,13.799403 24.568942,12.5 23.412427,12.5 h -2.424855 c -1.156515,0 -2.483072,1.299403 -2.483072,2.913559 v 1.599039 h -2.264856 c -0.963763,0 -1.739644,0.794104 -1.739644,1.780446 v 1.468512 3.519375 m 10.999998,5.64e-4 2e-6,8.367936 c 0,1.614156 -0.931058,2.913559 -2.087573,2.913559 h -2.424855 c -1.156515,0 -2.483072,-1.299403 -2.483072,-2.913559 V 30.550392 H 16.239644 C 15.275881,30.550392 14.5,29.756288 14.5,28.769946 v -1.468512 -3.519375"
-       inkscape:connector-curvature="0" />
+       d="M 25.499998,23.781495 25.5,15.413559 C 25.5,13.799403 24.568942,12.5 23.412427,12.5 h -2.424855 c -1.156515,0 -2.483072,1.299403 -2.483072,2.913559 v 1.599039 h -2.264856 c -0.963763,0 -1.739644,0.794104 -1.739644,1.780446 v 1.468512 3.519375 m 10.999998,5.64e-4 2e-6,8.367936 c 0,1.614156 -0.931058,2.913559 -2.087573,2.913559 h -2.424855 c -1.156515,0 -2.483072,-1.299403 -2.483072,-2.913559 V 30.550392 H 16.239644 C 15.275881,30.550392 14.5,29.756288 14.5,28.769946 v -1.468512 -3.519375" />
     <path
-       sodipodi:nodetypes="cc"
-       inkscape:connector-curvature="0"
        id="path2537-0"
        d="M 18.51661,16.539741 18.5464,30.705846"
        style="fill:#f1f1f1;stroke:#f1f1f1;stroke-width:0.92951375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1" />
     <path
        id="rect8645-2-5-2"
        style="display:inline;opacity:1;fill:#f1f1f1;fill-opacity:1;stroke:#f1f1f1;stroke-width:0.92951369;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 36.091538,26.489769 -10e-7,1.058985 c 0,1.06945 -0.863288,1.955925 -2.164732,1.930363 -1.301445,-0.02541 -1.941636,0 -1.941636,0 v 0.201512 c 0,1.544678 -1.158564,2.787985 -2.597679,2.788284 l -1.648306,2.98e-4 c -1.360345,3e-4 -1.22903,0.546236 -1.22903,-2.989646 V 17.520381 c 0,-3.536032 -0.205068,-2.989797 1.22903,-2.989797 h 1.648306 c 1.439115,0 2.597679,1.243607 2.597679,2.788284 v 0.201513 h 1.941637 c 1.199261,0 2.164732,0.860911 2.164732,1.930361 v 2.554332 z m 0.06454,-6.010119 h 8.461471 l -0.05085,6.010119 h -8.188123"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cczccssssssccsccccccc" />
+       d="m 36.091538,26.489769 -10e-7,1.058985 c 0,1.06945 -0.863288,1.955925 -2.164732,1.930363 -1.301445,-0.02541 -1.941636,0 -1.941636,0 v 0.201512 c 0,1.544678 -1.158564,2.787985 -2.597679,2.788284 l -1.648306,2.98e-4 c -1.360345,3e-4 -1.22903,0.546236 -1.22903,-2.989646 V 17.520381 c 0,-3.536032 -0.205068,-2.989797 1.22903,-2.989797 h 1.648306 c 1.439115,0 2.597679,1.243607 2.597679,2.788284 v 0.201513 h 1.941637 c 1.199261,0 2.164732,0.860911 2.164732,1.930361 v 2.554332 z m 0.06454,-6.010119 h 8.461471 l -0.05085,6.010119 h -8.188123" />
     <path
        transform="matrix(1.445753,0,0,1.3224494,-65.097292,-1327.9481)"
        style="opacity:0.794;fill:#f1f1f1;fill-opacity:1;stroke:#f1f1f1;stroke-width:0.67223209px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter8871-4)"
        d="m 64.018476,1016.5423 -0.152427,10.8222 c 2.375507,-3.3036 3.484206,-4.2052 2.972286,-9.2217 0.305009,-1.654 -1.117834,-1.7529 -2.819859,-1.6005 z"
-       id="path8861-9"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccc" />
+       id="path8861-9" />
     <ellipse
        transform="matrix(1.029538,0,0,1.1281495,-39.470994,-1128.0797)"
        style="opacity:0.828;fill:#f1f1f1;fill-opacity:1;stroke:#f1f1f1;stroke-width:0.86248446;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter8835-5)"
@@ -441,15 +364,12 @@
        transform="matrix(1.7350569,0,0,1.8824502,-91.814902,-1903.1505)"
        style="opacity:0.86199999;fill:#f1f1f1;fill-opacity:1;stroke:#f1f1f1;stroke-width:0.51432449px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter2533-6)"
        d="m 70.953811,1023.4014 v -1.8291 l 2.972286,-0.076 z"
-       id="path8875-0"
-       inkscape:connector-curvature="0" />
+       id="path8875-0" />
     <path
        transform="matrix(1.029538,0,0,1.1281495,-39.928294,-1128.6206)"
        style="display:inline;opacity:0.48500001;fill:#f1f1f1;fill-opacity:1;stroke:#f1f1f1;stroke-width:0.86248446px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter8871-1-6)"
        d="m 53.924652,1016.631 -0.152427,10.8222 c 2.375507,-3.3036 3.484206,-4.2052 2.972286,-9.2217 0.305009,-1.654 -1.117834,-1.7529 -2.819859,-1.6005 z"
-       id="path8861-7-0"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccc" />
+       id="path8861-7-0" />
   </g>
   <g
      id="g11331-3-1-1"
@@ -498,39 +418,28 @@
        transform="matrix(1.029538,0,0,1.1281495,-40.181606,-1129.0381)"
        style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.9278878px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter8813)"
        d="m 53.577367,1026.9835 -0.152425,-8.8407 0.91455,-1.2194 3.124711,-0.076 0.07621,-0.9908 h 0.91455 l -0.07621,1.9054 -3.048499,1.2194 -0.152425,4.9538 z"
-       id="path8791"
-       inkscape:connector-curvature="0" />
+       id="path8791" />
     <path
        id="path8722-7"
        style="display:inline;opacity:1;fill:url(#linearGradient8769);fill-opacity:1;stroke:url(#linearGradient8753);stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 3.4999999,23.512598 V 25.5 H 14.5 V 21.525196 H 3.4999999 v 1.987402"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccc" />
+       d="M 3.4999999,23.512598 V 25.5 H 14.5 V 21.525196 H 3.4999999 v 1.987402" />
     <path
-       sodipodi:nodetypes="csssscsscccsssscsscc"
        id="rect8645-3"
        style="display:inline;opacity:1;fill:url(#linearGradient8761);fill-opacity:1;stroke:#4d73ae;stroke-width:0.99999988;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 25.499998,23.781495 25.5,15.413559 C 25.5,13.799403 24.568942,12.5 23.412427,12.5 h -2.424855 c -1.156515,0 -2.483072,1.299403 -2.483072,2.913559 v 1.599039 h -2.264856 c -0.963763,0 -1.739644,0.794104 -1.739644,1.780446 v 1.468512 3.519375 m 10.999998,5.64e-4 2e-6,8.367936 c 0,1.614156 -0.931058,2.913559 -2.087573,2.913559 h -2.424855 c -1.156515,0 -2.483072,-1.299403 -2.483072,-2.913559 V 30.550392 H 16.239644 C 15.275881,30.550392 14.5,29.756288 14.5,28.769946 v -1.468512 -3.519375"
-       inkscape:connector-curvature="0" />
+       d="M 25.499998,23.781495 25.5,15.413559 C 25.5,13.799403 24.568942,12.5 23.412427,12.5 h -2.424855 c -1.156515,0 -2.483072,1.299403 -2.483072,2.913559 v 1.599039 h -2.264856 c -0.963763,0 -1.739644,0.794104 -1.739644,1.780446 v 1.468512 3.519375 m 10.999998,5.64e-4 2e-6,8.367936 c 0,1.614156 -0.931058,2.913559 -2.087573,2.913559 h -2.424855 c -1.156515,0 -2.483072,-1.299403 -2.483072,-2.913559 V 30.550392 H 16.239644 C 15.275881,30.550392 14.5,29.756288 14.5,28.769946 v -1.468512 -3.519375" />
     <path
-       sodipodi:nodetypes="cc"
-       inkscape:connector-curvature="0"
        id="path2537"
        d="M 18.51661,16.539741 18.5464,30.705846"
        style="fill:none;stroke:url(#linearGradient2545);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
     <path
        id="rect8645-2-5"
        style="display:inline;opacity:1;fill:url(#linearGradient8779);fill-opacity:1;stroke:url(#linearGradient8787);stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 36.091538,26.489769 -10e-7,1.058985 c 0,1.06945 -0.863288,1.955925 -2.164732,1.930363 -1.301445,-0.02541 -1.941636,0 -1.941636,0 v 0.201512 c 0,1.544678 -1.158564,2.787985 -2.597679,2.788284 l -1.648306,2.98e-4 c -1.360345,3e-4 -1.22903,0.546236 -1.22903,-2.989646 V 17.520381 c 0,-3.536032 -0.205068,-2.989797 1.22903,-2.989797 h 1.648306 c 1.439115,0 2.597679,1.243607 2.597679,2.788284 v 0.201513 h 1.941637 c 1.199261,0 2.164732,0.860911 2.164732,1.930361 v 2.554332 z m 0.06454,-6.010119 h 8.461471 l -0.05085,6.010119 h -8.188123"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cczccssssssccsccccccc" />
+       d="m 36.091538,26.489769 -10e-7,1.058985 c 0,1.06945 -0.863288,1.955925 -2.164732,1.930363 -1.301445,-0.02541 -1.941636,0 -1.941636,0 v 0.201512 c 0,1.544678 -1.158564,2.787985 -2.597679,2.788284 l -1.648306,2.98e-4 c -1.360345,3e-4 -1.22903,0.546236 -1.22903,-2.989646 V 17.520381 c 0,-3.536032 -0.205068,-2.989797 1.22903,-2.989797 h 1.648306 c 1.439115,0 2.597679,1.243607 2.597679,2.788284 v 0.201513 h 1.941637 c 1.199261,0 2.164732,0.860911 2.164732,1.930361 v 2.554332 z m 0.06454,-6.010119 h 8.461471 l -0.05085,6.010119 h -8.188123" />
     <path
        transform="matrix(1.445753,0,0,1.3224494,-65.097292,-1327.9481)"
        style="opacity:0.794;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.72320831px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter8871)"
        d="m 64.018476,1016.5423 -0.152427,10.8222 c 2.375507,-3.3036 3.484206,-4.2052 2.972286,-9.2217 0.305009,-1.654 -1.117834,-1.7529 -2.819859,-1.6005 z"
-       id="path8861"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccc" />
+       id="path8861" />
     <ellipse
        transform="matrix(1.029538,0,0,1.1281495,-39.470994,-1128.0797)"
        style="opacity:0.828;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.9278878;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter8835)"
@@ -543,15 +452,12 @@
        transform="matrix(1.7350569,0,0,1.8824502,-91.814902,-1903.1505)"
        style="opacity:0.86199999;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.55332637px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter2533)"
        d="m 70.953811,1023.4014 v -1.8291 l 2.972286,-0.076 z"
-       id="path8875"
-       inkscape:connector-curvature="0" />
+       id="path8875" />
     <path
        transform="matrix(1.029538,0,0,1.1281495,-39.928294,-1128.6206)"
        style="display:inline;opacity:0.48500001;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.9278878px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter8871-1)"
        d="m 53.924652,1016.631 -0.152427,10.8222 c 2.375507,-3.3036 3.484206,-4.2052 2.972286,-9.2217 0.305009,-1.654 -1.117834,-1.7529 -2.819859,-1.6005 z"
-       id="path8861-7"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccc" />
+       id="path8861-7" />
   </g>
   <path
      style="opacity:1;fill:none;fill-opacity:1;stroke:url(#linearGradient3578);stroke-width:1.00157475;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
diff --git a/ui/org.eclipse.swt.tools.spies/icons/sleak.svg b/ui/org.eclipse.swt.tools.spies/icons/sleak.svg
index 3d92a86bf07..e7dd4495187 100644
--- a/ui/org.eclipse.swt.tools.spies/icons/sleak.svg
+++ b/ui/org.eclipse.swt.tools.spies/icons/sleak.svg
@@ -2,24 +2,19 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="sleak.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient11665">
       <stop
          style="stop-color:#c6f2f5;stop-opacity:1"
@@ -31,7 +26,6 @@
          id="stop11669" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient11657">
       <stop
          style="stop-color:#24439e;stop-opacity:1"
@@ -43,7 +37,6 @@
          id="stop11661" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient11657"
        id="linearGradient11663"
        x1="11"
@@ -53,7 +46,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1,0,0,0.97884812,0,22.247385)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient11665"
        id="linearGradient11671"
        x1="4"
@@ -63,31 +55,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1,0,0,0.97884812,0,22.247385)" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="31.861111"
-     inkscape:cx="8.0000056"
-     inkscape:cy="7.5"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="2560"
-     inkscape:window-height="1392"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:snap-global="true"
-     inkscape:snap-bbox="true"
-     inkscape:bbox-nodes="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3966" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -96,13 +63,11 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
@@ -110,20 +75,7 @@
        y="1036.3622"
        x="17"
        id="image11649"
-       xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAptJREFU
-OI1Nk0lv22YYhJ9vIUXR2qjFqRLHQZCgTQKkl556bn9/gCBG4DibGzm2JUsWJZmUyG/rQTba9/4O
-Zh7MCF+bIKLAxm1RqoVBcrmC2RzW60C/I3g8hmEKMYDJaUQaSACNFgKMNUQ6wSDJHfwzLVmsYn5M
-FqjgeV2M+eM19CKIogbgeDiNVNhKoHSMBJZTw/TyitbgKdVuzvn3n9hqzTj7jfQpSJpIKiQSAcgQ
-AlIlyADbEhazDdIHso4iG0Ys8zkfPnzi9KxgvgQD1Cg8cu/ABoi1wDmYTmC7cjwajAisGY0aOL/j
-4+mMR/1fGQ1f0cmgiSa6jyC9kHhgtYSbKw8u4XDQpddVPH85ot/vsS4snz7PeX9ScrmEHeAfBKSC
-ANxcQ7GBNG4TR/C41+GonTI4HJCmfRZ54N3JBaffKjZ2/wMgA2BqWOXgjKQRg7MgHijrmKTZwdqY
-nxc51zdrrPufgHGwyKGsoCx3VBVkGRRUAPz91590OwOqnWf8yzO+fvnB7a39L0LwYC0UxR2bMidI
-SFNIaezZrMEYi1YS7yqqomQ+neHvqyDjCOIYvNxSVDllbXD3VbnawNfPM7ZFSaQdwheY7R35/BZr
-wXuPlkB6AM2WoPY5X76fQfcVZcg5O7/m/bsb7jYbOo0mwUgSHMo5nLE4GdAEiBvQH0WotObs/CMn
-k28syx2LvGIxc7jaoxt3BFPR1pIDpVH3FLUIEGs4fNLi2YshF8ucyWTB5bzGmCbBx2RZQr+laDcd
-g07KQRShBQgh9mMKQJYp3vz+gl3UIh2u6V4YttsIs3P0UskwrciSLc+PMrJOitYapQLa1p5aWFQc
-czRsIN4eM8gsx2NDnlcsF7e0E0GvqeglMcdPMnqdBK32Dv4FkplIH4yCm1IAAAAASUVORK5CYII=
-"
+       xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAptJREFU OI1Nk0lv22YYhJ9vIUXR2qjFqRLHQZCgTQKkl556bn9/gCBG4DibGzm2JUsWJZmUyG/rQTba9/4O Zh7MCF+bIKLAxm1RqoVBcrmC2RzW60C/I3g8hmEKMYDJaUQaSACNFgKMNUQ6wSDJHfwzLVmsYn5M FqjgeV2M+eM19CKIogbgeDiNVNhKoHSMBJZTw/TyitbgKdVuzvn3n9hqzTj7jfQpSJpIKiQSAcgQ AlIlyADbEhazDdIHso4iG0Ys8zkfPnzi9KxgvgQD1Cg8cu/ABoi1wDmYTmC7cjwajAisGY0aOL/j 4+mMR/1fGQ1f0cmgiSa6jyC9kHhgtYSbKw8u4XDQpddVPH85ot/vsS4snz7PeX9ScrmEHeAfBKSC ANxcQ7GBNG4TR/C41+GonTI4HJCmfRZ54N3JBaffKjZ2/wMgA2BqWOXgjKQRg7MgHijrmKTZwdqY nxc51zdrrPufgHGwyKGsoCx3VBVkGRRUAPz91590OwOqnWf8yzO+fvnB7a39L0LwYC0UxR2bMidI SFNIaezZrMEYi1YS7yqqomQ+neHvqyDjCOIYvNxSVDllbXD3VbnawNfPM7ZFSaQdwheY7R35/BZr wXuPlkB6AM2WoPY5X76fQfcVZcg5O7/m/bsb7jYbOo0mwUgSHMo5nLE4GdAEiBvQH0WotObs/CMn k28syx2LvGIxc7jaoxt3BFPR1pIDpVH3FLUIEGs4fNLi2YshF8ucyWTB5bzGmCbBx2RZQr+laDcd g07KQRShBQgh9mMKQJYp3vz+gl3UIh2u6V4YttsIs3P0UskwrciSLc+PMrJOitYapQLa1p5aWFQc czRsIN4eM8gsx2NDnlcsF7e0E0GvqeglMcdPMnqdBK32Dv4FkplIH4yCm1IAAAAASUVORK5CYII= "
        style="image-rendering:optimizeSpeed"
        preserveAspectRatio="none"
        height="16"
@@ -131,8 +83,6 @@ czRsIN4eM8gsx2NDnlcsF7e0E0GvqeglMcdPMnqdBK32Dv4FkplIH4yCm1IAAAAASUVORK5CYII=
     <path
        style="opacity:1;fill:url(#linearGradient11671);fill-opacity:1;stroke:url(#linearGradient11663);stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.98823529"
        d="m 12.499983,1046.9665 c 5e-6,2.703 -2.238569,4.8942 -4.9999916,4.8942 -2.7614224,0 -4.9999961,-2.1912 -4.9999914,-4.8942 -4.7e-6,-2.703 4.9999914,-8.8097 4.9999914,-8.8097 0,0 4.9999966,6.1067 4.9999916,8.8097 z"
-       id="path11652"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ssscs" />
+       id="path11652" />
   </g>
 </svg>
diff --git a/ui/org.eclipse.swt.tools.spies/icons/spy.svg b/ui/org.eclipse.swt.tools.spies/icons/spy.svg
index ef88139b4c3..92ec8629aed 100644
--- a/ui/org.eclipse.swt.tools.spies/icons/spy.svg
+++ b/ui/org.eclipse.swt.tools.spies/icons/spy.svg
@@ -2,24 +2,19 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="spy.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient8154">
       <stop
          style="stop-color:#cb6c1a;stop-opacity:1;"
@@ -31,227 +26,6 @@
          id="stop8158" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4749-5"
-       id="linearGradient4755-1"
-       x1="4.5"
-       y1="1042.047"
-       x2="4.5"
-       y2="1046.4902"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.72974182,0,0,0.72974182,1.517106,281.73477)" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient4749-5">
-      <stop
-         style="stop-color:#ffffee;stop-opacity:1"
-         offset="0"
-         id="stop4751-2" />
-      <stop
-         style="stop-color:#ffecad;stop-opacity:1"
-         offset="1"
-         id="stop4753-6" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4741-1"
-       id="linearGradient4747-9"
-       x1="11.0625"
-       y1="1038.5497"
-       x2="11.0625"
-       y2="1049.912"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.72974182,0,0,0.72974182,1.517106,281.73477)" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient4741-1">
-      <stop
-         style="stop-color:#ba7f0d;stop-opacity:1"
-         offset="0"
-         id="stop4743-8" />
-      <stop
-         style="stop-color:#a2660b;stop-opacity:1"
-         offset="1"
-         id="stop4745-9" />
-    </linearGradient>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath6384">
-      <path
-         d="m 119.99805,326.68164 15.44091,0 0,159.62402 -15.44091,0 0,-159.62402 z"
-         id="path6386"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath6388">
-      <path
-         d="m 119.99805,326.68164 15.44091,0 0,15.44141 -15.44091,0 0,-15.44141 z"
-         id="path6390"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath6392">
-      <path
-         d="m 119.99805,342.70117 15.44091,0 0,15.44141 -15.44091,0 0,-15.44141 z"
-         id="path6394"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath6396">
-      <path
-         d="m 119.99805,358.7207 15.44091,0 0,15.44141 -15.44091,0 0,-15.44141 z"
-         id="path6398"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath6400">
-      <path
-         d="m 119.99805,374.74219 15.44091,0 0,15.4414 -15.44091,0 0,-15.4414 z"
-         id="path6402"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath6404">
-      <path
-         d="m 119.99805,390.76172 15.44091,0 0,15.44189 -15.44091,0 0,-15.44189 z"
-         id="path6406"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath6408">
-      <path
-         d="m 119.99805,406.78174 15.44091,0 0,15.44336 -15.44091,0 0,-15.44336 z"
-         id="path6410"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath6412">
-      <path
-         d="m 119.99805,422.80371 15.44091,0 0,15.44141 -15.44091,0 0,-15.44141 z"
-         id="path6414"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath6416">
-      <path
-         d="m 119.99805,438.82373 15.44091,0 0,15.44141 -15.44091,0 0,-15.44141 z"
-         id="path6418"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath6420">
-      <path
-         d="m 119.99805,454.84424 15.44091,0 0,15.4414 -15.44091,0 0,-15.4414 z"
-         id="path6422"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath6424">
-      <path
-         d="m 119.99805,470.86426 15.44091,0 0,15.4414 -15.44091,0 0,-15.4414 z"
-         id="path6426"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath7144">
-      <path
-         d="m 167.99707,326.68262 15.44141,0 0,159.62304 -15.44141,0 0,-159.62304 z"
-         id="path7146"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath7148">
-      <path
-         d="m 167.99707,326.68262 15.44141,0 0,15.4414 -15.44141,0 0,-15.4414 z"
-         id="path7150"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath7152">
-      <path
-         d="m 167.99707,342.70313 15.44141,0 0,15.4414 -15.44141,0 0,-15.4414 z"
-         id="path7154"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath7156">
-      <path
-         d="m 167.99707,358.72266 15.44141,0 0,15.4414 -15.44141,0 0,-15.4414 z"
-         id="path7158"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath7160">
-      <path
-         d="m 167.99707,374.74316 15.44141,0 0,15.44141 -15.44141,0 0,-15.44141 z"
-         id="path7162"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath7164">
-      <path
-         d="m 167.99707,390.76367 15.44141,0 0,15.44141 -15.44141,0 0,-15.44141 z"
-         id="path7166"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath7168">
-      <path
-         d="m 167.99707,406.7832 15.44141,0 0,15.4419 -15.44141,0 0,-15.4419 z"
-         id="path7170"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath7172">
-      <path
-         d="m 167.99707,422.80371 15.44141,0 0,15.44141 -15.44141,0 0,-15.44141 z"
-         id="path7174"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath7176">
-      <path
-         d="m 167.99707,438.82373 15.44141,0 0,15.44141 -15.44141,0 0,-15.44141 z"
-         id="path7178"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath7180">
-      <path
-         d="m 167.99707,454.84424 15.44141,0 0,15.4414 -15.44141,0 0,-15.4414 z"
-         id="path7182"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath7184">
-      <path
-         d="m 167.99707,470.86426 15.44141,0 0,15.4414 -15.44141,0 0,-15.4414 z"
-         id="path7186"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient8154"
        id="linearGradient8160"
        x1="11"
@@ -260,31 +34,6 @@
        y2="1037.3622"
        gradientUnits="userSpaceOnUse" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="25.889754"
-     inkscape:cx="31.134238"
-     inkscape:cy="13.000028"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="2560"
-     inkscape:window-height="1392"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:snap-global="true"
-     inkscape:snap-bbox="true"
-     inkscape:bbox-nodes="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3966" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -293,13 +42,11 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
diff --git a/ui/org.eclipse.tools.layout.spy/icons/obj16/layoutspy_obj.svg b/ui/org.eclipse.tools.layout.spy/icons/obj16/layoutspy_obj.svg
index 4c054d76411..aae86b91f7c 100644
--- a/ui/org.eclipse.tools.layout.spy/icons/obj16/layoutspy_obj.svg
+++ b/ui/org.eclipse.tools.layout.spy/icons/obj16/layoutspy_obj.svg
@@ -2,48 +2,19 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="layoutspy_obj.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient5147"
-       inkscape:collect="always">
-      <stop
-         id="stop5149"
-         offset="0"
-         style="stop-color:#91a5c7;stop-opacity:1;" />
-      <stop
-         id="stop5151"
-         offset="1"
-         style="stop-color:#637aa7;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5141"
-       inkscape:collect="always">
-      <stop
-         id="stop5143"
-         offset="0"
-         style="stop-color:#91a5c7;stop-opacity:1;" />
-      <stop
-         id="stop5145"
-         offset="1"
-         style="stop-color:#637aa7;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        id="linearGradient4994">
       <stop
          style="stop-color:#f9fafc;stop-opacity:1;"
@@ -55,7 +26,6 @@
          id="stop4998" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4902">
       <stop
          style="stop-color:#bfb688;stop-opacity:1"
@@ -67,27 +37,6 @@
          id="stop4906" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5147"
-       id="linearGradient4871"
-       x1="7.0070496"
-       y1="1047.857"
-       x2="14"
-       y2="1047.857"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-2,-3.0091529)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5141"
-       id="linearGradient4875"
-       x1="7.0070496"
-       y1="1049.857"
-       x2="14"
-       y2="1049.857"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-2,-3.0091529)" />
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4902"
        id="linearGradient4908"
        x1="10.544736"
@@ -97,7 +46,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1,0,0,0.9258402,-3.9972455,75.004823)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4994"
        id="linearGradient5000"
        x1="9.8946028"
@@ -106,105 +54,7 @@
        y2="1051.8378"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1,0,0,0.88726352,-3.9972455,115.08221)" />
-    <linearGradient
-       id="linearGradient4852-7-8"
-       inkscape:collect="always">
-      <stop
-         id="stop4854-4-1"
-         offset="0"
-         style="stop-color:#707070;stop-opacity:1" />
-      <stop
-         id="stop4856-0-2"
-         offset="1"
-         style="stop-color:#a0a0a0;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4844-4-1"
-       inkscape:collect="always">
-      <stop
-         id="stop4846-8-4"
-         offset="0"
-         style="stop-color:#606060;stop-opacity:1" />
-      <stop
-         id="stop4848-8-9"
-         offset="1"
-         style="stop-color:#787878;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       y2="1038.5814"
-       x2="4.7528968"
-       y1="1051.0466"
-       x1="4.7528968"
-       gradientTransform="translate(1.9961442e-6,-9.9830355e-5)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient6120"
-       xlink:href="#linearGradient4852-7-8"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="1037.7"
-       x2="8.6566515"
-       y1="1050.7386"
-       x1="8.6566515"
-       gradientTransform="translate(1.9961442e-6,-9.9830355e-5)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient6122"
-       xlink:href="#linearGradient4844-4-1"
-       inkscape:collect="always" />
-    <mask
-       maskUnits="userSpaceOnUse"
-       id="mask6204">
-      <path
-         style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-         d="m 1,1036.3935 0,0.5 0,12.9687 0,0.5 0.5,0 10.0625,0 0.5,0 0,-0.5 0,-9.9687 0,-0.2188 -0.15625,-0.125 -3.0625,-3 -0.125,-0.1562 -0.21875,0 -7,0 -0.5,0 z"
-         id="path6206"
-         inkscape:connector-curvature="0" />
-    </mask>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4861-5"
-       id="linearGradient4869-6"
-       x1="7.0070496"
-       y1="1045.8571"
-       x2="14"
-       y2="1045.8571"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-2,-3.0091529)" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient4861-5">
-      <stop
-         style="stop-color:#acbcd5;stop-opacity:1"
-         offset="0"
-         id="stop4863-1" />
-      <stop
-         style="stop-color:#869abe;stop-opacity:1"
-         offset="1"
-         id="stop4865-2" />
-    </linearGradient>
-    <linearGradient
-       y2="1045.8571"
-       x2="14"
-       y1="1045.8571"
-       x1="7.0070496"
-       gradientTransform="translate(-2,-1.0091316)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3066-1"
-       xlink:href="#linearGradient4861-5-1"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient4861-5-1">
-      <stop
-         style="stop-color:#acbcd5;stop-opacity:1"
-         offset="0"
-         id="stop4863-1-6" />
-      <stop
-         style="stop-color:#869abe;stop-opacity:1"
-         offset="1"
-         id="stop4865-2-2" />
-    </linearGradient>
     <radialGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4177"
        id="radialGradient4245"
        cx="14.311938"
@@ -215,7 +65,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(0.56661847,0,0,0.70718173,-0.07816061,309.04807)" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4177">
       <stop
          style="stop-color:#ffffff;stop-opacity:1"
@@ -227,7 +76,6 @@
          id="stop4181" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4167"
        id="linearGradient4173"
        x1="22.69014"
@@ -237,7 +85,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(0.70710673,0,0,0.70718173,-7.1682751,309.04807)" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4167">
       <stop
          style="stop-color:#acaa94;stop-opacity:1"
@@ -249,33 +96,6 @@
          id="stop4171" />
     </linearGradient>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#c9c9c9"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="35.182747"
-     inkscape:cx="8.5008808"
-     inkscape:cy="7.9989192"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="2560"
-     inkscape:window-height="1391"
-     inkscape:window-x="0"
-     inkscape:window-y="1"
-     inkscape:window-maximized="1"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="true"
-     inkscape:snap-bbox="true"
-     inkscape:bbox-nodes="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3999" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -284,47 +104,31 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
     <path
        style="display:inline;fill:url(#linearGradient5000);fill-opacity:1;stroke:none"
        d="m 1.5000365,1036.8622 9.9999995,0 c 0,0 0.0054,6.7618 0.0054,11.5 l -10.0054345,0 z"
-       id="rect4001-3"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+       id="rect4001-3" />
     <path
        style="fill:none;stroke:url(#linearGradient4908);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1"
        d="m 1.5000365,1036.8622 9.9999995,0 c 0,0 0.0054,7.143 0.0054,12 l -10.0054345,0 z"
-       id="rect4001"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+       id="rect4001" />
     <path
-       inkscape:connector-curvature="0"
        id="path4185"
        d="m 15.6438,1052.0064 0,-1.0287 -3.980969,-4.0836 -1.102083,1.0311 4.054422,4.0812 z"
-       style="fill:#677da9;fill-opacity:1;fill-rule:evenodd;stroke:#677da9;stroke-width:0.71592331;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       sodipodi:nodetypes="cccccc" />
+       style="fill:#677da9;fill-opacity:1;fill-rule:evenodd;stroke:#677da9;stroke-width:0.71592331;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
     <image
        y="1036.3622"
        x="16"
        id="image4287"
-       xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAMAAAAoLQ9TAAAAilBMVEVsgq1nfal3jLWGk66Klatx
-h7F9krmDmL2HnMCNmKny9vzs8vqTm6Xn7/nx9vzv9Pry9vvo8Pnq8fnt8/rn8Pns8/ry9/z3+v36
-/P74+vz8/f7n8Pjy9/v1+fz3+vyZnqH0+fz3+/37/f76/P37/f39/v78/f2gop2mppmsqpSyrpG3
-sY2/toi8tIpAuRh9AAAAAXRSTlMAQObYZgAAAAFiS0dEAIgFHUgAAAAJcEhZcwAACxMAAAsTAQCa
-nBgAAAAHdElNRQfgBxMWJwTvHzz9AAAAHXRFWHRDb21tZW50AENyZWF0ZWQgd2l0aCBUaGUgR0lN
-UO9kJW4AAAB8SURBVBjTjc3dCsIwDIbhBoUPUYgUtLDKLDK3dD/3f3vrkrqd+tKTPDTEufnIaTN+
-VVjwtbAYTOia5tP3HSaDcV8ZDTLaEILkLNlAkFLKkTlWGPB6DvFeiqLwBjOxRgo3PK7EvlThAu8l
-arZy3i7SNpP9OGlCVJ7J0X+yAvwHDN8iK2w9AAAAAElFTkSuQmCC
-"
+       xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAMAAAAoLQ9TAAAAilBMVEVsgq1nfal3jLWGk66Klatx h7F9krmDmL2HnMCNmKny9vzs8vqTm6Xn7/nx9vzv9Pry9vvo8Pnq8fnt8/rn8Pns8/ry9/z3+v36 /P74+vz8/f7n8Pjy9/v1+fz3+vyZnqH0+fz3+/37/f76/P37/f39/v78/f2gop2mppmsqpSyrpG3 sY2/toi8tIpAuRh9AAAAAXRSTlMAQObYZgAAAAFiS0dEAIgFHUgAAAAJcEhZcwAACxMAAAsTAQCa nBgAAAAHdElNRQfgBxMWJwTvHzz9AAAAHXRFWHRDb21tZW50AENyZWF0ZWQgd2l0aCBUaGUgR0lN UO9kJW4AAAB8SURBVBjTjc3dCsIwDIbhBoUPUYgUtLDKLDK3dD/3f3vrkrqd+tKTPDTEufnIaTN+ VVjwtbAYTOia5tP3HSaDcV8ZDTLaEILkLNlAkFLKkTlWGPB6DvFeiqLwBjOxRgo3PK7EvlThAu8l arZy3i7SNpP9OGlCVJ7J0X+yAvwHDN8iK2w9AAAAAElFTkSuQmCC "
        style="image-rendering:optimizeSpeed"
        preserveAspectRatio="none"
        height="16"
@@ -332,14 +136,11 @@ arZy3i7SNpP9OGlCVJ7J0X+yAvwHDN8iK2w9AAAAAElFTkSuQmCC
     <path
        style="display:inline;fill:none;stroke:#8398bd;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1"
        d="m 2.5000153,1037.8622 7.9956537,0 c 0,0 0.0043,5.9525 0.0043,10 l -7.9999992,0 z"
-       id="rect4001-36"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+       id="rect4001-36" />
     <path
        style="fill:none;fill-rule:evenodd;stroke:#8398bd;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
        d="m 2,1040.8622 9,0"
-       id="path4314"
-       inkscape:connector-curvature="0" />
+       id="path4314" />
     <ellipse
        cy="1045.3625"
        cx="9"
diff --git a/ui/org.eclipse.tools.layout.spy/icons/up_nav.svg b/ui/org.eclipse.tools.layout.spy/icons/up_nav.svg
index 3f607257aef..66281eec6f9 100644
--- a/ui/org.eclipse.tools.layout.spy/icons/up_nav.svg
+++ b/ui/org.eclipse.tools.layout.spy/icons/up_nav.svg
@@ -2,25 +2,20 @@
 <!-- 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="16"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.48.0 r9654"
-   sodipodi:docname="up_nav.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient3973"
-       inkscape:collect="always">
+       id="linearGradient3973">
       <stop
          id="stop3975"
          offset="0"
@@ -31,8 +26,7 @@
          style="stop-color:#f8f0c8;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       id="linearGradient3967"
-       inkscape:collect="always">
+       id="linearGradient3967">
       <stop
          id="stop3969"
          offset="0"
@@ -66,7 +60,6 @@
          style="stop-color:#ba772f;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3949">
       <stop
          style="stop-color:#9e6627;stop-opacity:1"
@@ -78,7 +71,6 @@
          id="stop3953" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient3967"
        id="linearGradient3939"
        gradientUnits="userSpaceOnUse"
@@ -88,7 +80,6 @@
        x2="531.09253"
        y2="371.17883" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient3955"
        id="linearGradient3945"
        gradientUnits="userSpaceOnUse"
@@ -103,12 +94,9 @@
       <path
          style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;display:inline"
          d="m 462.77563,373.22885 29.11636,0 c 1.45425,0 2.625,1.17075 2.625,2.625 l 0,18.76896 c 0,1.45425 -1.17412,2.52598 -2.625,2.625 l -29.11636,1.98708 c -1.45088,0.099 -2.625,-1.17075 -2.625,-2.625 l 0,-20.75604 c 0,-1.45425 1.17075,-2.625 2.625,-2.625 z"
-         id="path4919"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="sssssssss" />
+         id="path4919" />
     </mask>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient3973"
        id="linearGradient4933"
        gradientUnits="userSpaceOnUse"
@@ -118,7 +106,6 @@
        x2="538.00562"
        y2="374.21222" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient3949"
        id="linearGradient4935"
        gradientUnits="userSpaceOnUse"
@@ -139,7 +126,6 @@
          id="stop5152" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient5148"
        id="linearGradient9162"
        x1="28.901876"
@@ -148,29 +134,6 @@
        y2="1042.0194"
        gradientUnits="userSpaceOnUse" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="16"
-     inkscape:cx="7.5096396"
-     inkscape:cy="4.8192667"
-     inkscape:document-units="px"
-     inkscape:current-layer="g7604-8"
-     showgrid="true"
-     inkscape:window-width="964"
-     inkscape:window-height="940"
-     inkscape:window-x="1234"
-     inkscape:window-y="421"
-     inkscape:window-maximized="0"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3947" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -184,8 +147,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      style="display:inline"
      transform="translate(0,-1036.3622)">
@@ -208,29 +169,23 @@
         <path
            style="fill:url(#linearGradient4933);fill-opacity:1;stroke:url(#linearGradient4935);stroke-width:3.02792978;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
            d="m 463.24874,368.76025 28.07551,0 c 1.45425,0 2.625,1.17075 2.625,2.625 l 0,18.92132 c 0,1.45425 -1.17074,2.62799 -2.625,2.625 l -28.07551,-0.0577 c -1.45425,-0.003 -2.625,-1.17075 -2.625,-2.625 l 0,-18.86359 c 0,-1.45425 1.17075,-2.625 2.625,-2.625 z"
-           id="rect13693"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="sssssssss" />
+           id="rect13693" />
         <path
            style="fill:none;stroke:url(#linearGradient3945);stroke-width:3.02792978;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
            d="m 462.26171,368.76025 20.09375,0"
-           id="path13797"
-           inkscape:connector-curvature="0" />
+           id="path13797" />
         <g
            id="g4914"
            mask="url(#mask4917)" />
         <g
            transform="matrix(0,-1.5754342,-1.5754342,0,2121.9777,401.22933)"
            style="display:inline"
-           id="layer1-9"
-           inkscape:label="Layer 1">
+           id="layer1-9">
           <g
              style="display:inline"
              id="g7604-8"
              transform="matrix(-1.6126329,0,0,-1.6126329,46.005373,2723.8623)">
             <path
-               sodipodi:nodetypes="ccsssscscsssszcc"
-               inkscape:connector-curvature="0"
                id="path7582-2"
                d="m 22.661327,1040.1179 0,-1.8566 c 0,0 -0.41258,-0.9799 -1.598748,-0.051 -1.186168,0.9283 -2.578626,2.424 -2.784917,2.8365 -0.206289,0.4127 -1.083079,1.1348 0.103147,2.2693 0.190189,0.1819 0.383029,0.3651 0.572781,0.5446 0.993695,0.9397 1.902701,1.7761 1.902701,1.7761 0,0 1.805038,1.7019 1.805038,0.1027 0,-1.5987 0,-2.1145 0,-2.1145 0.703285,0.019 2.652411,-0.1465 3.127354,0.1495 0.771951,0.4815 1.680072,0.9857 2.359903,3.5016 0.129381,0.4789 0.692227,-1.6976 0.631549,-3.065 -0.06353,-1.4316 -0.643779,-2.3394 -1.344769,-2.992 -0.980677,-0.913 -0.951882,-0.8604 -1.564157,-1.0288 -0.612276,-0.1685 -1.83184,-0.1097 -1.83184,-0.1097 z"
                style="fill:url(#linearGradient9162);fill-opacity:1;stroke:#1a659c;stroke-width:0.95345461;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />