Tango: more explicit object-fill and object-stroke icon

(bzr r7853)

6 files changed, 173 insertions, 436 deletions

diff --git a/share/icons/tango/16x16/status/object-fill.png b/share/icons/tango/16x16/status/object-fill.png
index 962653190..383892c23 100644
--- a/share/icons/tango/16x16/status/object-fill.png
+++ b/share/icons/tango/16x16/status/object-fill.png
diff --git a/share/icons/tango/16x16/status/object-stroke.png b/share/icons/tango/16x16/status/object-stroke.png
index c3a0ff066..6bd75bc84 100644
--- a/share/icons/tango/16x16/status/object-stroke.png
+++ b/share/icons/tango/16x16/status/object-stroke.png
diff --git a/share/icons/tango/24x24/status/object-fill.png b/share/icons/tango/24x24/status/object-fill.png
index 253b533d6..0c7ebf3be 100644
--- a/share/icons/tango/24x24/status/object-fill.png
+++ b/share/icons/tango/24x24/status/object-fill.png
diff --git a/share/icons/tango/24x24/status/object-stroke.png b/share/icons/tango/24x24/status/object-stroke.png
index cd4a2a36a..1709e9b17 100644
--- a/share/icons/tango/24x24/status/object-stroke.png
+++ b/share/icons/tango/24x24/status/object-stroke.png
diff --git a/share/icons/tango/scalable/status/object-fill.svg b/share/icons/tango/scalable/status/object-fill.svg
index 7c292f811..602b02ca0 100644
--- a/share/icons/tango/scalable/status/object-fill.svg
+++ b/share/icons/tango/scalable/status/object-fill.svg
@@ -14,102 +14,82 @@
    height="48"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.46+devel r21210 custom"
+   inkscape:version="0.46+devel r21315"
    version="1.0"
-   sodipodi:docname="object-fill.svg"
+   sodipodi:docname="color-gradient.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
      id="defs4">
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient16370"
-       id="radialGradient22663"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2,0,36.5)"
-       cx="27.125"
-       cy="45.625"
-       fx="27.125"
-       fy="45.625"
-       r="22.5" />
     <linearGradient
-       id="linearGradient16370">
+       inkscape:collect="always"
+       id="linearGradient14157">
       <stop
-         id="stop16372"
-         offset="0.0000000"
-         style="stop-color:#50534b;stop-opacity:0.46391752;" />
+         style="stop-color:black;stop-opacity:1;"
+         offset="0"
+         id="stop14159" />
       <stop
-         id="stop16374"
+         style="stop-color:black;stop-opacity:0;"
          offset="1"
-         style="stop-color:#50534b;stop-opacity:0;" />
+         id="stop14161" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5737"
-       id="linearGradient22665"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.438799,0,0,0.438799,0.565693,-0.279792)"
-       x1="2"
-       y1="27.182352"
-       x2="8.9176159"
-       y2="27.182352" />
-    <linearGradient
-       id="linearGradient5737">
+       id="linearGradient16083">
       <stop
-         id="stop5739"
-         offset="0.0000000"
-         style="stop-color:#c0d5f0;stop-opacity:1.0000000;" />
+         style="stop-color:#4e9a06;stop-opacity:1;"
+         offset="0"
+         id="stop16085" />
       <stop
-         id="stop5741"
-         offset="1.0000000"
-         style="stop-color:#77a4df;stop-opacity:1.0000000;" />
+         id="stop16091"
+         offset="0.47259524"
+         style="stop-color:#84d13b;stop-opacity:1;" />
+      <stop
+         style="stop-color:#e5fece;stop-opacity:1;"
+         offset="1"
+         id="stop16087" />
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient15060"
-       id="linearGradient22667"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.373813,-0.222635,0.215821,0.385616,-33.16474,24.90046)"
-       x1="88.659218"
-       y1="23.661831"
-       x2="104.94178"
-       y2="23.839598"
-       spreadMethod="reflect" />
-    <linearGradient
-       id="linearGradient15060">
+       id="linearGradient11528">
       <stop
-         id="stop15062"
+         style="stop-color:white;stop-opacity:1;"
          offset="0"
-         style="stop-color:#5e605c;stop-opacity:1" />
-      <stop
-         style="stop-color:#dddddd;stop-opacity:1;"
-         offset="0.66074723"
-         id="stop15066" />
+         id="stop11530" />
       <stop
-         id="stop15064"
+         style="stop-color:white;stop-opacity:0.2360515"
          offset="1"
-         style="stop-color:#f7f7f7;stop-opacity:1;" />
+         id="stop11532" />
     </linearGradient>
     <radialGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient8059"
-       id="radialGradient22669"
+       xlink:href="#linearGradient14157"
+       id="radialGradient69"
        gradientUnits="userSpaceOnUse"
-       cx="24.660349"
-       cy="21.21833"
-       fx="24.660349"
-       fy="21.21833"
-       r="4.3006992" />
+       gradientTransform="matrix(1,0,0,0.182573,0,206.088)"
+       cx="77.118835"
+       cy="252.11775"
+       fx="77.118835"
+       fy="252.11775"
+       r="10.650796" />
     <linearGradient
-       id="linearGradient8059">
-      <stop
-         id="stop8061"
-         offset="0.0000000"
-         style="stop-color:#ffffff;stop-opacity:1.0000000;" />
-      <stop
-         id="stop8063"
-         offset="1.0000000"
-         style="stop-color:#9d9d9d;stop-opacity:1" />
-    </linearGradient>
+       inkscape:collect="always"
+       xlink:href="#linearGradient11528"
+       id="linearGradient94"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.2000043,0,0,1.9999896,-147.60023,-465.49722)"
+       x1="85.895683"
+       y1="250.0228"
+       x2="67.177094"
+       y2="232.10251" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient16083"
+       id="linearGradient97"
+       gradientUnits="userSpaceOnUse"
+       x1="1240.214"
+       y1="1192.1547"
+       x2="1258.2748"
+       y2="1192.2783"
+       gradientTransform="matrix(1.8644051,0,0,1.8004141,-2302.7985,-2129.973)" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -118,24 +98,26 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="1.979899"
-     inkscape:cx="-3.3376824"
-     inkscape:cy="2.2227916"
+     inkscape:zoom="5.6"
+     inkscape:cx="26.168419"
+     inkscape:cy="25.377049"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="1024"
-     inkscape:window-height="737"
-     inkscape:window-x="0"
-     inkscape:window-y="1"
-     inkscape:snap-page="true"
+     showgrid="true"
+     inkscape:window-width="806"
+     inkscape:window-height="591"
+     inkscape:window-x="204"
+     inkscape:window-y="116"
      inkscape:snap-bbox="true"
-     inkscape:snap-nodes="true"
-     inkscape:bbox-nodes="false"
-     inkscape:snap-object-midpoints="false"
-     inkscape:snap-bbox-edge-midpoints="true"
-     inkscape:object-nodes="true"
-     inkscape:snap-midpoints="true" />
+     inkscape:snap-nodes="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid873"
+       empspacing="3"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -144,7 +126,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>
@@ -152,87 +134,23 @@
      inkscape:label="Layer 1"
      inkscape:groupmode="layer"
      id="layer1">
-    <use
-       height="2000"
-       width="2000"
-       transform="matrix(3.0000002,0,0,3.0000002,-4394.526,-560.64289)"
-       id="use20461"
-       xlink:href="#node_b"
-       y="0"
-       x="0" />
-    <use
-       height="2000"
-       width="2000"
-       transform="matrix(3.0000002,0,0,3.0000002,-4364.526,-590.64289)"
-       id="use20463"
-       xlink:href="#node_b"
-       y="0"
-       x="0" />
-    <g
-       style="display:inline"
-       id="properties_fill"
-       transform="matrix(2.1818132,0,0,2.1818132,-416.72632,-499.63511)">
-      <rect
-         y="229"
-         x="191"
-         height="22"
-         width="22"
-         id="rect6315"
-         style="opacity:0.24267782;fill:#ffffff;fill-opacity:0;stroke:none" />
-      <g
-         transform="translate(191,228.991)"
-         id="g6317"
-         inkscape:label="Layer 1">
-        <path
-           sodipodi:type="arc"
-           style="fill:url(#radialGradient22663);fill-opacity:1;fill-rule:evenodd;stroke:none"
-           id="path6319"
-           sodipodi:cx="27.125"
-           sodipodi:cy="45.625"
-           sodipodi:rx="22.5"
-           sodipodi:ry="4.5"
-           d="m 49.625,45.625 c 0,2.485281 -10.073593,4.5 -22.5,4.5 -12.426407,0 -22.5,-2.014719 -22.5,-4.5 0,-2.485281 10.073593,-4.5 22.5,-4.5 12.426407,0 22.5,2.014719 22.5,4.5 z"
-           transform="matrix(0.488889,0,0,0.555555,-2.261111,-5.847192)" />
-        <path
-           style="fill:url(#linearGradient22665);fill-opacity:1;fill-rule:evenodd;stroke:#586a9a;stroke-width:1.00000036;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-           d="m 7.6966835,6.4844713 c 0,0 -5.2446178,0.055146 -5.2446178,0.055146 C 0.36850838,6.6238488 0.50466579,8.4596779 0.51380729,8.875623 l 0,6.29065 c -0.15467961,1.757732 3.08763041,1.839655 2.96398281,0.0248 L 3.4971824,9.1746936 7.6966835,6.4844713 z"
-           id="path17768"
-           sodipodi:nodetypes="csccccc" />
-        <path
-           style="fill:url(#linearGradient22667);fill-opacity:1;fill-rule:evenodd;stroke:#555753;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-           d="M 3.4097349,9.1266507 9.317844,19.68288 c 0.4538002,0.736613 1.183381,1.019764 1.886689,0.643733 l 8.574343,-5.106699 c 0.652207,-0.458065 0.954668,-1.318389 0.538163,-2.071856 L 14.402183,2.579777 3.4097349,9.1266507 z"
-           id="path6323"
-           sodipodi:nodetypes="ccccccc" />
-        <path
-           sodipodi:type="arc"
-           style="fill:url(#radialGradient22669);fill-opacity:1;fill-rule:evenodd;stroke:#555753;stroke-width:2.0692811;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
-           id="path6325"
-           sodipodi:cx="24.660349"
-           sodipodi:cy="21.21833"
-           sodipodi:rx="3.800699"
-           sodipodi:ry="3.800699"
-           d="m 28.461048,21.21833 c 0,2.099068 -1.701631,3.800699 -3.800699,3.800699 -2.099068,0 -3.800699,-1.701631 -3.800699,-3.800699 0,-2.099068 1.701631,-3.800699 3.800699,-3.800699 2.099068,0 3.800699,1.701631 3.800699,3.800699 z"
-           transform="matrix(0.440329,-0.251438,0.253871,0.434898,-4.734555,7.454736)" />
-        <path
-           style="fill:none;stroke:#ffffff;stroke-width:0.93590623;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-           d="M 4.6986017,9.4065076 9.68299,18.640642 c 0.520358,0.928793 0.911435,1.116514 1.768689,0.606472 l 7.286146,-4.371634 c 0.853231,-0.507649 1.032048,-0.994643 0.501307,-1.941976 L 14.117721,3.8676268 4.6986017,9.4065076 z"
-           id="path6327"
-           sodipodi:nodetypes="ccccccc" />
-        <path
-           style="fill:none;stroke:#555753;stroke-width:1.00000036;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-           d="m 11.537072,8.5980236 0,-5.7442595 c 0,-3.18436397 6.042447,-3.08624871 6.042447,0.1325825 l 0,4.8583063"
-           id="path6329"
-           sodipodi:nodetypes="cccc" />
-        <path
-           sodipodi:type="arc"
-           style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.2;marker:none;visibility:visible;display:inline;overflow:visible"
-           id="path17774"
-           sodipodi:cx="1.59375"
-           sodipodi:cy="7.65625"
-           sodipodi:rx="0.75"
-           sodipodi:ry="0.75"
-           d="m 2.34375,7.65625 c 0,0.4142136 -0.3357864,0.75 -0.75,0.75 -0.4142136,0 -0.75,-0.3357864 -0.75,-0.75 0,-0.4142136 0.3357864,-0.75 0.75,-0.75 0.4142136,0 0.75,0.3357864 0.75,0.75 z" />
-      </g>
-    </g>
+    <path
+       sodipodi:type="arc"
+       style="opacity:0.5;fill:url(#radialGradient69);fill-opacity:1;stroke:none;display:inline"
+       id="path17003"
+       sodipodi:cx="77.118835"
+       sodipodi:cy="252.11775"
+       sodipodi:rx="10.650796"
+       sodipodi:ry="1.9445436"
+       d="m 87.769631,252.11775 a 10.650796,1.9445436 0 1 1 -21.301591,0 10.650796,1.9445436 0 1 1 21.301591,0 z"
+       transform="matrix(1.9716426,0,0,2.3142784,-128.05078,-542.97046)" />
+    <path
+       style="fill:url(#linearGradient97);fill-opacity:1;stroke:#3b7504;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline"
+       d="m 4.5,4.5 39,0 0,36 -39,0 0,-36 z"
+       id="path17005" />
+    <path
+       style="fill:none;stroke:url(#linearGradient94);stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline"
+       d="m 7.5,7.5 33,0 0,30 -33,0 0,-30 z"
+       id="path17007" />
   </g>
 </svg>
diff --git a/share/icons/tango/scalable/status/object-stroke.svg b/share/icons/tango/scalable/status/object-stroke.svg
index aa98a23b9..1053c9c5e 100644
--- a/share/icons/tango/scalable/status/object-stroke.svg
+++ b/share/icons/tango/scalable/status/object-stroke.svg
@@ -14,211 +14,92 @@
    height="48"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.46+devel r21210 custom"
+   inkscape:version="0.46+devel r21315"
    version="1.0"
-   sodipodi:docname="object-stroke.svg"
+   sodipodi:docname="object-fill.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
      id="defs4">
     <linearGradient
        inkscape:collect="always"
-       id="linearGradient7584">
+       id="linearGradient14157">
       <stop
          style="stop-color:black;stop-opacity:1;"
          offset="0"
-         id="stop7586" />
+         id="stop14159" />
       <stop
          style="stop-color:black;stop-opacity:0;"
          offset="1"
-         id="stop7588" />
+         id="stop14161" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       id="linearGradient7569">
-      <stop
-         style="stop-color:#fff8c6;stop-opacity:1"
-         offset="0"
-         id="stop7571" />
-      <stop
-         style="stop-color:#edd400;stop-opacity:1"
-         offset="1"
-         id="stop7573" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient8535">
-      <stop
-         style="stop-color:#3465a4;stop-opacity:1;"
-         offset="0"
-         id="stop8537" />
-      <stop
-         style="stop-color:#3465a4;stop-opacity:0;"
-         offset="1"
-         id="stop8539" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient8527">
+       id="linearGradient16083">
       <stop
-         style="stop-color:#204a87;stop-opacity:1;"
+         style="stop-color:#4e9a06;stop-opacity:1;"
          offset="0"
-         id="stop8529" />
+         id="stop16085" />
       <stop
-         style="stop-color:#204a87;stop-opacity:0;"
-         offset="1"
-         id="stop8531" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient8545"
-       inkscape:collect="always">
+         id="stop16091"
+         offset="0.47259524"
+         style="stop-color:#84d13b;stop-opacity:1;" />
       <stop
-         id="stop8547"
-         offset="0"
-         style="stop-color:white;stop-opacity:0.67487687" />
-      <stop
-         id="stop8549"
+         style="stop-color:#e5fece;stop-opacity:1;"
          offset="1"
-         style="stop-color:white;stop-opacity:0;" />
+         id="stop16087" />
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
-       id="linearGradient7553">
+       id="linearGradient11528">
       <stop
          style="stop-color:white;stop-opacity:1;"
          offset="0"
-         id="stop7555" />
+         id="stop11530" />
       <stop
-         style="stop-color:white;stop-opacity:0;"
+         style="stop-color:white;stop-opacity:0.2360515"
          offset="1"
-         id="stop7557" />
+         id="stop11532" />
     </linearGradient>
     <radialGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient7584"
-       id="radialGradient19947"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.960782,0,0,1.462986,43.79807,-132.694)"
-       cx="-30.49398"
-       cy="270.35876"
-       fx="-30.49398"
-       fy="267.70972"
-       r="5.126524" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient7569"
-       id="radialGradient19949"
+       xlink:href="#linearGradient14157"
+       id="radialGradient69"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,1.2225,45,-68.51864)"
-       cx="-31.406252"
-       cy="267.75433"
-       fx="-31.406252"
-       fy="267.75433"
-       r="4.4999986" />
+       gradientTransform="matrix(1,0,0,0.182573,0,206.088)"
+       cx="77.118835"
+       cy="252.11775"
+       fx="77.118835"
+       fy="252.11775"
+       r="10.650796" />
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient8535"
-       id="linearGradient19951"
+       xlink:href="#linearGradient11528"
+       id="linearGradient94"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.942952,0,15.03209)"
-       x1="14.5625"
-       y1="266.46875"
-       x2="14.5625"
-       y2="269.47916" />
+       gradientTransform="matrix(2.2000043,0,0,1.9999896,-147.60023,-465.49722)"
+       x1="85.895683"
+       y1="250.0228"
+       x2="67.177094"
+       y2="232.10251" />
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient8527"
-       id="linearGradient19953"
+       xlink:href="#linearGradient16083"
+       id="linearGradient97"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.942952,0,15.03209)"
-       x1="12.75"
-       y1="266.78125"
-       x2="12.75"
-       y2="269.28204" />
+       x1="1240.214"
+       y1="1192.1547"
+       x2="1258.2748"
+       y2="1192.2783"
+       gradientTransform="matrix(1.8644051,0,0,1.8004141,-2302.7985,-2129.973)" />
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient8545"
-       id="linearGradient19955"
+       xlink:href="#linearGradient11528"
+       id="linearGradient993"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.931552,45,9.720426)"
-       x1="-31.40625"
-       y1="272.24997"
-       x2="-31.40625"
-       y2="277.78131" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient7553"
-       id="linearGradient19957"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(45,-9.00006)"
-       x1="-33.90234"
-       y1="265.92642"
-       x2="-25.346506"
-       y2="270.86612" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient800"
-       id="linearGradient19959"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.968158,-5.440395e-6,8.175435)"
-       x1="4.5078058"
-       y1="261.92886"
-       x2="4.5078058"
-       y2="266.08313" />
-    <linearGradient
-       id="linearGradient800">
-      <stop
-         id="stop998"
-         offset="0"
-         style="stop-color:#f3ff49;stop-opacity:1;" />
-      <stop
-         id="stop999"
-         offset="1"
-         style="stop-color:#ffa01e;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8506"
-       id="linearGradient19961"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.968158,-5.440395e-6,8.175435)"
-       x1="5.833631"
-       y1="261.84045"
-       x2="5.833631"
-       y2="266.61633" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient8506">
-      <stop
-         style="stop-color:#a40000;stop-opacity:1;"
-         offset="0"
-         id="stop8508" />
-      <stop
-         style="stop-color:#a40000;stop-opacity:0;"
-         offset="1"
-         id="stop8510" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8487"
-       id="linearGradient19963"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,1.062427,2.530084e-7,-15.85546)"
-       x1="6.2166638"
-       y1="255.34987"
-       x2="3.84375"
-       y2="252.97696" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient8487">
-      <stop
-         style="stop-color:#ef2929;stop-opacity:1;"
-         offset="0"
-         id="stop8489" />
-      <stop
-         style="stop-color:#c00;stop-opacity:1"
-         offset="1"
-         id="stop8491" />
-    </linearGradient>
+       gradientTransform="matrix(2.2000043,0,0,1.9999896,-147.60023,-465.49722)"
+       x1="85.895683"
+       y1="250.0228"
+       x2="67.177094"
+       y2="232.10251" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -227,24 +108,28 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="1.979899"
-     inkscape:cx="-3.3376824"
-     inkscape:cy="2.2227916"
+     inkscape:zoom="5.6"
+     inkscape:cx="23.625838"
+     inkscape:cy="31.292162"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="1024"
-     inkscape:window-height="737"
-     inkscape:window-x="0"
-     inkscape:window-y="1"
-     inkscape:snap-page="true"
+     showgrid="true"
+     inkscape:window-width="806"
+     inkscape:window-height="591"
+     inkscape:window-x="204"
+     inkscape:window-y="116"
      inkscape:snap-bbox="true"
-     inkscape:snap-nodes="true"
-     inkscape:bbox-nodes="false"
-     inkscape:snap-object-midpoints="false"
-     inkscape:snap-bbox-edge-midpoints="true"
-     inkscape:object-nodes="true"
-     inkscape:snap-midpoints="true" />
+     inkscape:snap-nodes="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid873"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true"
+       spacingx="1.5px"
+       spacingy="1.5px" />
+  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -253,7 +138,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>
@@ -261,90 +146,24 @@
      inkscape:label="Layer 1"
      inkscape:groupmode="layer"
      id="layer1">
-    <use
-       height="2000"
-       width="2000"
-       transform="matrix(3.0000002,0,0,3.0000002,-4394.526,-560.64289)"
-       id="use20461"
-       xlink:href="#node_b"
-       y="0"
-       x="0" />
-    <use
-       height="2000"
-       width="2000"
-       transform="matrix(3.0000002,0,0,3.0000002,-4364.526,-590.64289)"
-       id="use20463"
-       xlink:href="#node_b"
-       y="0"
-       x="0" />
-    <g
-       style="display:inline"
-       id="properties_stroke_paint"
-       transform="matrix(2.1818182,0,0,2.1818182,10.909091,-532.36368)">
-      <path
-         id="path19843"
-         d="m -5,244 22,0 0,22 -22,0 0,-22 z"
-         style="fill:#f57a7a;fill-opacity:0;stroke:none" />
-      <g
-         transform="matrix(1,0,0,0.941239,-3.999995,10.92424)"
-         id="g19845">
-        <path
-           style="fill:url(#radialGradient19947);fill-opacity:1;stroke:none"
-           d="m 19.999995,263.49998 c 0,4.14002 -2.463998,7.50003 -5.499996,7.50003 -3.035999,0 -5.4999963,-3.36001 -5.4999963,-7.50003 0,-4.14003 2.4639973,-7.50003 5.4999963,-7.50003 3.035998,0 5.499996,3.36 5.499996,7.50003 z"
-           id="path19847" />
-        <path
-           style="fill:#f57a7a;fill-opacity:1;fill-rule:evenodd;stroke:#a40000;stroke-width:1.03074241px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-           d="m 3.4999954,253.43744 1.8200983,1.15625 c 0.9621055,-3.63729 8.2058673,-7.59073 8.2058673,-1.46875 l 1.997707,0 c 0,-8.05886 -9.955334,-5.09695 -12.0236726,0.3125 z"
-           id="path19849"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           style="fill:url(#radialGradient19949);fill-opacity:1;stroke:#c4a000;stroke-width:1.03074193;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1"
-           d="m 18.499997,260.16657 c 0,2.76 -1.791999,3.33334 -3.999998,3.33334 -2.208,0 -3.999999,-0.57334 -3.999999,-3.33334 0,-1.22606 0.943698,-2.06423 1.452229,-2.89002 0.531063,-0.86237 1.054243,-2.16119 1.787012,-3.77914 l 1.561538,0 c 0.71274,1.62594 1.293691,3.01745 1.80596,3.77914 0.634564,0.94355 1.393258,1.56436 1.393258,2.89002 z"
-           id="path19851"
-           sodipodi:nodetypes="cssscczc" />
-        <path
-           style="fill:url(#linearGradient19951);fill-opacity:1;stroke:url(#linearGradient19953);stroke-width:1.03074265;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1"
-           d="m 12.5,263.49983 4.000001,0 0,5.65788 -4.000001,0 0,-5.65788 z"
-           id="path19853" />
-        <path
-           style="fill:none;stroke:url(#linearGradient19955);stroke-width:1.03074241;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1"
-           d="m 13.499985,264.49998 2.000004,0 0,4.65773 -2.000004,0 0,-4.65773 z"
-           id="path19855" />
-        <path
-           style="fill:#555753;fill-opacity:1;stroke:none"
-           d="m 14,253.99994 1,0 0,6 -1,0 0,-6 z"
-           id="path19857" />
-        <path
-           sodipodi:type="arc"
-           style="fill:#555753;fill-opacity:1;stroke:none"
-           id="path19859"
-           sodipodi:cx="-30.5"
-           sodipodi:cy="269.375"
-           sodipodi:rx="1.03125"
-           sodipodi:ry="1.03125"
-           d="m -29.46875,269.375 c 0,0.56954 -0.461706,1.03125 -1.03125,1.03125 -0.569544,0 -1.03125,-0.46171 -1.03125,-1.03125 0,-0.56954 0.461706,-1.03125 1.03125,-1.03125 0.569544,0 1.03125,0.46171 1.03125,1.03125 z"
-           transform="matrix(1.000068,0,0,1.000068,45.00207,-9.424685)" />
-        <path
-           style="fill:none;stroke:url(#linearGradient19957);stroke-width:1.03074241;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-           d="m 17.499996,259.8333 c 0.02988,2.51673 -1.344002,2.66667 -3.000006,2.66667 -1.656004,0 -3.113178,-0.2848 -3.000006,-2.48989 0.03747,-0.73015 2.063972,-4.13584 3.000006,-5.76149 0.864255,1.61787 2.987354,4.53762 3.000006,5.58471 z"
-           id="path19861"
-           sodipodi:nodetypes="csscs" />
-        <path
-           style="fill:url(#linearGradient19959);fill-opacity:1;stroke:url(#linearGradient19961);stroke-width:1.03074253;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1"
-           d="m 3.4999951,256.75006 2.0000007,0 0,10.4077 -2.0000007,0 0,-10.4077 z"
-           id="path19863" />
-        <path
-           style="fill:url(#linearGradient19963);fill-opacity:1;stroke:#a40000;stroke-width:1.03074145;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1"
-           d="m 1.4999999,250.28258 6.9999943,0 0,7.43688 -6.9999943,0 0,-7.43688 z"
-           id="path19865" />
-        <rect
-           style="fill:none;stroke:#ffffff;stroke-width:1.03074169;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.45320195;stroke-dasharray:none"
-           id="rect19867"
-           width="5.0000005"
-           height="5.3121719"
-           x="2.4999948"
-           y="251.34502" />
-      </g>
-    </g>
+    <path
+       sodipodi:type="arc"
+       style="opacity:0.5;fill:url(#radialGradient69);fill-opacity:1;stroke:none;display:inline"
+       id="path17003"
+       sodipodi:cx="77.118835"
+       sodipodi:cy="252.11775"
+       sodipodi:rx="10.650796"
+       sodipodi:ry="1.9445436"
+       d="m 87.769631,252.11775 a 10.650796,1.9445436 0 1 1 -21.301591,0 10.650796,1.9445436 0 1 1 21.301591,0 z"
+       transform="matrix(1.9716426,0,0,2.3142784,-128.05078,-542.97046)" />
+    <path
+       style="fill:url(#linearGradient97);fill-opacity:1;stroke:#3b7504;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline"
+       d="m 4.5,4.5 0,36 39,0 0,-36 -39,0 z m 6,6 27,0 0,24 -27,0 0,-24 z"
+       id="path17005"
+       sodipodi:nodetypes="cccccccccc" />
+    <path
+       style="fill:none;stroke:url(#linearGradient94);stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline"
+       d="m 7.5,7.5 33,0 0,30 -33,0 0,-30 z"
+       id="path17007" />
   </g>
 </svg>