More icon cleanup.

7 files changed, 138 insertions, 297 deletions

diff --git a/share/icons/edit-select-all.svg b/share/icons/edit-select-all.svg
index 23c112a61..050806139 100644
--- a/share/icons/edit-select-all.svg
+++ b/share/icons/edit-select-all.svg
@@ -1,75 +1,39 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   id="svg1"
    width="16"
    height="16"
   >
-  <sodipodi:namedview
-     id="base"
-     showgrid="true"
-     gridspacingy="1pt"
-     gridspacingx="1pt"
-     gridoriginy="0pt"
-     gridoriginx="0pt"
-  />
-  <defs id="defs3">
-
-    <linearGradient gradientUnits="userSpaceOnUse" id="linearGradient5821" inkscape:collect="always" x1="108.3513" x2="101.1929" xlink:href="#linearGradient5740" y1="215.4819" y2="206.9966"/>
-    <linearGradient id="linearGradient6684">
-      <stop id="stop6686" offset="0" style="stop-color:#ffbf00;stop-opacity:1"/>
-      <stop id="stop6688" offset="1" style="stop-color:#ffffff;stop-opacity:1"/>
-    </linearGradient>
-    <linearGradient id="linearGradient5740">
-      <stop id="stop5742" offset="0" style="stop-color:#ffffff;stop-opacity:1"/>
-      <stop id="stop5744" offset="1" style="stop-color:#98b6d3;stop-opacity:1"/>
+  <defs>
+    <linearGradient id="linearGradientRectVector">
+      <stop offset="0" style="stop-color:#ffbf00"/>
+      <stop offset="1" style="stop-color:#ffffff"/>
     </linearGradient>
-    <linearGradient gradientTransform="matrix(1.124777,0,0,1.399469,339.507,-41.54364)" gradientUnits="userSpaceOnUse" id="linearGradient5825" inkscape:collect="always" x1="15.15684" x2="22.04275" xlink:href="#linearGradient5704" y1="214.0084" y2="218.3974"/>
-    <linearGradient id="linearGradient5704">
-      <stop id="stop5706" offset="0" style="stop-color:#5a5a5a;stop-opacity:1"/>
-      <stop id="stop5708" offset="1" style="stop-color:#000000;stop-opacity:1"/>
+    <linearGradient gradientUnits="userSpaceOnUse" id="linearGradientRectFill"   x1="6" x2="8" xlink:href="#linearGradientRectVector" y1="7" y2="13"/>
+    <linearGradient gradientUnits="userSpaceOnUse" id="linearGradientRectStroke" x1="8" x2="6" xlink:href="#linearGradientRectVector" y1="13" y2="7"/>
+
+    <linearGradient id="linearGradientCircleVector">
+      <stop offset="0" style="stop-color:#ffffff"/>
+      <stop offset="1" style="stop-color:#98b6d3"/>
     </linearGradient>
-    <linearGradient gradientTransform="matrix(1.165669,0,0,1.655559,338.7499,-97.1359)" gradientUnits="userSpaceOnUse" id="linearGradient5827" inkscape:collect="always" x1="17.48326" x2="20.98923" xlink:href="#linearGradient6684" y1="215.0097" y2="218.8156"/>
-    <linearGradient gradientUnits="userSpaceOnUse" id="linearGradient5819" inkscape:collect="always" x1="99.31348" x2="111.6865" xlink:href="#linearGradient5704" y1="210.5" y2="210.5"/>
-    <linearGradient gradientUnits="userSpaceOnUse" id="linearGradient5823" inkscape:collect="always" x1="101.7507" x2="108.8156" xlink:href="#linearGradient5740" y1="205.192" y2="212.9901"/>
-    <linearGradient gradientTransform="matrix(0.87731,0,0,0.991952,344.0693,46.88201)" gradientUnits="userSpaceOnUse" id="linearGradient5829" inkscape:collect="always" x1="19.08596" x2="16.10928" xlink:href="#linearGradient6684" y1="219.6944" y2="214.3821"/>
+    <linearGradient gradientUnits="userSpaceOnUse" id="linearGradientCircleStroke" x1="7" x2="12" xlink:href="#linearGradientCircleVector" y1="4" y2="9"/>
+    <linearGradient gradientUnits="userSpaceOnUse" id="linearGradientCircleFill"   x1="12" x2="7" xlink:href="#linearGradientCircleVector" y1="9" y2="4"/>
   </defs>
-<g id="edit-select-all" inkscape:label="#selection_select_all" transform="translate(-353.3149,-252.13877)">
-  <g id="use6072" transform="matrix(1,0,0,1,-0.0124923,-0.0145053)">
-    <rect height="6.999161" id="rect9496" style="color:#000000;fill:none;stroke:url(#linearGradient5825);stroke-width:1.0000005;stroke-linejoin:round;stroke-miterlimit:0" width="8.996735" x="355.8274" y="258.6541"/>
-    <rect height="4.972945" id="rect9498" style="color:#000000;fill:url(#linearGradient5827);fill-rule:evenodd;stroke:url(#linearGradient5829);stroke-width:1.0000005;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0" width="6.994853" x="356.8273" y="259.6532"/>
-  </g>
-  <g id="use6075" transform="matrix(1,0,0,1,-1.042199,0.956231)">
-    <circle cx="105.5" cy="210.5" id="path10763" r="5.5" style="color:#000000;fill:none;stroke:url(#linearGradient5819);stroke-width:1.3730356;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0" transform="matrix(0.727881,0,0,0.728748,287.069,104.2892)"/>
-    <circle cx="105.5" cy="210.5" id="path10409" r="5.5" style="color:#000000;fill:url(#linearGradient5821);fill-rule:evenodd;stroke:url(#linearGradient5823);stroke-width:1.8262242;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0" transform="matrix(0.547085,0,0,0.548073,306.1137,142.2991)"/>
+
+  <g id="edit-select-all" inkscape:label="#selection_select_all">
+    <g>
+      <rect x="2.5" y="6.5" width="9" height="7" style="fill:none;stroke:#222222;stroke-linejoin:round"/>
+      <rect x="3.5" y="7.5" width="7" height="5" style="fill:url(#linearGradientRectFill);stroke:url(#linearGradientRectStroke)"/>
+    </g>
+    <g>
+      <circle cx="9.5" cy="6.5" r="4" style="fill:none;stroke:#222222"/>
+      <circle cx="9.5" cy="6.5" r="3" style="fill:url(#linearGradientCircleFill);stroke:url(#linearGradientCircleStroke)"/>
+    </g>
+
+    <path d="m 0.5,0.5 h 15 v 15 h -15 z" style="fill:none;stroke:black;stroke-dasharray:2 1;stroke-dashoffset:0.5"/>
+
   </g>
-  <path d="M 55.5,185.5 56.5,185.5" id="path6078" inkscape:connector-curvature="0" style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:square" transform="translate(298.3149,67.13877)"/>
-  <path d="M 55.5,185.5 56.5,185.5" id="use6080" inkscape:connector-curvature="0" style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:square" transform="matrix(1,0,0,1,298.3149,67.13877)"/>
-  <path d="M 55.5,185.5 56.5,185.5" id="use6082" inkscape:connector-curvature="0" style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:square" transform="matrix(1,0,0,1,298.3149,67.13877)"/>
-  <path d="M 55.5,185.5 56.5,185.5" id="use6084" inkscape:connector-curvature="0" style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:square" transform="matrix(1,0,0,1,298.3149,67.13877)"/>
-  <path d="M 55.5,185.5 56.5,185.5" id="use6086" inkscape:connector-curvature="0" style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:square" transform="matrix(1,0,0,1,298.3149,67.13877)"/>
-  <path d="M 55.5,185.5 56.5,185.5" id="use6088" inkscape:connector-curvature="0" style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:square" transform="matrix(1,0,0,1,300.3149,82.13877)"/>
-  <path d="M 55.5,185.5 56.5,185.5" id="use6090" inkscape:connector-curvature="0" style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:square" transform="matrix(1,0,0,1,303.3149,82.13877)"/>
-  <path d="M 55.5,185.5 56.5,185.5" id="use6092" inkscape:connector-curvature="0" style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:square" transform="matrix(1,0,0,1,306.3149,82.13877)"/>
-  <path d="M 55.5,185.5 56.5,185.5" id="use6094" inkscape:connector-curvature="0" style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:square" transform="matrix(1,0,0,1,309.3149,82.13877)"/>
-  <path d="M 55.5,185.5 56.5,185.5" id="use6096" inkscape:connector-curvature="0" style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:square" transform="matrix(1,0,0,1,312.3149,82.13877)"/>
-  <path d="M 55.5,187.5 55.5,188.5" id="path6100" inkscape:connector-curvature="0" style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:square" transform="translate(298.3149,67.13877)"/>
-  <path d="M 55.5,187.5 55.5,188.5" id="use6102" inkscape:connector-curvature="0" style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:square" transform="matrix(1,0,0,1,298.3149,70.13877)"/>
-  <path d="M 55.5,187.5 55.5,188.5" id="use6104" inkscape:connector-curvature="0" style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:square" transform="matrix(1,0,0,1,298.3149,73.13877)"/>
-  <path d="M 55.5,187.5 55.5,188.5" id="use6106" inkscape:connector-curvature="0" style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:square" transform="matrix(1,0,0,1,298.3149,76.13877)"/>
-  <path d="M 55.5,187.5 55.5,188.5" id="use6108" inkscape:connector-curvature="0" style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:square" transform="matrix(1,0,0,1,298.3149,79.13877)"/>
-  <path d="M 55.5,187.5 55.5,188.5" id="use6110" inkscape:connector-curvature="0" style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:square" transform="matrix(1,0,0,1,313.3149,77.13877)"/>
-  <path d="M 55.5,187.5 55.5,188.5" id="use6112" inkscape:connector-curvature="0" style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:square" transform="matrix(1,0,0,1,313.3149,74.13877)"/>
-  <path d="M 55.5,187.5 55.5,188.5" id="use6114" inkscape:connector-curvature="0" style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:square" transform="matrix(1,0,0,1,313.3149,71.13877)"/>
-  <path d="M 55.5,187.5 55.5,188.5" id="use6116" inkscape:connector-curvature="0" style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:square" transform="matrix(1,0,0,1,313.3149,68.13877)"/>
-  <path d="M 55.5,187.5 55.5,188.5" id="use6118" inkscape:connector-curvature="0" style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:square" transform="matrix(1,0,0,1,313.3149,65.13877)"/>
-</g>
 
 </svg>
diff --git a/share/icons/edit-select-none.svg b/share/icons/edit-select-none.svg
index 503302d2d..ed9c8a713 100644
--- a/share/icons/edit-select-none.svg
+++ b/share/icons/edit-select-none.svg
@@ -1,75 +1,39 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   id="svg1"
    width="16"
    height="16"
   >
-  <sodipodi:namedview
-     id="base"
-     showgrid="true"
-     gridspacingy="1pt"
-     gridspacingx="1pt"
-     gridoriginy="0pt"
-     gridoriginx="0pt"
-  />
-  <defs id="defs3">
-
-    <linearGradient id="linearGradient5740">
-      <stop id="stop5742" offset="0" style="stop-color:#ffffff;stop-opacity:1"/>
-      <stop id="stop5744" offset="1" style="stop-color:#98b6d3;stop-opacity:1"/>
-    </linearGradient>
-    <linearGradient gradientUnits="userSpaceOnUse" id="linearGradient5821" inkscape:collect="always" x1="108.3513" x2="101.1929" xlink:href="#linearGradient5740" y1="215.4819" y2="206.9966"/>
-    <linearGradient id="linearGradient6684">
-      <stop id="stop6686" offset="0" style="stop-color:#ffbf00;stop-opacity:1"/>
-      <stop id="stop6688" offset="1" style="stop-color:#ffffff;stop-opacity:1"/>
+  <defs>
+    <linearGradient id="linearGradientRectVector">
+      <stop offset="0" style="stop-color:#ffbf00"/>
+      <stop offset="1" style="stop-color:#ffffff"/>
     </linearGradient>
-    <linearGradient gradientTransform="matrix(1.165669,0,0,1.655559,338.7499,-97.1359)" gradientUnits="userSpaceOnUse" id="linearGradient5827" inkscape:collect="always" x1="17.48326" x2="20.98923" xlink:href="#linearGradient6684" y1="215.0097" y2="218.8156"/>
-    <linearGradient gradientUnits="userSpaceOnUse" id="linearGradient5819" inkscape:collect="always" x1="99.31348" x2="111.6865" xlink:href="#linearGradient5704" y1="210.5" y2="210.5"/>
-    <linearGradient gradientUnits="userSpaceOnUse" id="linearGradient5823" inkscape:collect="always" x1="101.7507" x2="108.8156" xlink:href="#linearGradient5740" y1="205.192" y2="212.9901"/>
-    <linearGradient gradientTransform="matrix(0.87731,0,0,0.991952,344.0693,46.88201)" gradientUnits="userSpaceOnUse" id="linearGradient5829" inkscape:collect="always" x1="19.08596" x2="16.10928" xlink:href="#linearGradient6684" y1="219.6944" y2="214.3821"/>
-    <linearGradient gradientTransform="matrix(1.124777,0,0,1.399469,339.507,-41.54364)" gradientUnits="userSpaceOnUse" id="linearGradient5825" inkscape:collect="always" x1="15.15684" x2="22.04275" xlink:href="#linearGradient5704" y1="214.0084" y2="218.3974"/>
-    <linearGradient id="linearGradient5704">
-      <stop id="stop5706" offset="0" style="stop-color:#5a5a5a;stop-opacity:1"/>
-      <stop id="stop5708" offset="1" style="stop-color:#000000;stop-opacity:1"/>
+    <linearGradient gradientUnits="userSpaceOnUse" id="linearGradientRectFill"   x1="6" x2="8" xlink:href="#linearGradientRectVector" y1="7" y2="13"/>
+    <linearGradient gradientUnits="userSpaceOnUse" id="linearGradientRectStroke" x1="8" x2="6" xlink:href="#linearGradientRectVector" y1="13" y2="7"/>
+
+    <linearGradient id="linearGradientCircleVector">
+      <stop offset="0" style="stop-color:#ffffff"/>
+      <stop offset="1" style="stop-color:#98b6d3"/>
     </linearGradient>
+    <linearGradient gradientUnits="userSpaceOnUse" id="linearGradientCircleStroke" x1="7" x2="12" xlink:href="#linearGradientCircleVector" y1="4" y2="9"/>
+    <linearGradient gradientUnits="userSpaceOnUse" id="linearGradientCircleFill"   x1="12" x2="7" xlink:href="#linearGradientCircleVector" y1="9" y2="4"/>
   </defs>
-<g id="edit-select-none" inkscape:label="#selection_deselect" transform="translate(-55,-236)">
-  <g id="use5235" transform="matrix(1,0,0,1,-298.3274,-16.15328)">
-    <rect height="6.999161" id="rect9496" style="color:#000000;fill:none;stroke:url(#linearGradient5825);stroke-width:1.0000005;stroke-linejoin:round;stroke-miterlimit:0" width="8.996735" x="355.8274" y="258.6541"/>
-    <rect height="4.972945" id="rect9498" style="color:#000000;fill:url(#linearGradient5827);fill-rule:evenodd;stroke:url(#linearGradient5829);stroke-width:1.0000005;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0" width="6.994853" x="356.8273" y="259.6532"/>
-  </g>
-  <g id="use5237" transform="matrix(1,0,0,1,-299.3571,-15.18254)">
-    <circle cx="105.5" cy="210.5" id="path10763" r="5.5" style="color:#000000;fill:none;stroke:url(#linearGradient5819);stroke-width:1.3730356;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0" transform="matrix(0.727881,0,0,0.728748,287.069,104.2892)"/>
-    <circle cx="105.5" cy="210.5" id="path10409" r="5.5" style="color:#000000;fill:url(#linearGradient5821);fill-rule:evenodd;stroke:url(#linearGradient5823);stroke-width:1.8262242;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0" transform="matrix(0.547085,0,0,0.548073,306.1137,142.2991)"/>
+
+  <g id="edit-select-none" inkscape:label="#selection_deselect">
+    <g>
+      <rect x="2.5" y="6.5" width="9" height="7" style="fill:none;stroke:#222222;stroke-linejoin:round"/>
+      <rect x="3.5" y="7.5" width="7" height="5" style="fill:url(#linearGradientRectFill);stroke:url(#linearGradientRectStroke)"/>
+    </g>
+    <g>
+      <circle cx="9.5" cy="6.5" r="4" style="fill:none;stroke:#222222"/>
+      <circle cx="9.5" cy="6.5" r="3" style="fill:url(#linearGradientCircleFill);stroke:url(#linearGradientCircleStroke)"/>
+    </g>
+
+    <path d="m 0.5,0.5 h 15 v 15 h -15 z" style="fill:none;stroke:#cc0000;stroke-dasharray:2 1;stroke-dashoffset:0.5"/>
+
   </g>
-  <path d="M 55.5,236.5 56.5,236.5" id="path5239" inkscape:connector-curvature="0" style="fill:none;stroke:#cc0000;stroke-width:1px;stroke-linecap:square"/>
-  <path d="M 55.5,238.5 55.5,239.5" id="path5261" inkscape:connector-curvature="0" style="fill:none;stroke:#cc0000;stroke-width:1px;stroke-linecap:square"/>
-  <path d="M 55.5,236.5 56.5,236.5" id="use5306" inkscape:connector-curvature="0" style="fill:none;stroke:#cc0000;stroke-width:1px;stroke-linecap:square" transform="matrix(1,0,0,1,0,0)"/>
-  <path d="M 55.5,236.5 56.5,236.5" id="use5309" inkscape:connector-curvature="0" style="fill:none;stroke:#cc0000;stroke-width:1px;stroke-linecap:square" transform="matrix(1,0,0,1,0,0)"/>
-  <path d="M 55.5,236.5 56.5,236.5" id="use5313" inkscape:connector-curvature="0" style="fill:none;stroke:#cc0000;stroke-width:1px;stroke-linecap:square" transform="matrix(1,0,0,1,0,0)"/>
-  <path d="M 55.5,236.5 56.5,236.5" id="use5311" inkscape:connector-curvature="0" style="fill:none;stroke:#cc0000;stroke-width:1px;stroke-linecap:square" transform="matrix(1,0,0,1,0,0)"/>
-  <path d="M 55.5,238.5 55.5,239.5" id="use5318" inkscape:connector-curvature="0" style="fill:none;stroke:#cc0000;stroke-width:1px;stroke-linecap:square" transform="matrix(1,0,0,1,0,3)"/>
-  <path d="M 55.5,238.5 55.5,239.5" id="use5321" inkscape:connector-curvature="0" style="fill:none;stroke:#cc0000;stroke-width:1px;stroke-linecap:square" transform="matrix(1,0,0,1,0,6)"/>
-  <path d="M 55.5,238.5 55.5,239.5" id="use5323" inkscape:connector-curvature="0" style="fill:none;stroke:#cc0000;stroke-width:1px;stroke-linecap:square" transform="matrix(1,0,0,1,0,9)"/>
-  <path d="M 55.5,238.5 55.5,239.5" id="use5325" inkscape:connector-curvature="0" style="fill:none;stroke:#cc0000;stroke-width:1px;stroke-linecap:square" transform="matrix(1,0,0,1,0,12)"/>
-  <path d="M 55.5,236.5 56.5,236.5" id="use5327" inkscape:connector-curvature="0" style="fill:none;stroke:#cc0000;stroke-width:1px;stroke-linecap:square" transform="matrix(1,0,0,1,2,15)"/>
-  <path d="M 55.5,236.5 56.5,236.5" id="use5329" inkscape:connector-curvature="0" style="fill:none;stroke:#cc0000;stroke-width:1px;stroke-linecap:square" transform="matrix(1,0,0,1,5,15)"/>
-  <path d="M 55.5,236.5 56.5,236.5" id="use5331" inkscape:connector-curvature="0" style="fill:none;stroke:#cc0000;stroke-width:1px;stroke-linecap:square" transform="matrix(1,0,0,1,8,15)"/>
-  <path d="M 55.5,236.5 56.5,236.5" id="use5333" inkscape:connector-curvature="0" style="fill:none;stroke:#cc0000;stroke-width:1px;stroke-linecap:square" transform="matrix(1,0,0,1,11,15)"/>
-  <path d="M 55.5,236.5 56.5,236.5" id="use5335" inkscape:connector-curvature="0" style="fill:none;stroke:#cc0000;stroke-width:1px;stroke-linecap:square" transform="matrix(1,0,0,1,14,15)"/>
-  <path d="M 70.5,236.5 70.5,237.5" id="path5337" inkscape:connector-curvature="0" style="fill:none;stroke:#cc0000;stroke-width:1px;stroke-linecap:square"/>
-  <path d="M 55.5,238.5 55.5,239.5" id="use5340" inkscape:connector-curvature="0" style="fill:none;stroke:#cc0000;stroke-width:1px;stroke-linecap:square" transform="matrix(1,0,0,1,15,1)"/>
-  <path d="M 55.5,238.5 55.5,239.5" id="use5342" inkscape:connector-curvature="0" style="fill:none;stroke:#cc0000;stroke-width:1px;stroke-linecap:square" transform="matrix(1,0,0,1,15,4)"/>
-  <path d="M 55.5,238.5 55.5,239.5" id="use5344" inkscape:connector-curvature="0" style="fill:none;stroke:#cc0000;stroke-width:1px;stroke-linecap:square" transform="matrix(1,0,0,1,15,7)"/>
-  <path d="M 55.5,238.5 55.5,239.5" id="use5346" inkscape:connector-curvature="0" style="fill:none;stroke:#cc0000;stroke-width:1px;stroke-linecap:square" transform="matrix(1,0,0,1,15,10)"/>
-</g>
 
 </svg>
diff --git a/share/icons/grid-axonometric.svg b/share/icons/grid-axonometric.svg
index 5806aecb6..d6edc30d3 100644
--- a/share/icons/grid-axonometric.svg
+++ b/share/icons/grid-axonometric.svg
@@ -1,38 +1,20 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   id="svg1"
-   width="16.1046"
-   height="16.1126"
+   width="16"
+   height="16"
   >
-  <sodipodi:namedview
-     id="base"
-     showgrid="true"
-     gridspacingy="1pt"
-     gridspacingx="1pt"
-     gridoriginy="0pt"
-     gridoriginx="0pt"
-  />
-  <defs id="defs3">
-
-  </defs>
-<g id="grid-axonometric" inkscape:label="#grid_axonom" transform="translate(-329.9321,-420.9521)">
-  <path d="M 332.5,421.5 332.5,436.5" id="path4674" inkscape:connector-curvature="0" sodipodi:nodetypes="cc" style="fill:none;stroke:#0000ff;stroke-linecap:round"/>
-  <path d="M 342.5,421.5 342.5,436.5" id="path5266" inkscape:connector-curvature="0" sodipodi:nodetypes="cc" style="fill:none;stroke:#0000ff;stroke-linecap:round"/>
-  <path d="M 337.5,421.5 337.5,436.5" id="path5268" inkscape:connector-curvature="0" sodipodi:nodetypes="cc" style="fill:none;stroke:#0000ff;stroke-linecap:round"/>
-  <path d="M 330.4851,424.4741 345.5008,433.1434" id="path4720" inkscape:connector-curvature="0" sodipodi:nodetypes="cc" style="fill:none;stroke:#0000ff;stroke-linecap:round;stroke-linejoin:round"/>
-  <path d="M 330.4321,430.3454 341.0657,436.4847" id="path5309" inkscape:connector-curvature="0" sodipodi:nodetypes="cc" style="fill:none;stroke:#0000ff;stroke-linecap:round;stroke-linejoin:round"/>
-  <path d="M 335.1528,421.4521 345.4605,427.4032" id="path5311" inkscape:connector-curvature="0" sodipodi:nodetypes="cc" style="fill:none;stroke:#0000ff;stroke-linecap:round;stroke-linejoin:round"/>
-  <path d="M 330.4332,426.6692 339.4477,421.4646" id="path5313" inkscape:connector-curvature="0" sodipodi:nodetypes="cc" style="fill:none;stroke:#0000ff;stroke-linecap:round;stroke-linejoin:round"/>
-  <path d="M 330.4696,432.5182 345.4713,423.857" id="path5315" inkscape:connector-curvature="0" sodipodi:nodetypes="cc" style="fill:none;stroke:#0000ff;stroke-linecap:round;stroke-linejoin:round"/>
-  <path d="M 333.6366,436.5647 345.5367,429.6942" id="path5317" inkscape:connector-curvature="0" sodipodi:nodetypes="cc" style="fill:none;stroke:#0000ff;stroke-linecap:round;stroke-linejoin:round"/>
-</g>
-
+  <g id="grid-axonometric" inkscape:label="#grid_axonom" style="fill:none;stroke:blue;stroke-linecap:round">
+    <path d="m  2.5, 0.5  0,15"   />
+    <path d="m  7.5, 0.5  0,15"   />
+    <path d="m 12.5, 0.5  0,15"   />
+    <path d="m  0.5, 6.3 10,-5.8" />
+    <path d="m  0.5,12.0 15,-8.7" />
+    <path d="m  4.5,15.5 11,-6.4" />
+    <path d="m  4.5, 0.5 11, 6.4" />
+    <path d="m  0.5, 4.0 15, 8.7" />
+    <path d="m  0.5, 9.7 10, 5.8" />
+  </g>
 </svg>
diff --git a/share/icons/grid-rectangular.svg b/share/icons/grid-rectangular.svg
index 9f48b9837..064631942 100644
--- a/share/icons/grid-rectangular.svg
+++ b/share/icons/grid-rectangular.svg
@@ -1,37 +1,19 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   id="svg1"
    width="16"
    height="16"
   >
-  <sodipodi:namedview
-     id="base"
-     showgrid="true"
-     gridspacingy="1pt"
-     gridspacingx="1pt"
-     gridoriginy="0pt"
-     gridoriginx="0pt"
-  />
-  <defs id="defs3">
-
-  </defs>
-<g id="grid-rectangular" inkscape:label="#grid_xy" transform="translate(-304,-421)">
-  <path d="M 305.5,421.5 305.5,436.5" id="path5235" inkscape:connector-curvature="0" sodipodi:nodetypes="cc" style="fill:none;stroke:#0000ff;stroke-linecap:round"/>
-  <path d="M 305.5,421.5 305.5,436.5" id="use5238" inkscape:connector-curvature="0" sodipodi:nodetypes="cc" style="fill:none;stroke:#0000ff;stroke-linecap:round" transform="matrix(1,0,0,1,0,0)"/>
-  <path d="M 305.5,421.5 305.5,436.5" id="use5244" inkscape:connector-curvature="0" sodipodi:nodetypes="cc" style="fill:none;stroke:#0000ff;stroke-linecap:round" transform="matrix(1,0,0,1,0,0)"/>
-  <path d="M 305.5,421.5 305.5,436.5" id="use5246" inkscape:connector-curvature="0" sodipodi:nodetypes="cc" style="fill:none;stroke:#0000ff;stroke-linecap:round" transform="matrix(1,0,0,1,0,0)"/>
-  <path d="M 319.5,423.5 304.5,423.5" id="path5252" inkscape:connector-curvature="0" sodipodi:nodetypes="cc" style="fill:none;stroke:#0000ff;stroke-linecap:round"/>
-  <path d="M 319.5,423.5 304.5,423.5" id="use5254" inkscape:connector-curvature="0" sodipodi:nodetypes="cc" style="fill:none;stroke:#0000ff;stroke-linecap:round" transform="matrix(1,0,0,1,0,4)"/>
-  <path d="M 319.5,423.5 304.5,423.5" id="use5257" inkscape:connector-curvature="0" sodipodi:nodetypes="cc" style="fill:none;stroke:#0000ff;stroke-linecap:round" transform="matrix(1,0,0,1,0,8)"/>
-  <path d="M 319.5,423.5 304.5,423.5" id="use5259" inkscape:connector-curvature="0" sodipodi:nodetypes="cc" style="fill:none;stroke:#0000ff;stroke-linecap:round" transform="matrix(1,0,0,1,0,12)"/>
-</g>
-
+  <g id="grid-rectangular" inkscape:label="#grid_xy" style="fill:none;stroke:blue;stroke-linecap:round">
+    <path d="m  1.5, 0.5  0,15" />
+    <path d="m  5.5, 0.5  0,15" />
+    <path d="m  9.5, 0.5  0,15" />
+    <path d="m 13.5, 0.5  0,15" />
+    <path d="m  0.5, 2.5 15, 0" />
+    <path d="m  0.5, 6.5 15, 0" />
+    <path d="m  0.5,10.5 15, 0" />
+    <path d="m  0.5,14.5 15, 0" />
+  </g>
 </svg>
diff --git a/share/icons/guides.svg b/share/icons/guides.svg
index 315acd951..5d3859e9f 100644
--- a/share/icons/guides.svg
+++ b/share/icons/guides.svg
@@ -1,32 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   id="svg1"
-   width="13"
+   width="16"
    height="16"
   >
-  <sodipodi:namedview
-     id="base"
-     showgrid="true"
-     gridspacingy="1pt"
-     gridspacingx="1pt"
-     gridoriginy="0pt"
-     gridoriginx="0pt"
-  />
-  <defs id="defs3">
-
-  </defs>
-<g id="guides" inkscape:label="#guide" transform="translate(-305,-421)">
-  <path d="M 305.5,421.5 305.5,436.5" id="path5235-0" inkscape:connector-curvature="0" sodipodi:nodetypes="cc" style="fill:none;stroke:#0000ff;stroke-linecap:round"/>
-  <path d="M 315.5,421.5 310.4026,436.5" id="use5244-0" inkscape:connector-curvature="0" sodipodi:nodetypes="cc" style="fill:none;stroke:#0000ff;stroke-linecap:round"/>
-  <path d="M 305.5,421.5 305.5,436.5" id="use5246-9" inkscape:connector-curvature="0" sodipodi:nodetypes="cc" style="fill:none;stroke:#0000ff;stroke-linecap:round" transform="matrix(1,0,0,1,0,0)"/>
-</g>
-
+  <g id="guides" inkscape:label="#guide" style="fill:none;stroke:blue;stroke-linecap:round">
+    <path d="m  1.5, 0.5  0,15" />
+    <path d="m 11.5, 0.5 -5,15" />
+    <path d="m 13.5, 0.5  0,15" />
+  </g>
 </svg>
diff --git a/share/icons/object-group.svg b/share/icons/object-group.svg
index 041d883d1..706713159 100644
--- a/share/icons/object-group.svg
+++ b/share/icons/object-group.svg
@@ -1,54 +1,37 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   id="svg1"
-   width="16.00001"
-   height="15.999995"
+   width="16"
+   height="16"
   >
-  <sodipodi:namedview
-     id="base"
-     showgrid="true"
-     gridspacingy="1pt"
-     gridspacingx="1pt"
-     gridoriginy="0pt"
-     gridoriginx="0pt"
-  />
-  <defs id="defs3">
-
-    <linearGradient gradientUnits="userSpaceOnUse" id="linearGradient5819" inkscape:collect="always" x1="99.31348" x2="111.6865" xlink:href="#linearGradient5704" y1="210.5" y2="210.5"/>
-    <linearGradient gradientTransform="matrix(1.165662,0,0,1.664561,338.7448,-99.07928)" gradientUnits="userSpaceOnUse" id="linearGradient10396" inkscape:collect="always" x1="20.71646" x2="16.76138" xlink:href="#linearGradient5740" y1="218.8138" y2="215.0763"/>
-    <linearGradient gradientUnits="userSpaceOnUse" id="linearGradient5823" inkscape:collect="always" x1="101.7507" x2="108.8156" xlink:href="#linearGradient5740" y1="205.192" y2="212.9901"/>
-    <linearGradient id="linearGradient5704">
-      <stop id="stop5706" offset="0" style="stop-color:#5a5a5a;stop-opacity:1"/>
-      <stop id="stop5708" offset="1" style="stop-color:#000000;stop-opacity:1"/>
-    </linearGradient>
-    <linearGradient id="linearGradient5740">
-      <stop id="stop5742" offset="0" style="stop-color:#ffffff;stop-opacity:1"/>
-      <stop id="stop5744" offset="1" style="stop-color:#98b6d3;stop-opacity:1"/>
+  <defs>
+    <linearGradient id="linearGradientVector">
+      <stop offset="0" style="stop-color:#ffffff"/>
+      <stop offset="1" style="stop-color:#98b6d3"/>
     </linearGradient>
-    <linearGradient gradientUnits="userSpaceOnUse" id="linearGradient5821" inkscape:collect="always" x1="108.3513" x2="101.1929" xlink:href="#linearGradient5740" y1="215.4819" y2="206.9966"/>
-    <linearGradient gradientTransform="matrix(0.877306,0,0,0.997343,344.0641,45.72171)" gradientUnits="userSpaceOnUse" id="linearGradient10398" inkscape:collect="always" x1="15.64649" x2="17.04738" xlink:href="#linearGradient5740" y1="214.5411" y2="218.9876"/>
-    <linearGradient gradientTransform="matrix(1.124786,0,0,1.000669,344.0026,53.00302)" gradientUnits="userSpaceOnUse" id="linearGradient10394" inkscape:collect="always" x1="11.87961" x2="18.58443" xlink:href="#linearGradient5704" y1="205.4478" y2="211.605"/>
+    <linearGradient gradientUnits="userSpaceOnUse" id="linearGradientRectFill"     x1="8"  x2="6"  xlink:href="#linearGradientVector" y1="13" y2="7" />
+    <linearGradient gradientUnits="userSpaceOnUse" id="linearGradientRectStroke"   x1="6"  x2="8"  xlink:href="#linearGradientVector" y1="7"  y2="13"/>
+    <linearGradient gradientUnits="userSpaceOnUse" id="linearGradientCircleStroke" x1="8"  x2="13" xlink:href="#linearGradientVector" y1="3"  y2="8" />
+    <linearGradient gradientUnits="userSpaceOnUse" id="linearGradientCircleFill"   x1="13" x2="8"  xlink:href="#linearGradientVector" y1="8"  y2="3" />
   </defs>
-<g id="object-group" inkscape:label="#selection_group" transform="translate(-353.32219,-252.15412)">
-  <rect height="7.003806" id="rect10382" style="color:#000000;fill:none;stroke:url(#linearGradient10394);stroke-width:0.9999999;stroke-linejoin:round;stroke-miterlimit:0" width="8.996808" x="355.8222" y="258.6503"/>
-  <rect height="4.999979" id="rect10384" style="color:#000000;fill:url(#linearGradient10396);fill-rule:evenodd;stroke:url(#linearGradient10398);stroke-width:1.0000007;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0" width="6.994814" x="356.8222" y="259.6496"/>
-  <rect height="1.999995" id="rect10765" style="color:#000000;fill:#000000;fill-rule:evenodd;stroke-width:1.0000006" width="2.00001" x="353.3632" y="252.1931"/>
-  <rect height="1.999995" id="use8592" style="color:#000000;fill:#000000;fill-rule:evenodd;stroke-width:1.0000006" transform="matrix(1,0,0,1,13.959,-0.03898)" width="2.00001" x="353.3632" y="252.1931"/>
-  <rect height="1.999995" id="use8594" style="color:#000000;fill:#000000;fill-rule:evenodd;stroke-width:1.0000006" transform="matrix(1,0,0,1,-0.0410000000000004,13.96102)" width="2.00001" x="353.3632" y="252.1931"/>
-  <rect height="1.999995" id="use8596" style="color:#000000;fill:#000000;fill-rule:evenodd;stroke-width:1.0000006" transform="matrix(1,0,0,1,13.959,13.961014998425)" width="2.00001" x="353.3632" y="252.1931"/>
-  <g id="g10379" transform="matrix(1,0,0,1.008019,335.3152,51.42912)"/>
-  <g id="g10421">
-    <circle cx="105.5" cy="210.5" id="path10763" r="5.5" style="color:#000000;fill:none;stroke:url(#linearGradient5819);stroke-width:1.3730356;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0" transform="matrix(0.727881,0,0,0.728748,287.069,104.2892)"/>
-    <circle cx="105.5" cy="210.5" id="path10409" r="5.5" style="color:#000000;fill:url(#linearGradient5821);fill-rule:evenodd;stroke:url(#linearGradient5823);stroke-width:1.8262242;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0" transform="matrix(0.547085,0,0,0.548073,306.1137,142.2991)"/>
-  </g>
+
+  <g id="object-group" inkscape:label="#selection_group">
+    <g>
+      <rect x="2.5" y="6.5" width="9" height="7" style="fill:none;stroke:#222222;stroke-linejoin:round"/>
+      <rect x="3.5" y="7.5" width="7" height="5" style="fill:url(#linearGradientRectFill);stroke:url(#linearGradientRectStroke)"/>
+    </g>
+    <g>
+      <circle cx="10.5" cy="5.5" r="4" style="fill:none;stroke:#222222"/>
+      <circle cx="10.5" cy="5.5" r="3" style="fill:url(#linearGradientCircleFill);stroke:url(#linearGradientCircleStroke)"/>
+    </g>
+
+    <!-- Handles -->
+    <rect x="0"  y="0"  width="2" height="2"/>
+    <rect x="14" y="0"  width="2" height="2"/>
+    <rect x="0"  y="14" width="2" height="2"/>
+    <rect x="14" y="14" width="2" height="2"/>
 </g>
 
 </svg>
diff --git a/share/icons/object-ungroup.svg b/share/icons/object-ungroup.svg
index c303cd5b4..d24281110 100644
--- a/share/icons/object-ungroup.svg
+++ b/share/icons/object-ungroup.svg
@@ -1,62 +1,46 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   id="svg1"
-   width="16.00001"
+   width="16"
    height="16"
   >
-  <sodipodi:namedview
-     id="base"
-     showgrid="true"
-     gridspacingy="1pt"
-     gridspacingx="1pt"
-     gridoriginy="0pt"
-     gridoriginx="0pt"
-  />
-  <defs id="defs3">
-
-    <linearGradient gradientUnits="userSpaceOnUse" id="linearGradient5819" inkscape:collect="always" x1="99.31348" x2="111.6865" xlink:href="#linearGradient5704" y1="210.5" y2="210.5"/>
-    <linearGradient gradientTransform="matrix(1.165669,0,0,1.655559,338.7499,-97.1359)" gradientUnits="userSpaceOnUse" id="linearGradient5827" inkscape:collect="always" x1="17.48326" x2="20.98923" xlink:href="#linearGradient6684" y1="215.0097" y2="218.8156"/>
-    <linearGradient gradientTransform="matrix(0.87731,0,0,0.991952,344.0693,46.88201)" gradientUnits="userSpaceOnUse" id="linearGradient5829" inkscape:collect="always" x1="19.08596" x2="16.10928" xlink:href="#linearGradient6684" y1="219.6944" y2="214.3821"/>
-    <linearGradient gradientUnits="userSpaceOnUse" id="linearGradient5823" inkscape:collect="always" x1="101.7507" x2="108.8156" xlink:href="#linearGradient5740" y1="205.192" y2="212.9901"/>
-    <linearGradient id="linearGradient5704">
-      <stop id="stop5706" offset="0" style="stop-color:#5a5a5a;stop-opacity:1"/>
-      <stop id="stop5708" offset="1" style="stop-color:#000000;stop-opacity:1"/>
-    </linearGradient>
-    <linearGradient gradientTransform="matrix(1.124777,0,0,1.399469,339.507,-41.54364)" gradientUnits="userSpaceOnUse" id="linearGradient5825" inkscape:collect="always" x1="15.15684" x2="22.04275" xlink:href="#linearGradient5704" y1="214.0084" y2="218.3974"/>
-    <linearGradient id="linearGradient5740">
-      <stop id="stop5742" offset="0" style="stop-color:#ffffff;stop-opacity:1"/>
-      <stop id="stop5744" offset="1" style="stop-color:#98b6d3;stop-opacity:1"/>
+  <defs>
+    <linearGradient id="linearGradientRectVector">
+      <stop offset="0" style="stop-color:#ffbf00"/>
+      <stop offset="1" style="stop-color:#ffffff"/>
     </linearGradient>
-    <linearGradient id="linearGradient6684">
-      <stop id="stop6686" offset="0" style="stop-color:#ffbf00;stop-opacity:1"/>
-      <stop id="stop6688" offset="1" style="stop-color:#ffffff;stop-opacity:1"/>
+    <linearGradient gradientUnits="userSpaceOnUse" id="linearGradientRectFill"   x1="6" x2="8" xlink:href="#linearGradientRectVector" y1="7" y2="13"/>
+    <linearGradient gradientUnits="userSpaceOnUse" id="linearGradientRectStroke" x1="8" x2="6" xlink:href="#linearGradientRectVector" y1="13" y2="7"/>
+
+    <linearGradient id="linearGradientCircleVector">
+      <stop offset="0" style="stop-color:#ffffff"/>
+      <stop offset="1" style="stop-color:#98b6d3"/>
     </linearGradient>
-    <linearGradient gradientUnits="userSpaceOnUse" id="linearGradient5821" inkscape:collect="always" x1="108.3513" x2="101.1929" xlink:href="#linearGradient5740" y1="215.4819" y2="206.9966"/>
+    <linearGradient gradientUnits="userSpaceOnUse" id="linearGradientCircleStroke" x1="8" x2="13" xlink:href="#linearGradientCircleVector" y1="3" y2="8"/>
+    <linearGradient gradientUnits="userSpaceOnUse" id="linearGradientCircleFill"   x1="13" x2="8" xlink:href="#linearGradientCircleVector" y1="8" y2="3"/>
   </defs>
-<g id="object-ungroup" inkscape:label="#selection_ungroup" transform="translate(-353.32219,-252.15412)">
-  <g id="g6068">
-    <rect height="6.999161" id="rect9496" style="color:#000000;fill:none;stroke:url(#linearGradient5825);stroke-width:1.0000005;stroke-linejoin:round;stroke-miterlimit:0" width="8.996735" x="355.8274" y="258.6541"/>
-    <rect height="4.972945" id="rect9498" style="color:#000000;fill:url(#linearGradient5827);fill-rule:evenodd;stroke:url(#linearGradient5829);stroke-width:1.0000005;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0" width="6.994853" x="356.8273" y="259.6532"/>
-  </g>
-  <rect height="1.999995" id="use8598" style="color:#000000;fill:#000000;fill-rule:evenodd;stroke-width:1.0000006" transform="matrix(1,0,0,1,4.959,-0.03898)" width="2.00001" x="353.3632" y="252.1931"/>
-  <rect height="1.999995" id="use8601" style="color:#000000;fill:#000000;fill-rule:evenodd;stroke-width:1.0000006" transform="matrix(1,0,0,1,13.959,-0.0389847)" width="2.00001" x="353.3632" y="252.1931"/>
-  <rect height="1.999995" id="use8603" style="color:#000000;fill:#000000;fill-rule:evenodd;stroke-width:1.0000006" transform="matrix(1,0,0,1,-0.0409897,3.96102)" width="2.00001" x="353.3632" y="252.1931"/>
-  <rect height="1.999995" id="use8605" style="color:#000000;fill:#000000;fill-rule:evenodd;stroke-width:1.0000006" transform="matrix(1,0,0,1,13.9590003,8.961015)" width="2.00001" x="353.3632" y="252.1931"/>
-  <rect height="1.999995" id="use8607" style="color:#000000;fill:#000000;fill-rule:evenodd;stroke-width:1.0000006" transform="matrix(1,0,0,1,11.9590103,13.96102)" width="2.00001" x="353.3632" y="252.1931"/>
-  <rect height="1.999995" id="use8609" style="color:#000000;fill:#000000;fill-rule:evenodd;stroke-width:1.0000006" transform="matrix(1,0,0,1,11.9590103,13.96102)" width="2.00001" x="353.3632" y="252.1931"/>
-  <rect height="1.999995" id="use9484" style="color:#000000;fill:#000000;fill-rule:evenodd;stroke-width:1.0000006" transform="matrix(1,0,0,1,4.95900005073548,8.96102)" width="2.00001" x="353.3632" y="252.1931"/>
-  <g id="use10425" transform="matrix(1,0,0,1,-0.0348992,-0.0284392)">
-    <circle cx="105.5" cy="210.5" id="path10763" r="5.5" style="color:#000000;fill:none;stroke:url(#linearGradient5819);stroke-width:1.3730356;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0" transform="matrix(0.727881,0,0,0.728748,287.069,104.2892)"/>
-    <circle cx="105.5" cy="210.5" id="path10409" r="5.5" style="color:#000000;fill:url(#linearGradient5821);fill-rule:evenodd;stroke:url(#linearGradient5823);stroke-width:1.8262242;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0" transform="matrix(0.547085,0,0,0.548073,306.1137,142.2991)"/>
-  </g>
+
+  <g id="object-ungroup" inkscape:label="#selection_ungroup">
+    <g>
+      <rect x="2.5" y="6.5" width="9" height="7" style="fill:none;stroke:#222222;stroke-linejoin:round"/>
+      <rect x="3.5" y="7.5" width="7" height="5" style="fill:url(#linearGradientRectFill);stroke:url(#linearGradientRectStroke)"/>
+    </g>
+    <g>
+      <circle cx="10.5" cy="5.5" r="4" style="fill:none;stroke:#222222"/>
+      <circle cx="10.5" cy="5.5" r="3" style="fill:url(#linearGradientCircleFill);stroke:url(#linearGradientCircleStroke)"/>
+    </g>
+
+    <!-- Handles -->
+    <rect x="5"  y="0"  width="2" height="2"/>
+    <rect x="14" y="0"  width="2" height="2"/>
+    <rect x="5"  y="9"  width="2" height="2"/>
+    <rect x="14" y="9"  width="2" height="2"/>
+
+    <rect x="0"  y="4"  width="2" height="2"/>
+    <rect x="0"  y="14" width="2" height="2"/>
+    <rect x="12" y="14" width="2" height="2"/>
 </g>
 
 </svg>