diff --git a/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_ExtensionThreadBoltBottom.svg b/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_ExtensionThreadBoltBottom.svg
index 324e66fb96..ed41956fe6 100644
--- a/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_ExtensionThreadBoltBottom.svg
+++ b/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_ExtensionThreadBoltBottom.svg
@@ -2,44 +2,18 @@
 <!-- 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"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="64"
    height="64"
    viewBox="0 0 16.933333 16.933334"
    version="1.1"
    id="svg843"
-   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
-   sodipodi:docname="filettatura_foro_in_pianta_giallo.svg">
+   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="defs837" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="3.959798"
-     inkscape:cx="-43.983804"
-     inkscape:cy="32.609236"
-     inkscape:document-units="mm"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     units="px"
-     inkscape:pagecheckerboard="true"
-     inkscape:window-width="1366"
-     inkscape:window-height="745"
-     inkscape:window-x="-8"
-     inkscape:window-y="-8"
-     inkscape:window-maximized="1"
-     inkscape:snap-nodes="false"
-     inkscape:snap-others="false" />
   <metadata
      id="metadata840">
     <rdf:RDF>
@@ -48,77 +22,57 @@
         <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
-     inkscape:label="Livello 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-280.06665)">
+     id="layer2">
     <g
-       id="g824"
-       transform="translate(0.19510269,-3.3333334e-6)">
-      <path
-         sodipodi:open="true"
-         d="m 1.9929926,288.52266 a 6.4740801,6.4740801 0 0 1 6.4829481,-6.46341 a 6.4740801,6.4740801 0 0 1 6.4651993,6.48116 a 6.4740801,6.4740801 0 0 1 -6.4793749,6.46699 a 6.4740801,6.4740801 0 0 1 -6.4687803,-6.47758"
-         sodipodi:end="3.1421348"
-         sodipodi:start="3.1432401"
-         sodipodi:ry="6.4740801"
-         sodipodi:rx="6.4740801"
-         sodipodi:cy="288.53333"
-         sodipodi:cx="8.4670639"
-         sodipodi:type="arc"
-         id="path1031"
-         style="opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#2b2200;stroke-width:0.5;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-      <path
-         style="opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#2b2200;stroke-width:0.5;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         id="path1029"
-         sodipodi:type="arc"
-         sodipodi:cx="8.4670639"
-         sodipodi:cy="288.53333"
-         sodipodi:rx="7.8914909"
-         sodipodi:ry="7.8914909"
-         sodipodi:start="3.1432401"
-         sodipodi:end="3.1421348"
-         d="m 0.57558368,288.52032 a 7.8914909,7.8914909 0 0 1 7.90230042,-7.87848 a 7.8914909,7.8914909 0 0 1 7.8806659,7.90012 a 7.8914909,7.8914909 0 0 1 -7.8979451,7.88285 a 7.8914909,7.8914909 0 0 1 -7.88503077,-7.89576"
-         sodipodi:open="true" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path862"
-         d="m 8.5668927,280.18115 c -0.200452,16.70434 -0.200452,16.70434 -0.200452,16.70434"
-         style="fill:none;stroke:#ffff00;stroke-width:0.75;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:3.00000008, 1.50000004, 0.75000002, 1.50000004;stroke-dashoffset:0;stroke-opacity:1" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path862-3"
-         d="m 16.746133,288.70034 c -16.94913804,-0.2004 -16.94913804,-0.2004 -16.94913804,-0.2004"
-         style="fill:none;stroke:#ffff00;stroke-width:0.755;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:3.01999997, 1.50999999, 0.75499999, 1.50999999;stroke-dashoffset:0;stroke-opacity:1" />
-      <path
-         transform="scale(-1)"
-         sodipodi:open="true"
-         d="m -12.735178,-288.54265 a 4.2687368,4.2687368 0 0 1 4.2734194,-4.2617 a 4.2687368,4.2687368 0 0 1 4.2640479,4.27108 a 4.2687368,4.2687368 0 0 1 -4.2687361,4.26639"
-         sodipodi:end="1.5707963"
-         sodipodi:start="3.1432401"
-         sodipodi:ry="4.2687368"
-         sodipodi:rx="4.2687368"
-         sodipodi:cy="-288.53561"
-         sodipodi:cx="-8.4664469"
-         sodipodi:type="arc"
-         id="path1408-5"
-         style="opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#ff0000;stroke-width:1.20000005;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-      <path
-         sodipodi:open="true"
-         d="m 1.3568956,288.52134 a 7.110178,7.2772799 0 0 1 7.1199172,-7.26529 a 7.110178,7.2772799 0 0 1 7.1004252,7.28524 A 7.110178,7.2772799 0 0 1 8.4612444,295.8106 A 7.110178,7.2772799 0 0 1 1.356887,288.52938"
-         sodipodi:end="3.1421348"
-         sodipodi:start="3.1432401"
-         sodipodi:ry="7.2772799"
-         sodipodi:rx="7.110178"
-         sodipodi:cy="288.53333"
-         sodipodi:cx="8.4670639"
-         sodipodi:type="arc"
-         id="path1408"
-         style="opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#ffff00;stroke-width:1;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+       id="g3"
+       transform="translate(0)"
+       style="display:inline">
+      <ellipse
+         style="fill:none;stroke:#555753;stroke-width:1.58751;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none"
+         id="path1"
+         cx="8.4666662"
+         cy="8.4666681"
+         rx="6.8791614"
+         ry="6.8791628" />
+      <ellipse
+         style="fill:none;stroke:#d3d7cf;stroke-width:0.529167;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none"
+         id="ellipse1"
+         cx="8.4666662"
+         cy="8.4666681"
+         rx="6.8791614"
+         ry="6.8791628" />
     </g>
+    <path
+       style="fill:none;stroke:#555753;stroke-width:1.5875;stroke-linejoin:round;stroke-dasharray:none;stroke-dashoffset:1.05833"
+       d="M 0.52916667,8.4666664 H 16.404167"
+       id="path2"
+       transform="translate(0)" />
+    <path
+       style="fill:none;stroke:#555753;stroke-width:1.5875;stroke-linejoin:round;stroke-dasharray:none;stroke-dashoffset:4"
+       d="m 8.4666667,16.404167 2e-7,-15.87500033"
+       id="path6"
+       transform="translate(0)" />
+    <path
+       style="fill:none;stroke:#d3d7cf;stroke-width:0.52916667;stroke-linejoin:round;stroke-dasharray:2.11666679, 1.0583334, 0.5291667, 1.0583334;stroke-dashoffset:0.26458335"
+       d="M 0.52916667,8.4666664 H 16.404167"
+       id="path7"
+       transform="translate(0)" />
+    <path
+       style="fill:none;stroke:#d3d7cf;stroke-width:0.52916667;stroke-linejoin:round;stroke-dasharray:2.11666679, 1.0583334, 0.5291667, 1.0583334;stroke-dashoffset:0.26458335"
+       d="m 8.4666667,16.404167 2e-7,-15.87500033"
+       id="path8"
+       transform="translate(0)" />
+    <path
+       d="M 12.169544,8.4727662 A 3.7035339,3.704185 0 0 1 8.4619464,12.170851 3.7035339,3.704185 0 0 1 4.7624806,8.4646355 3.7035339,3.704185 0 0 1 8.466014,4.7624801"
+       id="path1408-5"
+       style="display:inline;opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#0b1521;stroke-width:1.58746;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    <path
+       d="M 12.169544,8.4727662 A 3.7035339,3.704185 0 0 1 8.4619464,12.170851 3.7035339,3.704185 0 0 1 4.7624806,8.4646355 3.7035339,3.704185 0 0 1 8.466014,4.7624801"
+       id="path3"
+       style="display:inline;opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#729fcf;stroke-width:0.52916667;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
   </g>
 </svg>
diff --git a/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_ExtensionThreadBoltSide.svg b/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_ExtensionThreadBoltSide.svg
index 94e934dd85..6a232cdebc 100644
--- a/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_ExtensionThreadBoltSide.svg
+++ b/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_ExtensionThreadBoltSide.svg
@@ -2,44 +2,18 @@
 <!-- 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"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="64"
    height="64"
    viewBox="0 0 16.933333 16.933334"
    version="1.1"
    id="svg843"
-   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
-   sodipodi:docname="filettatura_vite_perno_vista_leterale_sez_giallo.svg">
+   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="defs837" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="3.959798"
-     inkscape:cx="-28.121209"
-     inkscape:cy="37.299682"
-     inkscape:document-units="mm"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     units="px"
-     inkscape:pagecheckerboard="true"
-     inkscape:window-width="1366"
-     inkscape:window-height="745"
-     inkscape:window-x="-8"
-     inkscape:window-y="-8"
-     inkscape:window-maximized="1"
-     inkscape:snap-nodes="false"
-     inkscape:snap-others="false" />
   <metadata
      id="metadata840">
     <rdf:RDF>
@@ -48,86 +22,57 @@
         <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
-     inkscape:label="Livello 1"
-     inkscape:groupmode="layer"
      id="layer1"
-     transform="translate(0,-280.06665)">
+     transform="translate(-0.02545553)">
     <g
-       id="g834"
-       transform="translate(1.4702479e-7,-0.03725213)">
-      <rect
-         y="280.95236"
-         x="0.79279482"
-         height="14.956573"
-         width="1.349432"
-         id="rect1093"
-         style="opacity:1;fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:#2b2200;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-      <rect
-         style="opacity:1;fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:#2b2200;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         id="rect1095"
-         width="1.349432"
-         height="14.956573"
-         x="14.791106"
-         y="281.05502" />
-      <g
-         transform="translate(-0.10022637)"
-         id="g1179">
-        <path
-           style="fill:#a02c2c;stroke:#ffff00;stroke-width:0.74900001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:2.99599995, 1.49799998, 0.74899999, 1.49799998;stroke-dashoffset:6.66610003;stroke-opacity:1"
-           d="m 8.4967016,280.25378 c -0.057032,16.68194 -0.057032,16.68194 -0.057032,16.68194"
-           id="path862"
-           inkscape:connector-curvature="0" />
-        <rect
-           y="280.28027"
-           x="8.0449562"
-           height="3.0834899"
-           width="0.91023898"
-           id="rect1097"
-           style="opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#2b2200;stroke-width:0.30000001;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-        <rect
-           style="opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#2b2200;stroke-width:0.30000001;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-           id="rect1105"
-           width="0.91023898"
-           height="3.0834899"
-           x="8.0115471"
-           y="293.77737" />
-        <rect
-           style="opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#2b2200;stroke-width:0.30000001;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-           id="rect1107"
-           width="0.91023898"
-           height="3.0834899"
-           x="7.9781384"
-           y="286.99542" />
-        <rect
-           y="284.79971"
-           x="8.0625801"
-           height="0.80150861"
-           width="0.82487911"
-           id="rect1109"
-           style="opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#2b2200;stroke-width:0.30000001;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-        <rect
-           style="opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#2b2200;stroke-width:0.30000001;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-           id="rect1111"
-           width="0.82487911"
-           height="0.80150861"
-           x="8.0625801"
-           y="291.58167" />
-      </g>
+       id="g12">
       <path
-         style="fill:none;stroke:#ff0000;stroke-width:1.30170107;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="m 3.9588485,280.84372 c 0.066419,15.26509 0.066419,15.26509 0.066419,15.26509"
-         id="path1151"
-         inkscape:connector-curvature="0" />
+         style="fill:none;stroke:#555753;stroke-width:1.5875;stroke-linecap:butt;stroke-linejoin:round;stroke-dasharray:none"
+         d="M 2.1421222,14.552084 V 1.8520834"
+         id="path5" />
       <path
-         style="fill:none;stroke:#ff0000;stroke-width:1.29780579;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="m 12.909993,280.91552 c 0.06644,15.1703 0.06644,15.1703 0.06644,15.1703"
-         id="path1153"
-         inkscape:connector-curvature="0" />
+         style="fill:none;stroke:#555753;stroke-width:1.5875;stroke-linecap:butt;stroke-linejoin:round;stroke-dasharray:none"
+         d="M 14.842123,14.552084 V 1.8520834"
+         id="path6" />
+      <path
+         style="fill:none;stroke:#555753;stroke-width:1.5875;stroke-linecap:butt;stroke-linejoin:round;stroke-dasharray:none"
+         d="M 8.4921224,15.610417 V 1.3229167"
+         id="path7" />
+      <path
+         style="fill:none;stroke:#0b1521;stroke-width:1.5875;stroke-linecap:butt;stroke-linejoin:round;stroke-dasharray:none"
+         d="M 4.5233722,14.552084 V 1.8520834"
+         id="path11" />
+      <path
+         style="fill:none;stroke:#0b1521;stroke-width:1.5875;stroke-linecap:butt;stroke-linejoin:round;stroke-dasharray:none"
+         d="M 12.460872,14.552084 V 1.8520834"
+         id="path12" />
+    </g>
+    <g
+       id="g17">
+      <path
+         style="fill:none;stroke:#d3d7cf;stroke-width:0.529167;stroke-linecap:butt;stroke-linejoin:round;stroke-dasharray:none"
+         d="M 2.1421222,14.552084 V 1.8520834"
+         id="path13" />
+      <path
+         style="fill:none;stroke:#d3d7cf;stroke-width:0.529167;stroke-linecap:butt;stroke-linejoin:round;stroke-dasharray:none"
+         d="M 14.842123,14.552084 V 1.8520834"
+         id="path14" />
+      <path
+         style="fill:none;stroke:#d3d7cf;stroke-width:0.529167;stroke-linecap:butt;stroke-linejoin:round;stroke-dasharray:2.11667, 1.05833, 0.529167, 1.05833;stroke-dashoffset:1.05833"
+         d="M 8.4921224,15.610417 V 1.3229167"
+         id="path15" />
+      <path
+         style="fill:none;stroke:#729fcf;stroke-width:0.529167;stroke-linecap:butt;stroke-linejoin:round;stroke-dasharray:none"
+         d="M 4.5233724,14.552084 V 1.8520834"
+         id="path16" />
+      <path
+         style="fill:none;stroke:#729fcf;stroke-width:0.529167;stroke-linecap:butt;stroke-linejoin:round;stroke-dasharray:none"
+         d="M 12.460872,14.552084 V 1.8520834"
+         id="path17" />
     </g>
   </g>
 </svg>
diff --git a/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_ExtensionThreadHoleBottom.svg b/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_ExtensionThreadHoleBottom.svg
index bec523e18a..c899260b69 100644
--- a/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_ExtensionThreadHoleBottom.svg
+++ b/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_ExtensionThreadHoleBottom.svg
@@ -2,44 +2,18 @@
 <!-- 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"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="64"
    height="64"
    viewBox="0 0 16.933333 16.933334"
    version="1.1"
    id="svg843"
-   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
-   sodipodi:docname="filettatura_vite_perno_in_pianta_giallo.svg">
+   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="defs837" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="5.6"
-     inkscape:cx="-11.494932"
-     inkscape:cy="23.49302"
-     inkscape:document-units="mm"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     units="px"
-     inkscape:pagecheckerboard="true"
-     inkscape:window-width="1366"
-     inkscape:window-height="745"
-     inkscape:window-x="-8"
-     inkscape:window-y="-8"
-     inkscape:window-maximized="1"
-     inkscape:snap-nodes="false"
-     inkscape:snap-others="false" />
   <metadata
      id="metadata840">
     <rdf:RDF>
@@ -48,76 +22,50 @@
         <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
-     inkscape:label="Livello 1"
-     inkscape:groupmode="layer"
      id="layer1"
      transform="translate(0,-280.06665)">
     <path
-       style="opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#ffff00;stroke-width:1;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       style="display:inline;opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#555753;stroke-width:1.5875;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        id="path1408-5"
-       sodipodi:type="arc"
-       sodipodi:cx="-8.6379261"
-       sodipodi:cy="-288.37024"
-       sodipodi:rx="4.7936058"
-       sodipodi:ry="4.7364583"
-       sodipodi:start="1.5550658"
-       sodipodi:end="1.5496367"
-       d="m -8.5625233,-283.63437 a 4.7936058,4.7364583 0 0 1 -4.8683087,-4.65494 a 4.7936058,4.7364583 0 0 1 4.7044925,-4.81658 a 4.7936058,4.7364583 0 0 1 4.8810794,4.64186 a 4.7936058,4.7364583 0 0 1 -4.6912427,4.82919"
-       sodipodi:open="true"
-       transform="scale(-1)" />
+       d="m 8.4083989,284.84536 a 3.7041572,3.6963337 0 0 1 3.7618831,3.63272 3.7041572,3.6963337 0 0 1 -3.6352981,3.75887 3.7041572,3.6963337 0 0 1 -3.7717502,-3.62252 3.7041572,3.6963337 0 0 1 3.6250582,-3.7687" />
     <path
-       transform="scale(-1)"
-       sodipodi:open="true"
-       d="m -8.550788,-282.83127 a 5.5396576,5.5396576 0 0 1 -5.625987,-5.44431 a 5.5396576,5.5396576 0 0 1 5.4366753,-5.63337 a 5.5396576,5.5396576 0 0 1 5.6407451,5.42902 a 5.5396576,5.5396576 0 0 1 -5.4213632,5.64811"
-       sodipodi:end="1.5496367"
-       sodipodi:start="1.5550658"
-       sodipodi:ry="5.5396576"
-       sodipodi:rx="5.5396576"
-       sodipodi:cy="-288.37024"
-       sodipodi:cx="-8.6379261"
-       sodipodi:type="arc"
-       id="path1059"
-       style="opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#2b2200;stroke-width:0.5;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+       style="display:inline;opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#d3d7cf;stroke-width:0.52916667;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="path1"
+       d="m 8.4083989,284.84536 a 3.7041572,3.6963337 0 0 1 3.7618831,3.63272 3.7041572,3.6963337 0 0 1 -3.6352981,3.75887 3.7041572,3.6963337 0 0 1 -3.7717502,-3.62252 3.7041572,3.6963337 0 0 1 3.6250582,-3.7687"
+       transform="translate(0)" />
     <path
-       style="opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#2b2200;stroke-width:0.5;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="path1061"
-       sodipodi:type="arc"
-       sodipodi:cx="-8.6379261"
-       sodipodi:cy="-288.37024"
-       sodipodi:rx="4.0749998"
-       sodipodi:ry="4.0749998"
-       sodipodi:start="1.5550658"
-       sodipodi:end="1.5496367"
-       d="m -8.5738269,-284.29574 a 4.0749998,4.0749998 0 0 1 -4.1385041,-4.00487 a 4.0749998,4.0749998 0 0 1 3.9992455,-4.14394 a 4.0749998,4.0749998 0 0 1 4.1493603,3.99362 a 4.0749998,4.0749998 0 0 1 -3.9879819,4.15478"
-       sodipodi:open="true"
-       transform="scale(-1)" />
+       style="fill:none;stroke:#555753;stroke-width:1.5875;stroke-linejoin:round;stroke-dasharray:none;stroke-dashoffset:1.05833"
+       d="M 0.52916667,8.4666664 H 16.404167"
+       id="path2-4"
+       transform="translate(0,280.06665)" />
     <path
-       style="fill:none;stroke:#ffff00;stroke-width:0.75706565;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:3.02826266, 1.51413133, 0.75706566, 1.51413133;stroke-dashoffset:0;stroke-opacity:1"
-       d="M 8.7382827,280.01544 C 8.5380093,297.05119 8.5380093,297.05119 8.5380093,297.05119"
-       id="path862"
-       inkscape:connector-curvature="0" />
+       style="fill:none;stroke:#555753;stroke-width:1.5875;stroke-linejoin:round;stroke-dasharray:none;stroke-dashoffset:4"
+       d="m 8.4666667,16.404167 2e-7,-15.87500033"
+       id="path6"
+       transform="translate(0,280.06665)" />
     <path
-       style="fill:none;stroke:#ffff00;stroke-width:0.76400477;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:3.05601904, 1.52800953, 0.76400476, 1.52800953;stroke-dashoffset:0;stroke-opacity:1"
-       d="M 17.154273,288.53486 C -0.22093996,288.33468 -0.22093996,288.33468 -0.22093996,288.33468"
-       id="path862-3"
-       inkscape:connector-curvature="0" />
+       style="fill:none;stroke:#d3d7cf;stroke-width:0.529167;stroke-linejoin:round;stroke-dasharray:2.11667, 1.05833, 0.529167, 1.05833;stroke-dashoffset:0.264583"
+       d="M 0.52916667,8.4666664 H 16.404167"
+       id="path7"
+       transform="translate(0,280.06665)" />
     <path
-       style="opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#ff0000;stroke-width:1.20000005;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       style="fill:none;stroke:#d3d7cf;stroke-width:0.529167;stroke-linejoin:round;stroke-dasharray:2.11667, 1.05833, 0.529167, 1.05833;stroke-dashoffset:0.264583"
+       d="m 8.4666667,16.404167 2e-7,-15.87500033"
+       id="path8"
+       transform="translate(0,280.06665)" />
+    <path
+       style="display:inline;opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#0b1521;stroke-width:1.5875;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        id="path1408"
-       sodipodi:type="arc"
-       sodipodi:cx="-8.6385527"
-       sodipodi:cy="-288.36795"
-       sodipodi:rx="7.3717742"
-       sodipodi:ry="7.3717742"
-       sodipodi:start="3.1432401"
-       sodipodi:end="1.5907123"
-       d="m -16.010317,-288.3801 a 7.3717742,7.3717742 0 0 1 4.593088,-6.81588 a 7.3717742,7.3717742 0 0 1 8.0472049,1.6719 a 7.3717742,7.3717742 0 0 1 1.4980023,8.08138 a 7.3717742,7.3717742 0 0 1 -6.9133372,4.44506"
-       sodipodi:open="true"
+       d="m -15.344516,-288.5449 a 6.8788018,6.8794208 0 0 1 4.285934,-6.36066 6.8788018,6.8794208 0 0 1 7.5090644,1.56023 6.8788018,6.8794208 0 0 1 1.3978265,7.54164 6.8788018,6.8794208 0 0 1 -6.4510219,4.14818"
+       transform="scale(-1)" />
+    <path
+       style="display:inline;opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#729fcf;stroke-width:0.52916667;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="path2"
+       d="m -15.344516,-288.5449 a 6.8788018,6.8794208 0 0 1 4.285934,-6.36066 6.8788018,6.8794208 0 0 1 7.5090644,1.56023 6.8788018,6.8794208 0 0 1 1.3978265,7.54164 6.8788018,6.8794208 0 0 1 -6.4510219,4.14818"
        transform="scale(-1)" />
   </g>
 </svg>
diff --git a/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_ExtensionThreadHoleSide.svg b/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_ExtensionThreadHoleSide.svg
index bc976b0627..3f9b0d6c99 100644
--- a/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_ExtensionThreadHoleSide.svg
+++ b/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_ExtensionThreadHoleSide.svg
@@ -2,44 +2,18 @@
 <!-- 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"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="64"
    height="64"
    viewBox="0 0 16.933333 16.933334"
    version="1.1"
    id="svg843"
-   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
-   sodipodi:docname="filettatura_foro_vista_leterale_sez_giallo.svg">
+   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="defs837" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="2.8"
-     inkscape:cx="-76.57437"
-     inkscape:cy="4.7420529"
-     inkscape:document-units="mm"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     units="px"
-     inkscape:pagecheckerboard="true"
-     inkscape:window-width="1366"
-     inkscape:window-height="745"
-     inkscape:window-x="-8"
-     inkscape:window-y="-8"
-     inkscape:window-maximized="1"
-     inkscape:snap-nodes="false"
-     inkscape:snap-others="false" />
   <metadata
      id="metadata840">
     <rdf:RDF>
@@ -48,82 +22,58 @@
         <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
-     inkscape:label="Livello 1"
-     inkscape:groupmode="layer"
      id="layer1"
-     transform="translate(0,-280.06665)">
+     transform="translate(-0.02545553)"
+     style="display:inline">
     <g
-       id="g835"
-       transform="translate(2.1860055e-7,-0.03725213)">
+       id="g12">
       <path
-         inkscape:connector-curvature="0"
-         id="path862"
-         d="m 8.5105388,280.25378 c -0.057032,16.68194 -0.057032,16.68194 -0.057032,16.68194"
-         style="fill:#a02c2c;stroke:#ffff00;stroke-width:0.74900001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:2.99599995, 1.49799998, 0.74899999, 1.49799998;stroke-dashoffset:6.66610003;stroke-opacity:1" />
+         style="fill:none;stroke:#0b1521;stroke-width:1.5875;stroke-linecap:butt;stroke-linejoin:round;stroke-dasharray:none"
+         d="M 2.1421222,14.552084 V 1.8520834"
+         id="path5" />
       <path
-         inkscape:connector-curvature="0"
-         id="path845"
-         d="m 1.3195616,280.7769 c 0.066419,15.26509 0.066419,15.26509 0.066419,15.26509"
-         style="fill:none;stroke:#ff0000;stroke-width:1.30170107;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+         style="fill:none;stroke:#0b1521;stroke-width:1.5875;stroke-linecap:butt;stroke-linejoin:round;stroke-dasharray:none"
+         d="M 14.842123,14.552084 V 1.8520834"
+         id="path6" />
       <path
-         inkscape:connector-curvature="0"
-         id="path845-6"
-         d="m 15.549279,280.98234 c 0.06644,15.1703 0.06644,15.1703 0.06644,15.1703"
-         style="fill:none;stroke:#ff0000;stroke-width:1.29780579;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <rect
-         style="opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#2b2200;stroke-width:0.30000001;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         id="rect1097"
-         width="0.91023898"
-         height="3.0834899"
-         x="8.0587931"
-         y="280.28027" />
-      <rect
-         y="281.086"
-         x="3.2650385"
-         height="14.956573"
-         width="1.349432"
-         id="rect1093"
-         style="opacity:1;fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:#2b2200;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-      <rect
-         style="opacity:1;fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:#2b2200;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         id="rect1095"
-         width="1.349432"
-         height="14.956573"
-         x="12.318863"
-         y="281.05502" />
-      <rect
-         y="293.77737"
-         x="8.0253839"
-         height="3.0834899"
-         width="0.91023898"
-         id="rect1105"
-         style="opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#2b2200;stroke-width:0.30000001;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-      <rect
-         y="286.99542"
-         x="7.9919758"
-         height="3.0834899"
-         width="0.91023898"
-         id="rect1107"
-         style="opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#2b2200;stroke-width:0.30000001;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-      <rect
-         style="opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#2b2200;stroke-width:0.30000001;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         id="rect1109"
-         width="0.82487911"
-         height="0.80150861"
-         x="8.076417"
-         y="284.79971" />
-      <rect
-         y="291.58167"
-         x="8.076417"
-         height="0.80150861"
-         width="0.82487911"
-         id="rect1111"
-         style="opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#2b2200;stroke-width:0.30000001;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+         style="fill:none;stroke:#555753;stroke-width:1.5875;stroke-linecap:butt;stroke-linejoin:round;stroke-dasharray:none"
+         d="M 8.4921224,15.610417 V 1.3229167"
+         id="path7" />
+      <path
+         style="fill:none;stroke:#555753;stroke-width:1.5875;stroke-linecap:butt;stroke-linejoin:round;stroke-dasharray:none"
+         d="M 4.5233722,14.552084 V 1.8520834"
+         id="path11" />
+      <path
+         style="fill:none;stroke:#555753;stroke-width:1.5875;stroke-linecap:butt;stroke-linejoin:round;stroke-dasharray:none"
+         d="M 12.460872,14.552084 V 1.8520834"
+         id="path12" />
+    </g>
+    <g
+       id="g17">
+      <path
+         style="fill:none;stroke:#729fcf;stroke-width:0.529167;stroke-linecap:butt;stroke-linejoin:round;stroke-dasharray:none"
+         d="M 2.1421222,14.552084 V 1.8520834"
+         id="path13" />
+      <path
+         style="fill:none;stroke:#729fcf;stroke-width:0.529167;stroke-linecap:butt;stroke-linejoin:round;stroke-dasharray:none"
+         d="M 14.842123,14.552084 V 1.8520834"
+         id="path14" />
+      <path
+         style="fill:none;stroke:#d3d7cf;stroke-width:0.529167;stroke-linecap:butt;stroke-linejoin:round;stroke-dasharray:2.11667, 1.05833, 0.529167, 1.05833;stroke-dashoffset:1.05833"
+         d="M 8.4921224,15.610417 V 1.3229167"
+         id="path15" />
+      <path
+         style="fill:none;stroke:#d3d7cf;stroke-width:0.529167;stroke-linecap:butt;stroke-linejoin:round;stroke-dasharray:none"
+         d="M 4.5233724,14.552084 V 1.8520834"
+         id="path16" />
+      <path
+         style="fill:none;stroke:#d3d7cf;stroke-width:0.529167;stroke-linecap:butt;stroke-linejoin:round;stroke-dasharray:none"
+         d="M 12.460872,14.552084 V 1.8520834"
+         id="path17" />
     </g>
   </g>
 </svg>