diff --git a/src/Mod/BIM/Resources/icons/BIM_Glue.svg b/src/Mod/BIM/Resources/icons/BIM_Glue.svg
index 7f5d1cec97..1a17d2cd01 100644
--- a/src/Mod/BIM/Resources/icons/BIM_Glue.svg
+++ b/src/Mod/BIM/Resources/icons/BIM_Glue.svg
@@ -1,446 +1,98 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
 <svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
+   role="img"
+   focusable="false"
+   aria-hidden="true"
+   viewBox="0 0 64 64"
+   version="1.1"
+   id="svg1"
+   width="64"
+   height="64"
+   xml:space="preserve"
    xmlns:xlink="http://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="svg2568"
-   sodipodi:version="0.32"
-   inkscape:version="0.92.3 (2405546, 2018-03-11)"
-   sodipodi:docname="BIM_Glue.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   version="1.1">
-  <defs
-     id="defs2570">
-    <linearGradient
-       id="linearGradient875">
-      <stop
-         id="stop871"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"><defs
+     id="defs1"><linearGradient
+       id="linearGradient46"><stop
+         style="stop-color:#729fcf;stop-opacity:1;"
          offset="0"
-         style="stop-color:#ff1900;stop-opacity:1" />
-      <stop
-         id="stop873"
+         id="stop46" /><stop
+         style="stop-color:#3465a4;stop-opacity:1;"
          offset="1"
-         style="stop-color:#cf8872;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3864">
-      <stop
-         id="stop3866"
+         id="stop45" /></linearGradient><linearGradient
+       id="linearGradient44"><stop
+         style="stop-color:#729fcf;stop-opacity:1;"
          offset="0"
-         style="stop-color:#71b2f8;stop-opacity:1;" />
-      <stop
-         id="stop3868"
+         id="stop44" /><stop
+         style="stop-color:#3465a4;stop-opacity:1;"
          offset="1"
-         style="stop-color:#002795;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3593">
-      <stop
-         style="stop-color:#c8e0f9;stop-opacity:1;"
+         id="stop43" /></linearGradient><linearGradient
+       id="linearGradient39"><stop
+         style="stop-color:#fce94f;stop-opacity:1;"
          offset="0"
-         id="stop3595" />
-      <stop
-         style="stop-color:#637dca;stop-opacity:1;"
+         id="stop38" /><stop
+         style="stop-color:#c4a000;stop-opacity:1;"
          offset="1"
-         id="stop3597" />
-    </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="perspective2576" />
-    <linearGradient
-       id="linearGradient3143">
-      <stop
-         style="stop-color:#3465a4;stop-opacity:1"
-         offset="0"
-         id="stop3145" />
-      <stop
-         style="stop-color:#729fcf;stop-opacity:1"
-         offset="1"
-         id="stop3147" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3143-7">
-      <stop
-         style="stop-color:#729fcf;stop-opacity:1"
-         offset="0"
-         id="stop3145-0" />
-      <stop
-         style="stop-color:#204a87;stop-opacity:1"
-         offset="1"
-         id="stop3147-9" />
-    </linearGradient>
-    <radialGradient
-       r="19.571428"
-       fy="26.281744"
-       fx="46.534134"
-       cy="26.281744"
-       cx="46.534134"
+         id="stop39" /></linearGradient><linearGradient
+       xlink:href="#linearGradient39"
+       id="linearGradient13"
        gradientUnits="userSpaceOnUse"
-       id="radialGradient3090-3"
-       xlink:href="#linearGradient3143-6"
-       inkscape:collect="always"
-       gradientTransform="matrix(1.1486088,1.8477617,-3.056673,1.900094,73.257745,-112.1016)" />
-    <linearGradient
-       id="linearGradient3143-6">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0"
-         id="stop3145-7" />
-      <stop
-         style="stop-color:#d3d7cf;stop-opacity:1"
-         offset="1"
-         id="stop3147-5" />
-    </linearGradient>
-    <radialGradient
-       r="19.571428"
-       fy="26.281744"
-       fx="46.534134"
-       cy="26.281744"
-       cx="46.534134"
+       x1="23.90682"
+       y1="18.865206"
+       x2="9.2401533"
+       y2="2.8652053" /><linearGradient
+       xlink:href="#linearGradient44"
+       id="linearGradient54"
        gradientUnits="userSpaceOnUse"
-       id="radialGradient3090-5"
-       xlink:href="#linearGradient3143-62"
-       inkscape:collect="always"
-       gradientTransform="matrix(1.1486088,1.8477617,-3.056673,1.900094,73.257745,-112.1016)" />
-    <linearGradient
-       id="linearGradient3143-62">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0"
-         id="stop3145-9" />
-      <stop
-         style="stop-color:#d3d7cf;stop-opacity:1"
-         offset="1"
-         id="stop3147-1" />
-    </linearGradient>
-    <radialGradient
-       r="19.571428"
-       fy="30.181183"
-       fx="56.831726"
-       cy="30.181183"
-       cx="56.831726"
+       x1="5"
+       y1="49"
+       x2="30"
+       y2="59" /><linearGradient
+       xlink:href="#linearGradient46"
+       id="linearGradient55"
        gradientUnits="userSpaceOnUse"
-       id="radialGradient3090-36"
-       xlink:href="#linearGradient3143"
-       inkscape:collect="always"
-       gradientTransform="matrix(-0.51094884,-0.61313857,0.25133659,-0.20944716,37.451381,61.165998)" />
-    <radialGradient
-       r="19.571428"
-       fy="30.181183"
-       fx="56.831726"
-       cy="30.181183"
-       cx="56.831726"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient3090-6"
-       xlink:href="#linearGradient3143"
-       inkscape:collect="always"
-       gradientTransform="matrix(-0.51094884,-0.61313857,0.25133659,-0.20944716,37.451381,61.165998)" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect4415"
-       effect="spiro" />
-    <linearGradient
-       id="linearGradient4362">
-      <stop
-         style="stop-color:#faff2b;stop-opacity:1;"
-         offset="0"
-         id="stop4364" />
-      <stop
-         style="stop-color:#ffaa00;stop-opacity:1;"
-         offset="1"
-         id="stop4366" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4356">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop4358" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop4360" />
-    </linearGradient>
-    <radialGradient
-       gradientUnits="userSpaceOnUse"
-       r="19.467436"
-       fy="28.869568"
-       fx="45.883327"
-       cy="28.869568"
-       cx="45.883327"
-       id="radialGradient3692"
-       xlink:href="#linearGradient4362"
-       inkscape:collect="always" />
-    <radialGradient
-       gradientTransform="matrix(0.97435,0.2250379,-0.4623105,2.0016728,48.487554,-127.99883)"
-       r="19.467436"
-       fy="97.369568"
-       fx="135.38333"
-       cy="97.369568"
-       cx="135.38333"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient3703"
-       xlink:href="#linearGradient4362"
-       inkscape:collect="always" />
-    <radialGradient
-       gradientTransform="matrix(1.3852588,-0.05136783,0.03705629,0.9993132,-60.392403,7.7040438)"
-       r="19.467436"
-       fy="81.869568"
-       fx="148.88333"
-       cy="81.869568"
-       cx="148.88333"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient3705"
-       xlink:href="#linearGradient4362"
-       inkscape:collect="always" />
-    <inkscape:perspective
-       id="perspective2868"
-       inkscape:persp3d-origin="32 : 21.333333 : 1"
-       inkscape:vp_z="64 : 32 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 32 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <radialGradient
-       gradientTransform="matrix(0.9271142,0.3747789,-0.7448337,1.8425422,97.364191,-190.34757)"
-       r="19.467436"
-       fy="103.54697"
-       fx="271.96695"
-       cy="103.54697"
-       cx="271.96695"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient3713"
-       xlink:href="#linearGradient3377-1"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient3377-1">
-      <stop
-         style="stop-color:#c8ff43;stop-opacity:1;"
-         offset="0"
-         id="stop3379-5" />
-      <stop
-         style="stop-color:#04aa00;stop-opacity:1;"
-         offset="1"
-         id="stop3381-9" />
-    </linearGradient>
-    <radialGradient
-       r="19.571428"
-       fy="-6.229341"
-       fx="109.47948"
-       cy="-6.229341"
-       cx="109.47948"
-       gradientTransform="matrix(0.7037846,0.9728679,-1.3005398,0.9408264,121.13694,-67.560812)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient3784"
-       xlink:href="#linearGradient3864"
-       inkscape:collect="always" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3864"
-       id="radialGradient3009"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.7037846,0.9728679,-1.3005398,0.9408264,121.13694,-67.560812)"
-       cx="109.47948"
-       cy="-6.229341"
-       fx="109.47948"
-       fy="-6.229341"
-       r="19.571428" />
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       y2="99.250221"
-       x2="317.44043"
-       y1="99.250221"
-       x1="259.61429"
-       id="linearGradient3784"
-       xlink:href="#linearGradient4362"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="118.55784"
-       x2="298.46048"
-       y1="93.57151"
-       x1="276.57507"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3792"
-       xlink:href="#linearGradient4362"
-       inkscape:collect="always" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3011"
-       id="radialGradient3062"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.4090915,3.8636359,-0.97565325,-0.35582669,437.08461,-816.22007)"
-       cx="225.93762"
-       cy="91.956673"
-       fx="225.93762"
-       fy="91.956673"
-       r="22" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3011">
-      <stop
-         style="stop-color:#fce94f;stop-opacity:1"
-         offset="0"
-         id="stop3013" />
-      <stop
-         style="stop-color:#c4a000;stop-opacity:1"
-         offset="1"
-         id="stop3015" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3011"
-       id="radialGradient3086"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.4090915,3.8636359,-0.97565325,-0.35582669,355.44592,-815.80833)"
-       cx="225.93762"
-       cy="91.956673"
-       fx="225.93762"
-       fy="91.956673"
-       r="22" />
-    <radialGradient
-       r="22"
-       fy="91.956673"
-       fx="225.93762"
-       cy="91.956673"
-       cx="225.93762"
-       gradientTransform="matrix(-1.4090915,3.8636359,-0.97565325,-0.35582669,355.44592,-815.80833)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient3174"
-       xlink:href="#linearGradient3011"
-       inkscape:collect="always" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3143"
-       id="radialGradient875-3"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0729927,-1.2773725,0.81423443,-0.68370293,20.342552,125.64372)"
-       cx="49.032608"
-       cy="55.597115"
-       fx="49.032608"
-       fy="55.597115"
-       r="19.571428" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3143"
-       id="radialGradient875-0"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0729927,-1.2773725,0.81423443,-0.68370293,20.342552,125.64372)"
-       cx="49.032608"
-       cy="55.597115"
-       fx="49.032608"
-       fy="55.597115"
-       r="19.571428" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3143"
-       id="radialGradient875-6"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0729927,-1.2773725,0.81423443,-0.68370293,20.342552,125.64372)"
-       cx="49.032608"
-       cy="55.597115"
-       fx="49.032608"
-       fy="55.597115"
-       r="19.571428" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3143"
-       id="radialGradient1082-9"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.11728043,-1.2216969,0.56204378,-0.05109491,22.270025,75.548004)"
-       cx="37.254848"
-       cy="-19.367573"
-       fx="37.254848"
-       fy="-19.367573"
-       r="19.571428" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="6.6796364"
-     inkscape:cx="-13.062585"
-     inkscape:cy="27.441086"
-     inkscape:current-layer="g3560"
-     showgrid="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     inkscape:window-width="1920"
-     inkscape:window-height="1051"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2996"
-       empspacing="2"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata2573">
-    <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 />
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>[wmayer]</dc:title>
-          </cc:Agent>
-        </dc:creator>
-        <dc:title>Part_Common</dc:title>
-        <dc:date>2011-10-10</dc:date>
-        <dc:relation>http://www.freecadweb.org/wiki/index.php?title=Artwork</dc:relation>
-        <dc:publisher>
-          <cc:Agent>
-            <dc:title>FreeCAD</dc:title>
-          </cc:Agent>
-        </dc:publisher>
-        <dc:identifier>FreeCAD/src/Mod/Part/Gui/Resources/icons/Part_Common.svg</dc:identifier>
-        <dc:rights>
-          <cc:Agent>
-            <dc:title>FreeCAD LGPL2+</dc:title>
-          </cc:Agent>
-        </dc:rights>
-        <cc:license>https://www.gnu.org/copyleft/lesser.html</cc:license>
-        <dc:contributor>
-          <cc:Agent>
-            <dc:title>[agryson] Alexander Gryson</dc:title>
-          </cc:Agent>
-        </dc:contributor>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <g
-       id="g3560"
-       transform="matrix(0.91273618,0,0,0.90349515,105.85374,2.800363)">
-      <path
-         style="opacity:1;vector-effect:none;fill:#ff1900;fill-opacity:1;stroke:#210b0c;stroke-width:1.99799991;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none"
-         d="M 16.908203 8.578125 L 12.248047 19.759766 L 10.826172 20.107422 L 10.826172 23.173828 L 3.8144531 40 C 3.8144531 41.678979 6.8479222 42.773823 10.826172 43.314453 L 10.826172 49.470703 L 38.826172 54.107422 L 56.826172 46.107422 L 56.826172 18.107422 L 32.976562 14.685547 L 20.705078 17.689453 L 16.908203 8.578125 z "
-         transform="matrix(1.0956068,0,0,1.1068128,-115.97408,-3.0994776)"
-         id="path2993" />
-    </g>
-  </g>
-</svg>
+       gradientTransform="translate(29)"
+       x1="5"
+       y1="49"
+       x2="30"
+       y2="59" /></defs><metadata
+     id="metadata3"><rdf:RDF><cc:Work
+         rdf:about=""><dc:rights><cc:Agent><dc:title>FreeCAD LGPL2+</dc:title></cc:Agent></dc:rights><dc:publisher><cc:Agent><dc:title>FreeCAD</dc:title></cc:Agent></dc:publisher><dc:relation>https://www.freecad.org/wiki/index.php?title=Artwork</dc:relation><cc:license
+           rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" /></cc:Work><cc:License
+         rdf:about="http://creativecommons.org/licenses/by-sa/4.0/"><cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" /><cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" /><cc:requires
+           rdf:resource="http://creativecommons.org/ns#Notice" /><cc:requires
+           rdf:resource="http://creativecommons.org/ns#Attribution" /><cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" /><cc:requires
+           rdf:resource="http://creativecommons.org/ns#ShareAlike" /></cc:License></rdf:RDF></metadata><g
+     id="g3-3-7"
+     transform="matrix(1.5,0,0,1.5,7.13977,0.70219223)"
+     style="display:inline;stroke:#333333;stroke-width:1.33333;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1"><path
+       id="path1-6-0"
+       style="display:inline;fill:url(#linearGradient13);fill-opacity:1;stroke:#333333;stroke-width:1.33333;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1"
+       d="M 7.906818,3.5318715 V 18.198538 c 0,1.10457 0.8954304,2 1.9999997,2 h 2.6666673 v 2.666667 h 1.999998 l 1.333334,6 h 1.333335 l 1.333331,-6 h 2.000002 v -2.666667 h 2.666666 c 1.10457,0 2,-0.89543 2,-2 V 3.5318715 c 0,-1.1045693 -0.89543,-1.9999997 -2,-1.9999997 H 9.9068177 c -1.1045693,0 -1.9999997,0.8954304 -1.9999997,1.9999997 z" /></g><path
+     style="fill:none;stroke:#333333;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
+     d="M 26,30.999999 H 38"
+     id="path2-1-6" /><path
+     id="path1-9-8-2"
+     style="display:inline;fill:none;fill-opacity:1;stroke:#f8e549;stroke-width:1.99999;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1"
+     d="M 21,29 H 43 V 5 H 21 Z" /><path
+     d="m 32,9.9999997 c 0,0 -5,6.4977243 -5,9.9999993 C 27,22.901884 29.11353,25 32,25 c 2.88646,0 5,-2.098116 5,-5.000001 0,-3.502275 -5,-9.9999991 -5,-9.9999993 z"
+     style="display:inline;fill:#ffffff;fill-opacity:1;stroke:#333333;stroke-width:1.99999;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1"
+     id="path1-3-7-6" /><path
+     id="rect2-24"
+     style="fill:url(#linearGradient54);stroke:#333333;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:1"
+     d="M 3,47 H 32 V 61 H 3 Z" /><path
+     id="rect2-2-7"
+     style="fill:none;stroke:#74a1d4;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:1;stroke-opacity:1"
+     d="M 5,59 H 30 V 49 H 5 Z" /><path
+     id="rect2-9-7"
+     style="fill:url(#linearGradient55);stroke:#333333;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:1"
+     d="M 32,47 H 61 V 61 H 32 Z" /><path
+     id="rect2-2-2-5"
+     style="fill:none;stroke:#74a1d4;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:1;stroke-opacity:1"
+     d="M 34,59 H 59 V 49 H 34 Z" /></svg>