diff --git a/src/Gui/Icons/Part_Measure_Clear_All.svg b/src/Gui/Icons/Part_Measure_Clear_All.svg
deleted file mode 100644
index 61ccbcc802..0000000000
--- a/src/Gui/Icons/Part_Measure_Clear_All.svg
+++ /dev/null
@@ -1,626 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="64px"
-   height="64px"
-   id="svg2943"
-   sodipodi:version="0.32"
-   inkscape:version="0.92.1 r15371"
-   sodipodi:docname="Part_Measure_Clear_All.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   version="1.1">
-  <defs
-     id="defs2945">
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3876">
-      <stop
-         style="stop-color:#956363;stop-opacity:1;"
-         offset="0"
-         id="stop3878" />
-      <stop
-         style="stop-color:#ebe0a9;stop-opacity:1"
-         offset="1"
-         id="stop3880" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3858">
-      <stop
-         style="stop-color:#956363;stop-opacity:1;"
-         offset="0"
-         id="stop3860" />
-      <stop
-         style="stop-color:#d17878;stop-opacity:1;"
-         offset="1"
-         id="stop3862" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4158">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop4160" />
-      <stop
-         style="stop-color:#f6f6f6;stop-opacity:0;"
-         offset="1"
-         id="stop4162" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4122">
-      <stop
-         style="stop-color:#e3d328;stop-opacity:1;"
-         offset="0"
-         id="stop4124" />
-      <stop
-         style="stop-color:#e1dec3;stop-opacity:1;"
-         offset="1"
-         id="stop4126" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4088">
-      <stop
-         style="stop-color:#e9cd23;stop-opacity:1;"
-         offset="0"
-         id="stop4090" />
-      <stop
-         style="stop-color:#040000;stop-opacity:0;"
-         offset="1"
-         id="stop4092" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient4060">
-      <stop
-         style="stop-color:#ada9a9;stop-opacity:1;"
-         offset="0"
-         id="stop4062" />
-      <stop
-         style="stop-color:#ada9a9;stop-opacity:0;"
-         offset="1"
-         id="stop4064" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4052">
-      <stop
-         style="stop-color:#ada9a9;stop-opacity:1;"
-         offset="0"
-         id="stop4054" />
-      <stop
-         style="stop-color:#ada9a9;stop-opacity:0;"
-         offset="1"
-         id="stop4056" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4349">
-      <stop
-         style="stop-color:#898709;stop-opacity:1;"
-         offset="0"
-         id="stop4351" />
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="1"
-         id="stop4353" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5241">
-      <stop
-         style="stop-color:#212c45;stop-opacity:1;"
-         offset="0"
-         id="stop5243" />
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="1"
-         id="stop5245" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5227"
-       osb:paint="solid">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop5229" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3902">
-      <stop
-         style="stop-color:#000000;stop-opacity:0.58823532;"
-         offset="0"
-         id="stop3904" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0.39215687;"
-         offset="1"
-         id="stop3906" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3894">
-      <stop
-         style="stop-color:#45351d;stop-opacity:1;"
-         offset="0"
-         id="stop3896" />
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="1"
-         id="stop3898" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3886">
-      <stop
-         style="stop-color:#45351d;stop-opacity:1;"
-         offset="0"
-         id="stop3888" />
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="1"
-         id="stop3890" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3792">
-      <stop
-         style="stop-color:#aaaaaa;stop-opacity:1;"
-         offset="0"
-         id="stop3794" />
-      <stop
-         style="stop-color:#d2d2d2;stop-opacity:1;"
-         offset="1"
-         id="stop3796" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3784">
-      <stop
-         style="stop-color:#bebebe;stop-opacity:1;"
-         offset="0"
-         id="stop3786" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.39215687;"
-         offset="1"
-         id="stop3788" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3377">
-      <stop
-         id="stop3379"
-         offset="0"
-         style="stop-color:#71b2f8;stop-opacity:1;" />
-      <stop
-         id="stop3381"
-         offset="1"
-         style="stop-color:#002795;stop-opacity:1;" />
-    </linearGradient>
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 32 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="64 : 32 : 1"
-       inkscape:persp3d-origin="32 : 21.333333 : 1"
-       id="perspective2951" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4052"
-       id="linearGradient4058"
-       x1="138.99986"
-       y1="44.863674"
-       x2="92.497559"
-       y2="-14.356517"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(248.6744,65.825928)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4060"
-       id="linearGradient4066"
-       x1="103.93729"
-       y1="49.179436"
-       x2="120.49899"
-       y2="0.21229285"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(248.6744,65.825928)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4122"
-       id="linearGradient4128"
-       x1="391.3074"
-       y1="120.81136"
-       x2="394.43201"
-       y2="112.43636"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-8.034794,-1.0606602)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4158"
-       id="linearGradient4164"
-       x1="419.99387"
-       y1="102.77802"
-       x2="458.7193"
-       y2="69.431564"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-49.22376,-0.88388348)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4122"
-       id="linearGradient3856"
-       x1="116.83871"
-       y1="21.107124"
-       x2="89.015228"
-       y2="23.486774"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3858"
-       id="linearGradient3864"
-       x1="94.744598"
-       y1="31.189295"
-       x2="70.261253"
-       y2="42.461311"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3876"
-       id="linearGradient3882"
-       x1="123.75154"
-       y1="-0.084563509"
-       x2="104.85488"
-       y2="16.387842"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3858"
-       id="linearGradient3892"
-       gradientUnits="userSpaceOnUse"
-       x1="94.744598"
-       y1="31.189295"
-       x2="70.261253"
-       y2="42.461311" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4122"
-       id="linearGradient3895"
-       gradientUnits="userSpaceOnUse"
-       x1="116.83871"
-       y1="21.107124"
-       x2="89.015228"
-       y2="23.486774" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3876"
-       id="linearGradient3897"
-       gradientUnits="userSpaceOnUse"
-       x1="123.75154"
-       y1="-0.084563509"
-       x2="104.85488"
-       y2="16.387842" />
-    <filter
-       id="filter3911"
-       inkscape:menu-tooltip="Make the lightest parts of the object progressively transparent"
-       inkscape:menu="Transparency utilities"
-       inkscape:label="Light eraser"
-       height="1"
-       width="1"
-       y="0"
-       x="0"
-       color-interpolation-filters="sRGB">
-      <feColorMatrix
-         id="feColorMatrix3913"
-         result="result14"
-         type="luminanceToAlpha"
-         in="SourceGraphic" />
-      <feComposite
-         id="feComposite3915"
-         in2="result14"
-         in="SourceGraphic"
-         result="fbSourceGraphic"
-         operator="out" />
-      <feBlend
-         id="feBlend3917"
-         in2="fbSourceGraphic"
-         mode="normal"
-         result="result15" />
-    </filter>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4061"
-       id="linearGradient4059"
-       gradientUnits="userSpaceOnUse"
-       x1="266.08176"
-       y1="90.401306"
-       x2="301.7092"
-       y2="119.88659" />
-    <linearGradient
-       id="linearGradient4061"
-       inkscape:collect="always">
-      <stop
-         id="stop4063"
-         offset="0"
-         style="stop-color:#ef2929;stop-opacity:1" />
-      <stop
-         id="stop4065"
-         offset="1"
-         style="stop-color:#a40000;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       gradientTransform="matrix(-0.02477995,1.1554758,-1.231953,0.36165297,588.8059,-370.77187)"
-       inkscape:collect="always"
-       xlink:href="#linearGradient3944"
-       id="linearGradient3950"
-       x1="285.7092"
-       y1="75.886589"
-       x2="301.7092"
-       y2="119.88659"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3944">
-      <stop
-         style="stop-color:#8ae234;stop-opacity:1"
-         offset="0"
-         id="stop3946" />
-      <stop
-         style="stop-color:#4e9a06;stop-opacity:1"
-         offset="1"
-         id="stop3948" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3953"
-       id="linearGradient3959"
-       x1="214.70918"
-       y1="80.886589"
-       x2="218.70918"
-       y2="104.88659"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.02477995,1.1554758,-1.231953,0.36165297,586.8235,-278.33381)" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3953">
-      <stop
-         style="stop-color:#babdb6;stop-opacity:1"
-         offset="0"
-         id="stop3955" />
-      <stop
-         style="stop-color:#555753;stop-opacity:1"
-         offset="1"
-         id="stop3957" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3961"
-       id="linearGradient3967"
-       x1="196.70918"
-       y1="106.88659"
-       x2="190.70918"
-       y2="80.886589"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.02477995,1.1554758,-1.231953,0.36165297,586.8235,-278.33381)" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3961">
-      <stop
-         style="stop-color:#babdb6;stop-opacity:1"
-         offset="0"
-         id="stop3963" />
-      <stop
-         style="stop-color:#d3d7cf;stop-opacity:1"
-         offset="1"
-         id="stop3965" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3961"
-       id="linearGradient3196"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.02477995,1.1554758,-1.231953,0.36165297,586.8235,-278.33381)"
-       x1="196.70918"
-       y1="106.88659"
-       x2="190.70918"
-       y2="80.886589" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3953"
-       id="linearGradient3198"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.02477995,1.1554758,-1.231953,0.36165297,586.8235,-278.33381)"
-       x1="214.70918"
-       y1="80.886589"
-       x2="218.70918"
-       y2="104.88659" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1.4114514"
-     inkscape:cx="2.5629415"
-     inkscape:cy="48.271732"
-     inkscape:current-layer="g3939"
-     showgrid="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     inkscape:window-width="1366"
-     inkscape:window-height="705"
-     inkscape:window-x="-8"
-     inkscape:window-y="-8"
-     inkscape:window-maximized="1">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3080"
-       empspacing="2"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata2948">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <g
-       id="g3629"
-       transform="translate(-256.70919,-66.886588)">
-      <path
-         style="fill:#e3d328;fill-opacity:1;stroke:#040400;stroke-width:0.08838835;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d=""
-         id="path4102"
-         inkscape:connector-curvature="0"
-         transform="translate(256.70919,66.886588)" />
-      <g
-         id="g3973"
-         transform="matrix(-0.78031416,0.35176755,0.0870326,0.86674487,567.28599,-160.53129)"
-         style="stroke:#271903;stroke-width:1">
-        <g
-           id="g3939"
-           style="stroke-width:1"
-           transform="matrix(-0.41402493,-0.77441636,-1.0699456,0.41402494,675.14647,458.62926)">
-          <g
-             id="g3182"
-             transform="translate(-2.2797554,106.30378)">
-            <path
-               sodipodi:nodetypes="ccccccc"
-               inkscape:connector-curvature="0"
-               id="path3100"
-               d="m 485.77342,-12.473898 5.57209,-31.488982 c -13.55148,3.978183 -32.03078,9.402978 -44.39987,15.330459 l -15.52683,39.004106 7.39172,-2.1699102 4.97737,-3.75757 c 14.58519,4.90397 29.56687,-8.67967 41.98552,-16.9181028 z"
-               style="fill:#babdb6;stroke:#2e3436;stroke-width:2.37868047;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1" />
-            <path
-               inkscape:connector-curvature="0"
-               id="path3890"
-               d="m 431.41881,10.371685 4.63045,12.4191 7.39172,-2.16992 -4.63045,-12.4190902 z"
-               style="fill:#555753;stroke:#2e3436;stroke-width:2.37868047;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1" />
-            <path
-               inkscape:connector-curvature="0"
-               id="path3892"
-               d="m 448.41835,16.863305 -4.63045,-12.4191002 -4.97737,3.75757 4.63045,12.4190902 z"
-               style="fill:#d3d7cf;stroke:#2e3436;stroke-width:2.37868047;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-            <path
-               sodipodi:nodetypes="ccccc"
-               inkscape:connector-curvature="0"
-               id="path3894"
-               d="M 485.77342,-12.473898 C 473.35477,-4.2354652 458.37309,9.3481748 443.7879,4.4442048 l 4.63045,12.4191002 c 14.5852,4.90397 29.56687,-8.6796702 41.98552,-16.91811022 z"
-               style="fill:#888a85;stroke:#2e3436;stroke-width:2.37868047;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-            <path
-               sodipodi:nodetypes="ccccc"
-               inkscape:connector-curvature="0"
-               id="path3888"
-               d="m 491.34551,-43.96288 4.63045,12.419098 -5.57209,31.48897678 -4.63045,-12.41909278 z"
-               style="fill:#d3d7cf;stroke:#2e3436;stroke-width:2.37868047;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1" />
-            <path
-               sodipodi:nodetypes="ccccccc"
-               inkscape:connector-curvature="0"
-               id="path3100-6"
-               d="m 483.4674,-13.404423 5.36465,-27.5242 c -12.3731,3.632254 -28.91309,8.473394 -40.20628,13.869744 l -13.46154,34.0346538 3.07988,-0.90413 5.5983,-4.16948 c 14.5852,4.90397 27.07324,-6.5698 39.62499,-15.3065878 z"
-               style="fill:url(#linearGradient3196);fill-opacity:1;stroke:#d3d7cf;stroke-width:2.37867999;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-            <path
-               sodipodi:nodetypes="ccccc"
-               inkscape:connector-curvature="0"
-               id="path3894-7"
-               d="M 484.23065,-9.0356772 C 471.812,-0.79724522 461.45298,8.4440448 448.00061,7.8003248 l 2.54675,6.8305002 c 10.9389,3.67798 23.742,-5.3622302 36.92956,-15.20423022 z"
-               style="fill:url(#linearGradient3198);fill-opacity:1;stroke:#babdb6;stroke-width:2.37868047;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-            <path
-               transform="matrix(-0.26138323,0.99529292,-1.2077963,0.35456154,487.87344,60.853785)"
-               d="m -78,39 a 15,15 0 0 1 -15,15 15,15 0 0 1 -15,-15 15,15 0 0 1 15,-15 15,15 0 0 1 15,15 z"
-               sodipodi:ry="15"
-               sodipodi:rx="15"
-               sodipodi:cy="39"
-               sodipodi:cx="-93"
-               id="path3932"
-               style="fill:#555753;fill-opacity:1;stroke:#2e3436;stroke-width:2.25831866;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:1.6"
-               sodipodi:type="arc" />
-            <path
-               sodipodi:nodetypes="ccsc"
-               inkscape:connector-curvature="0"
-               id="path3932-5"
-               d="m 461.15727,-2.9511652 7.8415,-29.8587838 c 0,0 17.38477,-6.04764 14.19619,9.610971 -2.76605,13.5837028 -22.03769,20.2478128 -22.03769,20.2478128 z"
-               style="fill:#edd400;fill-opacity:1;stroke:#302b00;stroke-width:2.37868047;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:1.6" />
-            <path
-               sodipodi:nodetypes="ccccc"
-               inkscape:connector-curvature="0"
-               id="path3894-7-9"
-               d="m 469.53501,2.6268748 c -4.97737,3.75756 -13.62582,7.4446102 -18.50407,6.58027 l 1.13283,4.2602502 c 4.87825,0.86434 13.50192,-1.66723 18.4793,-5.4248002 z"
-               style="fill:#edd400;fill-opacity:1;stroke:#302b00;stroke-width:2.37868047;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-            <path
-               sodipodi:nodetypes="ccccc"
-               inkscape:connector-curvature="0"
-               id="path4003"
-               d="m 436.29706,11.236025 3.49762,8.15885 -6.55624,20.29588 -4.77914,-5.48624 z"
-               style="fill:#edd400;stroke:#302b00;stroke-width:2.37868047;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-            <path
-               sodipodi:nodetypes="ccccc"
-               inkscape:connector-curvature="0"
-               id="path4005"
-               d="m 433.23844,39.690755 -4.92782,1.44661 -4.77913,-5.48624 4.92781,-1.44661 z"
-               style="fill:#d3d7cf;stroke:#2e3436;stroke-width:2.37868047;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1" />
-          </g>
-          <g
-             id="g3890-0"
-             transform="matrix(-0.02477995,1.1554758,-1.231953,0.36165297,539.67526,-29.301855)">
-            <rect
-               transform="matrix(-0.70710678,0.70710678,0.70710678,0.70710678,0,0)"
-               ry="2"
-               y="110.13708"
-               x="-19.97056"
-               height="6"
-               width="36.76955"
-               id="rect3839-0"
-               style="fill:#cc0000;fill-opacity:1;stroke:#280000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-            <rect
-               transform="rotate(45)"
-               ry="2"
-               y="-4.5857863"
-               x="94.752312"
-               height="6"
-               width="36.76955"
-               id="rect3839-5-8"
-               style="fill:#cc0000;fill-opacity:1;stroke:#280000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-            <rect
-               transform="rotate(-45)"
-               ry="0"
-               y="112.14682"
-               x="-4.8928065"
-               height="2"
-               width="13"
-               id="rect3888-0"
-               style="fill:#cc0000;stroke:#cc0000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-          </g>
-          <path
-             style="fill:none;stroke:#ef2929;stroke-width:2.37868047;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
-             d="M 438.93871,90.258929 427.41855,82.734492"
-             id="path3922"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="cc" />
-          <path
-             style="fill:none;stroke:#ef2929;stroke-width:2.37868047;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
-             d="M 455.30447,101.05805 443.70535,93.481696"
-             id="path3922-2"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="cc" />
-          <path
-             style="fill:none;stroke:#ef2929;stroke-width:2.37868047;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
-             d="m 455.92254,75.970929 -1.78201,-1.17183"
-             id="path3922-7"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="cc" />
-        </g>
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/src/Gui/Icons/Part_Measure_Toggle_All.svg b/src/Gui/Icons/Part_Measure_Toggle_All.svg
deleted file mode 100644
index e0a2778566..0000000000
--- a/src/Gui/Icons/Part_Measure_Toggle_All.svg
+++ /dev/null
@@ -1,478 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="64px"
-   height="64px"
-   id="svg2943"
-   sodipodi:version="0.32"
-   inkscape:version="0.48.5 r10040"
-   sodipodi:docname="Part_Measure_Toggle_All.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   version="1.1">
-  <defs
-     id="defs2945">
-    <linearGradient
-       id="linearGradient4158">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop4160" />
-      <stop
-         style="stop-color:#f6f6f6;stop-opacity:0;"
-         offset="1"
-         id="stop4162" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4122">
-      <stop
-         style="stop-color:#e3d328;stop-opacity:1;"
-         offset="0"
-         id="stop4124" />
-      <stop
-         style="stop-color:#e1dec3;stop-opacity:1;"
-         offset="1"
-         id="stop4126" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4088">
-      <stop
-         style="stop-color:#e9cd23;stop-opacity:1;"
-         offset="0"
-         id="stop4090" />
-      <stop
-         style="stop-color:#040000;stop-opacity:0;"
-         offset="1"
-         id="stop4092" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient4060">
-      <stop
-         style="stop-color:#ada9a9;stop-opacity:1;"
-         offset="0"
-         id="stop4062" />
-      <stop
-         style="stop-color:#ada9a9;stop-opacity:0;"
-         offset="1"
-         id="stop4064" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4052">
-      <stop
-         style="stop-color:#ada9a9;stop-opacity:1;"
-         offset="0"
-         id="stop4054" />
-      <stop
-         style="stop-color:#ada9a9;stop-opacity:0;"
-         offset="1"
-         id="stop4056" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4349">
-      <stop
-         style="stop-color:#898709;stop-opacity:1;"
-         offset="0"
-         id="stop4351" />
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="1"
-         id="stop4353" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5241">
-      <stop
-         style="stop-color:#212c45;stop-opacity:1;"
-         offset="0"
-         id="stop5243" />
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="1"
-         id="stop5245" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5227"
-       osb:paint="solid">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop5229" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3902">
-      <stop
-         style="stop-color:#000000;stop-opacity:0.58823532;"
-         offset="0"
-         id="stop3904" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0.39215687;"
-         offset="1"
-         id="stop3906" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3894">
-      <stop
-         style="stop-color:#45351d;stop-opacity:1;"
-         offset="0"
-         id="stop3896" />
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="1"
-         id="stop3898" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3886">
-      <stop
-         style="stop-color:#45351d;stop-opacity:1;"
-         offset="0"
-         id="stop3888" />
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="1"
-         id="stop3890" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3792">
-      <stop
-         style="stop-color:#aaaaaa;stop-opacity:1;"
-         offset="0"
-         id="stop3794" />
-      <stop
-         style="stop-color:#d2d2d2;stop-opacity:1;"
-         offset="1"
-         id="stop3796" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3784">
-      <stop
-         style="stop-color:#bebebe;stop-opacity:1;"
-         offset="0"
-         id="stop3786" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.39215687;"
-         offset="1"
-         id="stop3788" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3377">
-      <stop
-         id="stop3379"
-         offset="0"
-         style="stop-color:#71b2f8;stop-opacity:1;" />
-      <stop
-         id="stop3381"
-         offset="1"
-         style="stop-color:#002795;stop-opacity:1;" />
-    </linearGradient>
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 32 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="64 : 32 : 1"
-       inkscape:persp3d-origin="32 : 21.333333 : 1"
-       id="perspective2951" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4052"
-       id="linearGradient4058"
-       x1="138.99986"
-       y1="44.863674"
-       x2="92.497559"
-       y2="-14.356517"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(168.6744,65.825928)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4060"
-       id="linearGradient4066"
-       x1="103.93729"
-       y1="49.179436"
-       x2="120.49899"
-       y2="0.21229285"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(168.6744,65.825928)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4122"
-       id="linearGradient4128"
-       x1="391.3074"
-       y1="120.81136"
-       x2="394.43201"
-       y2="112.43636"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-88.034794,-1.0606602)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4158"
-       id="linearGradient4164"
-       x1="419.99387"
-       y1="102.77802"
-       x2="458.7193"
-       y2="69.431564"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-129.22376,-0.88388348)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3944"
-       id="linearGradient3950"
-       x1="285.7092"
-       y1="75.886589"
-       x2="301.7092"
-       y2="119.88659"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3944">
-      <stop
-         style="stop-color:#8ae234;stop-opacity:1"
-         offset="0"
-         id="stop3946" />
-      <stop
-         style="stop-color:#4e9a06;stop-opacity:1"
-         offset="1"
-         id="stop3948" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3953"
-       id="linearGradient3959"
-       x1="214.70918"
-       y1="80.886589"
-       x2="218.70918"
-       y2="104.88659"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(80,0)" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3953">
-      <stop
-         style="stop-color:#babdb6;stop-opacity:1"
-         offset="0"
-         id="stop3955" />
-      <stop
-         style="stop-color:#555753;stop-opacity:1"
-         offset="1"
-         id="stop3957" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3961"
-       id="linearGradient3967"
-       x1="196.70918"
-       y1="106.88659"
-       x2="190.70918"
-       y2="80.886589"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(80,0)" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3961">
-      <stop
-         style="stop-color:#babdb6;stop-opacity:1"
-         offset="0"
-         id="stop3963" />
-      <stop
-         style="stop-color:#d3d7cf;stop-opacity:1"
-         offset="1"
-         id="stop3965" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4061"
-       id="linearGradient4059"
-       gradientUnits="userSpaceOnUse"
-       x1="266.08176"
-       y1="90.401306"
-       x2="301.7092"
-       y2="119.88659" />
-    <linearGradient
-       id="linearGradient4061"
-       inkscape:collect="always">
-      <stop
-         id="stop4063"
-         offset="0"
-         style="stop-color:#ef2929;stop-opacity:1" />
-      <stop
-         id="stop4065"
-         offset="1"
-         style="stop-color:#a40000;stop-opacity:1" />
-    </linearGradient>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="5.6458057"
-     inkscape:cx="38.919946"
-     inkscape:cy="27.398693"
-     inkscape:current-layer="g3629"
-     showgrid="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     inkscape:window-width="1600"
-     inkscape:window-height="837"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3061"
-       empspacing="2"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata2948">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <g
-       id="g3629"
-       transform="translate(-256.70919,-66.886588)">
-      <path
-         style="fill:#e3d328;fill-opacity:1;stroke:#040400;stroke-width:0.08838835;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d=""
-         id="path4102"
-         inkscape:connector-curvature="0"
-         transform="translate(256.70919,66.886588)" />
-      <path
-         style="fill:#babdb6;stroke:#2e3436;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
-         d="m 285.70919,77.886588 -26,-4 c 0,11 0,26.000002 2,36.000002 l 30,12 0,-6 -2,-4 c 8,-12 0,-24.000002 -4,-34.000002 z"
-         id="path3100"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccccc" />
-      <path
-         style="fill:#555753;stroke:#2e3436;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
-         d="m 291.70919,121.88659 12,-4 0,-6 -12,4 z"
-         id="path3890"
-         inkscape:connector-curvature="0" />
-      <path
-         style="fill:#d3d7cf;stroke:#2e3436;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="m 301.70919,107.88659 -12,4 2,4 12,-4 z"
-         id="path3892"
-         inkscape:connector-curvature="0" />
-      <path
-         style="fill:#888a85;stroke:#2e3436;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="m 285.70919,77.886588 c 4,10 12,22.000002 4,34.000002 l 12,-4 c 8,-12.000002 0,-24.000002 -4,-34.000002 z"
-         id="path3894"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         style="fill:#d3d7cf;stroke:#2e3436;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
-         d="m 259.70919,73.886588 12,-4 26,4 -12,4 z"
-         id="path3888"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         style="fill:url(#linearGradient3967);fill-opacity:1;stroke:#d3d7cf;stroke-width:1.99999976;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 284.30919,79.786588 -22.6,-3.9 c 0,10.043478 -0.0125,23.469562 1.8,32.600002 l 26.2,10.4 0,-2.5 -2.2,-4.5 c 8,-12 1.2,-22.000002 -3.2,-32.100002 z"
-         id="path3100-6"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccccc" />
-      <path
-         style="fill:url(#linearGradient3959);fill-opacity:1;stroke:#babdb6;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="m 288.30919,79.086588 c 4,10 9.4,18.3 5.4,29.300002 l 6.6,-2.2 c 6,-9.000002 1.4,-19.300002 -3.8,-29.900002 z"
-         id="path3894-7"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         sodipodi:type="arc"
-         style="fill:#555753;fill-opacity:1;stroke:#2e3436;stroke-width:2.25831866;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:1.6"
-         id="path3932"
-         sodipodi:cx="-93"
-         sodipodi:cy="39"
-         sodipodi:rx="15"
-         sodipodi:ry="15"
-         d="m -78,39 a 15,15 0 1 1 -30,0 15,15 0 1 1 30,0 z"
-         transform="matrix(0.79999998,0.19607832,0,0.9803916,350.10919,74.8866)" />
-      <path
-         style="fill:#edd400;fill-opacity:1;stroke:#302b00;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:1.6"
-         d="m 287.70919,97.827762 -24,-5.882349 c 0,0 -0.82229,-14.095015 12,-11.764699 11.12322,2.021527 12,17.647048 12,17.647048 z"
-         id="path3932-5"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccsc" />
-      <path
-         style="fill:#edd400;fill-opacity:1;stroke:#302b00;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="m 294.70919,90.886588 c 2,4 3,11.000002 1,15.000002 l 4,-1 c 2,-4 2,-11.000002 0,-15.000002 z"
-         id="path3894-7-9"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         style="fill:#edd400;stroke:#302b00;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="m 293.70919,117.88659 8,-3 16,5 -6,4 z"
-         id="path4003"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         style="fill:#d3d7cf;stroke:#2e3436;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
-         d="m 317.70919,119.88659 0,4 -6,4 0,-4 z"
-         id="path4005"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         style="fill:none;stroke:#172a04;stroke-width:8;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
-         d="m 262.70919,120.88659 0,-44.000002 52,0 0,44.000002"
-         id="path3138"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccc" />
-      <path
-         style="fill:none;stroke:url(#linearGradient3950);stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
-         d="m 262.70919,120.88659 0,-44.000002 52,0 0,44.000002"
-         id="path3138-3"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccc" />
-      <path
-         style="fill:none;stroke:#8ae234;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
-         d="m 261.70919,120.98659 0,-45.100002 52,0 0,45.100002"
-         id="path3138-3-6"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccc" />
-      <g
-         id="g4054"
-         transform="matrix(0.70710678,0.70710678,-0.70710678,0.70710678,160.48434,-175.18501)">
-        <path
-           sodipodi:nodetypes="cccc"
-           inkscape:connector-curvature="0"
-           id="path3138-36"
-           d="m 265.53762,120.88659 0,-35.514721 37.85786,0 0,35.514721"
-           style="fill:none;stroke:#280000;stroke-width:8;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
-        <path
-           sodipodi:nodetypes="cccc"
-           inkscape:connector-curvature="0"
-           id="path3138-3-7"
-           d="m 265.53762,120.88659 0,-35.514721 37.85786,0 0,35.514721"
-           style="fill:none;stroke:url(#linearGradient4059);stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
-        <path
-           sodipodi:nodetypes="cccc"
-           inkscape:connector-curvature="0"
-           id="path3138-3-6-5"
-           d="m 264.53762,120.98659 0,-36.614721 37.85786,0 0,36.614721"
-           style="fill:none;stroke:#ef2929;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/src/Gui/Icons/resource.qrc b/src/Gui/Icons/resource.qrc
index 4323b4667c..1d4e6e059c 100644
--- a/src/Gui/Icons/resource.qrc
+++ b/src/Gui/Icons/resource.qrc
@@ -134,7 +134,7 @@
         <file>view-rotate-right.svg</file>
         <file>view-measurement.svg</file>
         <file>view-measurement-cross.svg</file>
-        <file>umf-measurement.svg</file> 
+        <file>umf-measurement.svg</file>
         <file>Tree_Annotation.svg</file>
         <file>Tree_Dimension.svg</file>
         <file>Tree_Python.svg</file>
@@ -144,8 +144,6 @@
         <file>dagViewPass.svg</file>
         <file>dagViewFail.svg</file>
         <file>dagViewPending.svg</file>
-        <file>Part_Measure_Clear_All.svg</file>
-        <file>Part_Measure_Toggle_All.svg</file>
         <file>spaceball_button.svg</file>
         <file>SpNav-PanLR.svg</file>
         <file>SpNav-PanUD.svg</file>
diff --git a/src/Gui/PreferencePackTemplates/Shortcuts.cfg b/src/Gui/PreferencePackTemplates/Shortcuts.cfg
index 6f3030e17e..6dc7c24db7 100644
--- a/src/Gui/PreferencePackTemplates/Shortcuts.cfg
+++ b/src/Gui/PreferencePackTemplates/Shortcuts.cfg
@@ -362,13 +362,6 @@
           <FCText Name="Part_Loft"></FCText>
           <FCText Name="Part_MakeFace"></FCText>
           <FCText Name="Part_MakeSolid"></FCText>
-          <FCText Name="Part_Measure_Angular"></FCText>
-          <FCText Name="Part_Measure_Clear_All"></FCText>
-          <FCText Name="Part_Measure_Linear"></FCText>
-          <FCText Name="Part_Measure_Refresh"></FCText>
-          <FCText Name="Part_Measure_Toggle_3D"></FCText>
-          <FCText Name="Part_Measure_Toggle_All"></FCText>
-          <FCText Name="Part_Measure_Toggle_Delta"></FCText>
           <FCText Name="Part_Mirror"></FCText>
           <FCText Name="Part_Offset"></FCText>
           <FCText Name="Part_Offset2D"></FCText>