Fix and cleanup icons.

4 files changed, 101 insertions, 184 deletions

diff --git a/share/icons/edit-clone-unlink.svg b/share/icons/edit-clone-unlink.svg
index 57ba95452..412f33a92 100644
--- a/share/icons/edit-clone-unlink.svg
+++ b/share/icons/edit-clone-unlink.svg
@@ -1,59 +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.011261"
-   height="16.018507"
+   width="16"
+   height="16"
   >
-  <sodipodi:namedview
-     id="base"
-     showgrid="true"
-     gridspacingy="1pt"
-     gridspacingx="1pt"
-     gridoriginy="0pt"
-     gridoriginx="0pt"
-  />
-  <defs id="defs3">
-
-    <linearGradient gradientTransform="matrix(1.66352,0,0,3.319677,-16.32051,-505.9534)" gradientUnits="userSpaceOnUse" id="linearGradient5815" inkscape:collect="always" x1="21.80956" x2="10.29425" xlink:href="#linearGradient5740" y1="219.117" y2="212.9507"/>
-    <linearGradient gradientTransform="matrix(1.124786,0,0,1.142472,-6.359476,-29.34859)" gradientUnits="userSpaceOnUse" id="linearGradient5807" inkscape:collect="always" x1="11.87961" x2="15.65274" xlink:href="#linearGradient5704" y1="205.4478" y2="211.8799"/>
-    <linearGradient gradientTransform="matrix(1.49944,0,0,1.713117,-7.27874,-143.5936)" gradientUnits="userSpaceOnUse" id="linearGradient5813" inkscape:collect="always" x1="11.87961" x2="16.80415" xlink:href="#linearGradient5704" y1="205.4478" y2="210.8717"/>
-    <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 gradientTransform="matrix(0,1,-1.02198,0,139.2735,219.0057)" gradientUnits="userSpaceOnUse" id="linearGradient6664" inkscape:collect="always" x1="-37.33073" x2="-33.69472" xlink:href="#linearGradient5704" y1="187.863" y2="178.6575"/>
-    <linearGradient gradientTransform="matrix(1.165662,0,0,1.995259,-11.61728,-223.557)" gradientUnits="userSpaceOnUse" id="linearGradient5809" inkscape:collect="always" x1="19.63879" x2="17.50228" xlink:href="#linearGradient5740" y1="218.1055" y2="214.8796"/>
-    <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"/>
+  <defs>
+    <linearGradient id="linearGradientVector">
+      <stop offset="0" style="stop-color:#ffffff"/>
+      <stop offset="1" style="stop-color:#98b6d3"/>
     </linearGradient>
-    <linearGradient gradientTransform="matrix(1.02198,0,0,1,-8.921317,-0.991053)" gradientUnits="userSpaceOnUse" id="linearGradient6662" inkscape:collect="always" x1="361.6976" x2="367.2651" xlink:href="#linearGradient900" y1="261.2473" y2="264.4648"/>
-    <linearGradient gradientTransform="matrix(1.252006,0,0,1.989026,-8.72932,-217.1732)" gradientUnits="userSpaceOnUse" id="linearGradient5817" inkscape:collect="always" x1="16.81461" x2="17.98802" xlink:href="#linearGradient5740" y1="213.6587" y2="218.2771"/>
-    <linearGradient id="linearGradient900">
-      <stop id="stop1014" offset="0" style="stop-color:#e4ffa6;stop-opacity:1"/>
-      <stop id="stop1015" offset="1" style="stop-color:#3a7801;stop-opacity:1"/>
+    <linearGradient gradientUnits="userSpaceOnUse" id="linearGradientStroke1" inkscape:collect="always" x1="0"  x2="10" xlink:href="#linearGradientVector" y1="0"  y2="10"/>
+    <linearGradient gradientUnits="userSpaceOnUse" id="linearGradientFill1"   inkscape:collect="always" x1="8"  x2="1"  xlink:href="#linearGradientVector" y1="8"  y2="1" />
+    <linearGradient gradientUnits="userSpaceOnUse" id="linearGradientStroke2" inkscape:collect="always" x1="3"  x2="16" xlink:href="#linearGradientVector" y1="3"  y2="16"/>
+    <linearGradient gradientUnits="userSpaceOnUse" id="linearGradientFill2"   inkscape:collect="always" x1="14" x2="4"  xlink:href="#linearGradientVector" y1="14" y2="4"/>
+
+    <linearGradient id="linearGradientLockVector">
+      <stop offset="0" style="stop-color:#e4ffa6"/>
+      <stop offset="1" style="stop-color:#3a7801"/>
     </linearGradient>
-    <linearGradient gradientTransform="matrix(0.877306,0,0,1.195484,-6.297976,-49.98854)" gradientUnits="userSpaceOnUse" id="linearGradient5811" inkscape:collect="always" x1="14.85535" x2="17.85282" xlink:href="#linearGradient5740" y1="212.7111" y2="218.1995"/>
+    <linearGradient gradientUnits="userSpaceOnUse" id="linearGradientFillLock" inkscape:collect="always" x1="7" x2="12" xlink:href="#linearGradientLockVector" y1="9" y2="12"/>
   </defs>
-<g id="edit-clone-unlink" inkscape:label="#edit_unlink_clone" transform="translate(-353.3836,-252.18513)">
-  <g id="use5649" transform="matrix(1,0,0,1,348.4235001,47.244735132313)">
-    <rect height="7.996297" id="rect5607" style="color:#000000;fill:none;stroke:url(#linearGradient5807);stroke-width:0.9999996;stroke-linejoin:round;stroke-miterlimit:0" width="8.996808" x="5.4601" y="205.4404"/>
-    <rect height="5.993324" id="rect5609" style="color:#000000;fill:url(#linearGradient5809);fill-rule:evenodd;stroke:url(#linearGradient5811);stroke-width:1.0000006;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0" width="6.994814" x="6.46013" y="206.4404"/>
-    <rect height="11.99031" id="rect5611" style="color:#000000;fill:none;stroke:url(#linearGradient5813);stroke-width:0.9999994;stroke-linejoin:round;stroke-miterlimit:0" width="11.99355" x="8.477812" y="208.4686"/>
-    <rect height="9.971587" id="rect5613" style="color:#000000;fill:url(#linearGradient5815);fill-rule:evenodd;stroke:url(#linearGradient5817);stroke-width:1.0000004;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0" width="9.982319" x="9.477811" y="209.4688"/>
-  </g>
-  <rect height="4.001433" id="rect6638" style="color:#000000;fill:url(#linearGradient6662);fill-rule:evenodd;stroke:url(#linearGradient6664);stroke-width:1.0000005;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0" width="5.979028" x="359.9373" y="260.7562"/>
-  <path d="M 63.5,130.5 65.5,130.5" id="use6169" inkscape:connector-curvature="0" style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:square" transform="matrix(1,0,0,1,298.368,127.2036)"/>
-  <path d="M 62.5,131.5 C 62.5,132.5 62.5,132.5 62.5,132.5" id="use6172" inkscape:connector-curvature="0" style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:square" transform="matrix(1,0,0,1,298.368,127.2036)"/>
-  <path d="M 360.8836,263.6851 360.8836,261.6851 364.8836,261.6851" id="path6005" inkscape:connector-curvature="0" style="fill:none;stroke:#ffffff;stroke-width:1px"/>
-</g>
 
+<g id="edit-clone-unlink" inkscape:label="#edit_unlink_clone">
+    <rect x="0.5" y="0.5" width="9" height="9" style="fill:none;stroke:#222222;stroke-linejoin:round"/>
+    <rect x="1.5" y="1.5" width="7" height="7" style="fill:url(#linearGradientFill1);stroke:url(#linearGradientStroke1)"/>
+    <rect x="3.5" y="3.5" width="12" height="12" style="fill:none;stroke:#222222;stroke-linejoin:round"/>
+    <rect x="4.5" y="4.5" width="10" height="10" style="fill:url(#linearGradientFill2);stroke:url(#linearGradientStroke2)"/>
+
+    <!-- Lock -->
+    <rect x="6.5" y="8.5" width="6" height="4" style="fill:url(#linearGradientFillLock);stroke:black;stroke-linejoin:round"/>
+    <path d="m 7.5,11.5 0,-2 4,0" style="fill:none;stroke:white"/>
+    <path d="m 11.5,6 0,2" style="fill:none;stroke:black"/>
+    <path d="m 8,5.5  3,0" style="fill:none;stroke:black"/>
+
+  </g>
 </svg>
diff --git a/share/icons/edit-clone.svg b/share/icons/edit-clone.svg
index cdd718662..c0e40c234 100644
--- a/share/icons/edit-clone.svg
+++ b/share/icons/edit-clone.svg
@@ -1,60 +1,40 @@
 <?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.011261"
-   height="16.018507"
+   width="16"
+   height="16"
   >
-  <sodipodi:namedview
-     id="base"
-     showgrid="true"
-     gridspacingy="1pt"
-     gridspacingx="1pt"
-     gridoriginy="0pt"
-     gridoriginx="0pt"
-  />
-  <defs id="defs3">
-
-    <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 gradientTransform="matrix(0.877306,0,0,1.195484,-6.297976,-49.98854)" gradientUnits="userSpaceOnUse" id="linearGradient5811" inkscape:collect="always" x1="14.85535" x2="17.85282" xlink:href="#linearGradient5740" y1="212.7111" y2="218.1995"/>
-    <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"/>
+  <defs>
+    <linearGradient id="linearGradientVector">
+      <stop offset="0" style="stop-color:#ffffff"/>
+      <stop offset="1" style="stop-color:#98b6d3"/>
     </linearGradient>
-    <linearGradient gradientTransform="matrix(1.252006,0,0,1.989026,-8.72932,-217.1732)" gradientUnits="userSpaceOnUse" id="linearGradient5817" inkscape:collect="always" x1="16.81461" x2="17.98802" xlink:href="#linearGradient5740" y1="213.6587" y2="218.2771"/>
-    <linearGradient gradientTransform="matrix(1.165662,0,0,1.995259,-11.61728,-223.557)" gradientUnits="userSpaceOnUse" id="linearGradient5809" inkscape:collect="always" x1="19.63879" x2="17.50228" xlink:href="#linearGradient5740" y1="218.1055" y2="214.8796"/>
-    <linearGradient gradientTransform="matrix(1.02198,0,0,1,-8.949568,-1)" gradientUnits="userSpaceOnUse" id="linearGradient11815" inkscape:collect="always" x1="361.7094" x2="366.0981" xlink:href="#linearGradient800" y1="261.2473" y2="264.6892"/>
-    <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 gradientUnits="userSpaceOnUse" id="linearGradientStroke1" inkscape:collect="always" x1="0"  x2="10" xlink:href="#linearGradientVector" y1="0"  y2="10"/>
+    <linearGradient gradientUnits="userSpaceOnUse" id="linearGradientFill1"   inkscape:collect="always" x1="8"  x2="1"  xlink:href="#linearGradientVector" y1="8"  y2="1" />
+    <linearGradient gradientUnits="userSpaceOnUse" id="linearGradientStroke2" inkscape:collect="always" x1="3"  x2="16" xlink:href="#linearGradientVector" y1="3"  y2="16"/>
+    <linearGradient gradientUnits="userSpaceOnUse" id="linearGradientFill2"   inkscape:collect="always" x1="14" x2="4"  xlink:href="#linearGradientVector" y1="14" y2="4"/>
+
+    <linearGradient id="linearGradientLockVector">
+      <stop offset="0" style="stop-color:#f3ff49"/>
+      <stop offset="1" style="stop-color:#ffa01e"/>
     </linearGradient>
-    <linearGradient gradientTransform="matrix(1.49944,0,0,1.713117,-7.27874,-143.5936)" gradientUnits="userSpaceOnUse" id="linearGradient5813" inkscape:collect="always" x1="11.87961" x2="16.80415" xlink:href="#linearGradient5704" y1="205.4478" y2="210.8717"/>
-    <linearGradient gradientTransform="matrix(0,1,-1.02198,0,139.2452,218.9968)" gradientUnits="userSpaceOnUse" id="linearGradient6573" inkscape:collect="always" x1="-37.33073" x2="-33.69472" xlink:href="#linearGradient5704" y1="187.863" y2="178.6575"/>
-    <linearGradient gradientTransform="matrix(1.66352,0,0,3.319677,-16.32051,-505.9534)" gradientUnits="userSpaceOnUse" id="linearGradient5815" inkscape:collect="always" x1="21.80956" x2="10.29425" xlink:href="#linearGradient5740" y1="219.117" y2="212.9507"/>
-    <linearGradient gradientTransform="matrix(1.124786,0,0,1.142472,-6.359476,-29.34859)" gradientUnits="userSpaceOnUse" id="linearGradient5807" inkscape:collect="always" x1="11.87961" x2="15.65274" xlink:href="#linearGradient5704" y1="205.4478" y2="211.8799"/>
+    <linearGradient gradientUnits="userSpaceOnUse" id="linearGradientFillLock" inkscape:collect="always" x1="7" x2="12" xlink:href="#linearGradientLockVector" y1="9" y2="12"/>
   </defs>
-<g id="edit-clone" inkscape:label="#edit_clone" transform="translate(-353.3567,-252.18514)">
-  <g id="use6150" transform="translate(348.3966,47.24474)">
-    <rect height="7.996297" id="rect5607" style="color:#000000;fill:none;stroke:url(#linearGradient5807);stroke-width:0.9999996;stroke-linejoin:round;stroke-miterlimit:0" width="8.996808" x="5.4601" y="205.4404"/>
-    <rect height="5.993324" id="rect5609" style="color:#000000;fill:url(#linearGradient5809);fill-rule:evenodd;stroke:url(#linearGradient5811);stroke-width:1.0000006;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0" width="6.994814" x="6.46013" y="206.4404"/>
-    <rect height="11.99031" id="rect5611" style="color:#000000;fill:none;stroke:url(#linearGradient5813);stroke-width:0.9999994;stroke-linejoin:round;stroke-miterlimit:0" width="11.99355" x="8.477812" y="208.4686"/>
-    <rect height="9.971587" id="rect5613" style="color:#000000;fill:url(#linearGradient5815);fill-rule:evenodd;stroke:url(#linearGradient5817);stroke-width:1.0000004;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0" width="9.982319" x="9.477811" y="209.4688"/>
-  </g>
-  <rect height="4.001433" id="rect10978" style="color:#000000;fill:url(#linearGradient11815);fill-rule:evenodd;stroke:url(#linearGradient6573);stroke-width:1.0000005;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0" width="5.979028" x="359.909" y="260.7473"/>
-  <path d="M 62.5,131.5 C 62.5,132.5 62.5,132.5 62.5,132.5" id="path6162" inkscape:connector-curvature="0" style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:square" transform="translate(298.368,127.2036)"/>
-  <path d="M 62.5,131.5 C 62.5,132.5 62.5,132.5 62.5,132.5" id="use6164" inkscape:connector-curvature="0" style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:square" transform="matrix(1,0,0,1,298.368,127.2036)"/>
-  <path d="M 63.5,130.5 65.5,130.5" id="path6167" inkscape:connector-curvature="0" style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:square" transform="translate(298.368,127.2036)"/>
-  <path d="M 360.8567,263.6852 360.8567,261.6852 364.8567,261.6852" id="path5069" inkscape:connector-curvature="0" style="fill:none;stroke:#ffffff;stroke-width:1px"/>
-</g>
 
+  <g id="edit-clone" inkscape:label="#edit_clone">
+    <rect x="0.5" y="0.5" width="9" height="9" style="fill:none;stroke:#222222;stroke-linejoin:round"/>
+    <rect x="1.5" y="1.5" width="7" height="7" style="fill:url(#linearGradientFill1);stroke:url(#linearGradientStroke1)"/>
+    <rect x="3.5" y="3.5" width="12" height="12" style="fill:none;stroke:#222222;stroke-linejoin:round"/>
+    <rect x="4.5" y="4.5" width="10" height="10" style="fill:url(#linearGradientFill2);stroke:url(#linearGradientStroke2)"/>
+
+    <!-- Lock -->
+    <rect x="6.5" y="8.5" width="6" height="4" style="fill:url(#linearGradientFillLock);stroke:black;stroke-linejoin:round"/>
+    <path d="m 7.5,11.5 0,-2 4,0" style="fill:none;stroke:white"/>
+    <path d="m 7.5,6  0,2" style="fill:none;stroke:black"/>
+    <path d="m 11.5,6 0,2" style="fill:none;stroke:black"/>
+    <path d="m 8,5.5  3,0" style="fill:none;stroke:black"/>
+
+  </g>
 </svg>
diff --git a/share/icons/edit-duplicate.svg b/share/icons/edit-duplicate.svg
index 71b343ab1..692ed310b 100644
--- a/share/icons/edit-duplicate.svg
+++ b/share/icons/edit-duplicate.svg
@@ -1,49 +1,26 @@
 <?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.011261"
-   height="16.018507"
+   width="16"
+   height="16"
   >
-  <sodipodi:namedview
-     id="base"
-     showgrid="true"
-     gridspacingy="1pt"
-     gridspacingx="1pt"
-     gridoriginy="0pt"
-     gridoriginx="0pt"
-  />
-  <defs id="defs3">
-
-    <linearGradient gradientTransform="matrix(1.49944,0,0,1.713117,-7.27874,-143.5936)" gradientUnits="userSpaceOnUse" id="linearGradient6138" inkscape:collect="always" x1="11.87961" x2="16.80415" xlink:href="#linearGradient5704" y1="205.4478" y2="210.8717"/>
-    <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.124786,0,0,1.142472,-6.359476,-29.34859)" gradientUnits="userSpaceOnUse" id="linearGradient6124" inkscape:collect="always" x1="11.87961" x2="15.65274" xlink:href="#linearGradient5704" y1="205.4478" y2="211.8799"/>
-    <linearGradient gradientTransform="matrix(0.877306,0,0,1.195484,-6.297976,-49.98854)" gradientUnits="userSpaceOnUse" id="linearGradient6128" inkscape:collect="always" x1="15.38278" x2="18.5289" xlink:href="#linearGradient5740" y1="212.9046" y2="218.7801"/>
-    <linearGradient gradientTransform="matrix(1.66352,0,0,3.319677,-16.32051,-505.9534)" gradientUnits="userSpaceOnUse" id="linearGradient6140" inkscape:collect="always" x1="21.80956" x2="14.53613" xlink:href="#linearGradient5740" y1="219.2215" y2="215.1112"/>
-    <linearGradient gradientTransform="matrix(1.165662,0,0,1.995259,-11.61728,-223.557)" gradientUnits="userSpaceOnUse" id="linearGradient6126" inkscape:collect="always" x1="19.63879" x2="17.50228" xlink:href="#linearGradient5740" y1="218.1055" y2="214.8796"/>
-    <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 gradientTransform="matrix(1.252006,0,0,1.989026,-8.72932,-217.1732)" gradientUnits="userSpaceOnUse" id="linearGradient6142" inkscape:collect="always" x1="16.35263" x2="17.98802" xlink:href="#linearGradient5740" y1="214.6474" y2="218.2771"/>
+    <linearGradient gradientUnits="userSpaceOnUse" id="linearGradientStroke1" inkscape:collect="always" x1="0"  x2="10" xlink:href="#linearGradientVector" y1="0"  y2="10"/>
+    <linearGradient gradientUnits="userSpaceOnUse" id="linearGradientFill1"   inkscape:collect="always" x1="8"  x2="1"  xlink:href="#linearGradientVector" y1="8"  y2="1" />
+    <linearGradient gradientUnits="userSpaceOnUse" id="linearGradientStroke2" inkscape:collect="always" x1="3"  x2="16" xlink:href="#linearGradientVector" y1="3"  y2="16"/>
+    <linearGradient gradientUnits="userSpaceOnUse" id="linearGradientFill2"   inkscape:collect="always" x1="14" x2="4"  xlink:href="#linearGradientVector" y1="14" y2="4"/>
   </defs>
-<g id="edit-duplicate" inkscape:label="#edit_duplicate" transform="translate(-4.9601,-204.940399)">
-  <g id="g6144">
-    <rect height="7.996297" id="rect6120" style="color:#000000;fill:none;stroke:url(#linearGradient6124);stroke-width:0.9999996;stroke-linejoin:round;stroke-miterlimit:0" width="8.996808" x="5.4601" y="205.4404"/>
-    <rect height="5.993324" id="rect6122" style="color:#000000;fill:url(#linearGradient6126);fill-rule:evenodd;stroke:url(#linearGradient6128);stroke-width:1.0000006;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0" width="6.994814" x="6.46013" y="206.4404"/>
-    <rect height="11.99031" id="rect6134" style="color:#000000;fill:none;stroke:url(#linearGradient6138);stroke-width:0.9999994;stroke-linejoin:round;stroke-miterlimit:0" width="11.99355" x="8.477812" y="208.4686"/>
-    <rect height="9.971587" id="rect6136" style="color:#000000;fill:url(#linearGradient6140);fill-rule:evenodd;stroke:url(#linearGradient6142);stroke-width:1.0000004;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0" width="9.982319" x="9.477811" y="209.4688"/>
+  <g id="edit-duplicate" inkscape:label="#edit_duplicate">
+    <rect x="0.5" y="0.5" width="9" height="9" style="fill:none;stroke:#222222;stroke-linejoin:round"/>
+    <rect x="1.5" y="1.5" width="7" height="7" style="fill:url(#linearGradientFill1);stroke:url(#linearGradientStroke1)"/>
+    <rect x="3.5" y="3.5" width="12" height="12" style="fill:none;stroke:#222222;stroke-linejoin:round"/>
+    <rect x="4.5" y="4.5" width="10" height="10" style="fill:url(#linearGradientFill2);stroke:url(#linearGradientStroke2)"/>
   </g>
-</g>
 
 </svg>
diff --git a/share/icons/edit-select-original.svg b/share/icons/edit-select-original.svg
index 869ac9c37..7b7ddf92b 100644
--- a/share/icons/edit-select-original.svg
+++ b/share/icons/edit-select-original.svg
@@ -1,60 +1,40 @@
 <?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.011261"
-   height="16.018416"
+   width="16"
+   height="16"
   >
-  <sodipodi:namedview
-     id="base"
-     showgrid="true"
-     gridspacingy="1pt"
-     gridspacingx="1pt"
-     gridoriginy="0pt"
-     gridoriginx="0pt"
-  />
-  <defs id="defs3">
-
-    <linearGradient gradientTransform="matrix(1.02198,0,0,1,-307.3063,52.7964)" gradientUnits="userSpaceOnUse" id="linearGradient6122" inkscape:collect="always" x1="361.7094" x2="366.0981" xlink:href="#linearGradient800" y1="261.2473" y2="264.6892"/>
-    <linearGradient gradientTransform="matrix(1.252006,0,0,1.989026,41.31058,-116.1321)" gradientUnits="userSpaceOnUse" id="linearGradient6148" inkscape:collect="always" x1="16.81461" x2="17.98802" xlink:href="#linearGradient5740" y1="213.6587" y2="218.2771"/>
-    <linearGradient gradientTransform="matrix(1.124786,0,0,1.142472,43.68042,71.69251)" gradientUnits="userSpaceOnUse" id="linearGradient6159" inkscape:collect="always" x1="11.87961" x2="15.65274" xlink:href="#linearGradient5704" y1="205.4478" y2="211.8799"/>
-    <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 gradientTransform="matrix(0,1,-1.02198,0,-159.1115,272.7932)" gradientUnits="userSpaceOnUse" id="linearGradient6125" inkscape:collect="always" x1="-37.33073" x2="-33.69472" xlink:href="#linearGradient5704" y1="187.863" y2="178.6575"/>
-    <linearGradient gradientTransform="matrix(1.165662,0,0,1.995259,38.42262,-122.5159)" gradientUnits="userSpaceOnUse" id="linearGradient6154" inkscape:collect="always" x1="19.63879" x2="17.50228" xlink:href="#linearGradient5740" y1="218.1055" y2="214.8796"/>
-    <linearGradient gradientTransform="matrix(1.49944,0,0,1.713117,42.76116,-42.5525)" gradientUnits="userSpaceOnUse" id="linearGradient6151" inkscape:collect="always" x1="11.87961" x2="16.80415" xlink:href="#linearGradient5704" y1="205.4478" y2="210.8717"/>
-    <linearGradient gradientTransform="matrix(0.877306,0,0,1.195484,43.74192,51.05256)" gradientUnits="userSpaceOnUse" id="linearGradient6156" inkscape:collect="always" x1="14.85535" x2="17.85282" xlink:href="#linearGradient5740" y1="212.7111" y2="218.1995"/>
-    <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"/>
+  <defs>
+    <linearGradient id="linearGradientVector">
+      <stop offset="0" style="stop-color:#ffffff"/>
+      <stop offset="1" style="stop-color:#98b6d3"/>
     </linearGradient>
-    <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="linearGradientStroke1" inkscape:collect="always" x1="0"  x2="10" xlink:href="#linearGradientVector" y1="0"  y2="10"/>
+    <linearGradient gradientUnits="userSpaceOnUse" id="linearGradientFill1"   inkscape:collect="always" x1="8"  x2="1"  xlink:href="#linearGradientVector" y1="8"  y2="1" />
+    <linearGradient gradientUnits="userSpaceOnUse" id="linearGradientStroke2" inkscape:collect="always" x1="3"  x2="16" xlink:href="#linearGradientVector" y1="3"  y2="16"/>
+    <linearGradient gradientUnits="userSpaceOnUse" id="linearGradientFill2"   inkscape:collect="always" x1="14" x2="4"  xlink:href="#linearGradientVector" y1="14" y2="4"/>
+
+    <linearGradient id="linearGradientLockVector">
+      <stop offset="0" style="stop-color:#f3ff49"/>
+      <stop offset="1" style="stop-color:#ffa01e"/>
     </linearGradient>
-    <linearGradient gradientTransform="matrix(1.66352,0,0,3.319677,33.71939,-404.9123)" gradientUnits="userSpaceOnUse" id="linearGradient6146" inkscape:collect="always" x1="21.80956" x2="10.29425" xlink:href="#linearGradient5740" y1="219.117" y2="212.9507"/>
+    <linearGradient gradientUnits="userSpaceOnUse" id="linearGradientFillLock" inkscape:collect="always" x1="7" x2="12" xlink:href="#linearGradientLockVector" y1="9" y2="12"/>
   </defs>
-<g id="edit-select-original" inkscape:label="#edit_select_original" transform="translate(-55,-305.98151)">
-  <rect height="11.99031" id="rect5972" style="color:#000000;fill:none;stroke:url(#linearGradient6151);stroke-width:0.9999994;stroke-linejoin:round;stroke-miterlimit:0" width="11.99355" x="58.51771" y="309.5096"/>
-  <rect height="9.971587" id="rect5974" style="color:#000000;fill:url(#linearGradient6146);fill-rule:evenodd;stroke:url(#linearGradient6148);stroke-width:1.0000004;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0" width="9.982319" x="59.51771" y="310.5099"/>
-  <rect height="4.001433" id="rect5976" style="color:#000000;fill:url(#linearGradient6122);fill-rule:evenodd;stroke:url(#linearGradient6125);stroke-width:1.0000005;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0" width="5.979028" x="61.5523" y="314.5437"/>
-  <path d="M 62.5113,312.5 C 62.5113,313.5 62.5113,313.5 62.5113,313.5" id="path5978" inkscape:connector-curvature="0" style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:square"/>
-  <path d="M 62.5,131.5 C 62.5,132.5 62.5,132.5 62.5,132.5" id="use5981" inkscape:connector-curvature="0" style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:square" transform="matrix(1,0,0,1,4.01130000000001,181)"/>
-  <path d="M 63.5113,311.5 65.5113,311.5" id="path5983" inkscape:connector-curvature="0" style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:square"/>
-  <path d="M 62.5,317.4816 62.5,315.4816 66.5,315.4816" id="path5985" inkscape:connector-curvature="0" style="fill:none;stroke:#ffffff;stroke-width:1px"/>
-  <g id="g6161">
-    <rect height="7.996297" id="rect5968" style="color:#000000;fill:none;stroke:url(#linearGradient6159);stroke-width:0.9999996;stroke-linejoin:round;stroke-miterlimit:0" width="8.996808" x="55.5" y="306.4815"/>
-    <rect height="5.993324" id="rect5970" style="color:#000000;fill:url(#linearGradient6154);fill-rule:evenodd;stroke:url(#linearGradient6156);stroke-width:1.0000006;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0" width="6.994814" x="56.50003" y="307.4814"/>
-  </g>
-</g>
 
+  <g id="edit-select-original" inkscape:label="#edit_select_original">
+    <rect x="3.5" y="3.5" width="12" height="12" style="fill:none;stroke:#222222;stroke-linejoin:round"/>
+    <rect x="4.5" y="4.5" width="10" height="10" style="fill:url(#linearGradientFill2);stroke:url(#linearGradientStroke2)"/>
+
+    <!-- Lock -->
+    <rect x="6.5" y="8.5" width="6" height="4" style="fill:url(#linearGradientFillLock);stroke:black;stroke-linejoin:round"/>
+    <path d="m 7.5,11.5 0,-2 4,0" style="fill:none;stroke:white"/>
+    <path d="m 7.5,6  0,2" style="fill:none;stroke:black"/>
+    <path d="m 11.5,6 0,2" style="fill:none;stroke:black"/>
+    <path d="m 8,5.5  3,0" style="fill:none;stroke:black"/>
+
+    <rect x="0.5" y="0.5" width="9" height="9" style="fill:none;stroke:#222222;stroke-linejoin:round"/>
+    <rect x="1.5" y="1.5" width="7" height="7" style="fill:url(#linearGradientFill1);stroke:url(#linearGradientStroke1)"/>
+  </g>
 </svg>